4 files changed, 130 insertions, 1 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/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
+}