version bump

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

7 files changed, 197 insertions, 46 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index ae6b8bf990fd..166164555a32 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.345 2013/06/02 01:18:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.346 2013/06/03 16:38:29 mr_bones_ Exp $
+
+*syslog-ng-3.4.2 (03 Jun 2013)
+
+  03 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/3.4/syslog-ng-3.4.2-autotools.patch,
+  +files/3.4/syslog-ng-3.4.2-compile.patch, +syslog-ng-3.4.2.ebuild,
+  files/3.4/syslog-ng-3.4.1-autotools.patch,
+  files/3.4/syslog-ng-3.4.1-rollup.patch:
+  version bump
 
 *syslog-ng-3.4.1-r1 (02 Jun 2013)
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index c3d1e721a5f3..4c78b2eda204 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,7 @@
-AUX 3.4/syslog-ng-3.4.1-autotools.patch 1669 SHA256 312e655f41e87257f613e477dcc3a614e9698d3a4ac3ceedf5c1754e124dfb6b SHA512 d6043bdc7f0f59f09302e816891f5098dc8f15977f764fb4f0c8c9a106f9e3e82262f27eaba9055c6b51103f20e6d4422ff05e5227ee18a525a1a39b0856b170 WHIRLPOOL c37ddaa44b03136dfe07c6af805d7046ddc6806f6ac3342571940caa5ffddb63b0491da68bdae060973a4021e3a8f95cf06cab0661e7c2b84f491676e7f77e1d
-AUX 3.4/syslog-ng-3.4.1-rollup.patch 11181 SHA256 db146f40389f3d2beda9578317a82791628a9b350ee6cee22cc24ac42cf27f79 SHA512 0003333a0881ed722957ee3b906741e4a1a82be76ec0ca0665920143ad49f897d1dca31b4634e84a17fbff20428f655ef2e465a6f47948b7488b11be408321b9 WHIRLPOOL a71d71709d6ac96493c7a3f01c3fd9b97ec0f177b1ccfe2870b48a4964c7779f0bfd1fdf8879c92060cbde08189be8ee66fdf35f8c087cc7001ad1918759a268
+AUX 3.4/syslog-ng-3.4.1-autotools.patch 1313 SHA256 20b6fc12f119d548536435ad7c5e166488443eeebe8ee08e30adefa6038aafa3 SHA512 c5b84bc32c9b019452b8b3f369dc4689e40b59dc392e448412e14730679d452d4323d70ae73cc6fd126a44df6331c18d2168f05675a399e2ba868115944880ed WHIRLPOOL f7bc249b6ea28db74661b6682ff3c377b80ffeaa28412bfa378686f435a617d972a81d8dfc9382f2f8c44062ee35fc9e3217ef40a04d55f1bcf6578fb88e2c63
+AUX 3.4/syslog-ng-3.4.1-rollup.patch 9331 SHA256 08c3246eadbf72c51fe92b069f0fb299617ecffab5a17c972438905001002e19 SHA512 6bc81240c0427e52103f039845d7e6b74c5588981b012e036a7d2a91d08d730c10a2fd1f30f4e102d0b77d8e1522ee9d5f7870271ec672f2f68ef87e5c18b2af WHIRLPOOL e34a359be6c9c8139fcde653db7acb80bcf1be6a3af4faa90f7730bcd15c686b9f067202e7fe77fb157881fc28c678a331f12d19443878ab21cb0f16cdeb4a08
+AUX 3.4/syslog-ng-3.4.2-autotools.patch 1313 SHA256 20b6fc12f119d548536435ad7c5e166488443eeebe8ee08e30adefa6038aafa3 SHA512 c5b84bc32c9b019452b8b3f369dc4689e40b59dc392e448412e14730679d452d4323d70ae73cc6fd126a44df6331c18d2168f05675a399e2ba868115944880ed WHIRLPOOL f7bc249b6ea28db74661b6682ff3c377b80ffeaa28412bfa378686f435a617d972a81d8dfc9382f2f8c44062ee35fc9e3217ef40a04d55f1bcf6578fb88e2c63
+AUX 3.4/syslog-ng-3.4.2-compile.patch 239 SHA256 1400220d00e35261afdb93e9f199e5527ad8f6cd14f0b1fc7f89e6668b09979a SHA512 f8ec051d4fecb88f26279bb510ff892e93b9a211b5bd9312f734846a3108a6645d1de355c5d3aadb6fddd8e01bba40fd6489a6bf8f6a2f73466016b24bcbe930 WHIRLPOOL e7550d9def8c94e81eb9b7501d79b79acaa6fe6aeada4cf0840b72e65520a529010c8aa36df6221639226f2a53ee78f28993219364b2d500a49daa0261b78f55
 AUX 3.4/syslog-ng.conf.gentoo 1332 SHA256 949c0f2a9f4351be23249ba1b7763b5d4ff9ab4907c1211cc3e92b6bc9705c8e SHA512 bdbcfa27368ed75daac153d91c50555bea892f492639a2448e47a6f38a9b84808eedd35db09347a385c70725ab8349798f624aa5e2f730fb99b2986d05afb1a4 WHIRLPOOL d639db780aa07438e1a33b85cf3f388782f84fe884b95303605ccd58bf95232e5e013c5d491b44034e7d90121064b9c749d91c2fa6352ccb44db90d12d792d82
 AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931c3386eb94145f8e7495d9eb8ece0fc SHA512 a8f94d3cd4f120c3cb69f4e938877f62e87f7a6a3f422575e130b49ed3fa37effc6dc0c53398031602f9bcf26a1ce3b5267701483f045829960796098e843fb0 WHIRLPOOL 37ceec9bb7a1cc829b1eeb1aa8e9af162b67e90e03d862bc215150e011ad8be433270d658029fd72963d2486c72f5046e9d6e007a62f170c1295d61d68b62ca4
 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098
