Relocate patches to patchset like they should have been in the first place.

Package-Manager: portage-2.1.3.19

6 files changed, 26 insertions, 114 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index e2431cf51b25..f131787c4038 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.57 2007/11/01 19:09:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.58 2007/11/12 06:57:47 vapier Exp $
+
+  12 Nov 2007; Mike Frysinger <vapier@gentoo.org> -files/gpm-OPEN_MAX.patch,
+  -files/gpm-daemon.patch, gpm-1.20.1-r6.ebuild:
+  Relocate patches to patchset like they should have been in the first place.
 
   01 Nov 2007; Christian Heim <phreak@gentoo.org> +files/gpm-OPEN_MAX.patch,
   gpm-1.20.1-r6.ebuild:
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 39359f8e2570..7ed0dc9ea933 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,18 +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
 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b files/gpm-configure-LANG.patch 2052
-AUX gpm-daemon.patch 1885 RMD160 c02203779e3369e3a16c30ca2c9a05da46fa9fb6 SHA1 798092cc66d3ff32a88158338bee465972ab2c02 SHA256 e852b15f12304c18523ab567fce5fbf9f8d45cddd93c9a6fd9bb2411bf8d67e9
-MD5 9c91abc35d405b7fed8e75b27568bacb files/gpm-daemon.patch 1885
-RMD160 c02203779e3369e3a16c30ca2c9a05da46fa9fb6 files/gpm-daemon.patch 1885
-SHA256 e852b15f12304c18523ab567fce5fbf9f8d45cddd93c9a6fd9bb2411bf8d67e9 files/gpm-daemon.patch 1885
 AUX gpm.conf.d 580 RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 SHA1 44035e2059ac0fc178bfe427900d43ad33aeaa2a SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8
 MD5 5968cb47e493e348cf289b0dd1990f4a files/gpm.conf.d 580
 RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 files/gpm.conf.d 580
@@ -23,6 +15,7 @@ RMD160 770208133f13fd02207095f7b71a63ac790467d7 files/gpm.rc6 951
 SHA256 b893aa660a50014ea3dae4ce9925117b3b8bec9d50abf10f2da946a845789d04 files/gpm.rc6 951
 DIST gpm-1.20.1-patches-1.3.tar.bz2 9851 RMD160 e55a5ce19bb2df8cd3ff49a2730a836a47cfdaf0 SHA1 1be2033477da07a1239f87a1642d64f7251d8073 SHA256 cdef6e0b2c3de0e9bf77f12505f80ed5b3c68b2d329ea498f683aff6679e1cce
 DIST gpm-1.20.1-patches-1.4.tar.bz2 8049 RMD160 9bf31260db39870a678ed1167c0b242a778b2b61 SHA1 27eff31f6305b00a3f4ffabed096d79d8ad1b895 SHA256 64d68412c95358f7d3a525dce38661aa53f13c0ddf2e20eb869325e8dd170e07
+DIST gpm-1.20.1-patches-1.5.tar.bz2 9045 RMD160 911d3e6f2d4c37f9d1fedf436b346969331e9ce2 SHA1 9ac747abed5979953d6f812b8380063d3c198116 SHA256 9aeb116b17258ac4729c8476edef8d8efed332213df07e0a879061c152812d0c
 DIST gpm-1.20.1.tar.bz2 565014 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 SHA1 c48d937e62abb438c2f6439b34ef3332c89af8d1 SHA256 11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
 EBUILD gpm-1.20.1-r4.ebuild 1844 RMD160 583e6002921d0d6787d5d33d79620435f30aa9fa SHA1 48065b707ebe83653856eca77378770a0d46af61 SHA256 a2b4e0ce8b7f1920e24ef62dba015b77444bf01292b3a8949828b6106cfb2cf6
 MD5 fd78548b3a6d83712cecf555ef8538dc gpm-1.20.1-r4.ebuild 1844
