gpm: 1.20.5

6 files changed, 11 insertions, 53 deletions

diff --git a/utils/gpm/DETAILS b/utils/gpm/DETAILS
index 12f60f32c6..5bf7678b1e 100755
--- a/utils/gpm/DETAILS
+++ b/utils/gpm/DETAILS
@@ -1,13 +1,11 @@
            SPELL=gpm
-         VERSION=1.20.1
+         VERSION=1.20.5
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:876caa90a5bcda10a6c25656e0239dc5147ae34ad9db56c4b13c00bc1a178ed6198af3bbfdda11ebed5fe25312cf83af9b27ea7529024503d80cfcf073ffc8fe
+     SOURCE_HASH=sha512:34ac9e649cfd09eb2d6a5af85b829032e257ae0cac30e28afb968e3772d37e187b991b5cc2cc7d6c025baf6f5925dbb820a98bf4a97c3fd12f6a8198f6193cc5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://arcana.linux.it/pub/$SPELL/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.schottelius.org/pub/linux/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://linux.schottelius.org/gpm/archives/$SOURCE
         WEB_SITE=http://linux.schottelius.org/gpm/
          ENTERED=20011003
-         UPDATED=20030822
         KEYWORDS="utils"
            SHORT="GPM is a mouse server for the console and xterm"
 cat << EOF
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index 402c445492..5c3b06cbed 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,11 @@
+2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* gpm-OPEN_MAX-2.patch: removed, no longer needed
+	* gpm-OPEN_MAX-1.patch: removed, no longer needed
+	* PRE_BUILD: removed, no longer needed
+	* gpm.1.20.1-pts.patch: removed, no longer needed
+	* DETAILS: Fixed SOURCE_URL[0]
+	  updated spell to 1.20.5
+
 2007-12-01 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gpm-OPEN_MAX-1.patch and gpm-OPEN_MAX-2.patch
 	  (Bug #14109)
diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD
deleted file mode 100755
index 5a905fdfc9..0000000000
--- a/utils/gpm/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build                              &&
-patch  $SOURCE_DIRECTORY/src/lib/liblow.c      \
-       $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch  &&
-patch  $SOURCE_DIRECTORY/src/prog/gpm-root.y   \
-       $SCRIPT_DIRECTORY/gpm-OPEN_MAX-1.patch  &&
-patch  $SOURCE_DIRECTORY/src/special.c         \
-       $SCRIPT_DIRECTORY/gpm-OPEN_MAX-2.patch
diff --git a/utils/gpm/gpm-OPEN_MAX-1.patch b/utils/gpm/gpm-OPEN_MAX-1.patch
deleted file mode 100644
index b3be5f0fd1..0000000000
--- a/utils/gpm/gpm-OPEN_MAX-1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur gpm-1.20.1.orig/src/prog/gpm-root.y gpm-1.20.1/src/prog/gpm-root.y
---- gpm-1.20.1.orig/src/prog/gpm-root.y	2007-12-01 01:32:11.225537231 -0800
-+++ gpm-1.20.1/src/prog/gpm-root.y	2007-12-01 01:33:21.339840854 -0800
-@@ -525,7 +525,9 @@
- 	            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/utils/gpm/gpm-OPEN_MAX-2.patch b/utils/gpm/gpm-OPEN_MAX-2.patch
deleted file mode 100644
index 502d62447c..0000000000
--- a/utils/gpm/gpm-OPEN_MAX-2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur gpm-1.20.1.orig/src/special.c gpm-1.20.1/src/special.c
---- gpm-1.20.1.orig/src/special.c	2007-12-01 01:32:11.225537231 -0800
-+++ gpm-1.20.1/src/special.c	2007-12-01 01:34:00.774824800 -0800
-@@ -155,7 +155,9 @@
-       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
-       open(option.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",command,(char *)NULL);
-       exit(1); /* shouldn't happen */
-       
diff --git a/utils/gpm/gpm.1.20.1-pts.patch b/utils/gpm/gpm.1.20.1-pts.patch
deleted file mode 100644
index 28341cadc7..0000000000
--- a/utils/gpm/gpm.1.20.1-pts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gpm-1.20.1.orig/src/lib/liblow.c gpm-1.20.1/src/lib/liblow.c
---- gpm-1.20.1.orig/src/lib/liblow.c	2005-07-30 13:19:07.969733048 -0700
-+++ gpm-1.20.1/src/lib/liblow.c	2005-07-30 13:19:31.889096752 -0700
-@@ -199,7 +199,8 @@
-    Gpm_Stst *new = NULL;
-    char* sock_name = 0;
- 
--   option.consolename = NULL;
-+   if (!checked_con)
-+      option.consolename = NULL;
- 
-    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
-