update to pango-1.28.0-3.3.1. fixes CVE-2011-0020, CVE-2011-0064.

avoid warnings during install/deinstall.

4 files changed, 20 insertions, 25 deletions

diff --git a/emulators/suse113_gtk2/DEINSTALL b/emulators/suse113_gtk2/DEINSTALL
index 6ca23d95bbd..3354b4b1418 100644
--- a/emulators/suse113_gtk2/DEINSTALL
+++ b/emulators/suse113_gtk2/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.3 2011/01/01 03:48:54 obache Exp $
+# $NetBSD: DEINSTALL,v 1.4 2011/03/27 14:47:26 chs Exp $
 #
 # Remove gtk/pango module configuration.
 #
@@ -8,10 +8,10 @@ DEINSTALL)
 	GNOME_ETCDIR="${PKG_PREFIX}/@EMULSUBDIR@/etc"
 
 	${ECHO} "${PKGNAME}: removing GTK/Pango module configuration"
-        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
-        ${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
-        ${RM} -f ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
-	${RM} -rf ${PKG_PREFIX}/@EMULSUBDIR@/var/cache/gio-2.0
+	${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
+	${RM} -f ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+	${RM} -f ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
+	${RM} -f ${PKG_PREFIX}/@EMULSUBDIR@/var/cache/gio-2.0/defaults.list
 	${RM} -f ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
 	;;
 esac
diff --git a/emulators/suse113_gtk2/INSTALL b/emulators/suse113_gtk2/INSTALL
index d8f49bf6053..a8652626776 100644
--- a/emulators/suse113_gtk2/INSTALL
+++ b/emulators/suse113_gtk2/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.3 2011/01/01 03:48:54 obache Exp $
+# $NetBSD: INSTALL,v 1.4 2011/03/27 14:47:26 chs Exp $
 #
 # Initialize gtk/pango module configuration.
 #
@@ -9,9 +9,10 @@ POST-INSTALL)
 	SUSECONFIG="${PKG_PREFIX}/@EMULSUBDIR@/sbin/SuSEconfig"
 
 	${ECHO} "${PKGNAME}: initializing GTK/Pango module configuration"
-        ${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
-        ${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
-        ${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
+	${GNOME_BINDIR}/gtk-query-immodules-2.0@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gtk@ABISUFFIX@.immodules
+	${GNOME_BINDIR}/gdk-pixbuf-query-loaders@BINSUFFIX@ > ${GNOME_ETCDIR}/gtk-2.0/gdk-pixbuf.loaders
+	${GNOME_BINDIR}/pango-querymodules@BINSUFFIX@ > ${GNOME_ETCDIR}/pango/pango@ABISUFFIX@.modules
+	${MKDIR} -p ${PKG_PREFIX}/@EMULSUBDIR@/var/lock
 	PATH=${PKG_PREFIX}/@EMULSUBDIR@/bin ROOT=${PKG_PREFIX}/@EMULSUBDIR@ bash ${SUSECONFIG} --module glib2
 	${LN} -s /../var/db/dbus/machine-id ${PKG_PREFIX}/@EMULSUBDIR@/var/lib/dbus/machine-id
 	;;
diff --git a/emulators/suse113_gtk2/Makefile b/emulators/suse113_gtk2/Makefile
index 4c0831cdc77..07ce9bc2fd4 100644
--- a/emulators/suse113_gtk2/Makefile
+++ b/emulators/suse113_gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2011/02/10 03:29:27 chs Exp $
+# $NetBSD: Makefile,v 1.6 2011/03/27 14:47:26 chs Exp $
 
 DISTNAME=	suse_gtk2-${SUSE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 DISTFILES=	cairo-1.8.10-3.1.${SUSE_ARCH}.rpm			\
 		dbus-1-1.2.24-1.18.${SUSE_ARCH}.rpm			\
@@ -17,7 +17,7 @@ DISTFILES=	cairo-1.8.10-3.1.${SUSE_ARCH}.rpm			\
 		libgthread-2_0-0-2.24.1-2.5.${SUSE_ARCH}.rpm		\
 		libpulse0-0.9.21-9.2.${SUSE_ARCH}.rpm			\
 		orbit2-2.14.18-2.8.${SUSE_ARCH}.rpm   			\
-		pango-1.28.0-2.7.${SUSE_ARCH}.rpm
+		pango-1.28.0-3.3.1.${SUSE_ARCH}.rpm
 
 MAINTAINER=	chs@NetBSD.org
 COMMENT=	Linux compatibility package for GTK+-2.x
diff --git a/emulators/suse113_gtk2/distinfo b/emulators/suse113_gtk2/distinfo
index ef3f67d7a71..9114612bd33 100644
--- a/emulators/suse113_gtk2/distinfo
+++ b/emulators/suse113_gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/02/10 03:25:58 chs Exp $
+$NetBSD: distinfo,v 1.4 2011/03/27 14:47:26 chs Exp $
 
 SHA1 (suse113/i586/cairo-1.8.10-3.1.i586.rpm) = bfee95d99a32cdd85e8863a0a6e3b24bcad88c4b
 RMD160 (suse113/i586/cairo-1.8.10-3.1.i586.rpm) = 57658933228536b1f3855c52f2e026c9d45a0eca
@@ -6,9 +6,6 @@ Size (suse113/i586/cairo-1.8.10-3.1.i586.rpm) = 444857 bytes
 SHA1 (suse113/i586/dbus-1-1.2.24-1.18.i586.rpm) = 7bbf469d0a6e43c27a6bf4344a414cf0e4bcf67b
 RMD160 (suse113/i586/dbus-1-1.2.24-1.18.i586.rpm) = 8a867303a258e16cca2009f8fcf40c455dd3ba76
 Size (suse113/i586/dbus-1-1.2.24-1.18.i586.rpm) = 242783 bytes
-SHA1 (suse113/i586/dbus-1-glib-0.86-1.19.i586.rpm) = 18de53af7ad134c10ab576412ea15f0f9b922cde
-RMD160 (suse113/i586/dbus-1-glib-0.86-1.19.i586.rpm) = 636e0928a6604239e9a4c4a19605795a351bed87
-Size (suse113/i586/dbus-1-glib-0.86-1.19.i586.rpm) = 63660 bytes
 SHA1 (suse113/i586/gconf2-2.28.1-3.4.i586.rpm) = b057d14abf0d24eaa32847ca7d7e774aaa7c2eb6
 RMD160 (suse113/i586/gconf2-2.28.1-3.4.i586.rpm) = 7624c1da6b1bfe992b4b57790838d7099860c916
 Size (suse113/i586/gconf2-2.28.1-3.4.i586.rpm) = 247563 bytes
@@ -45,18 +42,15 @@ Size (suse113/i586/libpulse0-0.9.21-9.2.i586.rpm) = 199518 bytes
 SHA1 (suse113/i586/orbit2-2.14.18-2.8.i586.rpm) = 29ba6173936256f938563529945a6b9f67cd5ab8
 RMD160 (suse113/i586/orbit2-2.14.18-2.8.i586.rpm) = 5203c84e2ce5af80468dc78249aad541688e99fe
 Size (suse113/i586/orbit2-2.14.18-2.8.i586.rpm) = 160384 bytes
-SHA1 (suse113/i586/pango-1.28.0-2.7.i586.rpm) = d37c08d7d8d3d12035368e4a42fe3425608797e4
-RMD160 (suse113/i586/pango-1.28.0-2.7.i586.rpm) = 01bf2abd23944f3e70cbd8908ea479b449a356b2
-Size (suse113/i586/pango-1.28.0-2.7.i586.rpm) = 388224 bytes
+SHA1 (suse113/i586/pango-1.28.0-3.3.1.i586.rpm) = cc1385fd36d05137006816edef69a2f8538ac00e
+RMD160 (suse113/i586/pango-1.28.0-3.3.1.i586.rpm) = 84afc76d277db246d3458ece38be2db72f389e67
+Size (suse113/i586/pango-1.28.0-3.3.1.i586.rpm) = 388303 bytes
 SHA1 (suse113/x86_64/cairo-1.8.10-3.1.x86_64.rpm) = b6d5042729603d073b797b2f19b1eaeeff6f96a2
 RMD160 (suse113/x86_64/cairo-1.8.10-3.1.x86_64.rpm) = e1c70616604462537cef95315abd8543219e0b52
 Size (suse113/x86_64/cairo-1.8.10-3.1.x86_64.rpm) = 433901 bytes
 SHA1 (suse113/x86_64/dbus-1-1.2.24-1.18.x86_64.rpm) = ddbdac5594ec29e17239be884bdcb9f201b4cf6f
 RMD160 (suse113/x86_64/dbus-1-1.2.24-1.18.x86_64.rpm) = f68b1e542a95bf583ccdd0e91e54aa17a4d9e7d1
 Size (suse113/x86_64/dbus-1-1.2.24-1.18.x86_64.rpm) = 238285 bytes
-SHA1 (suse113/x86_64/dbus-1-glib-0.86-1.19.x86_64.rpm) = 67574414e54e64c572f9d7f54e68bba20320336d
-RMD160 (suse113/x86_64/dbus-1-glib-0.86-1.19.x86_64.rpm) = e79e8323b41f2060389cfdb1599bc28014ad980a
-Size (suse113/x86_64/dbus-1-glib-0.86-1.19.x86_64.rpm) = 63436 bytes
 SHA1 (suse113/x86_64/gconf2-2.28.1-3.4.x86_64.rpm) = ef1afc13027f719608e3a5d0fa9b3b6e1624830c
 RMD160 (suse113/x86_64/gconf2-2.28.1-3.4.x86_64.rpm) = 0486f680781b96f6a763aadf1e445157ac6d6219
 Size (suse113/x86_64/gconf2-2.28.1-3.4.x86_64.rpm) = 249411 bytes
@@ -93,6 +87,6 @@ Size (suse113/x86_64/libpulse0-0.9.21-9.2.x86_64.rpm) = 208684 bytes
 SHA1 (suse113/x86_64/orbit2-2.14.18-2.8.x86_64.rpm) = 40eb44e631c7b8d2864e7382a25ffe2f6b31dba6
 RMD160 (suse113/x86_64/orbit2-2.14.18-2.8.x86_64.rpm) = e2e5d65397cdef21c23b0e358bed98ef1b1e7799
 Size (suse113/x86_64/orbit2-2.14.18-2.8.x86_64.rpm) = 165243 bytes
-SHA1 (suse113/x86_64/pango-1.28.0-2.7.x86_64.rpm) = 39b3ac5af4bb2ce3c17e4bda577529594b505440
-RMD160 (suse113/x86_64/pango-1.28.0-2.7.x86_64.rpm) = a76beb2a42fef2e7b2bfeed24e157c284709d290
-Size (suse113/x86_64/pango-1.28.0-2.7.x86_64.rpm) = 390446 bytes
+SHA1 (suse113/x86_64/pango-1.28.0-3.3.1.x86_64.rpm) = 2cbe05cf782768fc40b26e55b8c2ff0ae8becc92
+RMD160 (suse113/x86_64/pango-1.28.0-3.3.1.x86_64.rpm) = 958c40edfafacbe0c00874c3df46cfccb649337b
+Size (suse113/x86_64/pango-1.28.0-3.3.1.x86_64.rpm) = 390134 bytes