@@ -32,14 +25,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 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
+EBUILD gpm-1.20.1-r6.ebuild 1940 RMD160 c4bec24a7a9848495f5e2d7e925c7dd2bbfa51a9 SHA1 20ff6058bc48fb41506ddc07bf033209858ad6fa SHA256 2ac102f35c71e05c825983c6e4d54481c22711181b022391472f78674e1a5ba6
+MD5 8a1ea0ae13414eceac5ff546cc53d536 gpm-1.20.1-r6.ebuild 1940
+RMD160 c4bec24a7a9848495f5e2d7e925c7dd2bbfa51a9 gpm-1.20.1-r6.ebuild 1940
+SHA256 2ac102f35c71e05c825983c6e4d54481c22711181b022391472f78674e1a5ba6 gpm-1.20.1-r6.ebuild 1940
+MISC ChangeLog 8182 RMD160 03c9db0e14ea0fddd68d6f5b77c83b86acf2f192 SHA1 4315e7d5145be09bb187298782cd964dfe10ad9a SHA256 f0d12662dd873d209830869496499872834b62c200383b4e66a9b29ef3966a97
+MD5 dea24707dadab1b961daa87c4d3f8994 ChangeLog 8182
+RMD160 03c9db0e14ea0fddd68d6f5b77c83b86acf2f192 ChangeLog 8182
+SHA256 f0d12662dd873d209830869496499872834b62c200383b4e66a9b29ef3966a97 ChangeLog 8182
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -50,13 +43,13 @@ SHA256 93297434737f68c2cf314483c1b0a681c72a0ab5972bbb4388c4f5e9aaec728e files/di
 MD5 729bb8c1fccf2aabb2e619665d67ed38 files/digest-gpm-1.20.1-r5 500
 RMD160 462e9eb4a0b8587158ff9dd23d39cfb66279f4d7 files/digest-gpm-1.20.1-r5 500
 SHA256 00e2a9daccf2985241490b46ef7695d12de12042fc8c4efd2991ea2f3218abbb files/digest-gpm-1.20.1-r5 500
-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
+MD5 37fda598cdc1d6e38a9665b8f5415734 files/digest-gpm-1.20.1-r6 500
+RMD160 281abbee9a707ff4d6334505d9969335b11d186a files/digest-gpm-1.20.1-r6 500
+SHA256 6018475a2210692fa2a5c8d680a3affad8da1a63416a93590f707f030cc87580 files/digest-gpm-1.20.1-r6 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHKiTAyuNVb5qfaOYRAt94AJ4n/zVTJxp21vkcofk03O/ZGPILxQCeNBvk
-CJdWzWu13j/SCF+mz/gXjKM=
-=/V15
+iD8DBQFHN/lwp/wUKkr7RBoRAt8CAJ0e2/O38IYXAfhxZhSzTDUpAY4xZQCfWWEd
+/iuJC6eP4WP1ZMUcQznSOgA=
+=oXiE
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.1-r6 b/sys-libs/gpm/files/digest-gpm-1.20.1-r6
index 0083e96a72bb..29e145f2ccf4 100644
--- a/sys-libs/gpm/files/digest-gpm-1.20.1-r6
+++ b/sys-libs/gpm/files/digest-gpm-1.20.1-r6
@@ -1,6 +1,6 @@
-MD5 ede95b6eb848f87440a2d7f86eaaf13a gpm-1.20.1-patches-1.4.tar.bz2 8049
-RMD160 9bf31260db39870a678ed1167c0b242a778b2b61 gpm-1.20.1-patches-1.4.tar.bz2 8049
-SHA256 64d68412c95358f7d3a525dce38661aa53f13c0ddf2e20eb869325e8dd170e07 gpm-1.20.1-patches-1.4.tar.bz2 8049
+MD5 ded7710f3b39ce0a7ed80623925c1a4d gpm-1.20.1-patches-1.5.tar.bz2 9045
+RMD160 911d3e6f2d4c37f9d1fedf436b346969331e9ce2 gpm-1.20.1-patches-1.5.tar.bz2 9045
+SHA256 9aeb116b17258ac4729c8476edef8d8efed332213df07e0a879061c152812d0c gpm-1.20.1-patches-1.5.tar.bz2 9045
 MD5 2c63e827d755527950d9d13fe3d87692 gpm-1.20.1.tar.bz2 565014
 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 gpm-1.20.1.tar.bz2 565014
 SHA256 11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936 gpm-1.20.1.tar.bz2 565014
