diff options
Diffstat (limited to 'security/stunnel')
| -rw-r--r-- | security/stunnel/Makefile | 6 | ||||
| -rw-r--r-- | security/stunnel/distinfo | 12 | ||||
| -rw-r--r-- | security/stunnel/patches/patch-aa | 10 | ||||
| -rw-r--r-- | security/stunnel/patches/patch-ac | 18 |
4 files changed, 24 insertions, 22 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 901f257cff6..993b10b6d96 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.73 2011/08/25 07:20:44 tron Exp $ +# $NetBSD: Makefile,v 1.74 2011/11/10 21:01:39 ryoon Exp $ -DISTNAME= stunnel-4.42 +DISTNAME= stunnel-4.46 CATEGORIES= security MASTER_SITES= ftp://ftp.stunnel.org/stunnel/ @@ -20,6 +20,8 @@ CONFIGURE_ARGS+= --with-cert-dir=${SSLCERTS:Q} CONFIGURE_ARGS+= --with-pem-dir=${SSLCERTS:Q} CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} +.include "../../mk/bsd.prefs.mk" + STUNNEL_USER?= stunnel STUNNEL_GROUP?= stunnel PKG_HOME?= ${VARBASE}/chroot/stunnel diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 641fb7bac2d..91a3b49baa8 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.32 2011/08/31 08:26:15 jym Exp $ +$NetBSD: distinfo,v 1.33 2011/11/10 21:01:39 ryoon Exp $ -SHA1 (stunnel-4.42.tar.gz) = 2bfe693f95d79e964c51fd5e9bf0762663338c9d -RMD160 (stunnel-4.42.tar.gz) = beecf4e8b4bfa538473e983910fa3ee7acedeafa -Size (stunnel-4.42.tar.gz) = 558391 bytes -SHA1 (patch-aa) = 1337b81c8b9a77dc18c052e3f7301d62c68a8b8f -SHA1 (patch-ac) = 65097bf1d0dab0f876a500426fe260b6166b1c85 +SHA1 (stunnel-4.46.tar.gz) = 0c4430426c741e0e22874b4f9ae2f37cbc07f5a5 +RMD160 (stunnel-4.46.tar.gz) = 85151366aa2373dc4ffbe0df56d72a0b8c17d65d +Size (stunnel-4.46.tar.gz) = 522125 bytes +SHA1 (patch-aa) = 0e57d4fa383dad7891795073d1f6b5075715b346 +SHA1 (patch-ac) = 43521a88606981bc55dd94043d52b1a16f08e583 diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index eb81ecaba53..7f7f9294d3c 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.24 2011/08/24 17:56:50 tron Exp $ +$NetBSD: patch-aa,v 1.25 2011/11/10 21:01:39 ryoon Exp $ Install configuration files into examples directory. ---- tools/Makefile.in.orig 2011-08-17 12:15:27.000000000 +0100 -+++ tools/Makefile.in 2011-08-24 18:46:44.000000000 +0100 -@@ -192,7 +192,7 @@ +--- tools/Makefile.in.orig 2011-10-27 14:53:32.000000000 +0000 ++++ tools/Makefile.in +@@ -196,7 +196,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \ stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf @@ -13,7 +13,7 @@ Install configuration files into examples directory. conf_DATA = stunnel.conf-sample examplesdir = $(docdir)/examples examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ -@@ -373,7 +373,7 @@ +@@ -377,7 +377,7 @@ info: info-am info-am: diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac index 9876dd62b34..68dbbd4c4f5 100644 --- a/security/stunnel/patches/patch-ac +++ b/security/stunnel/patches/patch-ac @@ -1,15 +1,15 @@ -$NetBSD: patch-ac,v 1.14 2011/08/31 08:26:16 jym Exp $ +$NetBSD: patch-ac,v 1.15 2011/11/10 21:01:39 ryoon Exp $ Change pid file location. ---- src/Makefile.in.orig 2011-08-17 12:15:27.000000000 +0100 -+++ src/Makefile.in 2011-08-24 18:49:46.000000000 +0100 -@@ -254,7 +254,7 @@ - INCLUDES = -I/usr/kerberos/include +--- src/Makefile.in.orig 2011-11-04 20:24:15.000000000 +0000 ++++ src/Makefile.in +@@ -271,7 +271,7 @@ libstunnel_la_LDFLAGS = -avoid-version - # Additional compiler flags --AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"' -+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel.pid"' + # Additional preprocesor definitions + stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \ +- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \ ++ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \ + -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"' # Win32 executable - EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat nogui.c os2.mak |