3 files changed, 72 insertions, 39 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>
diff --git a/misc/compat4x/distinfo b/misc/compat4x/distinfo
index 4c026fe711e8..6f1dc9ce8a95 100644
--- a/misc/compat4x/distinfo
+++ b/misc/compat4x/distinfo
@@ -1,15 +1,17 @@
-MD5 (alpha/4.4/compat4x.aa) = be8e49a8900b0ed7dd305d57cb3c2ebf
-MD5 (alpha/4.4/compat4x.ab) = ac29d5fcdf07d78f82fcf78767e97312
-MD5 (alpha/5.0.20010721/compat4x.aa) = 5c052f279d18b7a2d68ef9eb5b1f1505
-MD5 (alpha/5.0.20010721/compat4x.ab) = a86f387a12a0dba266b1eecdd2fd91eb
-MD5 (alpha/5.0.20010721/compat4x.ac) = 9cc91bf7f1a9d255f575ab538c3a15b4
-MD5 (alpha/5.0.20010721/compat4x.ad) = eb2681b993cc8829e1e947f00f5a5394
-MD5 (alpha/5.0.20010721/compat4x.ae) = 0df08287196d13eef071ec6ff12a3768
-MD5 (i386/4.4.20011227/compat4x.aa) = 47159e77af2b94eab04a49883bb526fb
-MD5 (i386/4.4.20011227/compat4x.ab) = 7d81d8c1017260f910192fa5dfdd50c5
-MD5 (i386/5.0.20020219/compat4x.aa) = 28d133f6b486580207cd30edc8b6fa14
-MD5 (i386/5.0.20020219/compat4x.ab) = f21c5489950974ee8c85b2c2894ccad7
-MD5 (i386/5.0.20020219/compat4x.ac) = 2898d67e9fbbf9a942133535a05fcee6
-MD5 (i386/5.0.20020219/compat4x.ad) = 1ef90c12798545493da8587a536f44a4
-MD5 (i386/5.0.20020219/compat4x.ae) = 4dcdf49260d7ff428f1da5080aa521f5
-MD5 (i386/5.0.20020219/compat4x.af) = 2b749703bea86b7e097755b4c83f49a0
+MD5 (alpha/4.6.2/compat4x.aa) = 37f95a98a33d5b536feed3deef213648
+MD5 (alpha/4.6.2/compat4x.ab) = 28b859345d06e833b820e2b97a51b083
+MD5 (alpha/5.0.20020809/compat4x.aa) = 21317ad52cd242827f812b617e806fa7
+MD5 (alpha/5.0.20020809/compat4x.ab) = 13f3d92036c8ca5ff5449d65f3048a68
+MD5 (alpha/5.0.20020809/compat4x.ac) = 7e8ca14d6903130d4a32591c0e7ef27d
+MD5 (alpha/5.0.20020809/compat4x.ad) = ac7f4c9d033022f02eac64996a4bdaa5
+MD5 (alpha/5.0.20020809/compat4x.ae) = 7bcaee5c5e337de65534bfaf04ef31d3
+MD5 (alpha/5.0.20020809/compat4x.af) = 6b7e63768a219393a0f4ab96aa2b5b1a
+MD5 (alpha/5.0.20020809/compat4x.ag) = 8e76cc5620364f4ab46e93db8d5cdf6a
+MD5 (i386/4.6.2/compat4x.aa) = 7ca8ce6dcc85d16cb393c10588c27aa2
+MD5 (i386/4.6.2/compat4x.ab) = 6ff885268ba4c7c11ccc9a650a582807
+MD5 (i386/5.0.20020917/compat4x.aa) = de66c57b51acb63689549b00073a8e3b
+MD5 (i386/5.0.20020917/compat4x.ab) = 77feee0d3497b67fa98a3c94d1966de5
+MD5 (i386/5.0.20020917/compat4x.ac) = 5f75379986c1335c24b80b346af57175
+MD5 (i386/5.0.20020917/compat4x.ad) = 951fa38b8ba8ed96e3fa2409259aa97c
+MD5 (i386/5.0.20020917/compat4x.ae) = 9bbc5e894d4e168d358d5783128bbfa1
+MD5 (i386/5.0.20020917/compat4x.af) = 4304fb3172dbb49cd3834316b76e868e
diff --git a/misc/compat4x/pkg-plist b/misc/compat4x/pkg-plist
index 838e0f1a9c1d..0c0ca6a2de36 100644
--- a/misc/compat4x/pkg-plist
+++ b/misc/compat4x/pkg-plist
@@ -1,10 +1,25 @@
 etc/rc.d/000.compat4x.sh
 %%CURRENT_ONLY:%%lib/compat/libc.so.4
-%%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf %B/libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
+%%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
 %%CURRENT_ONLY:%%lib/compat/libc_r.so.4.compat4x
-%%CURRENT_ONLY:%%@exec ln -sf %B/%f %B/libc_r.so.4
-lib/compat/libcrypto.so.1
-%%I386_ONLY:%%%%CURRENT_ONLY:%%lib/compat/libedit.so.3
-lib/compat/libssl.so.1
-%%I386_ONLY:%%%%CURRENT_ONLY:%%lib/compat/libperl.so.3
+%%CURRENT_ONLY:%%@exec ln -sf %f %B/libc_r.so.4
+%%FORBIDDEN:%%lib/compat/libcrypto.so.1
+%%CURRENT_ONLY:%%lib/compat/libedit.so.3
+lib/compat/libfetch.so.2
+%%CURRENT_ONLY:%%@unexec if [ -e %B/libperl.so.3.compat3x ]; then ln -sf libperl.so.3.compat3x %B/libperl.so.3; else rm %B/libperl.so.3; fi
+%%CURRENT_ONLY:%%lib/compat/libperl.so.3.compat4x
+%%CURRENT_ONLY:%%@exec ln -sf %f %B/libperl.so.3
+%%CURRENT_ONLY:%%lib/compat/libpam.so.1
+%%FORBIDDEN:%%lib/compat/libssl.so.1
+%%CURRENT_ONLY:%%lib/compat/libstdc++.so.3
+%%CURRENT_ONLY:%%lib/compat/libusb.so.0
+%%CURRENT_ONLY:%%lib/compat/pam_cleartext_pass_ok.so
+%%CURRENT_ONLY:%%lib/compat/pam_deny.so
+%%CURRENT_ONLY:%%lib/compat/pam_opie.so
+%%CURRENT_ONLY:%%lib/compat/pam_permit.so
+%%CURRENT_ONLY:%%lib/compat/pam_radius.so
+%%CURRENT_ONLY:%%lib/compat/pam_skey.so
+%%CURRENT_ONLY:%%lib/compat/pam_ssh.so
+%%CURRENT_ONLY:%%lib/compat/pam_tacplus.so
+%%CURRENT_ONLY:%%lib/compat/pam_unix.so
 @unexec rmdir %D/lib/compat 2>/dev/null || true