diff options
| author | trevor <trevor@FreeBSD.org> | 2004-12-17 13:42:44 +0800 |
|---|---|---|
| committer | trevor <trevor@FreeBSD.org> | 2004-12-17 13:42:44 +0800 |
| commit | 829a841cf1314642828edd85ea6a972bd43fcdbc (patch) | |
| tree | 8316cbe3c883d94c690977044a38e0eb0db9ce9f | |
| parent | d18ec452c6f14061f69b3a164db6896c1f0c95ab (diff) | |
| download | freebsd-ports-gnome-829a841cf1314642828edd85ea6a972bd43fcdbc.tar.gz freebsd-ports-gnome-829a841cf1314642828edd85ea6a972bd43fcdbc.tar.zst freebsd-ports-gnome-829a841cf1314642828edd85ea6a972bd43fcdbc.zip | |
update for security bugs in parsing of X Pixmap images, see:
<URL:https://rhn.redhat.com/errata/RHSA-2004-478.html>
<URL:http://www.novell.com/linux/security/advisories/2004_41_xshared_XFree86_libs_xorg_x11_libs.html>
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0687>
<URL:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-068*>
| -rw-r--r-- | x11/linux-XFree86-libs/Makefile | 36 | ||||
| -rw-r--r-- | x11/linux-XFree86-libs/distinfo.i386 | 4 |
2 files changed, 21 insertions, 19 deletions
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile index f695c6ffd7a2..8f7d2357806e 100644 --- a/x11/linux-XFree86-libs/Makefile +++ b/x11/linux-XFree86-libs/Makefile @@ -6,15 +6,14 @@ # PORTNAME= XFree86-libs -PORTVERSION= 4.3.0 -PORTREVISION= 2 +PORTVERSION= 4.3.99.902 CATEGORIES= x11 linux -MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= updates/9/en/os/i386 +MASTER_SITES= ftp://suse.cs.utah.edu/pub/suse.com/suse/i386/update/9.1/rpm/i586/ \ + ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/i586/ PKGNAMEPREFIX= linux- -DISTNAME= XFree86-libs-4.3.0-2.90.55.i386.rpm +DISTNAME= XFree86-libs-4.3.99.902-43.35.3.i586.rpm EXTRACT_SUFX= -DIST_SUBDIR= rpm +DIST_SUBDIR= rpm/i386/suse EXTRACT_ONLY= MAINTAINER= trevor@FreeBSD.org @@ -23,25 +22,27 @@ COMMENT= XFree86 libraries, Linux/i386 binary BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 -BASEVERSION= 9 CONFLICTS= linux_base-6* linux_base-7* linux_base-deb* linux_base-gentoo* MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} NO_BUILD= yes NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= i386 PLIST= ${WRKDIR}/plist +PLIST_DIRS= usr/X11R6/lib/X11 PREFIX= ${LINUXBASE} pre-install: - @${RM} -rf ${WRKSRC}/tmp - @${MKDIR} ${WRKSRC}/tmp - @cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} | cpio -id; \ - ${FIND} * -type f -o -type l > ${PLIST} -.for ii in X11/locale/lib/common X11/locale/lib X11/locale X11 - @${ECHO_CMD} @dirrm usr/X11R6/lib/${ii} >> ${PLIST} + @${RM} -f ${PLIST} +.for ii in libXss.so.1 libxkbui.so.1 libxkbfile.so.1 libfontenc.so.1 libXxf86rush.so.1 libXvMC.so.1 libXinerama.so.1 libXfontcache.so.1 libXRes.so.1 libVncExt.so.2 libI810XvMC.so.1 libGLw.so.1 libFS.so.6 + @${ECHO_CMD} usr/X11R6/lib/${ii} >> ${PLIST} .endfor - + @${RM} -rf ${WRKDIR}/tmp + @${MKDIR} ${WRKDIR}/tmp + @cd ${WRKDIR}/tmp; \ + rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} | cpio -id; \ + ${FIND} * -type f -o -type l >> ${PLIST} ; \ + ${FIND} -d usr/X11R6/lib/X11/locale -type d | \ + ${SED} -e 's:^:@dirrm :' >> ${PLIST} post-install: @${RM} -f ${LINUXBASE}/etc/ld.so.cache @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ @@ -49,7 +50,8 @@ post-install: @chroot ${LINUXBASE} sbin/ldconfig do-install: - @rpm -U --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm --nodeps \ - --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} || ${TRUE} + @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ + --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + || ${TRUE} .include <bsd.port.mk> diff --git a/x11/linux-XFree86-libs/distinfo.i386 b/x11/linux-XFree86-libs/distinfo.i386 index 1b265b6627df..92fd0a19d184 100644 --- a/x11/linux-XFree86-libs/distinfo.i386 +++ b/x11/linux-XFree86-libs/distinfo.i386 @@ -1,3 +1,3 @@ $FreeBSD$ -MD5 (rpm/XFree86-libs-4.3.0-2.90.55.i386.rpm) = cbd3f064fa8432540bbf122253f45c96 -SIZE (rpm/XFree86-libs-4.3.0-2.90.55.i386.rpm) = 2440716 +MD5 (rpm/i386/suse/XFree86-libs-4.3.99.902-43.35.3.i586.rpm) = 89431783cd8261a970d6ec5484dd09e6 +SIZE (rpm/i386/suse/XFree86-libs-4.3.99.902-43.35.3.i586.rpm) = 2404743 |