Update to the latest library set and unmark FORBIDDEN excpet:

- On 5-CURRENT/alpha: still FORBIDDEN because no updated libc/libc_r
  is available yet.

- By default, OpenSSL libraries are not installed because they are
  known to be vulnerable. (cf. FreeBSD-SA-02:33.openssl)  They are
  installed only when FORCE_VULNERABLE_OPENSSL is defined, although
  in that case the port is marked FORBIDDEN.  So, one must specify
  -DFORCE_VULNERABLE_OPENSSL -DNO_IGNORE to install this port with
  vulnerable OpenSSL libraries.

1 files changed, 34 insertions, 18 deletions

diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 971591d622e0..9692156bb95d 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -16,8 +16,6 @@ DIST_SUBDIR=	${ARCH}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-FORBIDDEN=	"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
-
 WRKSRC=		${WRKDIR}/usr/lib/compat
 NO_MTREE=	yes
 
@@ -33,34 +31,34 @@ COMPAT4X_OSVERSION=	5.0
 COMPAT4X_OSBRANCH=	CURRENT
 COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
 .if ${ARCH} == i386
-COMPAT4X_OSRELDATE=	20020219
+COMPAT4X_OSRELDATE=	20020917
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab \
 			${PORTNAME}.ac \
 			${PORTNAME}.ad \
 			${PORTNAME}.ae \
 			${PORTNAME}.af
-I386_ONLY=		""
 .elif ${ARCH} == alpha
-COMPAT4X_OSRELDATE=	20010721
+FORBIDDEN=		"FreeBSD-SA-02:28.resolv - buffer overflow in resolver in libc"
+
+COMPAT4X_OSRELDATE=	20020809
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab \
 			${PORTNAME}.ac \
 			${PORTNAME}.ad \
-			${PORTNAME}.ae
+			${PORTNAME}.ae \
+			${PORTNAME}.af \
+			${PORTNAME}.ag
 .else
 IGNORE=			unsupported architecture
 .endif
 CURRENT_ONLY=		""
 .else
-COMPAT4X_OSVERSION=	4.4
+COMPAT4X_OSVERSION=	4.6.2
 .if ${ARCH} == i386
-COMPAT4X_OSRELDATE=	20011227
-COMPAT4X_OSBRANCH=	STABLE
-COMPAT4X_MASTER_SITES=	ftp://stable.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
+COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
 			${PORTNAME}.ab
-I386_ONLY=		""
 .elif ${ARCH} == alpha
 COMPAT4X_MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 COMPAT4X_DISTFILES=	${PORTNAME}.aa \
@@ -71,14 +69,23 @@ IGNORE=			unsupported architecture
 .endif
 
 CURRENT_ONLY?=		"@comment "
-I386_ONLY?=		"@comment "
 
-PLIST_SUB+=		CURRENT_ONLY:=${CURRENT_ONLY} \
-			I386_ONLY:=${I386_ONLY}
+PLIST_SUB+=		CURRENT_ONLY:=${CURRENT_ONLY}
+
+OPENSSL_LIBS=		libcrypto.so.1 libssl.so.1
+.if defined(FORCE_VULNERABLE_OPENSSL)
+FORBIDDEN=		"FreeBSD-SA-02:33.openssl - openssl contains multiple vulnerabilities"
+
+PLIST_SUB+=		FORBIDDEN:=""
+.else
+PLIST_SUB+=		FORBIDDEN:="@comment "
+.endif
+
+FREEBSD4_LIBS=		libc_r.so.4 libperl.so.3
 
 .if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
-COMPAT4X_MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSRELDATE}-${COMPAT4X_OSBRANCH}/${PORTNAME}
+COMPAT4X_MASTER_SITE_SUBDIR=	snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
 .else
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}
 COMPAT4X_MASTER_SITE_SUBDIR=	releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME}
@@ -86,9 +93,16 @@ COMPAT4X_MASTER_SITE_SUBDIR=	releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PO
 
 do-extract:
 	${MKDIR} ${WRKDIR}
-	cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
+.for lib in ${FREEBSD4_LIBS}
 .if ${OSVERSION} >= 500000
-	${MV} ${WRKSRC}/libc_r.so.4 ${WRKSRC}/libc_r.so.4.compat4x
+	${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x
+.endif
+.endfor
+.if !defined(FORCE_VULNERABLE_OPENSSL)
+.for lib in ${OPENSSL_LIBS}
+	${RM} -f ${WRKSRC}/${lib}
+.endfor
 .endif
 
 do-build:
@@ -98,9 +112,11 @@ do-build:
 do-install:
 	${MKDIR} ${TARGET_DIR} ${PREFIX}/etc/rc.d
 	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
+.for lib in ${FREEBSD4_LIBS}
 .if ${OSVERSION} >= 500000
-	${LN} -sf ${TARGET_DIR}/libc_r.so.4.compat4x ${TARGET_DIR}/libc_r.so.4
+	${LN} -sf ${lib}.compat4x ${TARGET_DIR}/${lib}
 .endif
+.endfor
 	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>