@@ -26,8 +28,10 @@ AUX syslog-ng.rc6.3.3 2381 SHA256 19bbd35abc9f54ce368e1ccf46b6e4af6eec304906e432
 DIST syslog-ng_3.2.5.tar.gz 1448844 SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89 SHA512 f155a56b77c2a8e0e7809a98644394c9d4132e356c3190cda8b8d23a4cf28814bee02c53a1f2e8991c97302a8f1fe7410f8b2fa80f52bc1b7db2f09e26fa9dc8 WHIRLPOOL 0157a1f7611a0637acc54802b2ddb0e796e441dc304c702fece85e39e4ef31f5c5a95198ed264317fbebd805368955df63c6fe38580b74eaaa6e614a4b2e83ef
 DIST syslog-ng_3.3.5.tar.gz 2495235 SHA256 dcca69869ab3cf2afda6db0dad549b6be717f6cf6aa6d7f27ca10f9c4c6aaa75 SHA512 eaac6376c527bbf6730943670a2dfac1c8765837335ca509cbebf120279a31d13f7b813fe1dde72761bcf185320619b84b650b1e037ccf0fe94966e93c3415c3 WHIRLPOOL a2d32798219897c86b43f3dbf6e2be5bf6c704d896a664afe3a0f13f8b98c6e9839fcfc3bf2fb89f1e4764ad13878329e1c33ea2c85f17921505030f8eda9b1a
 DIST syslog-ng_3.4.1.tar.gz 3347306 SHA256 ca5613a808ea92cb72669d8e1c141bf86405e0d94f913c4db3ab9e2c37612986 SHA512 5f9830f269cd612f3ee62a044a0dab4a38b33395a6b60669e84433410ad63f74b1711536b49fad13589f82986f55c9581433141f7a77eeae34056ec6344c9399 WHIRLPOOL f5985236c0a4cb9044e60a9ef3beeffe9c3c03cebea98da853d256d60e853e5da235fc5d33faf871dcea018d931965156c8d8a29e941083513bccd8723b94155
