Several security flaws were found in the image loading modules of

gdk-pixbuf.  See:

http://vuxml.freebsd.org/3d1e9267-073f-11d9-b45d-000c41e2cdad.html

for details.

This patch brings the port up to version 0.22.0.11.3.5 using Fedora
RPMs.

Note: RedHat is no longer providing RPMs of this package for Alpha.

PR:		ports/71990
Submitted by:	maintainer.

6 files changed, 26 insertions, 104 deletions

diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile
index aed29754ab09..d8404bd796d8 100644
--- a/graphics/linux-f10-gdk-pixbuf/Makefile
+++ b/graphics/linux-f10-gdk-pixbuf/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	0.8.0.7
-PORTREVISION=	1
+PORTVERSION=	0.22.0.11.3.5
 CATEGORIES=	graphics linux
-MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${MACHINE_ARCH}/RPMS.updates/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH}
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
@@ -21,20 +20,16 @@ COMMENT=	Linux version of the graphic library for GTK+
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
-USE_LINUX_PREFIX=	yes
-ONLY_FOR_ARCHS=	alpha i386
+USE_LINUX_PREFIX=yes
+ONLY_FOR_ARCHS=	i386
 DIST_SUBDIR=	rpm
 NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
-PLIST=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-PLIST_SUB=	VERSION=${PORTVERSION:C/^(.+)\.[^\.]+$/\1/}
-MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
+NO_FILTER_SHLIBS=yes
+PLIST_SUB=	VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/}
 
-# Let's avoid hardcoding 'en' as the language.
-LANG=		en
-# Set the version of linux_base
-BASEVERSION?=	7.1
-RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \
+# Set the version of Fedora Core
+BASEVERSION?=	2
+RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath /var/lib/rpm\
 		--nodeps --replacepkgs
 
 do-install:
diff --git a/graphics/linux-f10-gdk-pixbuf/distinfo b/graphics/linux-f10-gdk-pixbuf/distinfo
new file mode 100644
index 000000000000..1cc54f8d67e7
--- /dev/null
+++ b/graphics/linux-f10-gdk-pixbuf/distinfo
@@ -0,0 +1,2 @@
+MD5 (rpm/gdk-pixbuf-0.22.0-11.3.5.i386.rpm) = 174e82dcdccb7832bc7186eba1ba4f8f
+SIZE (rpm/gdk-pixbuf-0.22.0-11.3.5.i386.rpm) = 228293
diff --git a/graphics/linux-f10-gdk-pixbuf/distinfo.alpha b/graphics/linux-f10-gdk-pixbuf/distinfo.alpha
deleted file mode 100644
index 8063194d58b1..000000000000
--- a/graphics/linux-f10-gdk-pixbuf/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gdk-pixbuf-0.8.0-7.alpha.rpm) = 05f564295dbf7a8f0b9e84252f285ca1
-SIZE (rpm/gdk-pixbuf-0.8.0-7.alpha.rpm) = 477648
diff --git a/graphics/linux-f10-gdk-pixbuf/distinfo.i386 b/graphics/linux-f10-gdk-pixbuf/distinfo.i386
deleted file mode 100644
index 842e531ab4c1..000000000000
--- a/graphics/linux-f10-gdk-pixbuf/distinfo.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gdk-pixbuf-0.8.0-7.i386.rpm) = e6b15de8014bd7c2cb3b4951dfe73934
-SIZE (rpm/gdk-pixbuf-0.8.0-7.i386.rpm) = 138245
diff --git a/graphics/linux-f10-gdk-pixbuf/pkg-plist.i386 b/graphics/linux-f10-gdk-pixbuf/pkg-plist
index e9c4213bebc2..af3c0548034e 100644
--- a/graphics/linux-f10-gdk-pixbuf/pkg-plist.i386
+++ b/graphics/linux-f10-gdk-pixbuf/pkg-plist
@@ -1,34 +1,17 @@
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1.0.0
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1.0.0
+usr/lib/gdk-pixbuf/loaders/libpixbufloader-xbm.so
 usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1.0.0
 usr/lib/libgdk_pixbuf.so.2
 usr/lib/libgdk_pixbuf.so.2.0.0
