Add upstream patch for USE=-ssl

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 103 insertions, 4 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 6d840dd080b6..1d37901da3c4 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # 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.305 2011/10/04 23:15:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.306 2011/10/07 16:40:50 mr_bones_ Exp $
+
+  07 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
+  +files/syslog-ng-3.3.1-ssl.patch:
+  Add upstream patch for USE="-ssl sql" case
 
   04 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org>
   files/syslog-ng.conf.gentoo.3.3, files/syslog-ng.conf.gentoo.fbsd.3.3,
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index cb57c1fbc34e..aff9a5410744 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,4 @@
+AUX syslog-ng-3.3.1-ssl.patch 2261 RMD160 31a34fc25736d059d2703debe2f3efa641779db1 SHA1 d27afb9962fccc168479ab9d87f63a23722f0983 SHA256 239a4bf414442e8aa568f1a26dad54aa216e3f35107f06740fc6cf354935e1b2
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
 AUX syslog-ng.conf.gentoo.3.3 1330 RMD160 0b55e8910274e898e7244fc6594bee74ef559943 SHA1 b36b047d73d9a0084019fcddac7fb7a354b01bdc SHA256 e0ff88d28e0fa9b5b2b96b13df2f14f1957996959a95f7ec6135b51b242a98cd
 AUX syslog-ng.conf.gentoo.fbsd.3.2 689 RMD160 001482d7e90b44896d374f4a1049ece9541a8f2e SHA1 4be46d2f9461c45e743e10e69a4252ce599deee5 SHA256 7249cb13fff50e2695a427fe4dc1285dad6838f576304cb6ddde0c53ff9814ad
@@ -11,6 +12,6 @@ AUX syslog-ng.rc6.3 1843 RMD160 6643aad29c60c55c417c9ab93a3588a022d7f7e5 SHA1 5f
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
 DIST syslog-ng_3.3.1.tar.gz 2405280 RMD160 f337db97ff445d8bb8a087d1894103443d8d2c2c SHA1 f084d66754c7fa1eada56946f77ef3066faa27a1 SHA256 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
-EBUILD syslog-ng-3.3.1.ebuild 3352 RMD160 4e3660e6b954c6571c749b92e657356d6dc996d2 SHA1 e36e4a2bd62557c260a2fc6b35074b56691b33c0 SHA256 1d3ac168a5802e9841db684983057b5dac0444575ef57d09f458228222818ce8
-MISC ChangeLog 41685 RMD160 d569f2bac3fb5abcb67a0d43d36cbf855f991464 SHA1 b1ae586b56f2ab58c11cd5d8b65cdecae5e7f270 SHA256 f21b7b01f3e75a738349180aff20fe9e281c50c8f903e998fab11ecae79af560
+EBUILD syslog-ng-3.3.1.ebuild 3389 RMD160 8c7eb120058b520886279670829ac1791d4e1867 SHA1 2dca053abea924baa6d75197f2a166003cf130e7 SHA256 7e631d73629d4bb6fa2953544c416311ecc9e618e72a4c0691b9e913fbaa8828
+MISC ChangeLog 41846 RMD160 2297e9f2870a5e375d0ea55b3a50a97cfefe0e8d SHA1 b246aeb4df18e9317547eff38d5eee29fdef1126 SHA256 992f7886233d3eb9c107aca2b5d7d0181cf4b7c05baaddc0e860d0a8b4012ed6
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
new file mode 100644
index 000000000000..ebb9b1df1b7a
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
@@ -0,0 +1,93 @@
+While most places where OpenSSL was used were guarded by ENABLE_SSL
+ifs, some were not. This patch adds those guards to lib/crypto.c,
+modules/afsql/afsql.c and tests/loggen/loggen.c.
+
+It also makes sure that OPENSSL_LIBS gets emptied when enable_ssl is
+set to no.
+
+Signed-off-by: Gergely Nagy <algernon@balabit.hu>
+---
+ configure.in          |    4 ++++
+ lib/crypto.c          |    4 ++++
+ modules/afsql/afsql.c |    3 +++
+ tests/loggen/loggen.c |    3 +++
+ 4 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 13bc874..686911e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -679,6 +679,10 @@ else
+         enable_ssl="no"
+ fi
+ 
++if test "x$enable_ssl" = "xno"; then
++	OPENSSL_LIBS=""
++fi
++
+ dnl
+ dnl Right now, openssl is never linked statically as it is only used by the
+ dnl TLS build of the afsocket plugin which is loaded dynamically anyway.
+diff --git a/lib/crypto.c b/lib/crypto.c
+index 702609c..ac4d070 100644
+--- a/lib/crypto.c
++++ b/lib/crypto.c
+@@ -29,6 +29,8 @@
+ #include "crypto.h"
+ #include "apphook.h"
+ 
++#if ENABLE_SSL
++
+ #include <openssl/rand.h>
+ #include <openssl/ssl.h>
+ #include <stdio.h>
+@@ -124,3 +126,5 @@ crypto_init(void)
+ }
+ 
+ /* the crypto options (seed) are handled in main.c */
++
++#endif
+diff --git a/modules/afsql/afsql.c b/modules/afsql/afsql.c
+index eb59b57..02b9f83 100644
+--- a/modules/afsql/afsql.c
++++ b/modules/afsql/afsql.c
+@@ -35,7 +35,10 @@
+ 
+ #include <dbi/dbi.h>
+ #include <string.h>
++
++#if ENABLE_SSL
+ #include <openssl/md5.h>
++#endif
+ 
+ /* field flags */
+ enum
+diff --git a/tests/loggen/loggen.c b/tests/loggen/loggen.c
+index c5399a7..bf11a1e 100644
+--- a/tests/loggen/loggen.c
++++ b/tests/loggen/loggen.c
+@@ -14,11 +14,14 @@
+ #include <glib.h>
+ #include <signal.h>
+ 
++#if ENABLE_SSL
+ #include <openssl/crypto.h>
+ #include <openssl/x509.h>
+ #include <openssl/pem.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
++#endif
++
+ #include <unistd.h>
+ 
+ #define MAX_MESSAGE_LENGTH 8192
+-- 
+1.7.0.4
+
+
+______________________________________________________________________________
+Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
+Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
+FAQ: http://www.balabit.com/wiki/syslog-ng-faq
+
+
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
index 2bc11c9867c1..f8bc0b80a246 100644
--- a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.2 2011/10/05 21:28:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.3 2011/10/07 16:40:50 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils multilib
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-ssl.patch
 	ht_fix_file configure.in
 	eautoreconf
 }