Added a new patch that parses the grub configuration file correctly and allows to reboot into the kernel or operating system of choice using the grub-set-default feature. Fixes bug #139603.

Package-Manager: portage-2.1-r2

5 files changed, 171 insertions, 15 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 76251d012164..ba17c80e1237 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.68 2006/07/25 11:17:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.69 2006/08/30 16:09:48 deathwing00 Exp $
+
+*kdm-3.5.4-r1 (30 Aug 2006)
+
+  30 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kdm-3.5.4-grub-patch.diff, +kdm-3.5.4-r1.ebuild:
+  Added a new patch that parses the grub configuration file correctly and
+  allows to reboot into the kernel or operating system of choice using the
+  grub-set-default feature. Fixes bug #139603.
 
   25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kdm-3.5.4-strict-aliasing.patch, kdm-3.5.4.ebuild:
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index fd3f6de3a7a5..a15d287e7a5a 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,6 +1,3 @@
------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
@@ -13,6 +10,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-grub-patch.diff 1730 RMD160 d3d174c544638ffb9445ac5221d7a8c4401db87e SHA1 bd8b00ac849271ec6fba0b69315a8f18114ae588 SHA256 73eb56285d423513875ee4b6c503f265c4e1ab515dfb6e2f731a28cf979a3f81
+MD5 fc7116ff12aae701f360630593b82f79 files/kdm-3.5.4-grub-patch.diff 1730
+RMD160 d3d174c544638ffb9445ac5221d7a8c4401db87e files/kdm-3.5.4-grub-patch.diff 1730
+SHA256 73eb56285d423513875ee4b6c503f265c4e1ab515dfb6e2f731a28cf979a3f81 files/kdm-3.5.4-grub-patch.diff 1730
 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
@@ -43,14 +44,18 @@ 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-r1.ebuild 2512 RMD160 7b5764fb2ff55416c1d50865f3758f568a7cb319 SHA1 83ea3b2dddd291e5fdc1fd324bdfa5a075738351 SHA256 dfbaf5590b367de63abe09421cb5a681f3807aa3290748874af0674ca3667f1b
+MD5 8647de9267a436f71a436d1a63bbd3df kdm-3.5.4-r1.ebuild 2512
+RMD160 7b5764fb2ff55416c1d50865f3758f568a7cb319 kdm-3.5.4-r1.ebuild 2512
+SHA256 dfbaf5590b367de63abe09421cb5a681f3807aa3290748874af0674ca3667f1b kdm-3.5.4-r1.ebuild 2512
 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 ChangeLog 9523 RMD160 dcf54e2187b6ec5f1a8974c63f66fb023f49270e SHA1 b75c4bd171a39e2a8334cee4f7c3c6741304a360 SHA256 ca561cdf1bc4e90aaba3a5f765083c183e52d44238fa69a17c608c74286b7b06
+MD5 12e659f0be46d78fa1763992762d516c ChangeLog 9523
+RMD160 dcf54e2187b6ec5f1a8974c63f66fb023f49270e ChangeLog 9523
+SHA256 ca561cdf1bc4e90aaba3a5f765083c183e52d44238fa69a17c608c74286b7b06 ChangeLog 9523
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -70,10 +75,6 @@ SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/di
 MD5 425303bc57c521473647c0068422baa7 files/digest-kdm-3.5.4 518
 RMD160 eed94e31e0e0aea46b977992f5d896d01d4e2159 files/digest-kdm-3.5.4 518
 SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/digest-kdm-3.5.4 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFExf3DAiZjviIA2XgRAsbzAJ9vQEadrMgIy86b3xSpw9GJymTAJgCg8NzM
