Fix patch for strict aliasing as the old one won't apply (half applied upstream).

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 34 insertions, 16 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index c8c614797a54..76251d012164 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.67 2006/07/25 05:25:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.68 2006/07/25 11:17:03 flameeyes Exp $
+
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdm-3.5.4-strict-aliasing.patch, kdm-3.5.4.ebuild:
+  Fix patch for strict aliasing as the old one won't apply (half applied
+  upstream).
 
 *kdm-3.5.4 (25 Jul 2006)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index d0e12468ac81..fd3f6de3a7a5 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -13,6 +13,10 @@ AUX kdm-3.5.3-strict-aliasing.patch 1454 RMD160 d3ea02774130bf4f59805d2d3b9f760a
 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 kdm-3.5.4-strict-aliasing.patch 402 RMD160 641395d16228df627ff16017f67ae4f17e0d7288 SHA1 77ab5687e06774ea1f1d3a56544ad566350d566d SHA256 ad8e466afc748a15bc04750a9231f668de5c953d9ba0e25e73e79f89587acd55
+MD5 10c1612d3d573ef3db770458da6a400d files/kdm-3.5.4-strict-aliasing.patch 402
+RMD160 641395d16228df627ff16017f67ae4f17e0d7288 files/kdm-3.5.4-strict-aliasing.patch 402
+SHA256 ad8e466afc748a15bc04750a9231f668de5c953d9ba0e25e73e79f89587acd55 files/kdm-3.5.4-strict-aliasing.patch 402
 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
@@ -39,14 +43,14 @@ EBUILD kdm-3.5.3-r2.ebuild 2563 RMD160 ad00310ce92c39ee9799aaa645ab7684cde12def
 MD5 e70374e5bdc6d6dacb952f01f3b080ce kdm-3.5.3-r2.ebuild 2563
 RMD160 ad00310ce92c39ee9799aaa645ab7684cde12def kdm-3.5.3-r2.ebuild 2563
 SHA256 d34065ec95c88422cc749dcf4ca34b1a3062f88be62ec27abcbea9ee159c45d1 kdm-3.5.3-r2.ebuild 2563
-EBUILD kdm-3.5.4.ebuild 2560 RMD160 82c01e1b008f85430b83bacd4118db2a3585a297 SHA1 3bc9717e2674fde67cba8d272570ad86134415e5 SHA256 d69a03a4a3e6ce198187725de3eda5ac32e1e48b6e7fe02678138525a243914e
-MD5 15a5c269780ed36de22793fc5bd89fbf kdm-3.5.4.ebuild 2560
-RMD160 82c01e1b008f85430b83bacd4118db2a3585a297 kdm-3.5.4.ebuild 2560
-SHA256 d69a03a4a3e6ce198187725de3eda5ac32e1e48b6e7fe02678138525a243914e kdm-3.5.4.ebuild 2560
-MISC ChangeLog 8979 RMD160 e7998474a12d092d450012a01099a09bd8df47d4 SHA1 2ca0ad0f639b40d3fad3e757a2144cb4847944d5 SHA256 deb343447db8fb091bbdec416c93dd5a357e5c97b522ef50deab76259aa2cd0b
-MD5 5030f3a47edecc6a4b7cb5b7db23fb7f ChangeLog 8979
-RMD160 e7998474a12d092d450012a01099a09bd8df47d4 ChangeLog 8979
-SHA256 deb343447db8fb091bbdec416c93dd5a357e5c97b522ef50deab76259aa2cd0b ChangeLog 8979
+EBUILD kdm-3.5.4.ebuild 2463 RMD160 227bb27a32170723e5e4a9fd350c9d8a8ccc32ac SHA1 be8b86304a192702c214a50f0ac15b4a2b6e4f72 SHA256 22b68d441f5551992aa71965cf69a0400a24f77b37462fcd57667970d1f36e64
+MD5 7bd3e0e517fed89f2ef37a51aa16675e kdm-3.5.4.ebuild 2463
+RMD160 227bb27a32170723e5e4a9fd350c9d8a8ccc32ac kdm-3.5.4.ebuild 2463
+SHA256 22b68d441f5551992aa71965cf69a0400a24f77b37462fcd57667970d1f36e64 kdm-3.5.4.ebuild 2463
+MISC ChangeLog 9179 RMD160 3c617ece75e536f5e974dbb15cfefa4b12cc1c05 SHA1 7dfec23633cca4aeb5c556f94d2e04df43897c62 SHA256 103ff77dde31cd1162a1d002671bb650e517cfdc24b2dfdee9f4ff745eee513f
+MD5 ccbad9c601928620cec7b7bcdecb352f ChangeLog 9179
+RMD160 3c617ece75e536f5e974dbb15cfefa4b12cc1c05 ChangeLog 9179
+SHA256 103ff77dde31cd1162a1d002671bb650e517cfdc24b2dfdee9f4ff745eee513f ChangeLog 9179
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -69,7 +73,7 @@ SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExatnAiZjviIA2XgRAtNXAJ4/ZfEE8ZZGLnBvFBbbj8ke7aBumQCfVger
-wq86I0nbFW9L5u0EKZ3X1iI=
-=8eQt
+iD8DBQFExf3DAiZjviIA2XgRAsbzAJ9vQEadrMgIy86b3xSpw9GJymTAJgCg8NzM
+6vooaxWfMi/45km5H022rTY=
+=Ygvp
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
new file mode 100644
index 000000000000..f732c7024b5e
--- /dev/null
+++ b/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
@@ -0,0 +1,12 @@
+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 \
diff --git a/kde-base/kdm/kdm-3.5.4.ebuild b/kde-base/kdm/kdm-3.5.4.ebuild
index 529f0c184b99..727b8fa9e2bb 100644
--- a/kde-base/kdm/kdm-3.5.4.ebuild
+++ b/kde-base/kdm/kdm-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2006/07/25 05:25:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.4.ebuild,v 1.2 2006/07/25 11:17:03 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -33,9 +33,6 @@ 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"
 }