+DIST syslog-ng_3.4.2.tar.gz 3354842 SHA256 f2585b42e7341bc53490aa59c5f405df506536bf0672bf71f9567ea78590f381 SHA512 94d1c8008c72a7fb82c86eb4ff666cacee26e2b1d7100f58a0ea5293e4efc74ad9608a7b1e72b217f9e6ead4b6ad82f5cf9e00dfcb230a03d3243f5c51fd5305 WHIRLPOOL ddb721e940e674a74079fb150213e7595f2a52eb8709f1a032bf6def93906b6f93c9a5131991946b1e19a026ca8162c40d7c7e537498f29a3d33b401c678611a
 EBUILD syslog-ng-3.2.5.ebuild 2852 SHA256 2f0de5b0f8296b0d4e4d00c206bea5b1b28f31ff1c51879ec72dd3aa8f306375 SHA512 c751b8975e62c884d1c5f034b53e10d27d08f0b9e745f63e5e150e3e2b77dfedb43223443172b9150cac5737ed541f22205173d4bcd9816b3878a3e4a89c42eb WHIRLPOOL c4bda63c10d006f7cc7dbeb78a9f272a10d70ca33bb060953c92f5b7b33c618d4f94f4b0b3022c010cd0c5d389fe261dcd638ec9e8813f3c1ae1ee88e100350d
 EBUILD syslog-ng-3.3.5-r1.ebuild 4168 SHA256 5471ae33faa88989b7fae5981ba9f75f66622bc388d9110ee1230c6c7ff3a1e9 SHA512 b8a966271f5c5a60f1750b7573b301aa113dc642e53cee2bee08b02439ecc0c01be332460d814d96ba8617eb397b6ce70bc357c4a2d4145ba166ee1fcf4f51f0 WHIRLPOOL eb1861e630599aa8c20ea94dd21f0ce5dded50b7aaa6989ee39a1bbcf9684e91c63a6340b27b1ebc385e51cdb0658dc28521fd60df75a8695602589ea57c8d36
 EBUILD syslog-ng-3.4.1-r1.ebuild 3187 SHA256 884a2dbb052a41ec269a36f414581b53849971c1e2fe8ddaa2bbabb9395a57ea SHA512 5f9f5abdff1066ab36bd1391b1ef76f13682ba7c6d59dfd2b92c45f0d5e72baa2d167e676a5eeb932ce8d5bda38dbea701d79b15a056d5e850ca48f57d31b012 WHIRLPOOL 5d2dcd7a42bae9925e9e1846ea50a9436365518a58be4355b939e08701ead7ad6524aebba54dcbb0aca1b08371d2ed759a46c1ad6947e61eaf1f5023004cb01e
-MISC ChangeLog 48103 SHA256 863ecf9793fd007267ce779167cf8db009130149f0cbc64665287121d7248e33 SHA512 4e08a1350a693a95959359b5904fd1827764e626432bb29a4ff7d353003fb863cfd1b94a29e85a555bea211ae03851fc264f731631a5c29183958c1406e5b371 WHIRLPOOL 945c589de1db86ae8caafbefa3ae71ac417a3759d925e1233c59fbe4d2468c6daa1ac50babb7b0fcca18a6f1bdbadeebf58d5408863a617cea31e057be11630b
+EBUILD syslog-ng-3.4.2.ebuild 3185 SHA256 15fbfcc418e73f91ddb90287e0b4c4e6228d7606d73a4aa830aa5f1b317fc5f7 SHA512 c9ad068e7e33dbbba4ef24d383cd631ef5280fb5b3b7e858516be923b3d18413b1defba9e713b9a8164e647000cf5b7d8195340a357a95162cd8b6ad8623081f WHIRLPOOL 00314860f475c1814530a84dec965124109cfc146fc7b257d3a868ec8772ae067b83fbb9317746cb21677f5e5e303daf328bcad6d634c2471cd69704e144e3e9
+MISC ChangeLog 48408 SHA256 b84ed763a83fb38e4d2282f10cd3715ce526c7d328a65fd561736b990108a88a SHA512 058a1ac76d421d8c5bff0e23c6653cfbe9396bf8e6842f37670f722fa5cf77f05933a7d0b7678c0f1c4c17288545f4af1544e12a57a0bdfd3c44d4914bdabf5b WHIRLPOOL e4b892c1ad6565da081552600c11cdb465456543433f36190fe955cce960700a7efb5df2c3e07e6c6c2f3d358a236f12f31721f9c5c062bb4937255c361dda5f
 MISC metadata.xml 622 SHA256 080a769b5f0dd360ac36a746667a70a85a8e857553da07dc5272005c097125ba SHA512 afc895b14a063c88fac179d3a588e0d77e507a7bd8a9bd93091989f5df959e002696d281364ef28d293546b191e2ab8a67eba59d2e1006f97640b57a302c4e1c WHIRLPOOL c634c831dc48c370a21f37abf5c4a96a0c11463fa69dd26c632f0b294af5f1372416d4bfb941eaa842cdc247587684aff14498e65e490cc4e16db6ae2aaff1b2
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
index e41bd3080cc9..c57f9f510473 100644
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
@@ -1,6 +1,5 @@
-diff -ru syslog-ng-3.4.1.orig/configure.in syslog-ng-3.4.1/configure.in
---- syslog-ng-3.4.1.orig/configure.in	2013-01-17 06:43:50.000000000 -0500
-+++ syslog-ng-3.4.1/configure.in	2013-05-08 15:47:42.860150947 -0400
+--- syslog-ng-3.4.1.orig/configure.in
++++ syslog-ng-3.4.1/configure.in
 @@ -68,7 +68,7 @@
  pidfiledir='${localstatedir}'
  moduledir='${exec_prefix}/lib/syslog-ng'
