ports/136321: x11-toolkits/linux-pango: please update linux based port of pango

Luchesar V. ILIEV luchesar.iliev at gmail.com
Thu Dec 30 03:00:39 UTC 2010 

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hello Everyone,

The PR has been suspended until support for the Linux runtime libraries
from Fedora 11 (or perhaps an even later version) is implemented, so it
seems we have to live with the vulnerable Pango for the time being.

However, I noticed a comment somewhere else in the MLs that if somebody
builds RPM for newer version of Pango on Fedora 10, it could be used as
intermediate solution -- so I decided to do it. I'm not really sure if
this is indeed an acceptable solution in the "official" sense, but as it
worked for me, I thought it would be nice to at least share it.

The build environment was pretty straightforward: standard "development
box" Fedora 10 installation in VirtualBox, fully patched. Had to only
install libthai-devel and (unsurprisingly) the RPM development tools.

I'm attaching a diff for the port files and also a shar(1) archive, just
in case (NB: the Makefile's CVS id has been stripped from it).

"${PORTSDIR}/Mk/bsd.linux-apps.mk" would also need to be updated, and
while that's pretty trivial, I've nevertheless attached the relevant
diff -- for the sake of clarity.

As you'll see from the Makefile, the RPMs are currently available from
two MASTER_SITES, but if the update is accepted for the official ports
tree, I could arrange to have it hosted in a few other places as well.

I have to emphasize, however, that I haven't had much (if any) previous
experience with building RPMs or patching ports, so please -- that goes
mostly to the "ordinary" list members like me -- DO NOT blindly use the
attached files. Even though I did my best to ensure everything is
correct, I could have as well made some nasty mistake.

That being said, I did test the port on my everyday system and at least
the following dependent ports seem to work flawlessly (I expect that if
something was badly broken, at least the Flash plugin would suffer):

linux-f10-flashplugin-10.1r102.65
linux-f10-gtk2-2.14.7_2
nspluginwrapper-1.2.2_7
linux-realplayer-10.0.9.809.20070726_1
mplayer-1.0.r20101106

If you need any further information, if there's any additional testing
you could suggest, or if there's anything that needs to be corrected,
please don't hesitate to ask/tell.

Cheers,
Luchesar

- -- 
Luchesar V. ILIEV
Operations & Information Security Officer
Ideaconsult Ltd. | www.ideaconsult.net

PGP Key ID 0x9A1FEEFF
https://cert.acad.bg/pgp-keys/

icq ......... 13261897
skype/yim ... luchesar_iliev
jabber ...... luchesariliev at jabber.org
gtalk ....... luchesar.iliev at gmail.com
msnm ........ l_iliev at hotmail.com
aim ......... luchesariliev


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBCAAGBQJNG/CGAAoJENvaS4iaH+7/mQoH/0M0EfeT6L5jMnRR0RHLVdHW
EmRID8a1ZSF306gIkZhYZpigXcLyXcrshg9EjkcMDsdUt1qCuNCKYTsqkJmNFeLr
PnUgByMQKegORW9DPhEJ9gtTP659Wv2FkZgSuZqLR62lfn0FB6EBU9HHhw+nSqY4
VPQe85H1LY66mwuUxyNfwP51z8EqHzEtBxgIPRtOO15LtHmuQ0UgdFbgdDHvscTh
o7ttR9+0Q7gREvMzuVR8RQhYWdMZ6FrLyDCydxl9QLsbZBkuoea1plZqiSBIjcuW
1vMDJtpQ12TYU4QiqgTF+W5GU9zbhHtJ/TzSvqyFDxfwrRxAn7dClGZ5C2/Shds=
=L7Mk
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -ru linux-f10-pango/Makefile linux-f10-pango_1.28.3/Makefile
--- linux-f10-pango/Makefile	2010-03-28 09:46:52.000000000 +0300
+++ linux-f10-pango_1.28.3/Makefile	2010-12-30 02:49:56.055674084 +0200
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.22.3
-PORTREVISION=	1
+PORTVERSION=	1.28.3
 CATEGORIES=	x11-toolkits linux
+MASTER_SITES=	http://www.ideaconsult.net/downloads/freebsd/ports/distfiles/ \
+		http://cerberus.uni-plovdiv.bg/downloads/freebsd/ports/distfiles/
 PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
@@ -29,6 +30,6 @@
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 post-install:
-	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
+	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i686-pc-linux-gnu/pango.modules
 
 .include <bsd.port.mk>
diff -ru linux-f10-pango/distinfo.i386 linux-f10-pango_1.28.3/distinfo.i386
--- linux-f10-pango/distinfo.i386	2009-06-01 20:26:30.000000000 +0300
+++ linux-f10-pango_1.28.3/distinfo.i386	2010-12-30 00:43:40.898185721 +0200
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = f266a55131ffe92541bdcbe03e7d114a
-SHA256 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 6aa64523453303366f1ac1bfd2a707bd4f7940dd13c366ad22b0fcde489fa44f
-SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 383756
-MD5 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 3ca29e030a3a491f1c43de6bdd27af1b
-SHA256 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = dc0b7f735d7b383f7740f0de2f2edca611caab9e4081dfadae89055bb71e3125
-SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 1401369
+MD5 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = f4b8e2d7f930a35218b07d34818b4335
+SHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = b263e79e1233d78237981922f8714fa1ecbbb836c5661a1fb65f180445f4784b
+SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 383736
+MD5 (distfiles/rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = f6b900912f3df12a3c8a3596e2960f89
+SHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = ab6a71c119e9d564dd321a2e255c8c5f04f11801c31772b01e31717f85d653b3
+SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 1432979
diff -ru linux-f10-pango/pkg-plist linux-f10-pango_1.28.3/pkg-plist
--- linux-f10-pango/pkg-plist	2009-06-01 20:26:30.000000000 +0300
+++ linux-f10-pango_1.28.3/pkg-plist	2010-12-30 00:43:40.898185721 +0200
@@ -1,17 +1,17 @@
 @comment file listing
-etc/pango/i386-redhat-linux-gnu/pango.modules
+etc/pango/i686-pc-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 usr/bin/pango-querymodules-32
 usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.2203.0
+usr/lib/libpango-1.0.so.0.2800.3
 usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.2203.0
+usr/lib/libpangocairo-1.0.so.0.2800.3
 usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.2203.0
+usr/lib/libpangoft2-1.0.so.0.2800.3
 usr/lib/libpangox-1.0.so.0
-usr/lib/libpangox-1.0.so.0.2203.0
+usr/lib/libpangox-1.0.so.0.2800.3
 usr/lib/libpangoxft-1.0.so.0
-usr/lib/libpangoxft-1.0.so.0.2203.0
+usr/lib/libpangoxft-1.0.so.0.2800.3
 usr/lib/pango/1.6.0/modules/pango-arabic-fc.so
 usr/lib/pango/1.6.0/modules/pango-arabic-lang.so
 usr/lib/pango/1.6.0/modules/pango-basic-x.so
@@ -24,19 +24,20 @@
 usr/lib/pango/1.6.0/modules/pango-thai-fc.so
 usr/lib/pango/1.6.0/modules/pango-thai-lang.so
 usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
-usr/share/doc/pango-1.22.3/AUTHORS
-usr/share/doc/pango-1.22.3/COPYING
-usr/share/doc/pango-1.22.3/HELLO.txt
-usr/share/doc/pango-1.22.3/NEWS
-usr/share/doc/pango-1.22.3/README
+usr/share/doc/pango-1.28.3/AUTHORS
+usr/share/doc/pango-1.28.3/COPYING
+usr/share/doc/pango-1.28.3/HELLO.txt
+usr/share/doc/pango-1.28.3/NEWS
+usr/share/doc/pango-1.28.3/README
 usr/share/man/man1/pango-querymodules.1.gz
+usr/share/man/man1/pango-view.1.gz
 @comment deal with empty directories created by the port
- at exec /bin/mkdir -p %D/etc/pango/i386-redhat-linux-gnu
- at dirrmtry etc/pango/i386-redhat-linux-gnu
+ at exec /bin/mkdir -p %D/etc/pango/i686-pc-linux-gnu
+ at dirrmtry etc/pango/i686-pc-linux-gnu
 @comment non-empty directory listing in revers order
- at dirrm usr/share/doc/pango-1.22.3
+ at dirrm usr/share/doc/pango-1.28.3
 @dirrm usr/lib/pango/1.6.0/modules
 @dirrm usr/lib/pango/1.6.0
 @dirrm usr/lib/pango
 @dirrm etc/pango
- at exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+ at exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i686-pc-linux-gnu/pango.modules 
-------------- next part --------------
--- Mk/bsd.linux-apps.mk.orig	2010-11-16 20:45:32.000000000 +0200
+++ Mk/bsd.linux-apps.mk	2010-12-30 02:00:48.532151247 +0200
@@ -388,7 +388,7 @@
 
 pango_FILE=			${LINUXBASE}/usr/lib/libpango-1.0.so.0.1001.1
 pango_f8_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.1800.4
-pango_f10_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2203.0
+pango_f10_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.3
 pango_DETECT=		${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 pango_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango
 pango_DEPENDS=		cairo expat fontconfig xorglibs
-------------- next part --------------
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	linux-f10-pango
#	linux-f10-pango/Makefile
#	linux-f10-pango/distinfo.i386
#	linux-f10-pango/pkg-plist
#
echo c - linux-f10-pango
mkdir -p linux-f10-pango > /dev/null 2>&1
echo x - linux-f10-pango/Makefile
sed 's/^X//' >linux-f10-pango/Makefile << '57a7046193fdcb19c17fcdcda2be6832'
X# New ports collection makefile for:	x11-toolkits/linux-f10-pango
X# Date created:				2009-05-03
X# Whom:					bsam
X
XPORTNAME=	pango
XPORTVERSION=	1.28.3
XCATEGORIES=	x11-toolkits linux
XMASTER_SITES=	http://www.ideaconsult.net/downloads/freebsd/ports/distfiles/ \
X		http://cerberus.uni-plovdiv.bg/downloads/freebsd/ports/distfiles/
XPKGNAMEPREFIX=	linux-f10-
XDISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
X
XMAINTAINER=	freebsd-emulation at FreeBSD.org
XCOMMENT=	The pango library (Linux Fedora 10)
X
XCONFLICTS=	linux-pango-[0-9]* linux-f8-pango-[0-9]*
X
XONLY_FOR_ARCHS=	i386 amd64
XUSE_LINUX_RPM=	yes
X# these libraries are required by pango-querymodules
XUSE_LINUX_APPS=	cairo expat fontconfig xorglibs
XLINUX_DIST_VER=	10
XRPMVERSION=	1.fc10
XBRANDELF_FILES=	usr/bin/pango-querymodules-32
XUSE_LDCONFIG=	yes
X
XDESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
X
Xpost-install:
X	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i686-pc-linux-gnu/pango.modules
X
X.include <bsd.port.mk>
57a7046193fdcb19c17fcdcda2be6832
echo x - linux-f10-pango/distinfo.i386
sed 's/^X//' >linux-f10-pango/distinfo.i386 << '9f551c9747a6d95cb43ed29344ebd7a9'
XMD5 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = f4b8e2d7f930a35218b07d34818b4335
XSHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = b263e79e1233d78237981922f8714fa1ecbbb836c5661a1fb65f180445f4784b
XSIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 383736
XMD5 (distfiles/rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = f6b900912f3df12a3c8a3596e2960f89
XSHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = ab6a71c119e9d564dd321a2e255c8c5f04f11801c31772b01e31717f85d653b3
XSIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 1432979
9f551c9747a6d95cb43ed29344ebd7a9
echo x - linux-f10-pango/pkg-plist
sed 's/^X//' >linux-f10-pango/pkg-plist << '91b43560c00c44254207bd55ad04e34e'
X at comment file listing
Xetc/pango/i686-pc-linux-gnu/pango.modules
Xetc/pango/pangox.aliases
Xusr/bin/pango-querymodules-32
Xusr/lib/libpango-1.0.so.0
Xusr/lib/libpango-1.0.so.0.2800.3
Xusr/lib/libpangocairo-1.0.so.0
Xusr/lib/libpangocairo-1.0.so.0.2800.3
Xusr/lib/libpangoft2-1.0.so.0
Xusr/lib/libpangoft2-1.0.so.0.2800.3
Xusr/lib/libpangox-1.0.so.0
Xusr/lib/libpangox-1.0.so.0.2800.3
Xusr/lib/libpangoxft-1.0.so.0
Xusr/lib/libpangoxft-1.0.so.0.2800.3
Xusr/lib/pango/1.6.0/modules/pango-arabic-fc.so
Xusr/lib/pango/1.6.0/modules/pango-arabic-lang.so
Xusr/lib/pango/1.6.0/modules/pango-basic-x.so
Xusr/lib/pango/1.6.0/modules/pango-hangul-fc.so
Xusr/lib/pango/1.6.0/modules/pango-hebrew-fc.so
Xusr/lib/pango/1.6.0/modules/pango-indic-fc.so
Xusr/lib/pango/1.6.0/modules/pango-indic-lang.so
Xusr/lib/pango/1.6.0/modules/pango-khmer-fc.so
Xusr/lib/pango/1.6.0/modules/pango-syriac-fc.so
Xusr/lib/pango/1.6.0/modules/pango-thai-fc.so
Xusr/lib/pango/1.6.0/modules/pango-thai-lang.so
Xusr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
Xusr/share/doc/pango-1.28.3/AUTHORS
Xusr/share/doc/pango-1.28.3/COPYING
Xusr/share/doc/pango-1.28.3/HELLO.txt
Xusr/share/doc/pango-1.28.3/NEWS
Xusr/share/doc/pango-1.28.3/README
Xusr/share/man/man1/pango-querymodules.1.gz
Xusr/share/man/man1/pango-view.1.gz
X at comment deal with empty directories created by the port
X at exec /bin/mkdir -p %D/etc/pango/i686-pc-linux-gnu
X at dirrmtry etc/pango/i686-pc-linux-gnu
X at comment non-empty directory listing in revers order
X at dirrm usr/share/doc/pango-1.28.3
X at dirrm usr/lib/pango/1.6.0/modules
X at dirrm usr/lib/pango/1.6.0
X at dirrm usr/lib/pango
X at dirrm etc/pango
X at exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i686-pc-linux-gnu/pango.modules 
91b43560c00c44254207bd55ad04e34e
exit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: linux-f10-pango_1.22.3-1.28.3.diff.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-emulation/attachments/20101230/895fb661/linux-f10-pango_1.22.3-1.28.3.diff.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bsd.linux-apps.mk.patch.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-emulation/attachments/20101230/895fb661/bsd.linux-apps.mk.patch.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: linux-f10-pango-1.28.3.shar.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-emulation/attachments/20101230/895fb661/linux-f10-pango-1.28.3.shar.obj

More information about the freebsd-emulation mailing list