Add patch to fix strict-aliasing breakages.

Package-Manager: portage-2.1.1_pre1

5 files changed, 155 insertions, 5 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index afb768dd7dad..83b3013ba52d 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.60 2006/06/17 12:02:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.61 2006/06/17 23:08:23 flameeyes Exp $
+
+*kdm-3.5.3-r2 (17 Jun 2006)
+
+  17 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdm-3.5.3-strict-aliasing.patch, +kdm-3.5.3-r2.ebuild:
+  Add patch to fix strict-aliasing breakages.
 
   17 Jun 2006; Carsten Lohrke <carlo@gentoo.org> kdm-3.4.3-r2.ebuild,
   kdm-3.5.2-r1.ebuild:
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index b7efa0ae7a9e..bcac2a9f1adf 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdebase-3.4.3-noimake.patch 2214 RMD160 72eaff49bea56612492a88ddeaa3ad529001b251 SHA1 155e10998c1987aa38580d6df00f5729d9385bc5 SHA256 8cb4a0ed5f5c02bc9c1e1b9e1ba8f45f963bcbbe08210c02d8a9bb00434d143f
 MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
 RMD160 72eaff49bea56612492a88ddeaa3ad529001b251 files/kdebase-3.4.3-noimake.patch 2214
@@ -6,6 +9,10 @@ AUX kdebase-3.4.3-xdmcp.patch 614 RMD160 10d4bba34bb3c6bb398f68423a766ca27dab92e
 MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
 RMD160 10d4bba34bb3c6bb398f68423a766ca27dab92e8 files/kdebase-3.4.3-xdmcp.patch 614
 SHA256 bedfb9a156f13f721f74e30ff525bbe982a27d7d8dc3a25787745a1380f8513f files/kdebase-3.4.3-xdmcp.patch 614
+AUX kdm-3.5.3-strict-aliasing.patch 1454 RMD160 d3ea02774130bf4f59805d2d3b9f760a335443fc SHA1 7f16dfae587909018fe8ffbf9ad89e57217bb8f7 SHA256 89f7a9d6cb4913fa2fcfd6fa733160ca5649ea4103f69d05802aecfceb54e960
+MD5 8ea4ae52af137ff483c245689f8fa5a0 files/kdm-3.5.3-strict-aliasing.patch 1454
+RMD160 d3ea02774130bf4f59805d2d3b9f760a335443fc files/kdm-3.5.3-strict-aliasing.patch 1454
+SHA256 89f7a9d6cb4913fa2fcfd6fa733160ca5649ea4103f69d05802aecfceb54e960 files/kdm-3.5.3-strict-aliasing.patch 1454
 AUX post-3.5.0-kdebase-kdm.diff 508 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f SHA1 327cd873bfeaea0665364b973245d744fa09c938 SHA256 95cc8feb448616e63eae37e3093bbdee690d04f8542f7f04aeab7926a6cffcf2
 MD5 9daecff07d57dabba35da247e752916a files/post-3.5.0-kdebase-kdm.diff 508
 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f files/post-3.5.0-kdebase-kdm.diff 508
@@ -35,14 +42,18 @@ EBUILD kdm-3.5.3-r1.ebuild 2484 RMD160 053a3efe71e49ff23f67464624539165bac1dc55
 MD5 32c27a79aba7f61ecaf613f127e7c3f9 kdm-3.5.3-r1.ebuild 2484
 RMD160 053a3efe71e49ff23f67464624539165bac1dc55 kdm-3.5.3-r1.ebuild 2484
 SHA256 c4602435a36cf7111a7a52f2fe5c5f5514f4f8b6fe4563c60e9ad16f51dc1ac5 kdm-3.5.3-r1.ebuild 2484
+EBUILD kdm-3.5.3-r2.ebuild 2538 RMD160 a48f273df1393efdd53a6267e96c3d3d184cd23f SHA1 518625ee49d3d0eb3f31e5b7652a120fcd64bb2c SHA256 67904060801701180014341b45f3c8c8f3fa7310574ff646d5dba9bf026d0693
+MD5 c2fae5765a1874445392878aa83ccc45 kdm-3.5.3-r2.ebuild 2538
+RMD160 a48f273df1393efdd53a6267e96c3d3d184cd23f kdm-3.5.3-r2.ebuild 2538
+SHA256 67904060801701180014341b45f3c8c8f3fa7310574ff646d5dba9bf026d0693 kdm-3.5.3-r2.ebuild 2538
 EBUILD kdm-3.5.3.ebuild 2385 RMD160 5ba6f8f7adef36751aeaac3df17fdeaa2ee5565c SHA1 5d9346b0a027270aa502ce932e20ca7f06f51792 SHA256 51684159a2e032b69ffb51547e78be2a86949ef7e55f64e9d46fbb024feee237
 MD5 4d47814b9aa8d3639f606be9d9fd5a21 kdm-3.5.3.ebuild 2385
 RMD160 5ba6f8f7adef36751aeaac3df17fdeaa2ee5565c kdm-3.5.3.ebuild 2385
 SHA256 51684159a2e032b69ffb51547e78be2a86949ef7e55f64e9d46fbb024feee237 kdm-3.5.3.ebuild 2385
