Add patch to fix /etc/passwd corruption in kuser (#87405).

Package-Manager: portage-2.0.51.19

6 files changed, 95 insertions, 3 deletions

diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index af41815ab965..6510daf94cc5 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.119 2005/03/18 17:22:51 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.120 2005/04/08 12:27:54 greg_g Exp $
+
+*kdeadmin-3.4.0-r1 (08 Apr 2005)
+
+  08 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeadmin-3.4.0-kuser.patch, +kdeadmin-3.4.0-r1.ebuild:
+  Add patch to fix /etc/passwd corruption in kuser (#87405).
 
   18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeadmin-3.4.0.ebuild:
   Added to ~ppc
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index cb246525d26a..1a35f637f11e 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,8 +1,11 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 4ec8ab8f6837082721eecf1fb28a9017 kdeadmin-3.4.0.ebuild 1014
 MD5 956e90a68612268a582c23ce5187beaa kdeadmin-3.2.3.ebuild 1039
-MD5 92e7a214bd64fe116a431c4580f2db61 ChangeLog 14560
+MD5 e07288f7dafa926ae21d98f246006e9f ChangeLog 14770
+MD5 ccf1a9badf80972c88b94a8614190c5d kdeadmin-3.4.0-r1.ebuild 1174
 MD5 a983b4d68ef55200abed1849a29fa391 kdeadmin-3.3.2.ebuild 1050
 MD5 2f8513094264710dea75ca730c25b858 files/digest-kdeadmin-3.3.2 68
+MD5 b734ff4d8c836982c23048f85e3492bf files/kdeadmin-3.4.0-kuser.patch 1637
 MD5 32fd62a326dd9a4724496ea209ebd263 files/digest-kdeadmin-3.2.3 68
+MD5 dff739018360a0997224c39ad20e83fb files/digest-kdeadmin-3.4.0-r1 68
 MD5 dff739018360a0997224c39ad20e83fb files/digest-kdeadmin-3.4.0 68
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1
new file mode 100644
index 000000000000..8cbd9915d983
--- /dev/null
+++ b/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1
@@ -0,0 +1 @@
+MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
diff --git a/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch b/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch
new file mode 100644
index 000000000000..b73ae0b384e3
--- /dev/null
+++ b/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch
@@ -0,0 +1,41 @@
+diff -Nur kdeadmin-3.4.0.orig/kuser/propdlg.cpp kdeadmin-3.4.0/kuser/propdlg.cpp
+--- kdeadmin-3.4.0.orig/kuser/propdlg.cpp	2004-11-29 01:03:48.000000000 +0100
++++ kdeadmin-3.4.0/kuser/propdlg.cpp	2005-04-08 14:05:03.000000000 +0200
+@@ -210,6 +210,8 @@
+       connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(changed()));
+       connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(cbposixChanged()));
+       addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
++    } else {
++      cbposix = 0;
+     }
+     frontrow = row;
+   }
+@@ -706,7 +708,8 @@
+   bool posix, samba = false;
+ 
+   newuser->copy( user );
+-  if ( cbposix->state() != QButton::NoChange ) {
++
++  if ( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX && cbposix->state() != QButton::NoChange ) {
+     if ( cbposix->isChecked() )
+       newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );
+     else
+@@ -873,7 +876,7 @@
+ bool propdlg::check()
+ {
+   bool one = ( mUsers.getFirst() == mUsers.getLast() );
+-  bool posix = !( cbposix->isChecked() );
++  bool posix = !( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX ) || !( cbposix->isChecked() );
+ 
+   if ( one && posix && leid->text().isEmpty() ) {
+     KMessageBox::sorry( 0, i18n("You need to specify an UID.") );
+@@ -928,7 +931,8 @@
+ 
+   uid_t newuid = leid->text().toULong();
+ 
+-  if ( one && !cbposix->isChecked() && olduid != newuid )
++  if ( one && ( !( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX ) || !cbposix->isChecked() )
++               && olduid != newuid )
+   {
+     if (kug->getUsers().lookup(newuid)) {
+       KMessageBox::sorry( 0,
diff --git a/kde-base/kdeadmin/kdeadmin-3.4.0-r1.ebuild b/kde-base/kdeadmin/kdeadmin-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..31c6d95844d5
--- /dev/null
+++ b/kde-base/kdeadmin/kdeadmin-3.4.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.4.0-r1.ebuild,v 1.1 2005/04/08 12:27:54 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE administration tools (user manager, etc.)"
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+IUSE=""
+
+DEPEND="~kde-base/kdebase-${PV}"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix /etc/passwd corruption in kuser (kde bug 100443). Applied for 3.4.1.
+	epatch "${FILESDIR}/${P}-kuser.patch"
+}
+
+src_compile() {
+	# we only want to compile the lilo config module on x86, but there we want to make sure it's
+	# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
+	# because configure when left to its own devices will build lilo-config or not basd on whether
+	# lilo is present in the path.
+	# so, we make configure build it by removing the configure.in.in file that checks for
+	# lilo's presense
+	if use x86; then
+		echo > ${S}/lilo-config/configure.in.in
+		make -f admin/Makefile.common
+	fi
+
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} ksysv"
+
+	kde_src_compile
+}
+
+# TODO: add nis support
diff --git a/kde-base/kuser/Manifest b/kde-base/kuser/Manifest
index 367fe3a2591b..eb85bacc4647 100644
--- a/kde-base/kuser/Manifest
+++ b/kde-base/kuser/Manifest
@@ -1,4 +1,7 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 f4717294a09aa1a444145e3deb52e536 kuser-3.4.0-r1.ebuild 559
 MD5 c68d56126b7ba23b2c49df44bfa04fa5 kuser-3.4.0.ebuild 432
-MD5 d95d6cf5c66c944656d8304d9770ecbe ChangeLog 1293
+MD5 b0040cf5817021d2c85aad3ae9da6a05 ChangeLog 1489
+MD5 dff739018360a0997224c39ad20e83fb files/digest-kuser-3.4.0-r1 68
+MD5 b734ff4d8c836982c23048f85e3492bf files/kdeadmin-3.4.0-kuser.patch 1637
 MD5 dff739018360a0997224c39ad20e83fb files/digest-kuser-3.4.0 68