@@ -18,9 +17,8 @@ diff -ru syslog-ng-3.4.1.orig/configure.in syslog-ng-3.4.1/configure.in
  AC_PROG_CC_C99
  if test "x$ac_cv_prog_cc_c99" = "xno"; then
  	AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
-diff -ru syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
---- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac	2013-01-06 15:41:48.000000000 -0500
-+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac	2013-05-08 15:48:09.275208195 -0400
+--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
++++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
 @@ -15,7 +15,7 @@
  
  AC_CONFIG_MACRO_DIR([m4])
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
index 0b487f6c719a..7d68a64eb6b4 100644
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
@@ -1,6 +1,5 @@
-diff -ru syslog-ng-3.4.1/contrib/systemd/syslog-ng.service syslog-ng-3.4-master/contrib/systemd/syslog-ng.service
---- syslog-ng-3.4.1/contrib/systemd/syslog-ng.service	2013-01-06 15:38:58.000000000 -0500
-+++ syslog-ng-3.4-master/contrib/systemd/syslog-ng.service	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/contrib/systemd/syslog-ng.service
++++ syslog-ng-3.4-master/contrib/systemd/syslog-ng.service
 @@ -7,6 +7,7 @@
  ExecStart=/usr/sbin/syslog-ng -F
  ExecReload=/bin/kill -HUP $MAINPID
@@ -9,9 +8,8 @@ diff -ru syslog-ng-3.4.1/contrib/systemd/syslog-ng.service syslog-ng-3.4-master/
  
  [Install]
  WantedBy=multi-user.target
-diff -ru syslog-ng-3.4.1/lib/cfg-tree.c syslog-ng-3.4-master/lib/cfg-tree.c
---- syslog-ng-3.4.1/lib/cfg-tree.c	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/cfg-tree.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/cfg-tree.c
++++ syslog-ng-3.4-master/lib/cfg-tree.c
 @@ -588,6 +588,22 @@
    return FALSE;
  }
@@ -70,9 +68,8 @@ diff -ru syslog-ng-3.4.1/lib/cfg-tree.c syslog-ng-3.4-master/lib/cfg-tree.c
      }
  
  