-MISC ChangeLog 7730 RMD160 eecd4ae7e307033d64baf1eff35ca9e6e2e017c3 SHA1 00a791a3ae1c7fa80e326a8d05483851728c6510 SHA256 0bccd7a0b073ab3636adf5a28cdfb34f17fa305a668e1bc13fb9aa11c3ba202f
-MD5 8fb05df7c6b0e7a4685f6b66b80d7d1c ChangeLog 7730
-RMD160 eecd4ae7e307033d64baf1eff35ca9e6e2e017c3 ChangeLog 7730
-SHA256 0bccd7a0b073ab3636adf5a28cdfb34f17fa305a668e1bc13fb9aa11c3ba202f ChangeLog 7730
+MISC ChangeLog 7927 RMD160 a1c6e318efd31241c3c4845490275237157302a2 SHA1 066819b54b29eefeb0ebeb6e13f4ab535cb20d85 SHA256 cf0409ce68d34bebdade04eaea7d4e4ed3c154cfd77c63564c7f4b2e762e6055
+MD5 804d2b724008d6c9f54fc4701b953b44 ChangeLog 7927
+RMD160 a1c6e318efd31241c3c4845490275237157302a2 ChangeLog 7927
+SHA256 cf0409ce68d34bebdade04eaea7d4e4ed3c154cfd77c63564c7f4b2e762e6055 ChangeLog 7927
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -65,3 +76,13 @@ SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/di
 MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdm-3.5.3-r1 518
 RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdm-3.5.3-r1 518
 SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdm-3.5.3-r1 518
+MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdm-3.5.3-r2 518
+RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdm-3.5.3-r2 518
+SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdm-3.5.3-r2 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFElIt7AiZjviIA2XgRAkRaAJ4u21FhzVhineq7kdGXUBQ1GIPIBgCfWLzd
+L7eDKVw01dyD4ojMTxzoPRY=
+=s5Lq
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/digest-kdm-3.5.3-r2 b/kde-base/kdm/files/digest-kdm-3.5.3-r2
new file mode 100644
index 000000000000..cfd18542a977
--- /dev/null
+++ b/kde-base/kdm/files/digest-kdm-3.5.3-r2
@@ -0,0 +1,6 @@
+MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118
+RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118
+SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
new file mode 100644
index 000000000000..fcdb060f5d25
--- /dev/null
+++ b/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
@@ -0,0 +1,38 @@
+Index: kdebase-3.5.3/kdm/backend/Makefile.am
+===================================================================
+--- kdebase-3.5.3.orig/kdm/backend/Makefile.am
++++ kdebase-3.5.3/kdm/backend/Makefile.am
+@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
+     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
+ 
+ bin_PROGRAMS = kdm
++kdm_CFLAGS = -fno-strict-aliasing
+ kdm_SOURCES = \
+     access.c \
+     auth.c \
+Index: kdebase-3.5.3/kdm/backend/xdmcp.c
+===================================================================
+--- kdebase-3.5.3.orig/kdm/backend/xdmcp.c
++++ kdebase-3.5.3/kdm/backend/xdmcp.c
+@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from
+ 	int family;
+ 	int length;
+ 
+-	family = ConvertAddr( (XdmcpNetaddr)from, &length, (char **)&(addr.data) );
++	family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
+ 	addr.length = length; /* convert int to short */
+ 	Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
+ 	       family, addr.length, addr.data );
+Index: kdebase-3.5.3/kdm/kfrontend/kdm_config.c
+===================================================================
+--- kdebase-3.5.3.orig/kdm/kfrontend/kdm_config.c
++++ kdebase-3.5.3/kdm/kfrontend/kdm_config.c
+@@ -733,7 +733,7 @@ CvtValue( Ent *et, Value *retval, int va
+ 				}
+ 			}
+ 			retval->ptr = 0;
+-			if (sscanf( buf, "%li", (long *)&retval->ptr ) != 1)
++			if (sscanf( buf, "%li", &retval->ptr ) != 1)
+ 				return "integer";
+ 			return 0;
+ 		case C_TYPE_STR:
diff --git a/kde-base/kdm/kdm-3.5.3-r2.ebuild b/kde-base/kdm/kdm-3.5.3-r2.ebuild
new file mode 100644
index 000000000000..ea716be1123e
--- /dev/null
+++ b/kde-base/kdm/kdm-3.5.3-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.3-r2.ebuild,v 1.1 2006/06/17 23:08:23 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam"
+
+KMEXTRA="kdmlib/"
+# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
+# 3.5_beta1.
+KMEXTRACTONLY="libkonq/konq_defaults.h"
+#	    kioslave/thumbnail/configure.in.in"
+KMCOMPILEONLY="kcontrol/background"
+DEPEND="pam? ( kde-base/kdebase-pam )
+	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
+	# Requires the desktop background settings and kdm kcontrol modules
+RDEPEND="${DEPEND}
+	kde-base/kdepasswd"
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# Avoid using imake (kde bug 114466)
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+
+	# Fix KDM symlink vulnerability, bug #136201
+	epatch "${FILESDIR}/post-3.5.0-kdebase-kdm.diff"
+
+	epatch "${FILESDIR}/${P}-strict-aliasing.patch"
+}
+
+src_compile() {
+	local myconf="--with-x-binaries-dir=/usr/bin"
+
+	if use pam; then
+		myconf="${myconf} --with-pam=yes"
+	else
+		myconf="${myconf} --with-pam=no --with-shadow"
+	fi
+
+	export USER_LDFLAGS="${LDFLAGS}"
+
+	kde-meta_src_compile myconf configure
+	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
+	kde-meta_src_compile make
+}
+
+src_install() {
+	kde-meta_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+}
+
+pkg_postinst() {
+	# set the default kdm face icon if it's not already set by the system admin
+	# because this is user-overrideable in that way, it's not in src_install
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ];	then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+		    "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	fi
+}