Update to stunnel-4.41 and fix the handling of CPPFLAGS.

8 files changed, 47 insertions, 12 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index dd3acbf775af..585ad2002b9f 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.35
+PORTVERSION=	4.41
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.stunnel.org/stunnel/%SUBDIR%/ \
 		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
@@ -74,12 +74,14 @@ BROKEN=	'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually excl
 
 .if defined(WITH_UCONTEXT)
 CONFIGURE_ARGS+=--with-threads=ucontext
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 .elif defined(WITH_FORK)
 CONFIGURE_ARGS+=--with-threads=fork
 .else
 CONFIGURE_ARGS+=--with-threads=pthread
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 .endif
 
 post-patch:
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index a06897e00253..afe8059b79aa 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stunnel-4.35.tar.gz) = a810e220498239483e14fae24eeb2a188a6167e9118958b903f8793768c4460f
-SIZE (stunnel-4.35.tar.gz) = 541012
+SHA256 (stunnel-4.41.tar.gz) = 08e0e7df42bfb8b8551eb6c4b5b50eae6051aaf75077101d729e67c7a3a00c72
+SIZE (stunnel-4.41.tar.gz) = 557467
diff --git a/security/stunnel/files/patch-Makefile.in b/security/stunnel/files/patch-Makefile.in
index 2268a46636e1..7cfd84953e85 100644
--- a/security/stunnel/files/patch-Makefile.in
+++ b/security/stunnel/files/patch-Makefile.in
@@ -2,11 +2,11 @@ Description: Do not install the sample stunnel.pem file.
  This is handled by the FreeBSD port's Makefile.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2010-09-20
+Last-Update: 2011-06-28
 
 --- tools/Makefile.in.orig
 +++ tools/Makefile.in
-@@ -370,7 +370,7 @@
+@@ -373,7 +373,7 @@
  
  info-am:
  
diff --git a/security/stunnel/files/patch-doc::stunnel.8 b/security/stunnel/files/patch-doc::stunnel.8
new file mode 100644
index 000000000000..950f09c73656
--- /dev/null
+++ b/security/stunnel/files/patch-doc::stunnel.8
@@ -0,0 +1,16 @@
+Description: Fix a typo (cuves -> curves)
+Forwarded: no
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2011-08-01
+
+--- doc/stunnel.8.orig
++++ doc/stunnel.8
+@@ -384,7 +384,7 @@
+ .IX Item "curve = nid"
+ specify \s-1ECDH\s0 curve name
+ .Sp
+-To get a list of supported cuves use:
++To get a list of supported curves use:
+ .Sp
+ .Vb 1
+ \&    openssl ecparam \-list_curves
diff --git a/security/stunnel/files/patch-doc::stunnel.html b/security/stunnel/files/patch-doc::stunnel.html
new file mode 100644
index 000000000000..0dac25748c54
--- /dev/null
+++ b/security/stunnel/files/patch-doc::stunnel.html
@@ -0,0 +1,16 @@
+Description: Fix a typo (cuves -> curves)
+Forwarded: no
+Author: Peter Pentchev <roam@FreeBSD.org>
+Last-Update: 2011-08-01
+
+--- doc/stunnel.html.orig
++++ doc/stunnel.html
+@@ -423,7 +423,7 @@
+ 
+ <dd>
+ <p>specify ECDH curve name</p>
+-<p>To get a list of supported cuves use:</p>
++<p>To get a list of supported curves use:</p>
+ <pre>
+     openssl ecparam -list_curves</pre>
+ <p>default: prime256v1</p>
diff --git a/security/stunnel/files/patch-src::common.h b/security/stunnel/files/patch-src::common.h
index 63e6ca8f4589..1017e87b8901 100644
--- a/security/stunnel/files/patch-src::common.h
+++ b/security/stunnel/files/patch-src::common.h
@@ -1,11 +1,11 @@
 Description: Build on FreeBSD versions of OpenSSL < 0.9.8b.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2011-02-10
+Last-Update: 2011-08-01
 
 --- src/common.h.orig
 +++ src/common.h
-@@ -353,9 +353,6 @@
+@@ -342,9 +342,6 @@
  
  #define OPENSSL_THREAD_DEFINES
  #include <openssl/opensslconf.h>
diff --git a/security/stunnel/files/ssl-noengine.patch b/security/stunnel/files/ssl-noengine.patch
index dd37c780fda7..376264744692 100644
--- a/security/stunnel/files/ssl-noengine.patch
+++ b/security/stunnel/files/ssl-noengine.patch
@@ -1,11 +1,11 @@
 Description: Disable the OpenSSL engine support for the FreeBSD port.
 Forwaded: not-needed
 Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2011-02-10
+Last-Update: 2011-06-28
 
 --- src/ssl.c.orig
 +++ src/ssl.c
-@@ -259,6 +259,8 @@
+@@ -258,6 +258,8 @@
  }
  
  static char *init_engine(void) {
diff --git a/security/stunnel/pkg-plist b/security/stunnel/pkg-plist
index 6476561e58e8..932a01bbcdbd 100644
--- a/security/stunnel/pkg-plist
+++ b/security/stunnel/pkg-plist
@@ -12,8 +12,9 @@ lib/stunnel/libstunnel.so
 %%PORTDOCS%%%%DOCSDIR%%/examples/importCA.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/importCA.sh
 %%PORTDOCS%%%%DOCSDIR%%/examples/script.sh
-%%PORTDOCS%%%%DOCSDIR%%/examples/stunnel.spec
 %%PORTDOCS%%%%DOCSDIR%%/examples/stunnel.init
+%%PORTDOCS%%%%DOCSDIR%%/examples/stunnel.service
+%%PORTDOCS%%%%DOCSDIR%%/examples/stunnel.spec
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog