From 1ff052ab97747c909c5ce41634085b87937a9bdf Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Fri, 19 Dec 2014 02:57:48 +0000 Subject: [PATCH] Add upstream patch to avoid memory leak with USE=redis Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- app-admin/syslog-ng/ChangeLog | 9 +- app-admin/syslog-ng/Manifest | 10 +- .../syslog-ng/files/3.5/syslog-ng.conf.gentoo | 37 ------ .../files/3.5/syslog-ng.conf.gentoo.fbsd | 25 ---- .../files/3.5/syslog-ng.conf.gentoo.hardened | 115 ------------------ app-admin/syslog-ng/files/3.5/syslog-ng.confd | 42 ------- app-admin/syslog-ng/files/3.5/syslog-ng.rc6 | 59 --------- .../files/3.6/syslog-ng-3.6.2-redis.patch | 29 +++++ app-admin/syslog-ng/syslog-ng-3.6.2.ebuild | 3 +- 9 files changed, 42 insertions(+), 287 deletions(-) delete mode 100644 app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo delete mode 100644 app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd delete mode 100644 app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened delete mode 100644 app-admin/syslog-ng/files/3.5/syslog-ng.confd delete mode 100644 app-admin/syslog-ng/files/3.5/syslog-ng.rc6 create mode 100644 app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index 169f0e515ef9..9c526c216015 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/syslog-ng # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.412 2014/12/18 23:05:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.413 2014/12/19 02:57:42 mr_bones_ Exp $ + + 19 Dec 2014; Michael Sterrett + +files/3.6/syslog-ng-3.6.2-redis.patch, -files/3.5/syslog-ng.conf.gentoo, + -files/3.5/syslog-ng.conf.gentoo.fbsd, + -files/3.5/syslog-ng.conf.gentoo.hardened, -files/3.5/syslog-ng.confd, + -files/3.5/syslog-ng.rc6, syslog-ng-3.6.2.ebuild: + Add upstream patch to avoid memory leak with USE=redis 18 Dec 2014; Michael Sterrett -files/3.6/syslog-ng-3.6.1-link-smtp.patch, diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 402c09705477..af61d1270010 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -5,11 +5,7 @@ AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098 AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444 AUX 3.4/syslog-ng.rc6 2052 SHA256 f2a180881e061963b1cb85aef0b06e54141158009ca8770d6e7a4832a451052f SHA512 f90e205391c716dc19ceae02b410e134a3763426dc7df22058d2624f43f474139e7771f7e38fb1aa3072de7da5e2cac91fc8270c8ae2967c392d56a9bd3bec96 WHIRLPOOL 2d448a7dfea10f25e82954adfe4b77c80a1017a89a3f701384074d5daced1ff44e81d877e71063ee20a230565b64b199b03541bb0d10065634f3130a05122331 -AUX 3.5/syslog-ng.conf.gentoo 1332 SHA256 2e1467150cf65fcf1c7a92736a3ec89562f5ab3168b540e157ffca07951b7c10 SHA512 8b81920a0565d9b5cba3e51090865f8e7515429408c561e7d9999dc9268ebeafaff8dd0aa76f86022f3aac8bf257136a1c31ae392ed67630b8a8112919df7a14 WHIRLPOOL 9d3dddbc82843606c480c82de1661c2a837bff344a1425e4acac2056a5e96485ad2c0eac6ea6c5ccd9ccacf7a5cda726b4af7b1ecf8ee4c9cea00dc1c0c11dec -AUX 3.5/syslog-ng.conf.gentoo.fbsd 727 SHA256 ac6c88f93137de23416dc2b418a1c06a95ba34c5c313bc722ded923737e5cc69 SHA512 61fe1ef88c0347a13d79efd3ee269bcd5a2f8c78eeda24ed5f4a2e4e1795b50099b950b3776e9742c8f17855895cae572f2152aeffde41907f877a4114dc1a8f WHIRLPOOL 9690056468ed0a1ce14c619a219c745abefcb9e3e6e950e84a52ad9d01f31c96afe5f0808dd5cc50b5e9a477fb20dade816960a72b9dca95f7f9acb4164c7d0f -AUX 3.5/syslog-ng.conf.gentoo.hardened 4658 SHA256 4dcd2abc551c2f65fb5ec638ac88fefd56ced339b855c0ba49b38e3ed86b8a94 SHA512 630bb802836caf3b83065ddcbcf8848904e3c2c792a58e02fee740adabbb462bff399c6c7c96451ead0bcc0c5ae1f8e65afeb364e6d267d25281bb51922bbcfc WHIRLPOOL 968c155b857249523c84649078264fd74a58b7916b05171ce8db3807c928bd64d32c54d11629c4189318349e3d7d349d40fe55d0eb0307af559418d1a4cfc5c1 -AUX 3.5/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444 -AUX 3.5/syslog-ng.rc6 2044 SHA256 9e5ba6d869b99d835cde702a028dae89935c234a14dad79e00a3b5e6379e1f91 SHA512 d67a80f7bd831de440b9f8ec2228d2b19eeca1e89dfd739e0cc7b188c7b0e640c240b263bf6250985c5153f1d822226a579535e029584cb8baadeceb59978b3a WHIRLPOOL ec635d0a2c7ec1ee10adeac2ab11ccbab139e2ceefc589e66848d9fbefb853d6bf6b66977523543a2e441e03845e2527ca532855ff21fbb3adb8cecead90574c +AUX 3.6/syslog-ng-3.6.2-redis.patch 853 SHA256 0645bb613776a653b844e8c3bb96ee85cecc9446c073b8646c29cd6428bc4c82 SHA512 fea621e66185509d79bd33ec440a8122faeadaff610c8823d428a6485563f4f83534c5ed40012a4d6818256e278a5bf0cc0d90caa00e60ce3a91561b549ce828 WHIRLPOOL 6eb24eca6c369e25ee3263216b20313e1332c6af13202a8b036ee6d7155adddc912083539a44ed7b3f330a895dddd4d98bb45e1d748a18749f06e31bf5c78ba6 AUX 3.6/syslog-ng.conf.gentoo 1332 SHA256 3e51ccba31ca55d7428e7c01373e3c6700936c115aa165f6a1fc9428500c7f9e SHA512 a39b4baee4a60b252a866e423c4cbeffb7f23d8d6446c40169894d5f45c4ef0e98b14e02e63ce1623e9d08a6e1f4037987bfe9453d3bf65f5315c70583a21d08 WHIRLPOOL 0aba4311cc95303aed2fe51332476bd9cabf3a6f57edfb52e28cf4d76db1a45bcfdb0417a42e30f45ad056a2c4c2675170686817d1d5e985d0c7f5352a6e3d0c AUX 3.6/syslog-ng.conf.gentoo.fbsd 727 SHA256 7f33666d6cf0772e1afa8a09658cb7799aa0278c20c1adb33018c1bc5bef4bcc SHA512 a571d28d4d8f49e204601526b70cce0690f4a5dab61a33c1cd46af1e4199bb2427fc5a0f69257a3f439197abf1177ae26826b0a4cc7762a4acbd0978275eb9ae WHIRLPOOL 332a13c2b7cd25a8826d424fc4ed782d36f37211aeef714913d3d50f3f26332e02b819f06842fbdbcc9a8149ff2f44a3a26df7a37408bf4a1b8d7f963e449973 AUX 3.6/syslog-ng.conf.gentoo.hardened 4658 SHA256 e566c3758b71255bc51bd72fa0a4b7d039c448b3f8fb85ff36b7eff541537e6b SHA512 06988cf6192e498b8f8845de2d192d5495f72bb7ac58276252e77a4593cea04cb6e3d18b9d77f9ea2e3fb18680b2d14799b6bf226f1a1ae1ca6c9f97cf5c1812 WHIRLPOOL f42ef0a3bb28dd066f7cc9b7337e5710b91de6141ee6a94ca81f6c9dd230c6baad9b4cf1e4e4ed4c6c2b7ebcb38be5993fec94c0f907dc35f1a88fa69fbb76a2 @@ -25,6 +21,6 @@ DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c9 DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f EBUILD syslog-ng-3.4.7.ebuild 3448 SHA256 66362e51bac724761c1d558313bd4b66fba6431a5334fe8e1c7989ccf12c977f SHA512 797279853096b6b51c45e63a57493ddb8f12586bc70f9736a4e1ae2c3659a761a432246c7a185d8663e7261a6158071239cc6cf6320c062245463f9dc50a8a92 WHIRLPOOL 636ab2e781b8af18768e494698c16367c892de018799b1dedb9a1c474e4017839a87b06d1aed3ac09bca1b00bebd7c3dc42eed5bf0d7047db6888c9e6bd9e681 EBUILD syslog-ng-3.4.8.ebuild 3588 SHA256 2bf7cb39b5486e7a6b95834ad87ec19a0d00e93126fc57dd826b6bebc3e9e844 SHA512 32eadb10f65970756a30d852dcb14bf0296425e5c256182956d3cc42b8571c46df3a293da40a9ff730046252a3e078413e11543176c39586d5dbcea970e41939 WHIRLPOOL ebbb2b786c6061017d0a69878fb6811d7b97495f948e5c46d8dff695281b864e6f8a8d177f71c7a75652905f4f511c479e26868ccebb7838c211a8dda8ecfc9d -EBUILD syslog-ng-3.6.2.ebuild 3771 SHA256 787008842b39a73c23f0066515dab77e78a1302029e3666e5553e1143a34c20a SHA512 b4ac86e01d2dd9001f7bc625337fa35e49558ea5c5ed5d49c2cdad140897d8e2a801252b5407683b07899ce3c8e44a0b0baa6acd653c7a19fae7fbeafb4c2fcd WHIRLPOOL 987d4e3f2f6ddfdbb672d82d7fba161df194c50e7005b1bad6460ed570c697dc4d3bcf12355f7dc138062617acf5c96a088f1cd9c82153197b88a67c373ba200 -MISC ChangeLog 57876 SHA256 54adf5a5585a7d5a78f5e57f8a7c50b789f6d0d883025b58cd7da60719bcb1eb SHA512 b1c4ee3c83c1bfd55099bbcaed7c1c901ab57c85a6feb83a692eeb0736ab3e14109e733c7e9dafb359c32cfe62d44248b6a1824847c229667a68739fbfcb2937 WHIRLPOOL 02a768a92248ba2475b447443fd809b06afab622891a1286df4fe6875cb39207dbdf9908d31a1a77fe96c3d1103fe2bdb3b16ddce23a6b73f0a37c39ca8af1da +EBUILD syslog-ng-3.6.2.ebuild 3822 SHA256 5bbd53a0fc84d8e0f5a108cce466beac0dbff3e0d5a787bb040aae9b74b3185d SHA512 14a3368135c8e06f80a4a65da4754a381ca3f179c543ea5069c005ddefe541957e298f48a24aa1c609223b192849cddb18939bab1ab60c0c91fc61f30af1d42a WHIRLPOOL 3bf40fb42587ad510849851aaf29c77e654b0857257742152c2d11c4ac2e4d1cad24d7168f699ba16bf79267d36313394ff2ffc69f94840bb186d89ec5a96a9b +MISC ChangeLog 58231 SHA256 feb6a8ac3e4365eafce881318e287d626a7ce8e2751cd1ad317b6791d31d792a SHA512 a4ae5b67c8586399a1e072e597f76d2e36e1e02c6e32456dbe61fc1ac2da15284e623a4f44a1b0f003bbfccabc10a31f722bf0df71b870261688715b8843b858 WHIRLPOOL 259301ed37848e34916ade078616f05058d0a1e3cb7ba702014ca2d3d30407ba8c600488812124010f17d767f297b4d4ed96751df107b47e30c49b848a458642 MISC metadata.xml 792 SHA256 9116bcafb5bc0f8cb3e27e43b474bb387de0467f47fe81f2a2da462cd1438834 SHA512 d81f3f86da8fa594eca1b2224ffe4e07c467f63aee77273b91df7b91256d54653c70b1a3c6543f1a6ce51594f75fdb4245d4ad6766d687275efe7b1811b317a4 WHIRLPOOL efc50cd99fe30a65e83b180794e3d9f58e09f6680c14ea038e09746f414b83c5ba3380d0c6796cca254a4ab81ce676f9dbdefb577abc5a39a26281a8ef9010d2 diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo deleted file mode 100644 index 69a07f17fe27..000000000000 --- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo +++ /dev/null @@ -1,37 +0,0 @@ -@version: 3.5 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $ -# -# Syslog-ng default configuration file for Gentoo Linux - -# https://bugs.gentoo.org/show_bug.cgi?id=426814 -@include "scl.conf" - -options { - threaded(yes); - chain_hostnames(no); - - # The default action of syslog-ng is to log a STATS line - # to the file every 10 minutes. That's pretty ugly after a while. - # Change it to every 12 hours so you get a nice daily update of - # how many messages syslog-ng missed (0). - stats_freq(43200); - # The default action of syslog-ng is to log a MARK line - # to the file every 20 minutes. That's seems high for most - # people so turn it down to once an hour. Set it to zero - # if you don't want the functionality at all. - mark_freq(3600); -}; - -source src { system(); internal(); }; - -destination messages { file("/var/log/messages"); }; - -# By default messages are logged to tty12... -destination console_all { file("/dev/tty12"); }; -# ...if you intend to use /dev/console for programs like xconsole -# you can comment out the destination line above that references /dev/tty12 -# and uncomment the line below. -#destination console_all { file("/dev/console"); }; - -log { source(src); destination(messages); }; -log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd deleted file mode 100644 index 2e42aa4e4a7e..000000000000 --- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd +++ /dev/null @@ -1,25 +0,0 @@ -@version: 3.5 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.fbsd,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $ -# -# Syslog-ng default configuration file for Gentoo FreeBSD -# - -# https://bugs.gentoo.org/show_bug.cgi?id=426814 -@include "scl.conf" - -options { - threaded(yes); - chain_hostnames(no); - - # The default action of syslog-ng is to log a STATS line - # to the file every 10 minutes. That's pretty ugly after a while. - # Change it to every 12 hours so you get a nice daily update of - # how many messages syslog-ng missed (0). - stats_freq(43200); -}; - -source src { system(); internal(); }; - -destination messages { file("/var/log/messages"); }; - -log { source(src); destination(messages); }; diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened deleted file mode 100644 index 282ff91e4470..000000000000 --- a/app-admin/syslog-ng/files/3.5/syslog-ng.conf.gentoo.hardened +++ /dev/null @@ -1,115 +0,0 @@ -@version: 3.5 -# 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/files/3.5/syslog-ng.conf.gentoo.hardened,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $ - -# https://bugs.gentoo.org/show_bug.cgi?id=426814 -@include "scl.conf" - -# -# Syslog-ng configuration file, compatible with default hardened installations. -# - -options { - threaded(yes); - chain_hostnames(no); - stats_freq(43200); -}; - -source src { - unix-dgram("/dev/log"); - internal(); -}; -source kernsrc { - file("/proc/kmsg"); -}; - -#source net { udp(); }; -#log { source(net); destination(net_logs); }; -#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); }; - -destination authlog { file("/var/log/auth.log"); }; -destination _syslog { file("/var/log/syslog"); }; -destination cron { file("/var/log/cron.log"); }; -destination daemon { file("/var/log/daemon.log"); }; -destination kern { file("/var/log/kern.log"); file("/dev/tty12"); }; -destination lpr { file("/var/log/lpr.log"); }; -destination user { file("/var/log/user.log"); }; -destination uucp { file("/var/log/uucp.log"); }; -#destination ppp { file("/var/log/ppp.log"); }; -destination mail { file("/var/log/mail.log"); }; - -destination avc { file("/var/log/avc.log"); }; -destination audit { file("/var/log/audit.log"); }; -destination pax { file("/var/log/pax.log"); }; -destination grsec { file("/var/log/grsec.log"); }; - -destination mailinfo { file("/var/log/mail.info"); }; -destination mailwarn { file("/var/log/mail.warn"); }; -destination mailerr { file("/var/log/mail.err"); }; - -destination newscrit { file("/var/log/news/news.crit"); }; -destination newserr { file("/var/log/news/news.err"); }; -destination newsnotice { file("/var/log/news/news.notice"); }; - -destination debug { file("/var/log/debug"); }; -destination messages { file("/var/log/messages"); }; -destination console { usertty("root"); }; -destination console_all { file("/dev/tty12"); }; -#destination loghost { udp("loghost" port(999)); }; - -destination xconsole { pipe("/dev/xconsole"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { not facility(authpriv, mail); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kern { facility(kern); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -#filter f_ppp { facility(ppp); }; -filter f_news { facility(news); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) - and not facility(auth, authpriv, mail, news); }; -filter f_emergency { level(emerg); }; - -filter f_info { level(info); }; - -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; - -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); }; -log { source(src); filter(f_cron); destination(cron); }; -log { source(src); filter(f_daemon); destination(daemon); }; -log { source(kernsrc); filter(f_kern); destination(kern); }; -log { source(src); filter(f_lpr); destination(lpr); }; -log { source(src); filter(f_mail); destination(mail); }; -log { source(src); filter(f_user); destination(user); }; -log { source(src); filter(f_uucp); destination(uucp); }; -log { source(kernsrc); filter(f_pax); destination(pax); }; -log { source(kernsrc); filter(f_grsec); destination(grsec); }; -log { source(kernsrc); filter(f_audit); destination(audit); }; -log { source(kernsrc); filter(f_avc); destination(avc); }; -log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); }; -log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); }; -log { source(src); filter(f_mail); filter(f_err); destination(mailerr); }; -log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; -log { source(src); filter(f_news); filter(f_err); destination(newserr); }; -log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; -log { source(src); filter(f_debug); destination(debug); }; -log { source(src); filter(f_messages); destination(messages); }; -log { source(src); filter(f_emergency); destination(console); }; -#log { source(src); filter(f_ppp); destination(ppp); }; -log { source(src); destination(console_all); }; diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.confd b/app-admin/syslog-ng/files/3.5/syslog-ng.confd deleted file mode 100644 index 6a437d1bf36f..000000000000 --- a/app-admin/syslog-ng/files/3.5/syslog-ng.confd +++ /dev/null @@ -1,42 +0,0 @@ -# Config file for /etc/init.d/syslog-ng - -# If you are not using network logging, this entire section should be -# commented out. Otherwise, choose one of the settings below based on -# how you are configuring your network. -# -# If you are using the net.* scripts to configure your network, you should -# set rc_need to match the interface through which your logging server -# can be reached. -#rc_need="net.eth0" -# -# If you are using an interface manager like wicd, dhcpcd in standalone -# mode, networkmanager, etc to control your interfaces, set rc_need to -# the name of that service. -# rc_need="dhcpcd" -#rc_need="networkmanager" -# -# If you are using newnet and configuring your interface statically with -# the network script, you should use this setting. -#rc_need="network" -# -# You can use this setting, but I do not recommend relying on it. -#rc_need="net" -# -# You may also want to uncomment the following if you are using network -# logging. -#rc_use="stunnel" - -# For very customized setups these variables can be adjusted as needed -# but for most situations they should remain commented: -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/var/run -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid -# SYSLOG_NG_GROUP=root -# SYSLOG_NG_USER=root - -# Put any additional options for syslog-ng here. -# See syslog-ng(8) for more information. - -SYSLOG_NG_OPTS="" diff --git a/app-admin/syslog-ng/files/3.5/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.5/syslog-ng.rc6 deleted file mode 100644 index 99c7e0450ad2..000000000000 --- a/app-admin/syslog-ng/files/3.5/syslog-ng.rc6 +++ /dev/null @@ -1,59 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.5/syslog-ng.rc6,v 1.1 2014/01/22 04:25:36 mr_bones_ Exp $ - -SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} -SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} -SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} -SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run} -SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} - -SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} -SYSLOG_NG_USER=${SYSLOG_NG_USER:-root} - -command="/usr/sbin/syslog-ng" -command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}" -extra_commands="checkconfig" -extra_started_commands="reload" -pidfile="${SYSLOG_NG_PIDFILE}" -start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" -description="Syslog-ng is a syslog replacement with advanced filtering features." -description_checkconfig="Check the configuration file that will be used by \"start\"" -description_reload="Reload the configuration without exiting" -required_files="${SYSLOG_NG_CONFIGFILE}" -required_dirs="${SYSLOG_NG_PIDFILE_DIR}" - -depend() { - use clock - need hostname localmount - after bootmisc - provide logger -} - -checkconfig() { - ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" - syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" - eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" -} - -start_pre() { - checkconfig || return 1 - checkpath \ - -d \ - --mode 0700 \ - --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ - "${SYSLOG_NG_STATEFILE_DIR}" -} - -stop_pre() { - [ "$RC_CMD" = restart ] && sleep 1 - return 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading configuration and re-opening log files" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch new file mode 100644 index 000000000000..aa00c3b9d0e4 --- /dev/null +++ b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch @@ -0,0 +1,29 @@ +From 0e51c69056a93bd2b95341f005b8b1fdceec2b10 Mon Sep 17 00:00:00 2001 +From: Tibor Benke +Date: Wed, 17 Dec 2014 23:52:41 +0100 +Subject: [PATCH] redis: free reply object after a succesful ping + +--- + modules/redis/redis.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules/redis/redis.c b/modules/redis/redis.c +index 46a5b6b..9114324 100644 +--- a/modules/redis/redis.c ++++ b/modules/redis/redis.c +@@ -132,9 +132,14 @@ redis_dd_format_persist_name(LogThrDestDriver *d) + static gboolean + redis_dd_connect(RedisDriver *self, gboolean reconnect) + { ++ redisReply *reply; ++ + if (reconnect && (self->c != NULL)) + { +- redisCommand(self->c, "ping"); ++ reply = redisCommand(self->c, "ping"); ++ ++ if (reply) ++ freeReplyObject(reply); + + if (!self->c->err) + return TRUE; diff --git a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild index 651d38294452..dbee42c95179 100644 --- a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.6.2.ebuild,v 1.1 2014/12/18 19:37:32 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.2 2014/12/19 02:57:42 mr_bones_ Exp $ EAPI=5 inherit eutils multilib systemd versionator @@ -38,6 +38,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-${MY_PV} src_prepare() { + epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die cd "${TMPDIR}" || die -- 2.26.2