gentoo resync : 03.11.2019

3 files changed, 3 insertions, 81 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index eb149022ed76..752600412bcb 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,4 @@
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
-AUX patches/syslog-ng-3.23.1-fix-sigabrt.patch 2287 BLAKE2B 1937edf0bdf29f9737361134302ba0817bdc8ae029186e1aba712032b52fa2b9e6a5d7d634c521fd734d7d536eaa94c6a6ecaa3c7c55287ad7abcc09beeaa8ce SHA512 fc23bb8778d9889a24afb3cebc4de722f3d1a83f6d184cd2bdd279056a0eae2050beb4f8d4bcc5bf3cabb66ab698b3555d36b0568929f2186060d82c63519450
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
@@ -9,7 +8,7 @@ AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
-DIST syslog-ng-3.23.1.tar.gz 5008517 BLAKE2B a128707ed36ae3a236dbd3bffb080bd39187a77b3ed7fc0c8d6a2de65f6b761f3c7160a8fdc804c56e4ba673451779382a91c83c8d8cd15ec6fed2c799309adf SHA512 d1ded084a9141637da44cb9c7d8c66585e498b16ff6717548e31ad61bbfe1e04de3554183c8a4de540d9280de1e6370303845010164b3b2ac53ecce1e7434a48
+DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
 EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
-EBUILD syslog-ng-3.23.1-r1.ebuild 5040 BLAKE2B 42fe6556ac3b19d5faf90b6b48a8f57b97bd61ced33d861ffdfe1d0fd314332437768a8803e607fd5841b95780f11b196642544cbe525f21cac1531d8c223761 SHA512 1ac2e842474c19050fbf9bd90c9027d211df516bc962def2508b3397733094049b483aa8e1c32168412d92aafba46ce24a2eb3ca59e4e673a7a18cea89b568c3
+EBUILD syslog-ng-3.24.1.ebuild 4897 BLAKE2B 779e2c58e303606079e830fa123bfab8e5efc1729ff48e9086b82efe996360978590db4117b61b08bb264080e8f5d9959b68c4d9fd4cc399d3f7dc4fc210611c SHA512 d2c3c294cd7195b7c290230080669b0b56686c51f577a09d4e7e75ffce12bcfa77894f6eab862b49725e41880a00f357423c92b19d35e82b926e4ed827d00e67
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
deleted file mode 100644
index 6d27e88abf71..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/lib/logsource.c b/lib/logsource.c
-index 3f38b66e8b..83c61a8e93 100644
---- a/lib/logsource.c
-+++ b/lib/logsource.c
-@@ -633,7 +633,20 @@ log_source_queue(LogPipe *s, LogMessage *msg, const LogPathOptions *path_options
-                   evt_tag_printf("msg", "%p", msg));
- 
-   msg_set_context(NULL);
-+}
-+
-+static void
-+_initialize_window(LogSource *self, gint init_window_size)
-+{
-+  self->window_initialized = TRUE;
-+  window_size_counter_set(&self->window_size, init_window_size);
-+  self->full_window_size = init_window_size;
-+}
- 
-+static gboolean
-+_is_window_initialized(LogSource *self)
-+{
-+  return self->window_initialized;
- }
- 
- void
-@@ -645,11 +658,9 @@ log_source_set_options(LogSource *self, LogSourceOptions *options,
-    * configuration and we received a SIGHUP.  This means that opened
-    * connections will not have their window_size changed. */
- 
--  if ((gint)window_size_counter_get(&self->window_size, NULL) == -1)
--    {
--      window_size_counter_set(&self->window_size, options->init_window_size);
--      self->full_window_size = options->init_window_size;
--    }
-+  if (!_is_window_initialized(self))
-+    _initialize_window(self, options->init_window_size);
-+
-   self->options = options;
-   if (self->stats_id)
-     g_free(self->stats_id);
-@@ -679,7 +690,7 @@ log_source_init_instance(LogSource *self, GlobalConfig *cfg)
-   self->super.free_fn = log_source_free;
-   self->super.init = log_source_init;
-   self->super.deinit = log_source_deinit;
--  window_size_counter_set(&self->window_size, (gsize)-1);
-+  self->window_initialized = FALSE;
-   self->ack_tracker = NULL;
- }
- 
-@@ -696,7 +707,9 @@ log_source_free(LogPipe *s)
- 
-   ack_tracker_free(self->ack_tracker);
-   self->ack_tracker = NULL;
--  _release_dynamic_window(self);
-+
-+  if (G_UNLIKELY(dynamic_window_is_enabled(&self->dynamic_window)))
-+    _release_dynamic_window(self);
- }
- 
- void
-diff --git a/lib/logsource.h b/lib/logsource.h
-index 370842efc2..75d4926046 100644
---- a/lib/logsource.h
-+++ b/lib/logsource.h
-@@ -71,6 +71,7 @@ struct _LogSource
-   gchar *stats_instance;
-   WindowSizeCounter window_size;
-   DynamicWindow dynamic_window;
-+  gboolean window_initialized;
-   /* full_window_size = static + dynamic */
-   gsize full_window_size;
-   atomic_gssize window_size_to_be_reclaimed;
diff --git a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index bc13ee0fdc78..f3b04f13b93f 100644
--- a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
 RESTRICT="test"
@@ -27,7 +27,6 @@ RDEPEND="
 	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
 	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
@@ -51,9 +50,6 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
 
-# bug #695176
-PATCHES=( "${FILESDIR}/patches/${PN}-3.23.1-fix-sigabrt.patch" )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -116,7 +112,6 @@ src_configure() {
 		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
 		$(use_enable caps linux-caps)
 		$(use_enable dbi sql)
-		$(use_enable geoip)
 		$(use_enable geoip2)
 		$(use_enable http)
 		$(use_enable ipv6)