-6vooaxWfMi/45km5H022rTY=
-=Ygvp
------END PGP SIGNATURE-----
+MD5 425303bc57c521473647c0068422baa7 files/digest-kdm-3.5.4-r1 518
+RMD160 eed94e31e0e0aea46b977992f5d896d01d4e2159 files/digest-kdm-3.5.4-r1 518
+SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/digest-kdm-3.5.4-r1 518
diff --git a/kde-base/kdm/files/digest-kdm-3.5.4-r1 b/kde-base/kdm/files/digest-kdm-3.5.4-r1
new file mode 100644
index 000000000000..d7974a138105
--- /dev/null
+++ b/kde-base/kdm/files/digest-kdm-3.5.4-r1
@@ -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 882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 23636847
+RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 kdebase-3.5.4.tar.bz2 23636847
+SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 kdebase-3.5.4.tar.bz2 23636847
diff --git a/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
new file mode 100644
index 000000000000..6fd004931d4a
--- /dev/null
+++ b/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
@@ -0,0 +1,64 @@
+diff -U 4 -H -b -w -B -E -d -i -r kdm-3.5.4-orig/kdm/backend/bootman.c kdm-3.5.4/kdm/backend/bootman.c
+--- kdm-3.5.4-orig/kdm/backend/bootman.c	2006-08-30 17:41:12.000000000 +0200
++++ kdm-3.5.4/kdm/backend/bootman.c	2006-08-30 17:50:20.000000000 +0200
+@@ -77,28 +77,30 @@
+ static int
+ getGrub( char ***opts, int *def, int *cur )
+ {
+ 	FILE *f;
+-	char *ptr;
++	char *ptr, *linp;
+ 	int len;
+ 	char line[1000];
+ 
+-	if (!grub && !(grub = locate( "grub" )))
++	if (!grub && !(grub = locate( "grub-set-default" )))
+ 		return BO_NOMAN;
+ 
+ 	*def = 0;
+ 	*cur = -1;
+ 	*opts = initStrArr( 0 );
+ 
+ 	if (!(f = fopen( GRUB_MENU, "r" )))
+ 		return errno == ENOENT ? BO_NOMAN : BO_IO;
+-	while ((len = fGets( line, sizeof(line), f )) != -1)
+-		if ((ptr = match( line, &len, "default", 7 )))
++	while ((len = fGets( line, sizeof(line), f )) != -1) {
++		for (linp = line; isspace(*linp); linp++, len--);
++		if ((ptr = match( linp, &len, "default", 7 )))
+ 			*def = atoi( ptr );
+-		else if ((ptr = match( line, &len, "title", 5 ))) {
++		else if ((ptr = match( linp, &len, "title", 5 ))) {
+ 			for (; isspace( ptr[len - 1] ); len--);
+ 			*opts = addStrArr( *opts, ptr, len );
+ 		}
++	}
+ 	fclose( f );
+ 
+ 	return BO_OK;
+ }
+@@ -129,21 +131,16 @@
+ 
+ static void
+ commitGrub( void )
+ {
+-	FILE *f;
+-	int pid;
+-	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
++	char command[256];
+ 
+ 	if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
+ 	    setGrub( sdRec.osname, &sdRec ) != BO_OK)
+ 		return;
+ 
+-	args[0] = grub;
+-	if ((f = pOpen( (char **)args, 'w', &pid ))) {
+-		fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
+-		pClose( f, pid );
+-	}
++	sprintf(command, "%s %d", grub, sdRec.osindex);
++	system(command);
+ }
+ 
+ static char *lilo;
+ 
diff --git a/kde-base/kdm/kdm-3.5.4-r1.ebuild b/kde-base/kdm/kdm-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..e18f1b35bcaa
--- /dev/null
+++ b/kde-base/kdm/kdm-3.5.4-r1.ebuild
@@ -0,0 +1,77 @@
+# 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-r1.ebuild,v 1.1 2006/08/30 16:09:48 deathwing00 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 elibc_glibc"
+
+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}
+	|| ( x11-apps/xinit <virtual/x11-7 )
+	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"
+
+	epatch "${FILESDIR}/${P}-strict-aliasing.patch"
+
+	epatch "${FILESDIR}/${P}-grub-patch.diff"
+}
+
+src_compile() {
+	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
+
+	if ! use pam && use elibc_glibc; then
+		myconf="${myconf} --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
+}