summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-10-07 16:40:50 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-10-07 16:40:50 +0000
commit77cfb3af79652354f257e16b901a7eee65c7132e (patch)
tree90316106a70d3d02d9c76fd2340af89e9025ffb7 /app-admin/syslog-ng
parentDisable failing time-dependent test, bug #385331 by graaff. (diff)
downloadgentoo-2-77cfb3af79652354f257e16b901a7eee65c7132e.tar.gz
gentoo-2-77cfb3af79652354f257e16b901a7eee65c7132e.tar.bz2
gentoo-2-77cfb3af79652354f257e16b901a7eee65c7132e.zip
Add upstream patch for USE=-ssl
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'app-admin/syslog-ng')
-rw-r--r--app-admin/syslog-ng/ChangeLog6
-rw-r--r--app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch93
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.3.1.ebuild3
3 files changed, 100 insertions, 2 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/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
}