Attachment #112197 for bug #153568

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

Lines 7-13 Link Here

(-)security/stunnel/Makefile (-1 / +5 lines)
7		7
8	PORTNAME= stunnel	8	PORTNAME= stunnel
9	PORTVERSION= 4.34	9	PORTVERSION= 4.34
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \	12	MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \
13	http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \	13	http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
Lines 95-100 Link Here
95	${WRKSRC}/tools/Makefile.in	95	${WRKSRC}/tools/Makefile.in
96	.endif	96	.endif
97		97
		98	.if ${OSVERSION} >= 800000
		99	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/bindany_client.c
		100	.endif
		101
98	post-install:	102	post-install:
99	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \	103	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
100	${PKGINSTALL} ${PKGNAME} POST-INSTALL	104	${PKGINSTALL} ${PKGNAME} POST-INSTALL




--- ./src/client.c.orig	2010-12-30 09:53:09.000000000 -0800
+++ ./src/client.c	2010-12-30 09:54:32.000000000 -0800
@@ -1034,15 +1034,15 @@
 static void local_bind(CLI *c) {
     SOCKADDR_UNION addr;
 
-#ifdef IP_TRANSPARENT
+#ifdef IP_BINDANY
     int on=1;
     if(c->opt->option.transparent) {
-        if(setsockopt(c->fd, SOL_IP, IP_TRANSPARENT, &on, sizeof on))
-            sockerror("setsockopt IP_TRANSPARENT");
+        if(setsockopt(c->fd, IPPROTO_IP, IP_BINDANY, &on, sizeof on))
+            sockerror("setsockopt IP_BINDANY");
         /* ignore the error to retain Linux 2.2 compatibility */
         /* the error will be handled by bind(), anyway */
     }
-#endif /* IP_TRANSPARENT */
+#endif /* IP_BINDANY */
 
     memcpy(&addr, &c->bind_addr.addr[0], sizeof addr);
     if(ntohs(addr.in.sin_port)>=1024) { /* security check */

Return to bug 153568

Added Link Here

(-)security/stunnel/files/bindany_client.c (+22 lines)
1	--- ./src/client.c.orig 2010-12-30 09:53:09.000000000 -0800
2	+++ ./src/client.c 2010-12-30 09:54:32.000000000 -0800
3	@@ -1034,15 +1034,15 @@
4	static void local_bind(CLI *c) {
5	SOCKADDR_UNION addr;
6
7	-#ifdef IP_TRANSPARENT
8	+#ifdef IP_BINDANY
9	int on=1;
10	if(c->opt->option.transparent) {
11	- if(setsockopt(c->fd, SOL_IP, IP_TRANSPARENT, &on, sizeof on))
12	- sockerror("setsockopt IP_TRANSPARENT");
13	+ if(setsockopt(c->fd, IPPROTO_IP, IP_BINDANY, &on, sizeof on))
14	+ sockerror("setsockopt IP_BINDANY");
15	/* ignore the error to retain Linux 2.2 compatibility */
16	/* the error will be handled by bind(), anyway */
17	}
18	-#endif /* IP_TRANSPARENT */
19	+#endif /* IP_BINDANY */
20
21	memcpy(&addr, &c->bind_addr.addr[0], sizeof addr);
22	if(ntohs(addr.in.sin_port)>=1024) { /* security check */