ports/80143: Update port: security/stunnel to 4.09

[Vasil Dimov]

>Number:         80143
>Category:       ports
>Synopsis:       Update port: security/stunnel to 4.09
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 20 12:30:29 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:
System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #5: Mon Apr 11 14:07:32 EEST 2005 root at sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386
>Description:
	Changes to stunnel itself:
	http://www.stunnel.mirt.net/news_sdf.html

	Changes to port:
	* add all possible mirrors to MASTER_SITES
	* firstly try main dir and then OBSOLETE/ subdir. This makes
	  MASTER_SITES work even after 4.10 is released without port-maintainer
	  intervention.
	* sync patch-Makefile.in with 4.09 tools/Makefile.in
	* patched function s_ntop() has escaped to resolver.c so now we need to
	  hunt for it in resolver.c. Remove old and add new patch for that.
>How-To-Repeat:
	
>Fix:

	

--- stunnel_update-4.07-4.09.diff begins here ---
diff -urN stunnel-4.07/Makefile stunnel/Makefile
--- stunnel-4.07/Makefile	Wed Apr 13 02:22:06 2005
+++ stunnel/Makefile	Wed Apr 20 12:58:42 2005
@@ -6,10 +6,18 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.07
+PORTVERSION=	4.09
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
+		ftp://stunnel.mirt.net/stunnel/ \
 		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
+		http://mirror.hudecof.net/stunnel/ \
+		http://mirror.hudecof.net/stunnel/OBSOLETE \
+		http://ftp.bit.nl/mirror/stunnel/ \
+		http://ftp.bit.nl/mirror/stunnel/OBSOLETE \
+		http://stunnel.md5.com.ar/ \
+		http://stunnel.md5.com.ar/OBSOLETE \
+		http://www.mirrors.wiretapped.net/security/network-security/stunnel/ \
 		ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/
 
 MAINTAINER=	roam at FreeBSD.org
@@ -36,7 +44,7 @@
 .endif
 
 post-patch:
-# place files under /var/tmp so that this can be run by an unprivileged user
+# place files under /var/tmp so that this can be run by an unprivileged
 # user stunnel and group stunnel
 	@${REINPLACE_CMD} -E -e 's|\@prefix\@/var/run/stunnel/|/var/tmp/stunnel|; \
 		s|nobody|stunnel|;s|nogroup|stunnel|' \
diff -urN stunnel-4.07/distinfo stunnel/distinfo
--- stunnel-4.07/distinfo	Tue Feb  1 10:39:16 2005
+++ stunnel/distinfo	Wed Apr 20 12:59:09 2005
@@ -1,2 +1,2 @@
-MD5 (stunnel-4.07.tar.gz) = 7d53af550a1c2e01e146b936e58b8860
-SIZE (stunnel-4.07.tar.gz) = 486230
+MD5 (stunnel-4.09.tar.gz) = 2077669b04c36e4c0baa68348e8860a7
+SIZE (stunnel-4.09.tar.gz) = 484745
diff -urN stunnel-4.07/files/patch-Makefile.in stunnel/files/patch-Makefile.in
--- stunnel-4.07/files/patch-Makefile.in	Tue Feb  1 10:39:16 2005
+++ stunnel/files/patch-Makefile.in	Wed Apr 20 15:03:52 2005
@@ -1,19 +1,24 @@
---- tools/Makefile.in.orig	Mon Dec 27 13:52:12 2004
-+++ tools/Makefile.in	Mon Dec 27 13:52:25 2004
-@@ -163,7 +163,7 @@
- 	stunnel.spec stunnel.mak stunnel.cnf
- 
- confdir = $(sysconfdir)/stunnel
--conf_DATA = stunnel.conf-sample stunnel.pem
-+conf_DATA = stunnel.conf-sample
- docdir = $(datadir)/doc/stunnel
- examplesdir = $(docdir)/examples
- examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
-@@ -337,7 +337,6 @@
- install-data-am: install-confDATA install-data-local \
- 	install-examplesDATA
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
+--- tools/Makefile.in.orig	Wed Apr 20 15:00:33 2005
++++ tools/Makefile.in	Wed Apr 20 15:00:42 2005
+@@ -375,21 +375,6 @@
+ 	uninstall-examplesDATA uninstall-info-am
  
