ports/181734: Patch to IPv6+SSL in sysutils/ucspi-tcp

[Mamoru Sakaue]

>Number:         181734
>Category:       ports
>Synopsis:       Patch to IPv6+SSL in sysutils/ucspi-tcp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 01 22:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Mamoru Sakaue
>Release:        8.4-RELEASE
>Organization:
MwGhennndo
>Environment:
FreeBSD Grubstake.EmpireNmw 8.4-RELEASE-p3 FreeBSD 8.4-RELEASE-p3 #0: Wed Aug 21 19:17:37 UTC 2013     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
IPV6 and SSL options of sysutils/ucspi-tcp have been incompatible with each other because of the confliction of patches applied to them. In the world, there is another version of the SSL patch to apply after the IPv6 patch, however, it has not been employed in the FreeBSD port yet. This report proposes a modification to fix this problem.
>How-To-Repeat:
The latest version (ucspi-tcp-0.88_2) is set to be BROKEN if both IPV6 and SSL options are set.
>Fix:
Apply the attached patch.

Changes are made so that ucspi-tcp-ipv6-ssl-20061230.patch is employed instead of ucspi-tcp-ssl-20050405.patch.gz when both IPV6 and SSL options are set. All of fetch, build, installation and work processes are confirmed to be successful.

The version of the port is untouched. Please update to a proper one.

Patch attached with submission follows:

diff -ruN /usr/ports/sysutils/ucspi-tcp.orig/Makefile /usr/ports/sysutils/ucspi-tcp/Makefile
--- /usr/ports/sysutils/ucspi-tcp.orig/Makefile	2013-08-27 03:47:29.000000000 +0900
+++ /usr/ports/sysutils/ucspi-tcp/Makefile	2013-08-27 04:32:21.000000000 +0900
@@ -21,7 +21,6 @@
 RBL2SMTPD_DESC=	Don't drop connection, pass envvar to smtpd
 LIMITS_DESC=	Implement per-connection and other limits
 
-
 ALL_TARGET=	prog install instcheck
 
 SCRIPTS_ENV=	BINOWN="${BINOWN}" \
@@ -77,7 +76,7 @@
 PATCHFILES+=	ucspi-rss.diff:rss
 .endif
 
-.if ${PORT_OPTIONS:MSSL}
+.if ${PORT_OPTIONS:MSSL} && !${PORT_OPTIONS:MIPV6}
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 PATCH_SITES+=	http://www.nrg4u.com/qmail/:ssl
@@ -94,18 +93,19 @@
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
-# Neither can IPv6 and SSL
+PATCH_SITES+=	http://www.fefe.de/ucspi/:ipv6
+PATCHFILES+=	ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6
+
 . if ${PORT_OPTIONS:MSSL}
-BROKEN=	SSL and IPv6 options cannot coexist, please choose one of them
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+PATCH_SITES+=	http://manuel.mausz.at/coding/patches/ucspi-tcp/gentoo/:ipv6ssl
+PATCHFILES+=	ucspi-tcp-ipv6-ssl-20061230.patch:ipv6ssl
 . endif
 
 # Same for IPv6 and LIMITS
 . if ${PORT_OPTIONS:MLIMITS}
 BROKEN=	IPv6 and LIMITS options cannot coexist, please choose one of them
 . endif
-
-PATCH_SITES+=	http://www.fefe.de/ucspi/:ipv6
-PATCHFILES+=	ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6
 .endif
 
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:rss,ssl,rbl2smtpd/}
diff -ruN /usr/ports/sysutils/ucspi-tcp.orig/distinfo /usr/ports/sysutils/ucspi-tcp/distinfo
--- /usr/ports/sysutils/ucspi-tcp.orig/distinfo	2013-08-27 03:47:35.000000000 +0900
+++ /usr/ports/sysutils/ucspi-tcp/distinfo	2013-08-27 03:55:07.000000000 +0900
@@ -12,3 +12,5 @@
 SIZE (tcpserver-limits-2006-01-26.diff) = 15523
 SHA256 (ucspi-tcp-0.88-ipv6.diff19.bz2) = 35952cd290d714452c840580126004cbae8db65b1632df67ac9c8fad7d1f9ace
 SIZE (ucspi-tcp-0.88-ipv6.diff19.bz2) = 22632
+SHA256 (ucspi-tcp-ipv6-ssl-20061230.patch) = e8019f6af54d5a3601097d47d697a78863975c77d061837c37afe4678f805980
+SIZE (ucspi-tcp-ipv6-ssl-20061230.patch) = 14191


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