OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Dec-2007 10:47:16
Branch: HEAD Handle: 2007122809471500
Modified files:
openpkg-src/sudosh sudosh.patch sudosh.spec
Log:
apply a segfault fix from sudosh2
Summary:
Revision Changes Path
1.2 +14 -4 openpkg-src/sudosh/sudosh.patch
1.4 +1 -1 openpkg-src/sudosh/sudosh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sudosh/sudosh.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 sudosh.patch
--- openpkg-src/sudosh/sudosh.patch 7 Jan 2007 10:19:17 -0000 1.1
+++ openpkg-src/sudosh/sudosh.patch 28 Dec 2007 09:47:15 -0000 1.2
@@ -1,6 +1,6 @@
Index: src/Makefile.in
--- src/Makefile.in.orig 2005-06-13 04:33:29 +0200
-+++ src/Makefile.in 2007-01-07 10:55:05 +0100
++++ src/Makefile.in 2007-12-28 10:43:39 +0100
@@ -427,7 +427,7 @@
install-sudosh.conf:
@@ -12,7 +12,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: src/getopt.c
--- src/getopt.c.orig 2005-06-13 01:22:42 +0200
-+++ src/getopt.c 2007-01-07 10:54:52 +0100
++++ src/getopt.c 2007-12-28 10:43:39 +0100
@@ -37,6 +37,8 @@
#include "config.h"
#endif
@@ -24,7 +24,7 @@
reject `defined (const)'. */
Index: src/parse.c
--- src/parse.c.orig 2005-06-13 01:22:42 +0200
-+++ src/parse.c 2007-01-07 10:54:52 +0100
++++ src/parse.c 2007-12-28 10:43:39 +0100
@@ -19,7 +19,8 @@
void parse(option * o, const char *file)
{
@@ -35,9 +35,19 @@
char line[BUFSIZ];
char *arg, *cmt, *opt;
config *scan;
+@@ -38,6 +39,9 @@
+ while (isspace(*opt))
+ opt++;
+
++ if (strlen(opt)==0)
++ continue;
++
+ for (i = strlen(opt) - 1; i >= 0 && isspace(opt[i]); i--)
+ opt[i] = '\0';
+
Index: src/sudosh.c
--- src/sudosh.c.orig 2005-06-13 04:35:07 +0200
-+++ src/sudosh.c 2007-01-07 10:54:52 +0100
++++ src/sudosh.c 2007-12-28 10:43:39 +0100
@@ -28,6 +28,13 @@
#define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sudosh/sudosh.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 sudosh.spec
--- openpkg-src/sudosh/sudosh.spec 27 Oct 2007 12:00:20 -0000 1.3
+++ openpkg-src/sudosh/sudosh.spec 28 Dec 2007 09:47:15 -0000 1.4
@@ -33,7 +33,7 @@
Group: ShellUtils
License: Open Software License
Version: 1.8.2
-Release: 20071027
+Release: 20071228
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
