Add revision to actually propagate changes in the init scripts. This is QA commit...

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index ac2e9c39478331463441e2b97d34feb6bcf4d836..ecd5e4c5e44c65d807a92c2db22b8e6fae11cd80 100644 (file)
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.300 2011/09/22 20:37:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.301 2011/09/22 20:50:07 scarabeus Exp $
+
+  22 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +syslog-ng-3.2.4-r1.ebuild:
+  Add revision to actually propagate changes in the init scripts. This is QA
+  commit and if you want to revert it ask QA for permission first.
 
 *syslog-ng-3.2.4-r1 (22 Sep 2011)
 

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index b8825e0a91c27a305bf4087da57cb8fde2990e2b..3ab17c7de27429cf58c10568376d7bc221c33b35 100644 (file)
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
 AUX syslog-ng.conf.gentoo.fbsd.3.2 689 RMD160 001482d7e90b44896d374f4a1049ece9541a8f2e SHA1 4be46d2f9461c45e743e10e69a4252ce599deee5 SHA256 7249cb13fff50e2695a427fe4dc1285dad6838f576304cb6ddde0c53ff9814ad
 AUX syslog-ng.conf.gentoo.hardened.3.2 4573 RMD160 052ece8eda5e118fb2ce99258c5fc9733675e112 SHA1 97fab61fca9f2387d1c2c890b648f5df363198a7 SHA256 1ed9f8dc0be045bb3064b0ae237adf865689b35c9da58d19ce69367d709191e2
@@ -6,6 +9,24 @@ AUX syslog-ng.logrotate 354 RMD160 120e617e36299bd7bea2ec226c2cda6e1574b793 SHA1
 AUX syslog-ng.logrotate.hardened 1742 RMD160 fd60ca606aec32eae51e3c219fd86124ca1f8cf6 SHA1 675f800200b37496a0335cd27e289b24c8d4f259 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f
 AUX syslog-ng.rc6.3 1856 RMD160 d7e29615e9c93fd2bc56fb45ff3e284248f5f382 SHA1 0db4b5d2fc1de9b881447bffd00abea8f98dab37 SHA256 5d6e19dbc5d7b3e6f348a4c1458c3cb6a4d60aaa268f82e13a6ea39d0ee3e6e8
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
+EBUILD syslog-ng-3.2.4-r1.ebuild 3306 RMD160 1285ff772569a4174eeb343aa86020b6e990cc9d SHA1 968af8d8b36404cc6e42dea463f274cdea25a7c6 SHA256 39cb9d367843eb24d8e3f9bf27603aa0323b6240393b824e348bba670151d0f7
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
-MISC ChangeLog 40661 RMD160 09d5471ac10cb9ded00ae3902e668cd31616eef9 SHA1 3c93026cb900890ff152c980b5812471902c61e4 SHA256 ca4e0865f4593d7c3e6195d82ca6e13b678f2bce3399cee3e44b19c875eef75a
+MISC ChangeLog 40891 RMD160 5cdeaaa9b49ca9189ba9a6c1f66f76ac1eebeb63 SHA1 d8749a082cbf7904dd940a4796926a80da0933ce SHA256 d0a2b82ad47f4210ef95a9c46a79dc67d9aa70352a51feb0e9636f1100a6c195
 MISC metadata.xml 407 RMD160 cf71f8c335372c633573600fa8a135d51406ab6e SHA1 336703907e8fbc77f751b508f7b65f7775539e65 SHA256 b31b90dd95563d796552d348fbf1158e9d0d93f4ca37ad596d57f22f133c9ac9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOe59gAAoJEOSiRoyO7jvokS8P/iGd1mm2O60VCekraxdKd5/U
