Mon Apr 28 10:43:24 2008 UTC ()
Pullup ticket 2351 - requested by markd
security fix for kdelibs3

- pkgsrc/x11/kdelibs3/Makefile				1.137
- pkgsrc/x11/kdelibs3/distinfo				1.92

   Module Name:		pkgsrc
   Committed By:	markd
   Date:		Sun Apr 27 04:14:32 UTC 2008

   Modified Files:
	   pkgsrc/x11/kdelibs3: Makefile distinfo

   Log Message:
   start_kdeinit multiple vulnerabilities - linux only
   http://www.kde.org/info/security/advisory-20080426-2.txt


(ghen)
diff -r1.135 -r1.135.2.1 pkgsrc/x11/kdelibs3/Makefile
diff -r1.91 -r1.91.2.1 pkgsrc/x11/kdelibs3/distinfo
cvs diff -r1.135 -r1.135.2.1 pkgsrc/x11/kdelibs3/Attic/Makefile (switch to unified diff)

--- pkgsrc/x11/kdelibs3/Attic/Makefile 2008/02/20 09:49:56 1.135
+++ pkgsrc/x11/kdelibs3/Attic/Makefile 2008/04/28 10:43:24 1.135.2.1
@@ -1,142 +1,143 @@ @@ -1,142 +1,143 @@
1# $NetBSD: Makefile,v 1.135 2008/02/20 09:49:56 markd Exp $ 1# $NetBSD: Makefile,v 1.135.2.1 2008/04/28 10:43:24 ghen Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5COMMENT= Support libraries for the KDE integrated X11 desktop 6COMMENT= Support libraries for the KDE integrated X11 desktop
6 7
7#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 8PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
8# http://mirrors.isc.org/pub/kde/security_patches/ 9 http://mirrors.isc.org/pub/kde/security_patches/
9#PATCHFILES= post-3.5.7-kdelibs-kdecore-2.diff 10PATCHFILES= post-kde-3.5.5-kinit.diff
10 11
11.include "../../meta-pkgs/kde3/Makefile.kde3" 12.include "../../meta-pkgs/kde3/Makefile.kde3"
12 13
13CONFLICTS+= koffice3<=1.1.1 14CONFLICTS+= koffice3<=1.1.1
14 15
15USE_TOOLS+= iceauth:run perl:run pkg-config 16USE_TOOLS+= iceauth:run perl:run pkg-config
16 17
17MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus 18MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
18CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \ 19CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \
19 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu 20 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu
20 21
21CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" 22CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
22CONFIGURE_ARGS+= --with-distribution="NetBSD pkgsrc" 23CONFIGURE_ARGS+= --with-distribution="NetBSD pkgsrc"
23 24
24SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog 25SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog
25SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat 26SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat
26SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat 27SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat
27 28
28.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
29 30
30LIBS.NetBSD+= ${EXPORT_SYMBOLS_LDFLAGS} 31LIBS.NetBSD+= ${EXPORT_SYMBOLS_LDFLAGS}
31 32
32REPLACE_PERL+= \ 33REPLACE_PERL+= \
33 dcop/dcopidlng/kalyptus \ 34 dcop/dcopidlng/kalyptus \
34 kio/proxytype.pl \ 35 kio/proxytype.pl \
35 kio/useragent.pl \ 36 kio/useragent.pl \
36 kio/misc/fileshareset \ 37 kio/misc/fileshareset \
37 kdeui/preparetips 38 kdeui/preparetips
38 39
39CHECK_PORTABILITY_SKIP+=kate/tests/highlight.sh 40CHECK_PORTABILITY_SKIP+=kate/tests/highlight.sh
40 41
41UNLIMIT_RESOURCES= datasize memorysize 42UNLIMIT_RESOURCES= datasize memorysize
42 43
43SUBST_CLASSES+= kdelibsfix 44SUBST_CLASSES+= kdelibsfix
44SUBST_STAGE.kdelibsfix= pre-configure 45SUBST_STAGE.kdelibsfix= pre-configure
45SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. 46SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths.
46SUBST_FILES.kdelibsfix= \ 47SUBST_FILES.kdelibsfix= \
47 kdecore/kstandarddirs.cpp \ 48 kdecore/kstandarddirs.cpp \
48 kdecore/ktimezones.cpp \ 49 kdecore/ktimezones.cpp \
49 kdeui/ksconfig.cpp \ 50 kdeui/ksconfig.cpp \
50 kio/kssl/kopenssl.cc 51 kio/kssl/kopenssl.cc
51SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' 52SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
52SUBST_SED.kdelibsfix+= -e 's:@PKGLOCALEDIR@:${PKGLOCALEDIR}:g' 53SUBST_SED.kdelibsfix+= -e 's:@PKGLOCALEDIR@:${PKGLOCALEDIR}:g'
53 54
54SUBST_CLASSES+= kdemagic 55SUBST_CLASSES+= kdemagic
55SUBST_STAGE.kdemagic= pre-configure 56SUBST_STAGE.kdemagic= pre-configure
56SUBST_MESSAGE.kdemagic= Add LOCALBASE paths to magic file. 57SUBST_MESSAGE.kdemagic= Add LOCALBASE paths to magic file.
57SUBST_FILES.kdemagic= kio/magic 58SUBST_FILES.kdemagic= kio/magic
58SUBST_SED.kdemagic= -n -e 'p' -e 's:/usr/local/bin:${LOCALBASE}/bin:p' 59SUBST_SED.kdemagic= -n -e 'p' -e 's:/usr/local/bin:${LOCALBASE}/bin:p'
59 60
60SPECIAL_PERMS+= ${PREFIX}/bin/fileshareset ${SETUID_ROOT_PERMS} 61SPECIAL_PERMS+= ${PREFIX}/bin/fileshareset ${SETUID_ROOT_PERMS}
61SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${SETUID_ROOT_PERMS} 62SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${SETUID_ROOT_PERMS}
62SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS} 63SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS}
63 64
64.include "options.mk" 65.include "options.mk"
65 66
66.if ${OPSYS} == "NetBSD" 67.if ${OPSYS} == "NetBSD"
67. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} 68. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
68PLIST_SUBST+= KDED_WORKAROUND="@comment " 69PLIST_SUBST+= KDED_WORKAROUND="@comment "
69. else 70. else
70PLIST_SUBST+= KDED_WORKAROUND="" 71PLIST_SUBST+= KDED_WORKAROUND=""
71. endif 72. endif
72# make sure zone.tab is installed 73# make sure zone.tab is installed
73DEPENDS+= zonetab-[0-9]*:../../time/zonetab 74DEPENDS+= zonetab-[0-9]*:../../time/zonetab
74.else 75.else
75PLIST_SUBST+= KDED_WORKAROUND="" 76PLIST_SUBST+= KDED_WORKAROUND=""
76.endif 77.endif
77 78
78.include "../../mk/krb5.buildlink3.mk" 79.include "../../mk/krb5.buildlink3.mk"
79CONFIGURE_ARGS+= --with-gssapi=yes 80CONFIGURE_ARGS+= --with-gssapi=yes
80 81
81post-install: 82post-install:
82.if ${OPSYS} == "NetBSD" 83.if ${OPSYS} == "NetBSD"
83. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} 84. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
84 @${RM} ${PREFIX}/lib/kded.* 85 @${RM} ${PREFIX}/lib/kded.*
85. endif 86. endif
86.endif 87.endif
87 88
88.if ${MACHINE_ARCH} == "alpha" 89.if ${MACHINE_ARCH} == "alpha"
89GCC_REQD+= 2.95 90GCC_REQD+= 2.95
90.endif 91.endif
91 92
92.include "../../meta-pkgs/kde3/kde3.mk" 93.include "../../meta-pkgs/kde3/kde3.mk"
93 94
94.include "../../archivers/bzip2/buildlink3.mk" 95.include "../../archivers/bzip2/buildlink3.mk"
95.include "../../audio/arts/buildlink3.mk" 96.include "../../audio/arts/buildlink3.mk"
96.include "../../audio/libaudiofile/buildlink3.mk" 97.include "../../audio/libaudiofile/buildlink3.mk"
97.include "../../devel/libidn/buildlink3.mk" 98.include "../../devel/libidn/buildlink3.mk"
98.include "../../devel/pcre/buildlink3.mk" 99.include "../../devel/pcre/buildlink3.mk"
99.include "../../graphics/jasper/buildlink3.mk" 100.include "../../graphics/jasper/buildlink3.mk"
100.include "../../graphics/jpeg/buildlink3.mk" 101.include "../../graphics/jpeg/buildlink3.mk"
101.include "../../graphics/libart/buildlink3.mk" 102.include "../../graphics/libart/buildlink3.mk"
102.include "../../graphics/openexr/buildlink3.mk" 103.include "../../graphics/openexr/buildlink3.mk"
103.include "../../graphics/tiff/buildlink3.mk" 104.include "../../graphics/tiff/buildlink3.mk"
104.include "../../net/mDNSResponder/buildlink3.mk" 105.include "../../net/mDNSResponder/buildlink3.mk"
105.include "../../security/openssl/buildlink3.mk" 106.include "../../security/openssl/buildlink3.mk"
106.include "../../textproc/aspell/buildlink3.mk" 107.include "../../textproc/aspell/buildlink3.mk"
107.include "../../textproc/libxml2/buildlink3.mk" 108.include "../../textproc/libxml2/buildlink3.mk"
108.include "../../textproc/libxslt/buildlink3.mk" 109.include "../../textproc/libxslt/buildlink3.mk"
109.include "../../textproc/xmlcatmgr/catalogs.mk" 110.include "../../textproc/xmlcatmgr/catalogs.mk"
110.include "../../mk/oss.buildlink3.mk" 111.include "../../mk/oss.buildlink3.mk"
111 112
112.include "../../mk/bsd.pkg.mk" 113.include "../../mk/bsd.pkg.mk"
113 114
114# XXX On NetBSD, the egcs and gcc-2.95.3 for: 115# XXX On NetBSD, the egcs and gcc-2.95.3 for:
115# XXX 116# XXX
116# XXX alpha and sparc 117# XXX alpha and sparc
117# XXX 118# XXX
118# XXX has an optimization bug when compiling with -O2 that is tickled by 119# XXX has an optimization bug when compiling with -O2 that is tickled by
119# XXX ${WRKSRC}/kio/kio/global.cpp 120# XXX ${WRKSRC}/kio/kio/global.cpp
120# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp. 121# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp.
121# XXX and others 122# XXX and others
122# 123#
123.if ${OPSYS} == "NetBSD" 124.if ${OPSYS} == "NetBSD"
124. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc") 125. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc")
125CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g} 126CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
126CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g} 127CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
127CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} 128CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
128CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} 129CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
129. endif 130. endif
130# 131#
131# Configure finds these but apparently they are not ready for primetime 132# Configure finds these but apparently they are not ready for primetime
132# and build will blow up as declarations in netdb.h are not visible 133# and build will blow up as declarations in netdb.h are not visible
133CONFIGURE_ENV+= ac_cv_func_getservbyname_r='no' 134CONFIGURE_ENV+= ac_cv_func_getservbyname_r='no'
134CONFIGURE_ENV+= ac_cv_func_getservbyport_r='no' 135CONFIGURE_ENV+= ac_cv_func_getservbyport_r='no'
135CONFIGURE_ENV+= ac_cv_func_getprotobyname_r='no' 136CONFIGURE_ENV+= ac_cv_func_getprotobyname_r='no'
136.endif 137.endif
137 138
138.if ${OPSYS} == "SunOS" 139.if ${OPSYS} == "SunOS"
139# We require use of a recent enough libbz2 to have the BZ2_ prefixes 140# We require use of a recent enough libbz2 to have the BZ2_ prefixes
140# so force this as configure gets this wrong on Solaris 9 141# so force this as configure gets this wrong on Solaris 9
141CONFIGURE_ENV+= ac_cv_lib_bzip2='no' 142CONFIGURE_ENV+= ac_cv_lib_bzip2='no'
142.endif 143.endif
cvs diff -r1.91 -r1.91.2.1 pkgsrc/x11/kdelibs3/Attic/distinfo (switch to unified diff)

--- pkgsrc/x11/kdelibs3/Attic/distinfo 2008/02/20 09:49:56 1.91
+++ pkgsrc/x11/kdelibs3/Attic/distinfo 2008/04/28 10:43:24 1.91.2.1
@@ -1,22 +1,25 @@ @@ -1,22 +1,25 @@
1$NetBSD: distinfo,v 1.91 2008/02/20 09:49:56 markd Exp $ 1$NetBSD: distinfo,v 1.91.2.1 2008/04/28 10:43:24 ghen Exp $
2 2
3SHA1 (kdelibs-3.5.9.tar.bz2) = b8197d94075a54f90f08a9ef7bed95ccf53e12ad 3SHA1 (kdelibs-3.5.9.tar.bz2) = b8197d94075a54f90f08a9ef7bed95ccf53e12ad
4RMD160 (kdelibs-3.5.9.tar.bz2) = 9ac02bf2314de387b2aa9664703c72b0613fcbb3 4RMD160 (kdelibs-3.5.9.tar.bz2) = 9ac02bf2314de387b2aa9664703c72b0613fcbb3
5Size (kdelibs-3.5.9.tar.bz2) = 15568675 bytes 5Size (kdelibs-3.5.9.tar.bz2) = 15568675 bytes
 6SHA1 (post-kde-3.5.5-kinit.diff) = 35147db4d6791e4c98d7cec5e72509547813dd98
 7RMD160 (post-kde-3.5.5-kinit.diff) = e5e7dc462c88ad45ac7051261aaec5b83c64d59e
 8Size (post-kde-3.5.5-kinit.diff) = 3964 bytes
6SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779 9SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
7SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1 10SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
8SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186 11SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186
9SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65 12SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65
10SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74 13SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74
11SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec 14SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
12SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c 15SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
13SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308 16SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
14SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d 17SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
15SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea 18SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
16SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d 19SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d
17SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c 20SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
18SHA1 (patch-cc) = 136bedb27637ab1679871a4940999e8d32c54a09 21SHA1 (patch-cc) = 136bedb27637ab1679871a4940999e8d32c54a09
19SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781 22SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
20SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522 23SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
21SHA1 (patch-da) = ac1888a52f22ac81c0fb51dda48c8e168516a229 24SHA1 (patch-da) = ac1888a52f22ac81c0fb51dda48c8e168516a229
22SHA1 (patch-db) = bba958ba9f3059074fd97174dacab2bf47801fa8 25SHA1 (patch-db) = bba958ba9f3059074fd97174dacab2bf47801fa8