+ install-data-local:
+-	if test ! -r $(DESTDIR)$(confdir)/stunnel.pem; then \
+-		if test -r "$(RANDOM_FILE)"; then \
+-			dd if="$(RANDOM_FILE)" of=stunnel.rnd bs=256 count=1; \
+-			RND="-rand stunnel.rnd"; \
+-		else \
+-			RND=""; \
+-		fi; \
+-		$(openssl) req -new -x509 -days 365 -nodes $$RND \
+-			-config $(srcdir)/stunnel.cnf \
+-			-out stunnel.pem -keyout stunnel.pem; \
+-		test $(USE_DH) -eq 0 || $(openssl) gendh $$RND 512 >> stunnel.pem; \
+-		$(openssl) x509 -subject -dates -fingerprint -noout -in stunnel.pem; \
+-		${INSTALL} -m 600 stunnel.pem $(DESTDIR)$(confdir)/stunnel.pem; \
+-		rm stunnel.pem; \
+-	fi
+ 	mkdir -p $(DESTDIR)$(localstatedir)/stunnel
+ 	-chmod a=rwx,+t $(DESTDIR)$(localstatedir)/stunnel
+ 	if uname | grep SunOS; then \
diff -urN stunnel-4.07/files/patch-src::network.c stunnel/files/patch-src::network.c
--- stunnel-4.07/files/patch-src::network.c	Mon Jan  3 11:54:20 2005
+++ stunnel/files/patch-src::network.c	Thu Jan  1 02:00:00 1970
@@ -1,19 +0,0 @@
---- src/network.c.orig	Mon Jan  3 09:16:45 2005
-+++ src/network.c	Mon Jan  3 09:17:49 2005
-@@ -488,10 +488,13 @@
- 
- char *s_ntop(char *text, SOCKADDR_UNION *addr) {
-     char host[IPLEN-6], port[6];
-+    int err;
- 
--    if(getnameinfo(&addr->sa, addr_len(*addr),
--            host, IPLEN-6, port, 6, NI_NUMERICHOST|NI_NUMERICSERV)) {
--        sockerror("getnameinfo");
-+    err = getnameinfo(&addr->sa, addr_len(*addr),
-+            host, IPLEN-6, port, 6, NI_NUMERICHOST|NI_NUMERICSERV);
-+    if (err) {
-+        s_log(LOG_ERR, "Error resolving the specified address: %s",
-+            s_gai_strerror(err));
-         strcpy(text, "unresolvable IP");
-         return text;
-     }
diff -urN stunnel-4.07/files/patch-src::resolver.c stunnel/files/patch-src::resolver.c
--- stunnel-4.07/files/patch-src::resolver.c	Thu Jan  1 02:00:00 1970
+++ stunnel/files/patch-src::resolver.c	Wed Apr 20 13:13:26 2005
@@ -0,0 +1,19 @@
+--- src/resolver.c.orig	Wed Apr 20 13:06:48 2005
++++ src/resolver.c	Wed Apr 20 13:11:12 2005
+@@ -142,10 +142,13 @@
+ 
+ char *s_ntop(char *text, SOCKADDR_UNION *addr) {
+     char host[IPLEN-6], port[6];
++    int err;
+ 
+-    if(getnameinfo(&addr->sa, addr_len(*addr),
+-            host, IPLEN-6, port, 6, NI_NUMERICHOST|NI_NUMERICSERV)) {
+-        sockerror("getnameinfo");
++    err = getnameinfo(&addr->sa, addr_len(*addr),
++        host, IPLEN-6, port, 6, NI_NUMERICHOST|NI_NUMERICSERV);
++    if (err) {
++        s_log(LOG_ERR, "Error resolving the specified address: %s",
++            s_gai_strerror(err));
+         strcpy(text, "unresolvable IP");
+         return text;
+     }
--- stunnel_update-4.07-4.09.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: