From: Magnus Granberg Date: Mon, 5 Apr 2010 22:19:33 +0000 (+0000) Subject: Fix bug #284669 #232847 #291259 Thank you all X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=986ae63049afa5df2223761ff3a0e813e75680e5;p=gentoo.git Fix bug #284669 #232847 #291259 Thank you all --- diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 924ad87bcf6c..e66d0d744283 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -4,10 +4,10 @@ AUX syslog-ng.conf.gentoo.3.0 1071 RMD160 678ddf3f718b5656351320969b60d8b7e4ba06 AUX syslog-ng.conf.gentoo.fbsd 702 RMD160 2fb49bab8ccc7ce763156ef14dbff858d7e6b416 SHA1 1a6bd708009fd6d18516d66a34bd9cb9ec7c3eed SHA256 ab54cc3e5595fad1b362039932ee8a7d7e852ebda3f08bb20ecc19c1be830751 AUX syslog-ng.conf.gentoo.fbsd.3.0 689 RMD160 2846d0f4983e77c84dd0d910125fc06db35b7bea SHA1 fe691a832c6349f103be06030ef3c0149003ab0c SHA256 7664196305d7937613c8bd5f653fa4703d37e51efc8c5c5f286f30be9da5ecaa AUX syslog-ng.conf.gentoo.hardened 4619 RMD160 0356a63c0a0552f23c119beb0567b5aa7d9fba70 SHA1 c02ad68e91c8198df698990c969fc24a72872530 SHA256 8c229d39e3fcb79d5ac29dcd859ec29cb84e345867985a8a36dcbf72db3ff7bc -AUX syslog-ng.conf.gentoo.hardened.3.0 4513 RMD160 ff17de6ce1f3f627db878b0e45035d087c09b5fa SHA1 5cc68a6435a29295b8a10c3df63172a23b9ba8af SHA256 189f77e5a76969bcb857b31ec94a9b907717c029998169aa32fca37d4028b4df +AUX syslog-ng.conf.gentoo.hardened.3.0 4568 RMD160 0d617eb0feb4d62f3a53fb86d28d6efe57b324bf SHA1 93660b5797ba0a1ca500e9c8788d7863e128e6c0 SHA256 1201c4ee97dc8280260aae8627c57070027c551fc53eb01fd5834f40a3057167 AUX syslog-ng.confd 150 RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d SHA1 c5df6ef1eca2a169fb3073816d4a06b7c85c0b0c SHA256 8319ca8e39a5dab5ddc82eede088e1f58ff25deef330804648000359cb736a3f AUX syslog-ng.logrotate 354 RMD160 120e617e36299bd7bea2ec226c2cda6e1574b793 SHA1 64abb48d2222e9702cbb33bc223507c44dbe2e85 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd1423bf2ae7bffee8ca3 -AUX syslog-ng.logrotate.hardened 1696 RMD160 9f22685778cf6d9c54ab899e586650e356a66498 SHA1 2c40af7591dac343047ac7a517c4ee8a5cb5f0a7 SHA256 e4530dab9b9d3c1a78bc1349e4ae647a6747b0aba7b3d5192f029281d71c89bf +AUX syslog-ng.logrotate.hardened 1746 RMD160 647cb1f31ec8894e05739a987b3066e27b00ccc6 SHA1 6b5f1c6b1febd6509b83555a704350084351dcae SHA256 ea625e0b9037eaecb8f2b1f557a1847408d226bf7aca8d80947ce690a1c9eb80 AUX syslog-ng.rc6-r1 1878 RMD160 1b7d090964cb8868d37e38ff7121c503d41ef38b SHA1 4c019348769fc49af8fa95ee033eebbc876f175e SHA256 68ed87191267b48bfc092fc383d2872dc46f60c550c963923aacd52f71fb100f AUX syslog-ng.rc6.3.0 1882 RMD160 6cae49c65efc4fa347f96edf373077dd9fab1a0c SHA1 0640fc1793b3f54b55961bc9e8bf7a7c556e56b9 SHA256 454c85dc4b007f2d888acbd2b997709c7c607267d7ca62280a9ed2252049672e AUX syslog-ng.rc6.3.0-r1 1860 RMD160 a2c6f92e9659e53a7c638788306059f5a58fe7e8 SHA1 3e593d0690523243ea2ee20d1cbdaa866b11c67e SHA256 f993d65a36e100ae6b6d4671d25f2708d39d46f28c82986cec984409ce350a2a @@ -18,6 +18,7 @@ DIST syslog-ng_3.0.5.tar.gz 567960 RMD160 db8746d35c24af941596bd0c673cc81e14d896 EBUILD syslog-ng-2.0.10.ebuild 2518 RMD160 65c60e0d3f8ba83fd543bc75976f9a4fabea17c8 SHA1 078667b4f3aabc71bdcbf7b9d358b744e5ef28dd SHA256 adf582f295675b6f58734908a42e868ccf57e918495f6dbff160d79ab18ac917 EBUILD syslog-ng-2.1.4.ebuild 2514 RMD160 d4907d2c4f0ed2b7aff50cbdf451253d203dd888 SHA1 23ce928dc151ddd59222c977d2544d2b58576655 SHA256 8afe9b35522c6fafd7721ce0d15466c434585e5f5f269bd7d61705d3b89fb160 EBUILD syslog-ng-3.0.4.ebuild 2918 RMD160 1779eb6e30591cbf5ec3b52f28375a7c87d7d10b SHA1 7e2966b1ce4131d611d9ae1f5cc9a31fa2cd31e4 SHA256 8f6a5eb92b608ec13e95e5584c499db997cc8183fede5746d040f2eea07a821b +EBUILD syslog-ng-3.0.5-r1.ebuild 2931 RMD160 a97b4c1b6af45a09ad9eefad372cfe7f899d2c19 SHA1 c15407e03dda9a778eaa776cd8915a6d4ac58297 SHA256 70c6cc8ce2a367785183692da69f262bc296945d4880d9266ba4693babd8edda EBUILD syslog-ng-3.0.5.ebuild 2931 RMD160 a97b4c1b6af45a09ad9eefad372cfe7f899d2c19 SHA1 c15407e03dda9a778eaa776cd8915a6d4ac58297 SHA256 70c6cc8ce2a367785183692da69f262bc296945d4880d9266ba4693babd8edda MISC ChangeLog 30292 RMD160 2e625366363a91ea461084f54d6e0dd91f8c9c12 SHA1 856d6cbb3a77a857a38b003eb73ead8327b14787 SHA256 6955e23f21550c2bc1d1a1d3594c8a0001c885ab3db716808f357deaaaf0af1f MISC metadata.xml 407 RMD160 cf71f8c335372c633573600fa8a135d51406ab6e SHA1 336703907e8fbc77f751b508f7b65f7775539e65 SHA256 b31b90dd95563d796552d348fbf1158e9d0d93f4ca37ad596d57f22f133c9ac9 diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0 index 1d928f92a58e..d12d89a8fbee 100644 --- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0 +++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0 @@ -1,7 +1,7 @@ @version: 3.0 # Copyright 2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0,v 1.1 2009/05/25 20:07:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0,v 1.2 2010/04/05 22:19:33 zorry Exp $ # # Syslog-ng configuration file, compatible with default hardened installations. @@ -80,10 +80,10 @@ filter f_warn { level(warn); }; filter f_crit { level(crit); }; filter f_err { level(err); }; -filter f_avc { match(".*avc: .*"); }; -filter f_audit { match("^audit.*") and not match(".*avc: .*"); }; -filter f_pax { match("^PAX:.*"); }; -filter f_grsec { match("^grsec:.*"); }; +filter f_avc { message(".*avc: .*"); }; +filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); }; +filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); }; +filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); }; log { source(src); filter(f_authpriv); destination(authlog); }; log { source(src); filter(f_syslog); destination(_syslog); }; diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened index 0527d48971d3..b743b146a0be 100644 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened +++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened @@ -1,12 +1,14 @@ -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened,v 1.2 2007/07/26 20:58:01 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened,v 1.3 2010/04/05 22:19:33 zorry Exp $ # # Syslog-ng logrotate snippet for Hardened Gentoo Linux # contributed by Maciej Grela # +# Updated bug #284669 # Generic /var/log/debug /var/log/syslog /var/log/kern.log { sharedscripts + missingok postrotate /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true endscript @@ -24,6 +26,7 @@ # User log /var/log/user.log { sharedscripts + missingok postrotate /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true endscript diff --git a/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild new file mode 100644 index 000000000000..64939c490ef3 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2010 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.0.5-r1.ebuild,v 1.1 2010/04/05 22:19:33 zorry Exp $ + +EAPI=2 +inherit fixheadtails eutils + +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 ) + >=dev-libs/eventlog-0.2 + >=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} + dev-util/pkgconfig + sys-devel/flex" +PROVIDE="virtual/logger" + +src_prepare() { + ht_fix_file configure +} + +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 \ + --with-pidfile-dir=/var/run \ + $(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 + elif use userland_BSD ; then + newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf + else + newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf + 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 + else + newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng + fi + + newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}-r1" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng +} + +pkg_postinst() { + 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 +}