diff --git a/sys-libs/gpm/files/gpm-OPEN_MAX.patch b/sys-libs/gpm/files/gpm-OPEN_MAX.patch
deleted file mode 100644
index 34384ce28624..000000000000
--- a/sys-libs/gpm/files/gpm-OPEN_MAX.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/files/gpm-daemon.patch b/sys-libs/gpm/files/gpm-daemon.patch
deleted file mode 100644
index 75bbb9945c49..000000000000
--- a/sys-libs/gpm/files/gpm-daemon.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 -ur a/src/startup.c b/src/startup.c
---- a/src/startup.c	2002-12-24 22:57:16.000000000 +0000
-+++ b/src/startup.c	2007-07-06 23:33:50.000000000 +0100
-@@ -29,7 +29,7 @@
- #include <sys/types.h>  /* geteuid, mknod */
- #include <sys/stat.h>   /* mknod */
- #include <fcntl.h>      /* mknod */
--#include <unistd.h>     /* mknod */
-+#include <unistd.h>     /* mknod, daemon */
- 
- 
- #include "headers/gpmInt.h"
-@@ -134,26 +134,17 @@
-       }
-    }
- 
--   if(option.run_status == GPM_RUN_STARTUP ) { /* else is debugging */
--      /* goto background and become a session leader (Stefan Giessler) */  
--      switch(fork()) {
--         case -1: gpm_report(GPM_PR_OOPS,GPM_MESS_FORK_FAILED);   /* error  */
--         case  0: option.run_status = GPM_RUN_DAEMON; break;      /* child  */
--         default: _exit(0);                                       /* parent */
--      }
-+   if (option.run_status == GPM_RUN_STARTUP ) { /* else is debugging */
-+      if (daemon(0,0))
-+         gpm_report(GPM_PR_OOPS,GPM_MESS_FORK_FAILED);   /* error  */
- 
--      if (setsid() < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_SETSID_FAILED);
-+      option.run_status = GPM_RUN_DAEMON; /* child  */
-    }
- 
-    /* damon init: check whether we run or not, display message */
-    check_uniqueness();
-    gpm_report(GPM_PR_INFO,GPM_MESS_STARTED);
- 
--   /* is changing to root needed, because of relative paths ? or can we just
--    * remove and ignore it ?? FIXME */
--   if (chdir("/") < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_CHDIR_FAILED);
--
--   
-    //return mouse_table[1].fd; /* the second is handled in the main() */
- 
-    /****************** OLD CODE from gpn.c  END ***********************/
diff --git a/sys-libs/gpm/gpm-1.20.1-r6.ebuild b/sys-libs/gpm/gpm-1.20.1-r6.ebuild
index ec0b80222294..f8c305ec4759 100644
--- a/sys-libs/gpm/gpm-1.20.1-r6.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r6.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2007/11/01 19:09:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r6.ebuild,v 1.3 2007/11/12 06:57:47 vapier Exp $
 
 # emacs support disabled due to Bug 99533
 
 inherit eutils toolchain-funcs
 #elisp-common
 
-PATCH_VER="1.4"
+PATCH_VER="1.5"
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="http://linux.schottelius.org/gpm/"
 SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2
@@ -28,8 +28,6 @@ src_unpack() {
 	cd "${S}"
 	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() {