From 2ceb8d0f12ad01d6033530be7c34a9f5404c4ebb Mon Sep 17 00:00:00 2001 From: schmonz Date: Sun, 9 Jan 2005 13:09:12 +0000 Subject: pkgsrc changes: * An "stunnel3" perl script is installed. REPLACE_PERL and add to PLIST. * Regenerate patches to lose fuzz. * Format DESCR. * Bump PKGREVISION. --- security/stunnel/DESCR | 14 ++++++++------ security/stunnel/Makefile | 4 +++- security/stunnel/PLIST | 3 ++- security/stunnel/distinfo | 6 +++--- security/stunnel/patches/patch-aa | 18 +++++++++++++----- security/stunnel/patches/patch-ab | 24 ++++++++++++++++++------ 6 files changed, 47 insertions(+), 22 deletions(-) diff --git a/security/stunnel/DESCR b/security/stunnel/DESCR index 1d9eee01684..566821d1d2d 100644 --- a/security/stunnel/DESCR +++ b/security/stunnel/DESCR @@ -1,7 +1,9 @@ -The stunnel program is designed to work as SSL encryption wrapper between -remote client and local (inetd-startable) or remote server. The concept is -that having non-SSL aware daemons running on your system you can easily setup -them to communicate with clients over secure SSL channel. +The stunnel program is designed to work as SSL encryption wrapper +between remote client and local (inetd-startable) or remote server. +The concept is that having non-SSL aware daemons running on your +system you can easily setup them to communicate with clients over +secure SSL channel. -stunnel can be used to add SSL functionality to commonly used inetd daemons -like POP-2, POP-3 and IMAP servers without any changes in the program code. +stunnel can be used to add SSL functionality to commonly used inetd +daemons like POP-2, POP-3 and IMAP servers without any changes in +the program code. diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 4db40a42f5d..f65070929f1 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2005/01/03 12:17:44 martti Exp $ +# $NetBSD: Makefile,v 1.47 2005/01/09 13:09:12 schmonz Exp $ DISTNAME= stunnel-4.07 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.fu-berlin.de/unix/security/stunnel/ \ ftp://stunnel.mirt.net/stunnel/ \ @@ -23,6 +24,7 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \ PKG_SYSCONFSUBDIR= stunnel RCD_SCRIPTS= stunnel +REPLACE_PERL= src/stunnel3.in .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST index 780a0cf787b..d2616365e42 100644 --- a/security/stunnel/PLIST +++ b/security/stunnel/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/01/09 13:09:12 schmonz Exp $ lib/libstunnel.la man/man8/stunnel.8 man/man8/stunnel.fr.8 man/man8/stunnel.pl.8 sbin/stunnel +sbin/stunnel3 share/doc/stunnel/AUTHORS share/doc/stunnel/BUGS share/doc/stunnel/COPYING diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 9dfc055bdb7..dc8bb246fa3 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.17 2005/01/03 12:17:44 martti Exp $ +$NetBSD: distinfo,v 1.18 2005/01/09 13:09:12 schmonz Exp $ SHA1 (stunnel-4.07.tar.gz) = fe9661148bda73ce5a48cd21baf99ecbdc477e1d Size (stunnel-4.07.tar.gz) = 486230 bytes -SHA1 (patch-aa) = c8795837b7582de4d863fdd551501a4ef561bb0e -SHA1 (patch-ab) = 4a0de1c531f155304531fd1334576e9cda03d2e2 +SHA1 (patch-aa) = a470942ef4f37a1783068f2f1fdde9ea4bac451f +SHA1 (patch-ab) = ddd342c25a818390a731ec84a472bdf2f2395e31 diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa index cb662b6291e..b3006707a65 100644 --- a/security/stunnel/patches/patch-aa +++ b/security/stunnel/patches/patch-aa @@ -1,16 +1,24 @@ -$NetBSD: patch-aa,v 1.16 2004/12/28 09:09:52 martti Exp $ +$NetBSD: patch-aa,v 1.17 2005/01/09 13:09:12 schmonz Exp $ ---- tools/Makefile.in.orig 2004-12-26 01:36:52.000000000 +0200 -+++ tools/Makefile.in 2004-12-28 12:28:16.000000000 +0200 -@@ -164,4 +164,4 @@ +--- tools/Makefile.in.orig 2004-12-30 06:57:40.000000000 -0500 ++++ tools/Makefile.in +@@ -162,8 +162,8 @@ DISTCLEANFILES = stunnel.pem + EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \ + stunnel.spec stunnel.mak stunnel.cnf -confdir = $(sysconfdir)/stunnel -conf_DATA = stunnel.conf-sample stunnel.pem +confdir = $(datadir)/examples/stunnel +conf_DATA = stunnel.conf-sample docdir = $(datadir)/doc/stunnel -@@ -401,3 +401,3 @@ + examplesdir = $(docdir)/examples + examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ +@@ -399,7 +399,7 @@ stunnel.pem: stunnel.cnf + -in stunnel.pem + install-data-hook: - chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem + true + clean-local: + -rm -f stunnel.rnd diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab index 461006516e9..eb2b6f6f9cd 100644 --- a/security/stunnel/patches/patch-ab +++ b/security/stunnel/patches/patch-ab @@ -1,17 +1,29 @@ -$NetBSD: patch-ab,v 1.15 2005/01/03 12:17:44 martti Exp $ +$NetBSD: patch-ab,v 1.16 2005/01/09 13:09:12 schmonz Exp $ ---- configure.orig 2004-12-30 13:57:47.000000000 +0200 -+++ configure 2005-01-03 14:13:54.000000000 +0200 -@@ -21497,2 +21497,3 @@ +--- configure.orig 2004-12-30 06:57:47.000000000 -0500 ++++ configure +@@ -21495,6 +21495,7 @@ _ACEOF + fi + +if false; then # OSF hack instead of simple AC_CHECK_LIB here -@@ -21624,2 +21625,3 @@ + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +@@ -21622,6 +21623,7 @@ _ACEOF + + fi +fi -@@ -22168,3 +22170,3 @@ + + # Check for libwrap library +@@ -22166,7 +22168,7 @@ fi; + { echo "$as_me:$LINENO: **************************************** write the results" >&5 + echo "$as_me: **************************************** write the results" >&6;} LIBS="$LIBS $wrap_LIB" -CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" +CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" ac_config_files="$ac_config_files Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init" + + cat >confcache <<\_ACEOF -- cgit v1.2.3