Attachment #53143 for bug #80405

View | Details | Raw Unified | Return to bug 80405
Collapse All | Expand All

Lines 6-15 Link Here

(-)stunnel/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= stunnel	8	PORTNAME= stunnel
9	PORTVERSION= 4.07	9	PORTVERSION= 4.10
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \	11	MASTER_SITES= ftp://stunnel.mirt.net/stunnel/ \
12	ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \	12	http://www.stunnel.org/download/stunnel/src/ \
13	ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/	13	ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/
14		14
15	MAINTAINER= roam@FreeBSD.org	15	MAINTAINER= roam@FreeBSD.org

Lines 1-2 Link Here

(-)stunnel/distinfo (-2 / +2 lines)
1	MD5 (stunnel-4.07.tar.gz) = 7d53af550a1c2e01e146b936e58b8860	1	MD5 (stunnel-4.10.tar.gz) = 9de7a62a44083114779ca4e109d70776
2	SIZE (stunnel-4.07.tar.gz) = 486230	2	Size (stunnel-4.10.tar.gz) = 487066




--- 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:
 




--- 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;
     }

Lines 1-6 Link Here

(-)stunnel/files/ssl-noengine.patch (-3 / +3 lines)
1	--- src/ssl.c.orig Mon Dec 27 13:47:16 2004	1	--- src/ssl.c.orig Tue Feb 15 22:07:57 2005
2	+++ src/ssl.c Mon Dec 27 13:50:36 2004	2	+++ src/ssl.c Tue Mar 29 17:48:18 2005
3	@@ -116,6 +116,8 @@	3	@@ -122,6 +122,8 @@
4	static void init_engine(void) {	4	static void init_engine(void) {
5	ENGINE *e;	5	ENGINE *e;

Return to bug 80405

Lines 1-19 Link Here

(-)stunnel/files/patch-Makefile.in (-19 lines)
1	--- tools/Makefile.in.orig Mon Dec 27 13:52:12 2004
2	+++ tools/Makefile.in Mon Dec 27 13:52:25 2004
3	@@ -163,7 +163,7 @@
4	stunnel.spec stunnel.mak stunnel.cnf
5
6	confdir = $(sysconfdir)/stunnel
7	-conf_DATA = stunnel.conf-sample stunnel.pem
8	+conf_DATA = stunnel.conf-sample
9	docdir = $(datadir)/doc/stunnel
10	examplesdir = $(docdir)/examples
11	examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
12	@@ -337,7 +337,6 @@
13	install-data-am: install-confDATA install-data-local \
14	install-examplesDATA
15	@$(NORMAL_INSTALL)
16	- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
17
18	install-exec-am:
19

Lines 1-19 Link Here

(-)stunnel/files/patch-src::network.c (-19 lines)
1	--- src/network.c.orig Mon Jan 3 09:16:45 2005
2	+++ src/network.c Mon Jan 3 09:17:49 2005
3	@@ -488,10 +488,13 @@
4
5	char s_ntop(char text, SOCKADDR_UNION *addr) {
6	char host[IPLEN-6], port[6];
7	+ int err;
8
9	- if(getnameinfo(&addr->sa, addr_len(*addr),
10	- host, IPLEN-6, port, 6, NI_NUMERICHOST\|NI_NUMERICSERV)) {
11	- sockerror("getnameinfo");
12	+ err = getnameinfo(&addr->sa, addr_len(*addr),
13	+ host, IPLEN-6, port, 6, NI_NUMERICHOST\|NI_NUMERICSERV);
14	+ if (err) {
15	+ s_log(LOG_ERR, "Error resolving the specified address: %s",
16	+ s_gai_strerror(err));
17	strcpy(text, "unresolvable IP");
18	return text;
19	}