diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/compat4x/Makefile | 50 | ||||
-rw-r--r-- | misc/compat4x/distinfo | 37 | ||||
-rw-r--r-- | misc/compat4x/pkg-plist.freebsd4 (renamed from misc/compat4x/pkg-plist.alpha-freebsd4) | 2 | ||||
-rw-r--r-- | misc/compat4x/pkg-plist.freebsd5 (renamed from misc/compat4x/pkg-plist.alpha-freebsd5) | 13 | ||||
-rw-r--r-- | misc/compat4x/pkg-plist.i386-freebsd4 | 5 | ||||
-rw-r--r-- | misc/compat4x/pkg-plist.i386-freebsd5 | 27 |
6 files changed, 60 insertions, 74 deletions
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index 840712b70d69..1d4376e387ba 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -28,52 +28,44 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/compat .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500000 -COMPAT4X_OSVERSION= 5.0 -COMPAT4X_OSBRANCH= CURRENT -COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ +COMPAT4X_OSVERSION= 5.2.1 +PLIST= ${.CURDIR}/pkg-plist.freebsd5 .if ${ARCH} == i386 -COMPAT4X_OSRELDATE= 20030328 COMPAT4X_DISTFILES= ${PORTNAME}.aa \ ${PORTNAME}.ab .elif ${ARCH} == alpha -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}.af \ - ${PORTNAME}.ag + ${PORTNAME}.ab .else IGNORE= unsupported architecture .endif .else -COMPAT4X_OSVERSION= 4.7 +COMPAT4X_OSVERSION= 4.9 +PLIST= ${.CURDIR}/pkg-plist.freebsd4 .if ${ARCH} == i386 -COMPAT4X_MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} COMPAT4X_DISTFILES= ${PORTNAME}.aa \ - ${PORTNAME}.ab + ${PORTNAME}.ab \ + ${PORTNAME}.ac \ + ${PORTNAME}.ad .elif ${ARCH} == alpha -COMPAT4X_MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} COMPAT4X_DISTFILES= ${PORTNAME}.aa \ - ${PORTNAME}.ab + ${PORTNAME}.ab \ + ${PORTNAME}.ac \ + ${PORTNAME}.ad .else IGNORE= unsupported architecture .endif .endif -PLIST= ${.CURDIR}/pkg-plist.${ARCH}-freebsd${OSREL:C/\..*//} .if ${ARCH} == i386 -I386_ONLY= "" +PLIST_SUB+= I386_ONLY="" .else -I386_ONLY= "@comment " +PLIST_SUB+= I386_ONLY="@comment " .endif -OPENSSL_LIBS= libcrypto.so.1 libssl.so.1 +OPENSSL_LIBS= libcrypto.so.1 libcrypto.so.2 libssl.so.1 libssl.so.2 .if defined(FORCE_VULNERABLE_OPENSSL) -FORBIDDEN= "FreeBSD-SA-02:33.openssl - openssl contains multiple vulnerabilities" +FORBIDDEN= "FreeBSD-SA-02:33.openssl, FreeBSD-SA-03:02.openssl, FreeBSD-SA-03:18.openssl - OpenSSL contains multiple vulnerabilities" PLIST_SUB+= FORBIDDEN:="" .else @@ -84,20 +76,22 @@ 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_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME} +COMPAT4X_MASTER_SITES= ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ +COMPAT4X_MASTER_SITE_SUBDIR= snapshots/${ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME} .else COMPAT4X_PORTVERSION= ${COMPAT4X_OSVERSION} +COMPAT4X_MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} COMPAT4X_MASTER_SITE_SUBDIR= releases/${ARCH}/${COMPAT4X_OSVERSION}-RELEASE/${PORTNAME} .endif do-extract: ${MKDIR} ${WRKDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} -.for lib in ${FREEBSD4_LIBS} .if ${OSVERSION} >= 500000 +.for lib in ${FREEBSD4_LIBS} ${MV} ${WRKSRC}/${lib} ${WRKSRC}/${lib}.compat4x -.endif .endfor +.endif .if !defined(FORCE_VULNERABLE_OPENSSL) .for lib in ${OPENSSL_LIBS} ${RM} -f ${WRKSRC}/${lib} @@ -111,11 +105,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 +.for lib in ${FREEBSD4_LIBS} ${LN} -sf ${lib}.compat4x ${TARGET_DIR}/${lib} -.endif .endfor +.endif ${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 0950b3400779..6c1c6b84cf32 100644 --- a/misc/compat4x/distinfo +++ b/misc/compat4x/distinfo @@ -1,13 +1,24 @@ -MD5 (alpha/4.7/compat4x.aa) = 6f35d1ce24c37339dce2ee46a4231f21 -MD5 (alpha/4.7/compat4x.ab) = c4e5a5c9b59226422f51daec923ffaea -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.7/compat4x.aa) = 6d4c2cdf62264901c90182598c64780a -MD5 (i386/4.7/compat4x.ab) = 0712a862736bd8abc1023f027a654399 -MD5 (i386/5.0.20030328/compat4x.aa) = 1e50ec18408259bd50477706e826728e -MD5 (i386/5.0.20030328/compat4x.ab) = 3bff0596ed305709d13d97f89464ec6e +MD5 (alpha/4.9/compat4x.aa) = 06151ecbbff4e230a7eb53033c2195c8 +SIZE (alpha/4.9/compat4x.aa) = 240640 +MD5 (alpha/4.9/compat4x.ab) = e96903ec5a834e39e32d8e6982872f1f +SIZE (alpha/4.9/compat4x.ab) = 240640 +MD5 (alpha/4.9/compat4x.ac) = 94c53795e22afcea5d5b641b6f0b86eb +SIZE (alpha/4.9/compat4x.ac) = 240640 +MD5 (alpha/4.9/compat4x.ad) = 371c07b2048ea56ddfcea97cf0c33a27 +SIZE (alpha/4.9/compat4x.ad) = 137820 +MD5 (alpha/5.2.1/compat4x.aa) = 9a31c1e90791b0b437fa846caee520c6 +SIZE (alpha/5.2.1/compat4x.aa) = 1457152 +MD5 (alpha/5.2.1/compat4x.ab) = 7ace0ca7e9f7aa292808a5acf68bf9ea +SIZE (alpha/5.2.1/compat4x.ab) = 675421 +MD5 (i386/4.9/compat4x.aa) = 8b7c6dfdf4f447f7cb9a59b5a0700529 +SIZE (i386/4.9/compat4x.aa) = 240640 +MD5 (i386/4.9/compat4x.ab) = 9f01404c3df43d41da8d63f939e5b1d6 +SIZE (i386/4.9/compat4x.ab) = 240640 +MD5 (i386/4.9/compat4x.ac) = fecd4ce7253505d1bc05a25272048559 +SIZE (i386/4.9/compat4x.ac) = 240640 +MD5 (i386/4.9/compat4x.ad) = 16bea1ade439a60090e6dfc3e579e0d8 +SIZE (i386/4.9/compat4x.ad) = 89809 +MD5 (i386/5.2.1/compat4x.aa) = f691bac030f8dd5687d3465a338ca094 +SIZE (i386/5.2.1/compat4x.aa) = 1457152 +MD5 (i386/5.2.1/compat4x.ab) = dc5f34aaa9347cefda58bb54d3291faf +SIZE (i386/5.2.1/compat4x.ab) = 443667 diff --git a/misc/compat4x/pkg-plist.alpha-freebsd4 b/misc/compat4x/pkg-plist.freebsd4 index 009c01e93b31..3db15e685483 100644 --- a/misc/compat4x/pkg-plist.alpha-freebsd4 +++ b/misc/compat4x/pkg-plist.freebsd4 @@ -1,5 +1,7 @@ etc/rc.d/000.compat4x.sh %%FORBIDDEN:%%lib/compat/libcrypto.so.1 +%%FORBIDDEN:%%lib/compat/libcrypto.so.2 lib/compat/libfetch.so.2 %%FORBIDDEN:%%lib/compat/libssl.so.1 +%%FORBIDDEN:%%lib/compat/libssl.so.2 @unexec rmdir %D/lib/compat 2>/dev/null || true diff --git a/misc/compat4x/pkg-plist.alpha-freebsd5 b/misc/compat4x/pkg-plist.freebsd5 index 242468a4719a..47f8585f5f21 100644 --- a/misc/compat4x/pkg-plist.alpha-freebsd5 +++ b/misc/compat4x/pkg-plist.freebsd5 @@ -4,18 +4,29 @@ lib/compat/libc.so.4 lib/compat/libc_r.so.4.compat4x @exec ln -sf %f %B/libc_r.so.4 %%FORBIDDEN:%%lib/compat/libcrypto.so.1 +%%FORBIDDEN:%%lib/compat/libcrypto.so.2 +lib/compat/libdevstat.so.2 lib/compat/libedit.so.3 lib/compat/libfetch.so.2 +lib/compat/libgmp.so.3 +lib/compat/libmp.so.3 +lib/compat/libpam.so.1 @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 lib/compat/libperl.so.3.compat4x @exec ln -sf %f %B/libperl.so.3 -lib/compat/libpam.so.1 +lib/compat/libposix1e.so.2 +lib/compat/libskey.so.2 %%FORBIDDEN:%%lib/compat/libssl.so.1 +%%FORBIDDEN:%%lib/compat/libssl.so.2 lib/compat/libstdc++.so.3 lib/compat/libusb.so.0 +lib/compat/libusbhid.so.0 +%%I386_ONLY%%lib/compat/libutil.so.3 +%%I386_ONLY%%lib/compat/libvgl.so.2 lib/compat/pam_cleartext_pass_ok.so lib/compat/pam_deny.so lib/compat/pam_opie.so +lib/compat/pam_opieaccess.so lib/compat/pam_permit.so lib/compat/pam_radius.so lib/compat/pam_skey.so diff --git a/misc/compat4x/pkg-plist.i386-freebsd4 b/misc/compat4x/pkg-plist.i386-freebsd4 deleted file mode 100644 index 009c01e93b31..000000000000 --- a/misc/compat4x/pkg-plist.i386-freebsd4 +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/000.compat4x.sh -%%FORBIDDEN:%%lib/compat/libcrypto.so.1 -lib/compat/libfetch.so.2 -%%FORBIDDEN:%%lib/compat/libssl.so.1 -@unexec rmdir %D/lib/compat 2>/dev/null || true diff --git a/misc/compat4x/pkg-plist.i386-freebsd5 b/misc/compat4x/pkg-plist.i386-freebsd5 deleted file mode 100644 index 3c6cbfd7d28d..000000000000 --- a/misc/compat4x/pkg-plist.i386-freebsd5 +++ /dev/null @@ -1,27 +0,0 @@ -etc/rc.d/000.compat4x.sh -lib/compat/libc.so.4 -@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 -lib/compat/libc_r.so.4.compat4x -@exec ln -sf %f %B/libc_r.so.4 -lib/compat/libcrypto.so.2 -lib/compat/libedit.so.3 -lib/compat/libfetch.so.2 -lib/compat/libgmp.so.3 -@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 -lib/compat/libperl.so.3.compat4x -@exec ln -sf %f %B/libperl.so.3 -lib/compat/libpam.so.1 -lib/compat/libposix1e.so.2 -lib/compat/libssl.so.2 -lib/compat/libstdc++.so.3 -lib/compat/libusb.so.0 -lib/compat/pam_cleartext_pass_ok.so -lib/compat/pam_deny.so -lib/compat/pam_opie.so -lib/compat/pam_permit.so -lib/compat/pam_radius.so -lib/compat/pam_skey.so -lib/compat/pam_ssh.so -lib/compat/pam_tacplus.so -lib/compat/pam_unix.so -@unexec rmdir %D/lib/compat 2>/dev/null || true |