-usr/lib/libgnomecanvaspixbuf.so.1
-usr/lib/libgnomecanvaspixbuf.so.1.0.0
+usr/lib/libgdk_pixbuf_xlib.so.2
+usr/lib/libgdk_pixbuf_xlib.so.2.0.0
 usr/share/doc/gdk-pixbuf-%%VERSION%%/AUTHORS
 usr/share/doc/gdk-pixbuf-%%VERSION%%/COPYING
 usr/share/doc/gdk-pixbuf-%%VERSION%%/COPYING.LIB
@@ -36,9 +19,8 @@ usr/share/doc/gdk-pixbuf-%%VERSION%%/ChangeLog
 usr/share/doc/gdk-pixbuf-%%VERSION%%/NEWS
 usr/share/doc/gdk-pixbuf-%%VERSION%%/README
 usr/share/doc/gdk-pixbuf-%%VERSION%%/TODO
-usr/share/doc/gdk-pixbuf-%%VERSION%%/gdk-pixbuf-decl.txt
 usr/share/doc/gdk-pixbuf-%%VERSION%%/gdk-pixbuf-sections.txt
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/book1.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/a3696.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/compiling.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/extra-configuration-options.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-animation.html
@@ -46,15 +28,22 @@ usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-creating.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-file-loading.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-from-drawables.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf-xlib-init.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-refcounting.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-rendering.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-scaling.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-util.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdkpixbufloader.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gnomecanvaspixbuf.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/index.html
 usr/share/doc/gdk-pixbuf-%%VERSION%%/html/index.sgml
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/r14.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/r15.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/license.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/r27.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/x3715.html
+usr/share/doc/gdk-pixbuf-%%VERSION%%/html/x3767.html
 @dirrm usr/lib/gdk-pixbuf/loaders
 @dirrm usr/lib/gdk-pixbuf
 @dirrm usr/share/doc/gdk-pixbuf-%%VERSION%%/html
diff --git a/graphics/linux-f10-gdk-pixbuf/pkg-plist.alpha b/graphics/linux-f10-gdk-pixbuf/pkg-plist.alpha
deleted file mode 100644
index bd9cb96b5de6..000000000000
--- a/graphics/linux-f10-gdk-pixbuf/pkg-plist.alpha
+++ /dev/null
@@ -1,60 +0,0 @@
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1.0.0
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1
-usr/lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1.0.0
-usr/lib/libgdk_pixbuf.so.2
-usr/lib/libgdk_pixbuf.so.2.0.0
-usr/lib/libgnomecanvaspixbuf.so.1
-usr/lib/libgnomecanvaspixbuf.so.1.0.0
-usr/share/doc/gdk-pixbuf-%%VERSION%%/AUTHORS
-usr/share/doc/gdk-pixbuf-%%VERSION%%/COPYING
-usr/share/doc/gdk-pixbuf-%%VERSION%%/COPYING.LIB
-usr/share/doc/gdk-pixbuf-%%VERSION%%/ChangeLog
-usr/share/doc/gdk-pixbuf-%%VERSION%%/NEWS
-usr/share/doc/gdk-pixbuf-%%VERSION%%/README
-usr/share/doc/gdk-pixbuf-%%VERSION%%/TODO
-usr/share/doc/gdk-pixbuf-%%VERSION%%/gdk-pixbuf-decl.txt
-usr/share/doc/gdk-pixbuf-%%VERSION%%/gdk-pixbuf-sections.txt
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/book1.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/compiling.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/extra-configuration-options.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-animation.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-creating.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-file-loading.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-from-drawables.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-gdk-pixbuf.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-refcounting.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-rendering.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-scaling.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdk-pixbuf-util.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gdkpixbufloader.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/gnomecanvaspixbuf.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/r14.html
-usr/share/doc/gdk-pixbuf-%%VERSION%%/html/r15.html
-@dirrm usr/lib/gdk-pixbuf/loaders
-@dirrm usr/lib/gdk-pixbuf
-@dirrm usr/share/doc/gdk-pixbuf-%%VERSION%%/html
-@dirrm usr/share/doc/gdk-pixbuf-%%VERSION%%