-diff -ru syslog-ng-3.4.1/lib/control.c syslog-ng-3.4-master/lib/control.c
---- syslog-ng-3.4.1/lib/control.c	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/control.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/control.c
++++ syslog-ng-3.4-master/lib/control.c
 @@ -1,5 +1,5 @@
  /*
 - * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
@@ -91,9 +88,8 @@ diff -ru syslog-ng-3.4.1/lib/control.c syslog-ng-3.4-master/lib/control.c
        goto destroy_connection;
      }
    else
-diff -ru syslog-ng-3.4.1/lib/filter.c syslog-ng-3.4-master/lib/filter.c
---- syslog-ng-3.4.1/lib/filter.c	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/filter.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/filter.c
++++ syslog-ng-3.4-master/lib/filter.c
 @@ -46,6 +46,12 @@
    self->ref_cnt = 1;
  }
@@ -173,9 +169,8 @@ diff -ru syslog-ng-3.4.1/lib/filter.c syslog-ng-3.4-master/lib/filter.c
    msg_debug("Filter rule evaluation result",
              evt_tag_str("result", res ? "match" : "not-match"),
              evt_tag_str("rule", self->name),
-diff -ru syslog-ng-3.4.1/lib/filter.h syslog-ng-3.4-master/lib/filter.h
---- syslog-ng-3.4.1/lib/filter.h	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/filter.h	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/filter.h
++++ syslog-ng-3.4-master/lib/filter.h
 @@ -48,6 +48,8 @@
  
  gboolean filter_expr_eval(FilterExprNode *self, LogMessage *msg);
@@ -185,9 +180,8 @@ diff -ru syslog-ng-3.4.1/lib/filter.h syslog-ng-3.4-master/lib/filter.h
  void filter_expr_unref(FilterExprNode *self);
  
  typedef struct _FilterRE
-diff -ru syslog-ng-3.4.1/lib/logmpx.c syslog-ng-3.4-master/lib/logmpx.c
---- syslog-ng-3.4.1/lib/logmpx.c	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/logmpx.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/logmpx.c
++++ syslog-ng-3.4-master/lib/logmpx.c
 @@ -39,9 +39,15 @@
    
    for (i = 0; i < self->next_hops->len; i++)
@@ -206,9 +200,8 @@ diff -ru syslog-ng-3.4.1/lib/logmpx.c syslog-ng-3.4-master/lib/logmpx.c
          {
            self->fallback_exists = TRUE;
          }
-diff -ru syslog-ng-3.4.1/lib/logmsg.h syslog-ng-3.4-master/lib/logmsg.h
---- syslog-ng-3.4.1/lib/logmsg.h	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/logmsg.h	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/logmsg.h
++++ syslog-ng-3.4-master/lib/logmsg.h
 @@ -1,6 +1,6 @@
  /*
 - * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
@@ -231,9 +224,8 @@ diff -ru syslog-ng-3.4.1/lib/logmsg.h syslog-ng-3.4-master/lib/logmsg.h
  const gchar *log_msg_get_macro_value(LogMessage *self, gint id, gssize *value_len);
  
  static inline const gchar *
-diff -ru syslog-ng-3.4.1/lib/logpipe.h syslog-ng-3.4-master/lib/logpipe.h
---- syslog-ng-3.4.1/lib/logpipe.h	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/logpipe.h	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/logpipe.h
++++ syslog-ng-3.4-master/lib/logpipe.h
 @@ -47,6 +47,7 @@
  /* log statement flags that are copied to the head of a branch */
  #define PIF_BRANCH_FINAL      0x0004
@@ -242,9 +234,8 @@ diff -ru syslog-ng-3.4.1/lib/logpipe.h syslog-ng-3.4-master/lib/logpipe.h
  
  /* branch starting with this pipe wants hard flow control */
  #define PIF_HARD_FLOW_CONTROL 0x0010
-diff -ru syslog-ng-3.4.1/lib/logrewrite.c syslog-ng-3.4-master/lib/logrewrite.c
---- syslog-ng-3.4.1/lib/logrewrite.c	2013-01-31 01:58:05.000000000 -0500
-+++ syslog-ng-3.4-master/lib/logrewrite.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/lib/logrewrite.c
++++ syslog-ng-3.4-master/lib/logrewrite.c
 @@ -45,7 +45,7 @@
    gssize length;
    const gchar *value;
