sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (474deb38278c0c272b1e5a93c0038a7ddb264336)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (474deb38278c0c272b1e5a93c0038a7ddb264336)
Date: Sat, 1 Dec 2007 03:38:18 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/gpm/BUILD | 4 +++-
utils/gpm/HISTORY | 9 +++++++++
utils/gpm/PRE_BUILD | 10 +++++++---
utils/gpm/gpm-OPEN_MAX-1.patch | 14 ++++++++++++++
utils/gpm/gpm-OPEN_MAX-2.patch | 14 ++++++++++++++
5 files changed, 47 insertions(+), 4 deletions(-)

New commits:
commit 474deb38278c0c272b1e5a93c0038a7ddb264336
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gpm: OPEN_MAX patches updated to apply cleanly against 1.20.1

commit 35ad9d1889fe5b8d0c75db6bccad48c1f3ccbb23
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gpm: Fails to compile with multiple make jobs

commit 7859c9d086db5be7372deb88aea63d6f68bbc31d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gpm: Fix compile (Bug #14109)

diff --git a/utils/gpm/BUILD b/utils/gpm/BUILD
index ab13ac0..ddd570e 100755
--- a/utils/gpm/BUILD
+++ b/utils/gpm/BUILD
@@ -8,4 +8,6 @@ LDFLAGS="$LDFLAGS -lm" &&
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
sedit "s/src doc contrib/src contrib/" Makefile &&
-make
+make_single &&
+make &&
+make_normal
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index ff490ac..402c445 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,12 @@
+2007-12-01 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gpm-OPEN_MAX-1.patch and gpm-OPEN_MAX-2.patch
+ (Bug #14109)
+ * BUILD: Fails to compile with multiple make jobs
+ * gpm-OPEN_MAX-1.patch: Patch from P. Berens to fix Bug #14109
+ Updated to apply cleanly against 1.20.1
+ * gpm-OPEN_MAX-2.patch: Patch from P. Berens to fix Bug #14109
+ Updated to apply cleanly against 1.20.1
+
2006-07-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: make the dialogs optional #11598 and clean it up
* FINAL: insert default values if none were specified
diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD
index c426d5d..5a905fd 100755
--- a/utils/gpm/PRE_BUILD
+++ b/utils/gpm/PRE_BUILD
@@ -1,3 +1,7 @@
-default_pre_build &&
-patch $SOURCE_DIRECTORY/src/lib/liblow.c \
- $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch
+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
new file mode 100644
index 0000000..b3be5f0
--- /dev/null
+++ b/utils/gpm/gpm-OPEN_MAX-1.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..502d624
--- /dev/null
+++ b/utils/gpm/gpm-OPEN_MAX-2.patch
@@ -0,0 +1,14 @@
+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 */
+

[SM-Commit] GIT changes to master grimoire by Eric Sandall (474deb38278c0c272b1e5a93c0038a7ddb264336), Eric Sandall, 12/01/2007