Add patch by Tomas Janousek to fix compilation against linux-headers-2.6.23 (see #195977).

Package-Manager: portage-2.1.3.9

4 files changed, 65 insertions, 10 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index ceb559de995e..e2431cf51b25 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.56 2007/07/07 19:48:14 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.57 2007/11/01 19:09:21 phreak Exp $
+
+  01 Nov 2007; Christian Heim <phreak@gentoo.org> +files/gpm-OPEN_MAX.patch,
+  gpm-1.20.1-r6.ebuild:
+  Add patch by Tomas Janousek to fix compilation against linux-headers-2.6.23
+  (see #195977).
 
 *gpm-1.20.1-r6 (07 Jul 2007)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index e28744bd9b76..39359f8e2570 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gpm-OPEN_MAX.patch 1516 RMD160 a675b6182961bf9d88ea085e3af00c0208845e7b SHA1 34a035a47fdd2a835ce73e55ff28bfdd5ef94d00 SHA256 84fe6616275912eeade2431c09551f52311e48b3e1f35279159a80812889446f
+MD5 45f577d84f8bb27c68d38abca944587c files/gpm-OPEN_MAX.patch 1516
+RMD160 a675b6182961bf9d88ea085e3af00c0208845e7b files/gpm-OPEN_MAX.patch 1516
+SHA256 84fe6616275912eeade2431c09551f52311e48b3e1f35279159a80812889446f files/gpm-OPEN_MAX.patch 1516
 AUX gpm-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
 MD5 e1d606df0fb23c52c4ec513d52fa50ab files/gpm-configure-LANG.patch 2052
 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee files/gpm-configure-LANG.patch 2052
@@ -25,14 +32,14 @@ EBUILD gpm-1.20.1-r5.ebuild 1927 RMD160 78a7a4a26511fcb366e38fbe13a079a18f1630eb
 MD5 17cd4021459611a75056ae90e2502dad gpm-1.20.1-r5.ebuild 1927
 RMD160 78a7a4a26511fcb366e38fbe13a079a18f1630eb gpm-1.20.1-r5.ebuild 1927
 SHA256 2b1144ad72a161b0dccf0aaaab31523731c0de3e3faab97143b22dc8fc1b9f66 gpm-1.20.1-r5.ebuild 1927
-EBUILD gpm-1.20.1-r6.ebuild 1981 RMD160 1247ea85c614e8afddc57e6a00d9502388dca5da SHA1 75aa61409ae1f17c3c9ebac232f9bca631d9f338 SHA256 08a5b02393fcad7260227aa43e35373be759529ceef310c5bdd5e2e4207ed57c
-MD5 0a5aa2346fdb1af5e76bf103609a654e gpm-1.20.1-r6.ebuild 1981
-RMD160 1247ea85c614e8afddc57e6a00d9502388dca5da gpm-1.20.1-r6.ebuild 1981
-SHA256 08a5b02393fcad7260227aa43e35373be759529ceef310c5bdd5e2e4207ed57c gpm-1.20.1-r6.ebuild 1981
-MISC ChangeLog 7782 RMD160 88b0d293c509e3199aed2c0b69eeba3a3d5743e9 SHA1 8749cbf0e8932d31014d66d94346ca4b2352d4d7 SHA256 0c2a98693a197c1bdf5b66e0f25379436beb1c088dc3de0789ed40a4e909dbf4
-MD5 fda10f306b04d222e4f220d5f9010d21 ChangeLog 7782
-RMD160 88b0d293c509e3199aed2c0b69eeba3a3d5743e9 ChangeLog 7782
-SHA256 0c2a98693a197c1bdf5b66e0f25379436beb1c088dc3de0789ed40a4e909dbf4 ChangeLog 7782
+EBUILD gpm-1.20.1-r6.ebuild 2020 RMD160 e98f1298f8145295253231fcff937b44b1eaa90f SHA1 b765161342a13d54c052941b19a8065cd3f841b3 SHA256 19989ab5f5a3ddc4e47b79aec7fa2c5fb3c492c0de2e99d8c320ea09c2cae4bb
+MD5 8c83ffd52e3009ffd33f224238a805d0 gpm-1.20.1-r6.ebuild 2020
+RMD160 e98f1298f8145295253231fcff937b44b1eaa90f gpm-1.20.1-r6.ebuild 2020
+SHA256 19989ab5f5a3ddc4e47b79aec7fa2c5fb3c492c0de2e99d8c320ea09c2cae4bb gpm-1.20.1-r6.ebuild 2020
+MISC ChangeLog 7977 RMD160 9f10630054455b02ebb21eb6b9638cf437bad049 SHA1 5464e4acd8a10a64ff526bf176c177325c66121b SHA256 aac5ea6dfc37007f271fec3c8dad6f5a131b135f709d00b47271e089158bac11
+MD5 28d0115b39d94953df6914d13e832323 ChangeLog 7977
+RMD160 9f10630054455b02ebb21eb6b9638cf437bad049 ChangeLog 7977
+SHA256 aac5ea6dfc37007f271fec3c8dad6f5a131b135f709d00b47271e089158bac11 ChangeLog 7977
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -46,3 +53,10 @@ SHA256 00e2a9daccf2985241490b46ef7695d12de12042fc8c4efd2991ea2f3218abbb files/di
 MD5 729bb8c1fccf2aabb2e619665d67ed38 files/digest-gpm-1.20.1-r6 500
 RMD160 462e9eb4a0b8587158ff9dd23d39cfb66279f4d7 files/digest-gpm-1.20.1-r6 500
 SHA256 00e2a9daccf2985241490b46ef7695d12de12042fc8c4efd2991ea2f3218abbb files/digest-gpm-1.20.1-r6 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHKiTAyuNVb5qfaOYRAt94AJ4n/zVTJxp21vkcofk03O/ZGPILxQCeNBvk
+CJdWzWu13j/SCF+mz/gXjKM=
+=/V15
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm-OPEN_MAX.patch b/sys-libs/gpm/files/gpm-OPEN_MAX.patch
new file mode 100644
index 000000000000..34384ce28624
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-OPEN_MAX.patch
@@ -0,0 +1,35 @@
+Daemons should always close stdin, stdout and stderr after forking otherwise
+the controlling terminal will have issues closing.
+Examples include starting over ssh or baselayout-2
+http://bugs.gentoo.org/show_bug.cgi?id=182721
+
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 3a97602..b496550 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -526,7 +526,9 @@ int f_bgcmd(int mode, DrawItem *self, int uid)
+ 	            open("/dev/null",O_RDONLY); /* stdin  */
+ 	            open(consolename,O_WRONLY); /* stdout */
+ 	            dup(1);                     /* stderr */  
+-	            for (i=3;i<OPEN_MAX; i++) close(i);
++		    int open_max = sysconf(_SC_OPEN_MAX);
++		    if (open_max == -1) open_max = 1024;
++	            for (i=3;i<open_max; i++) close(i);
+ 	            execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
+ 	            exit(1); /* shouldn't happen */
+ 	         default: return 0;
+diff --git a/src/special.c b/src/special.c
+index 5bed91a..c6cd04d 100644
+--- a/src/special.c
++++ b/src/special.c
+@@ -156,7 +156,9 @@ int processSpecial(Gpm_Event *event)
+       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
+       open(console.device, O_WRONLY); /* stdout */
+       dup(1);                     /* stderr */
+-      for (i=3;i<OPEN_MAX; i++) close(i);
++      int open_max = sysconf(_SC_OPEN_MAX);
++      if (open_max == -1) open_max = 1024;
++      for (i=3;i<open_max; i++) close(i);
+       execl("/bin/sh","sh","-c",command,(char *)NULL);
+       exit(1); /* shouldn't happen */
\ No newline at end of file
diff --git a/sys-libs/gpm/gpm-1.20.1-r6.ebuild b/sys-libs/gpm/gpm-1.20.1-r6.ebuild
index db71761253d7..ec0b80222294 100644
--- a/sys-libs/gpm/gpm-1.20.1-r6.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r6.ebuild,v 1.1 2007/07/07 19:48:14 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r6.ebuild,v 1.2 2007/11/01 19:09:21 phreak Exp $
 
 # emacs support disabled due to Bug 99533
 
@@ -29,6 +29,7 @@ src_unpack() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	epatch "${FILESDIR}"/gpm-configure-LANG.patch
 	epatch "${FILESDIR}"/gpm-daemon.patch
+	epatch "${FILESDIR}"/gpm-OPEN_MAX.patch
 }
 
 src_compile() {