Add patch to fix segfault in XDMCP (#109528). Add patch to compile without imake (#102780).

(Portage version: 2.0.51.22-r3)

4 files changed, 137 insertions, 0 deletions

diff --git a/kde-base/kdm/files/digest-kdm-3.4.3-r1 b/kde-base/kdm/files/digest-kdm-3.4.3-r1
new file mode 100644
index 000000000000..6a8e77ebae51
--- /dev/null
+++ b/kde-base/kdm/files/digest-kdm-3.4.3-r1
@@ -0,0 +1 @@
+MD5 7b25feba2774c077601d472dae5352c8 kdebase-3.4.3.tar.bz2 22425835
diff --git a/kde-base/kdm/files/kdebase-3.4.3-noimake.patch b/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
new file mode 100644
index 000000000000..4718f1587a3f
--- /dev/null
+++ b/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
@@ -0,0 +1,61 @@
+diff -Nur kdebase-3.4.3.orig/kdm/configure.in.in kdebase-3.4.3/kdm/configure.in.in
+--- kdebase-3.4.3.orig/kdm/configure.in.in	2005-10-05 15:39:13.000000000 +0200
++++ kdebase-3.4.3/kdm/configure.in.in	2005-10-19 11:26:29.000000000 +0200
+@@ -1,42 +1,22 @@
+ 
+ dnl this is for kdm:
+ 
+-KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
++AC_MSG_CHECKING([X paths for KDM])
+ 
+-dnl ask imake about various X settings
+-AC_MSG_CHECKING([X paths])
+-imkv=8
+-test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+-AC_CACHE_VAL(kde_cv_defines_imake, [
+-  rm -fr conftestdir
+-  if mkdir conftestdir; then
+-    cd conftestdir
+-    cat > Imakefile <<'EOF'[
+-
+-acimake:
+-	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
+-
+-]EOF
+-    if $XMKMF >&5 2>&1 && test -f Makefile; then
+-	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+-	kde_cv_defines_imake_version=$imkv
+-    else
+-        AC_MSG_RESULT([failed])
+-	AC_MSG_ERROR([$XMKMF (imake) failed.
+-Make sure you have all necessary X development packages installed.
+-On some systems a missing /lib/cpp symlink is at fault.])
+-    fi
+-    cd ..
+-    rm -fr conftestdir
+-  else
+-    AC_MSG_RESULT([failed])
+-    AC_MSG_ERROR([cannot create temporary directory])
+-  fi
+-])
+-AC_MSG_RESULT([done])
+-eval "$kde_cv_defines_imake"
+-AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
+-AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
++AC_ARG_WITH(x-binaries-dir,
++	[AS_HELP_STRING(--with-x-binaries-dir=DIR,
++		[set the location of X binaries for KDM])],
++	[], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
++
++AC_ARG_WITH(x-libraries-dir,
++	[AS_HELP_STRING(--with-x-libraries-dir=DIR,
++		[set the location of X libraries for KDM])],
++	[], [with_x_libraries_dir=$kde_x_libraries])
++
++AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
++
++AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
++AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
+ 
+ if test -f /etc/ttys; then
+   AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
diff --git a/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch b/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
new file mode 100644
index 000000000000..96b666902ae7
--- /dev/null
+++ b/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
@@ -0,0 +1,17 @@
+diff -Nur kdebase-3.4.3.orig/kdm/backend/xdmcp.c kdebase-3.4.3/kdm/backend/xdmcp.c
+--- kdebase-3.4.3.orig/kdm/backend/xdmcp.c	2005-10-05 15:39:11.000000000 +0200
++++ kdebase-3.4.3/kdm/backend/xdmcp.c	2005-10-18 15:30:05.000000000 +0200
+@@ -940,7 +940,12 @@
+ 			}
+ 			DisposeProtoDisplay( pdpy );
+ 			Debug( "starting display %s,%s\n", d->name, d->class2 );
+-			StartDisplay( d );
++			if (LoadDisplayResources( d ) < 0) {
++				LogError( "Unable to read configuration for display %s; "
++				          "stopping it.\n", d->name );
++				StopDisplay( d );
++			} else
++				StartDisplay( d );
+ 			CloseGetter();
+ 		}
+ 	}
diff --git a/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch b/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
new file mode 100644
index 000000000000..1f84c2f00460
--- /dev/null
+++ b/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
@@ -0,0 +1,58 @@
+diff -Nur kdebase-3.4.92.orig/kdm/configure.in.in kdebase-3.4.92/kdm/configure.in.in
+--- kdebase-3.4.92.orig/kdm/configure.in.in	2005-10-10 17:04:31.000000000 +0200
++++ kdebase-3.4.92/kdm/configure.in.in	2005-10-19 15:30:11.000000000 +0200
+@@ -1,39 +1,19 @@
+-KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
++AC_MSG_CHECKING([X paths for KDM])
+ 
+-dnl ask imake about various X settings
+-AC_MSG_CHECKING([X paths])
+-imkv=8
+-test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+-AC_CACHE_VAL(kde_cv_defines_imake, [
+-  rm -fr conftestdir
+-  if mkdir conftestdir; then
+-    cd conftestdir
+-    cat > Imakefile <<'EOF'[
+-
+-acimake:
+-	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
+-
+-]EOF
+-    if $XMKMF >&5 2>&1 && test -f Makefile; then
+-	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+-	kde_cv_defines_imake_version=$imkv
+-    else
+-        AC_MSG_RESULT([failed])
+-	AC_MSG_ERROR([$XMKMF (imake) failed.
+-Make sure you have all necessary X development packages installed.
+-On some systems a missing /lib/cpp symlink is at fault.])
+-    fi
+-    cd ..
+-    rm -fr conftestdir
+-  else
+-    AC_MSG_RESULT([failed])
+-    AC_MSG_ERROR([cannot create temporary directory])
+-  fi
+-])
+-AC_MSG_RESULT([done])
+-eval "$kde_cv_defines_imake"
+-AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
+-AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
++AC_ARG_WITH(x-binaries-dir,
++        [AS_HELP_STRING(--with-x-binaries-dir=DIR,
++                [set the location of X binaries for KDM])],
++        [], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
++
++AC_ARG_WITH(x-libraries-dir,
++        [AS_HELP_STRING(--with-x-libraries-dir=DIR,
++                [set the location of X libraries for KDM])],
++        [], [with_x_libraries_dir=$kde_x_libraries])
++
++AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
++
++AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
++AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
+ 
+ if test -f /etc/ttys; then
+   AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])