diff options
| author | roam <roam@FreeBSD.org> | 2005-11-03 19:51:10 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2005-11-03 19:51:10 +0800 |
| commit | 13532d570e8814811994687f7dfb41351b3337ed (patch) | |
| tree | 7a2024bdc953bd6df59ca900c9e15740dcc87617 /security | |
| parent | 22512d887f5279ecaebab896a06f41eeb3cf00f2 (diff) | |
| download | freebsd-ports-gnome-13532d570e8814811994687f7dfb41351b3337ed.tar.gz freebsd-ports-gnome-13532d570e8814811994687f7dfb41351b3337ed.tar.zst freebsd-ports-gnome-13532d570e8814811994687f7dfb41351b3337ed.zip | |
Update to stunnel 4.14, which is mostly a bugfix release.
Besides what's in the PR, also revert the pidfile location change to
preserve POLA and hier(7).
PR: 88436
Submitted by: Vasil Dimov <vd@datamax.bg>
Diffstat (limited to 'security')
| -rw-r--r-- | security/stunnel/Makefile | 2 | ||||
| -rw-r--r-- | security/stunnel/distinfo | 4 | ||||
| -rw-r--r-- | security/stunnel/files/patch-configure | 12 | ||||
| -rw-r--r-- | security/stunnel/files/patch-configure.ac | 12 | ||||
| -rw-r--r-- | security/stunnel/files/patch-tools::stunnel.init.in | 12 |
5 files changed, 39 insertions, 3 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index dc28cc1d8e5c..5216ddbfd81b 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= stunnel -PORTVERSION= 4.13 +PORTVERSION= 4.14 CATEGORIES= security MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \ ftp://stunnel.mirt.net/stunnel/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 4c9052f3d32d..e1d52db12771 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,2 +1,2 @@ -MD5 (stunnel-4.13.tar.gz) = d06383b49d8da71ca0b7f46caff90bde -SIZE (stunnel-4.13.tar.gz) = 488225 +MD5 (stunnel-4.14.tar.gz) = 0969cc4868dfd75f22792ecccc9ec555 +SIZE (stunnel-4.14.tar.gz) = 488512 diff --git a/security/stunnel/files/patch-configure b/security/stunnel/files/patch-configure new file mode 100644 index 000000000000..15633529ae77 --- /dev/null +++ b/security/stunnel/files/patch-configure @@ -0,0 +1,12 @@ +diff -urN stunnel-4.13/configure stunnel-4.14/configure +--- configure Thu Oct 20 11:00:50 2005 ++++ configure Tue Oct 25 23:21:23 2005 +@@ -23194,7 +23339,7 @@ + + { echo "$as_me:$LINENO: **************************************** write the results" >&5 + echo "$as_me: **************************************** write the results" >&6;} +-CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/stunnel/stunnel.pid\\\"" ++CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -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 diff --git a/security/stunnel/files/patch-configure.ac b/security/stunnel/files/patch-configure.ac new file mode 100644 index 000000000000..7573e5d78493 --- /dev/null +++ b/security/stunnel/files/patch-configure.ac @@ -0,0 +1,12 @@ +diff -urN stunnel-4.13/configure.ac stunnel-4.14/configure.ac +--- configure.ac Thu Oct 20 10:25:51 2005 ++++ configure.ac Tue Oct 25 23:20:00 2005 +@@ -295,7 +296,7 @@ + ) + + AC_MSG_NOTICE([**************************************** write the results]) +-CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/stunnel/stunnel.pid\\\"" ++CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\"" + AC_CONFIG_FILES([Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init]) + AC_OUTPUT + diff --git a/security/stunnel/files/patch-tools::stunnel.init.in b/security/stunnel/files/patch-tools::stunnel.init.in new file mode 100644 index 000000000000..b5ff244333c9 --- /dev/null +++ b/security/stunnel/files/patch-tools::stunnel.init.in @@ -0,0 +1,12 @@ +diff -urN stunnel-4.13/tools/stunnel.init.in stunnel-4.14/tools/stunnel.init.in +--- tools/stunnel.init.in Sun Aug 11 01:17:48 2002 ++++ tools/stunnel.init.in Tue Oct 25 23:34:39 2005 +@@ -5,7 +5,7 @@ + PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + PREFIX=@prefix@ + DAEMON=$PREFIX/sbin/stunnel +-PIDFILE=$PREFIX/var/stunnel/stunnel.pid ++PIDFILE=$PREFIX/var/run/stunnel/stunnel.pid + + test -f $DAEMON || exit 0 + |