@@ -254,9 +245,8 @@ diff -ru syslog-ng-3.4.1/lib/logrewrite.c syslog-ng-3.4-master/lib/logrewrite.c
      {
        msg_debug("Rewrite condition unmatched, skipping rewrite",
                  evt_tag_str("value", log_msg_get_value_name(self->value_handle, NULL)),
-diff -ru syslog-ng-3.4.1/lib/persist-state.c syslog-ng-3.4-master/lib/persist-state.c
---- syslog-ng-3.4.1/lib/persist-state.c	2013-01-06 15:40:30.000000000 -0500
-+++ syslog-ng-3.4-master/lib/persist-state.c	2013-04-28 00:43:29.703864600 -0400
+--- syslog-ng-3.4.1/lib/persist-state.c
++++ syslog-ng-3.4-master/lib/persist-state.c
 @@ -26,6 +26,7 @@
  #include "serialize.h"
  #include "messages.h"
@@ -273,9 +263,8 @@ diff -ru syslog-ng-3.4.1/lib/persist-state.c syslog-ng-3.4-master/lib/persist-st
    self->current_key_block = offsetof(PersistFileHeader, initial_key_store);
    self->current_key_ofs = 0;
    self->current_key_size = sizeof((((PersistFileHeader *) NULL))->initial_key_store);
-diff -ru syslog-ng-3.4.1/modules/dbparser/patterndb.c syslog-ng-3.4-master/modules/dbparser/patterndb.c
---- syslog-ng-3.4.1/modules/dbparser/patterndb.c	2013-01-17 06:43:50.000000000 -0500
-+++ syslog-ng-3.4-master/modules/dbparser/patterndb.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/modules/dbparser/patterndb.c
++++ syslog-ng-3.4-master/modules/dbparser/patterndb.c
 @@ -1302,7 +1302,7 @@
            log_msg_set_value(msg, match->handle, match->match, match->len);
            g_free(match->match);
@@ -285,9 +274,8 @@ diff -ru syslog-ng-3.4.1/modules/dbparser/patterndb.c syslog-ng-3.4-master/modul
          {
            log_msg_set_value_indirect(msg, match->handle, ref_handle, match->type, match->ofs, match->len);
          }
-diff -ru syslog-ng-3.4.1/tests/loggen/loggen.c syslog-ng-3.4-master/tests/loggen/loggen.c
---- syslog-ng-3.4.1/tests/loggen/loggen.c	2013-01-06 15:38:59.000000000 -0500
-+++ syslog-ng-3.4-master/tests/loggen/loggen.c	2013-04-16 10:11:23.000000000 -0400
+--- syslog-ng-3.4.1/tests/loggen/loggen.c
++++ syslog-ng-3.4-master/tests/loggen/loggen.c
 @@ -847,6 +847,12 @@
      {
        static struct sockaddr_un saun;
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch
new file mode 100644
index 000000000000..c57f9f510473
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch
@@ -0,0 +1,38 @@
+--- syslog-ng-3.4.1.orig/configure.in
++++ syslog-ng-3.4.1/configure.in
+@@ -68,7 +68,7 @@
+ pidfiledir='${localstatedir}'
+ moduledir='${exec_prefix}/lib/syslog-ng'
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl ***************************************************************************
+ dnl Arguments
+@@ -227,7 +227,6 @@
+ dnl ***************************************************************************
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_CC_C99
+ if test "x$ac_cv_prog_cc_c99" = "xno"; then
+ 	AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
+--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
++++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
+@@ -15,7 +15,7 @@
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
+ vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
+@@ -24,7 +24,6 @@
+ dnl ***************************************************************************
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
+ LT_INIT([shared])
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch
new file mode 100644
index 000000000000..ad72bdb0c3d0
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch
@@ -0,0 +1,10 @@
+--- syslog-ng-3.4.1/lib/persist-state.c
++++ syslog-ng-3.4-master/lib/persist-state.c
+@@ -26,6 +26,7 @@
+ #include "serialize.h"
+ #include "messages.h"
+ #include "mainloop.h"
++#include "misc.h"
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild
new file mode 100644
index 000000000000..f00d97257aeb
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 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.4.2.ebuild,v 1.1 2013/06/03 16:38:29 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	smtp? ( net-libs/libesmtp )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-c-0.9 )
+	caps? ( sys-libs/libcap )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV%.*}/${P}-compile.patch \
+		"${FILESDIR}"/${PV%.*}/${P}-autotools.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pcre) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${FILESDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+	# 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
+}