Update to avoid possible DoS and multiple buffer overflows

when displaying ICO, XPM and BMP images.

See security advisories CAN-2004-0753, -0782, -0783, -0788, and
<URL:https://rhn.redhat.com/errata/RHSA-2004-466.html>.

3 files changed, 23 insertions, 172 deletions

diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 20f55f863e55..d6256fc5f5df 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
+MASTER_SITES=	http://www.infostrategique.com/linuxrpms/legacy/9/
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
@@ -24,11 +25,27 @@ BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-gl
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
 		${BUILD_DEPENDS}
 
-BASEVERSION=	9
+DIST_SUBDIR=	rpm/i386/rh9
+NO_MTREE=	yes
 ONLY_FOR_ARCHS=	i386
-PLIST=		${PKGDIR}/pkg-plist
+PLIST=		${WRKDIR}/plist
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-2.2.1-4.i386.rpm
+RPM_SET=	gtk2-2.2.1-4.1.legacy.i386.rpm
+
+pre-install:
+	${RM} -f ${PLIST}
+.for ii in gtk.immodules gdk-pixbuf.loaders
+	${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST}
+.endfor
+	${MKDIR} ${WRKSRC}/tmp
+	cd ${WRKSRC}/tmp; \
+	rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
+		${FIND} * -type f -o -type l >> ${PLIST}; \
+		${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \
+		${SED} -e 's:^:@dirrm :' >> ${PLIST}; \
+		${FIND} -d * -type d | ${GREP} locale | \
+		${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' \
+			>> ${PLIST}
 
 post-install:
 .for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext
diff --git a/x11-toolkits/linux-f10-gtk2/distinfo.i386 b/x11-toolkits/linux-f10-gtk2/distinfo.i386
index 352fc2841a02..b4b73d529be3 100644
--- a/x11-toolkits/linux-f10-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk2/distinfo.i386
@@ -1,2 +1,2 @@
-MD5 (rpm/gtk2-2.2.1-4.i386.rpm) = c8716bde8a503bd5b72b05805cb1ffb3
-SIZE (rpm/gtk2-2.2.1-4.i386.rpm) = 2755206
+MD5 (rpm/i386/rh9/gtk2-2.2.1-4.1.legacy.i386.rpm) = 862c882efa4431b368d9bc8bec90b2b3
+SIZE (rpm/i386/rh9/gtk2-2.2.1-4.1.legacy.i386.rpm) = 2755487
diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist
deleted file mode 100644
index 2ee863b4e630..000000000000
--- a/x11-toolkits/linux-f10-gtk2/pkg-plist
+++ /dev/null
@@ -1,166 +0,0 @@
-etc/gtk-2.0/gtk.immodules
-etc/gtk-2.0/gdk-pixbuf.loaders
-usr/bin/gdk-pixbuf-query-loaders
-usr/bin/gtk-demo
-usr/bin/gtk-query-immodules-2.0
-usr/bin/testgtk
-usr/bin/testtext
-usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so
-usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la
-usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
-usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
-usr/lib/libgdk-x11-2.0.so.0
-usr/lib/libgdk-x11-2.0.so.0.200.1
-usr/lib/libgdk_pixbuf-2.0.so.0
-usr/lib/libgdk_pixbuf-2.0.so.0.200.1
-usr/lib/libgdk_pixbuf_xlib-2.0.so.0
-usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1
-usr/lib/libgtk-x11-2.0.so.0
-usr/lib/libgtk-x11-2.0.so.0.200.1
-usr/share/doc/gtk2-2.2.1/AUTHORS
-usr/share/doc/gtk2-2.2.1/COPYING
-usr/share/doc/gtk2-2.2.1/ChangeLog
-usr/share/doc/gtk2-2.2.1/NEWS
-usr/share/doc/gtk2-2.2.1/README
-usr/share/gtk-2.0/demo/alphatest.png
-usr/share/gtk-2.0/demo/apple-red.png
-usr/share/gtk-2.0/demo/appwindow.c
-usr/share/gtk-2.0/demo/background.jpg
-usr/share/gtk-2.0/demo/button_box.c
-usr/share/gtk-2.0/demo/changedisplay.c
-usr/share/gtk-2.0/demo/colorsel.c
-usr/share/gtk-2.0/demo/dialog.c
-usr/share/gtk-2.0/demo/drawingarea.c
-usr/share/gtk-2.0/demo/editable_cells.c
-usr/share/gtk-2.0/demo/floppybuddy.gif
-usr/share/gtk-2.0/demo/gnome-applets.png
-usr/share/gtk-2.0/demo/gnome-calendar.png
-usr/share/gtk-2.0/demo/gnome-foot.png
-usr/share/gtk-2.0/demo/gnome-gimp.png
-usr/share/gtk-2.0/demo/gnome-gmush.png
-usr/share/gtk-2.0/demo/gnome-gsame.png
-usr/share/gtk-2.0/demo/gnu-keys.png
-usr/share/gtk-2.0/demo/gtk-logo-rgb.gif
-usr/share/gtk-2.0/demo/images.c
-usr/share/gtk-2.0/demo/item_factory.c
-usr/share/gtk-2.0/demo/list_store.c
-usr/share/gtk-2.0/demo/menus.c
-usr/share/gtk-2.0/demo/panes.c
-usr/share/gtk-2.0/demo/pixbufs.c
-usr/share/gtk-2.0/demo/sizegroup.c
-usr/share/gtk-2.0/demo/stock_browser.c
-usr/share/gtk-2.0/demo/textview.c
-usr/share/gtk-2.0/demo/tree_store.c
-usr/share/locale/am/LC_MESSAGES/gtk20.mo
-usr/share/locale/az/LC_MESSAGES/gtk20.mo
-usr/share/locale/be/LC_MESSAGES/gtk20.mo
-usr/share/locale/bg/LC_MESSAGES/gtk20.mo
-usr/share/locale/ca/LC_MESSAGES/gtk20.mo
-usr/share/locale/cs/LC_MESSAGES/gtk20.mo
-usr/share/locale/cy/LC_MESSAGES/gtk20.mo
-usr/share/locale/da/LC_MESSAGES/gtk20.mo
-usr/share/locale/de/LC_MESSAGES/gtk20.mo
-usr/share/locale/el/LC_MESSAGES/gtk20.mo
-usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo
-usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
-usr/share/locale/es/LC_MESSAGES/gtk20.mo
-usr/share/locale/et/LC_MESSAGES/gtk20.mo
-usr/share/locale/eu/LC_MESSAGES/gtk20.mo
-usr/share/locale/fa/LC_MESSAGES/gtk20.mo
-usr/share/locale/fi/LC_MESSAGES/gtk20.mo
-usr/share/locale/fr/LC_MESSAGES/gtk20.mo
-usr/share/locale/ga/LC_MESSAGES/gtk20.mo
-usr/share/locale/gl/LC_MESSAGES/gtk20.mo
-usr/share/locale/he/LC_MESSAGES/gtk20.mo
-usr/share/locale/hi/LC_MESSAGES/gtk20.mo
-usr/share/locale/hr/LC_MESSAGES/gtk20.mo
-usr/share/locale/hu/LC_MESSAGES/gtk20.mo
-usr/share/locale/ia/LC_MESSAGES/gtk20.mo
-usr/share/locale/it/LC_MESSAGES/gtk20.mo
-usr/share/locale/ja/LC_MESSAGES/gtk20.mo
-usr/share/locale/ko/LC_MESSAGES/gtk20.mo
-usr/share/locale/lt/LC_MESSAGES/gtk20.mo
-usr/share/locale/lv/LC_MESSAGES/gtk20.mo
-usr/share/locale/mk/LC_MESSAGES/gtk20.mo
-usr/share/locale/mn/LC_MESSAGES/gtk20.mo
-usr/share/locale/ms/LC_MESSAGES/gtk20.mo
-usr/share/locale/nl/LC_MESSAGES/gtk20.mo
-usr/share/locale/nn/LC_MESSAGES/gtk20.mo
-usr/share/locale/no/LC_MESSAGES/gtk20.mo
-usr/share/locale/pl/LC_MESSAGES/gtk20.mo
-usr/share/locale/pt/LC_MESSAGES/gtk20.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
-usr/share/locale/ro/LC_MESSAGES/gtk20.mo
-usr/share/locale/ru/LC_MESSAGES/gtk20.mo
-usr/share/locale/sk/LC_MESSAGES/gtk20.mo
-usr/share/locale/sl/LC_MESSAGES/gtk20.mo
-usr/share/locale/sp/LC_MESSAGES/gtk20.mo
-usr/share/locale/sr/LC_MESSAGES/gtk20.mo
-usr/share/locale/sv/LC_MESSAGES/gtk20.mo
-usr/share/locale/ta/LC_MESSAGES/gtk20.mo
-usr/share/locale/tr/LC_MESSAGES/gtk20.mo
-usr/share/locale/uk/LC_MESSAGES/gtk20.mo
-usr/share/locale/vi/LC_MESSAGES/gtk20.mo
-usr/share/locale/wa/LC_MESSAGES/gtk20.mo
-usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
-usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
-usr/share/themes/Default/gtk-2.0-key/gtkrc
-usr/share/themes/Emacs/gtk-2.0-key/gtkrc
-usr/share/themes/Raleigh/gtk-2.0/gtkrc
-@dirrm etc/gtk-2.0
-@dirrm usr/lib/gtk-2.0/2.2.0/immodules
-@dirrm usr/lib/gtk-2.0/2.2.0/loaders
-@dirrm usr/lib/gtk-2.0/2.2.0
-@dirrm usr/lib/gtk-2.0
-@dirrm usr/share/doc/gtk2-2.2.1
-@dirrm usr/share/gtk-2.0/demo
-@dirrm usr/share/gtk-2.0
-@dirrm usr/share/themes/Default/gtk-2.0-key
-@dirrm usr/share/themes/Default
-@dirrm usr/share/themes/Emacs/gtk-2.0-key
-@dirrm usr/share/themes/Emacs
-@dirrm usr/share/themes/Raleigh/gtk-2.0
-@dirrm usr/share/themes/Raleigh
-@dirrm usr/share/themes