Added patches.

(Portage version: 2.1.4)

2 files changed, 78 insertions, 0 deletions

diff --git a/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch
new file mode 100644
index 000000000000..6fb54f05c547
--- /dev/null
+++ b/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch b/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch
new file mode 100644
index 000000000000..95d787cdc239
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch
@@ -0,0 +1,49 @@
+Disable creating dirs in the live file system,
+and let the package manager handle it.
+diff -ur kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c
+--- kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c	2007-12-09 06:56:49.000000000 +0100
++++ kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c	2007-12-09 10:28:05.000000000 +0100
+@@ -266,43 +266,12 @@
+ static int
+ mkpdirs( const char *name, const char *what )
+ {
+-	char *mfname = mstrdup( name );
+-	int i;
+-	struct stat st;
+-
+-	for (i = 1; mfname[i]; i++)
+-		if (mfname[i] == '/') {
+-			mfname[i] = 0;
+-			if (stat( mfname, &st )) {
+-				if (mkdir( mfname, 0755 )) {
+-					fprintf( stderr, "Cannot create parent %s of %s directory %s: %s\n",
+-					         mfname, what, name, strerror( errno ) );
+-					free( mfname );
+-					return False;
+-				}
+-				chmod( mfname, 0755 );
+-			}
+-			mfname[i] = '/';
+-		}
+-	free( mfname );
+ 	return True;
+ }
+ 
+ static int
+ mkdirp( const char *name, int mode, const char *what, int existok )
+ {
+-	struct stat st;
+-
+-	if (stat( name, &st )) {
+-		mkpdirs( name, what );
+-		if (mkdir( name, mode )) {
+-			fprintf( stderr, "Cannot create %s directory %s: %s\n",
+-			         what, name, strerror( errno ) );
+-			return False;
+-		}
+-		chmod( name, mode );
+-		return True;
+-	}
+ 	return existok;
+ }
+