+dOFPihmKcHfdltThAvNr8zzsr0WoXd0TAljohDUy7BcQw7Ln7lTqoyjvSdGArlxF
+NezlAUfjF6VuAgqu6PEYdlnG+QZ1K1seFJXxBiX3KvB7ktdKbisTL3DAq5zkoWJ/
+IQqS2Mosb+gAh9ii3JCIUlHZk6vbX44Heb4EtRtLmxstgqPLQamBd8fI0EwSLtSe
+JoD+QqFv17OAMnc7tHzTBkJArrGh4hW+1TOE26QddeGymp8oQHqbyvRyTQGXV1Tr
+0HVns68dJsff4kRXw0uoPjI8JJbP3pkc4t0MsOflPV7UlJq+bvfsuWScHuUUnEZn
+9fHLzKIxs/Ry6FPrPR/qT9JcmhXPrjeKT65TYXqLyrKpRifd00dkKdW4iKQhOSuu
+4NmEGaViNpURJn5eoA4JQItNhg1SLZaTdHq4vWgMPJahDluRww2HzQ82w9qmuKvQ
+7h6Rmcfn5SZ36TmzjYmieZMdM6Xcfi6RDA5iK/gAGty5Bb+vDoA4gv33ZEwCq2kO
+jWtEiaOp4oJigOYU7PKcC8U75rWgXJPaMeEvNfJJwGf1FuGOwi4vXxQM64hPmGUK
+7o7F5Mx/7YZt4CTRpt32K6DpopJpFNTesJkWqU8mtXRtkjH67V5Yg4hcaExECPL+
+9p7ha7Uc7xVbeJXFluDo
+=zOMX
+-----END PGP SIGNATURE-----

diff --git a/app-admin/syslog-ng/syslog-ng-3.2.4-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.2.4-r1.ebuild
new file mode 100644 (file)
index 0000000..c50b67d
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.2.4-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.4-r1.ebuild,v 1.3 2011/09/22 20:50:07 scarabeus Exp $
+
+EAPI=2
+inherit autotools fixheadtails eutils multilib
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps hardened ipv6 +pcre selinux spoof-source sql ssl static tcpd"
+RESTRICT="test"
+
+LIBS_DEPEND="
+       spoof-source? ( net-libs/libnet )
+       ssl? ( dev-libs/openssl )
+       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+       !static? ( >=dev-libs/eventlog-0.2.12 )
+       >=dev-libs/glib-2.10.1:2
+       caps? ( sys-libs/libcap )
+       sql? ( >=dev-db/libdbi-0.8.3 )"
+RDEPEND="
+       !static? (
+               pcre? ( dev-libs/libpcre )
+               ${LIBS_DEPEND}
+       )"
+DEPEND="${RDEPEND}
+       ${LIBS_DEPEND}
+       static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
+       dev-util/pkgconfig
+       sys-devel/flex"
+
+src_prepare() {
+       ht_fix_file configure.in
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       if use static ; then
+               myconf="${myconf} --enable-static-linking"
+               if use pcre ; then
+                       ewarn "USE=pcre is incompatible with static linking"
+                       myconf="${myconf} --disable-pcre"
+               fi
+       else
+                       myconf="${myconf} --enable-dynamic-linking"
+       fi
+       econf \
+               --disable-dependency-tracking \
+               --sysconfdir=/etc/syslog-ng \
+               --localstatedir=/var/lib/misc \
+               --with-pidfile-dir=/var/run \
+               --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+               $(use_enable caps linux-caps) \
+               $(use_enable ipv6) \
+               $(use_enable pcre) \
+               $(use_enable spoof-source) \
+               $(use_enable sql) \
+               $(use_enable ssl) \
+               $(use_enable tcpd tcp-wrapper) \
+               ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       dodoc AUTHORS ChangeLog NEWS README \
+               doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
+               contrib/syslog-ng.conf* \
+               contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
+
+       # Install default configuration
+       insinto /etc/syslog-ng
+       if use hardened || use selinux ; then
+               newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
+       elif use userland_BSD ; then
+               newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
+       else
+               newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
+       fi
+
+       insinto /etc/logrotate.d
+       # Install snippet for logrotate, which may or may not be installed
+       if use hardened || use selinux ; then
+               newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
+       else
+               newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
+       fi
+
+       newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
+       newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
+       keepdir /etc/syslog-ng/patterndb.d
+       find "${D}" -type f -name '*.la' -exec rm {} + || die
+}
+
+pkg_postinst() {
+       # bug #355257
+       if ! has_version app-admin/logrotate ; then
+               echo
+               elog "It is highly recommended that app-admin/logrotate be emerged to"
+               elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+               elog "for logrotate to use."
+               echo
+       fi
+}