rel 11; kill the other double free() in pidof

[packages/SysVinit.git] / sysvinit-paths.patch

diff --git a/sysvinit-paths.patch b/sysvinit-paths.patch
index d27f5c3450ccb08ccb5541a20c2595d3f246a8d3..31061aebab5a1b3da3c74ea9bfd1105dc52e3be7 100644 (file)
--- a/sysvinit-paths.patch
+++ b/sysvinit-paths.patch
@@ -1,66 +1,6 @@
---- sysvinit-2.86/src/Makefile.orig    2004-06-09 14:47:45.000000000 +0200
-+++ sysvinit-2.86/src/Makefile 2004-12-26 22:40:47.622737944 +0100
-@@ -9,7 +9,8 @@
- #
- 
- CC    = gcc
--CFLAGS        = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
-+OPTIMIZE = -O2 -fomit-frame-pointer
-+CFLAGS        = -Wall $(OPTIMIZE) -D_GNU_SOURCE
- LDFLAGS       = -s
- STATIC        =
- 
-@@ -26,7 +27,7 @@
- ifeq ($(DISTRO),)
- BIN   += mountpoint
- SBIN  += sulogin bootlogd
--USRBIN        += utmpdump wall
-+USRBIN        += utmpx-dump wall
- MAN1  += mountpoint.1 wall.1
- MAN8  += sulogin.8 bootlogd.8
- endif
-@@ -71,7 +72,7 @@
- mountpoint:   mountpoint.o
-               $(CC) $(LDFLAGS) -o $@ mountpoint.o
- 
--utmpdump:     utmpdump.o
-+utmpx-dump:   utmpdump.o
-               $(CC) $(LDFLAGS) -o $@ utmpdump.o
- 
- runlevel:     runlevel.o
---- sysvinit-2.86/src/paths.h.orig     2004-06-09 14:47:45.000000000 +0200
-+++ sysvinit-2.86/src/paths.h  2004-12-26 22:41:21.122645184 +0100
-@@ -25,7 +25,7 @@
- #define SDPID         "/var/run/shutdown.pid" /* PID of shutdown program */
- #define SHELL         "/bin/sh"               /* Default shell */
- #define SULOGIN               "/sbin/sulogin"         /* Sulogin */
--#define INITSCRIPT    "/etc/initscript"       /* Initscript. */
-+#define INITSCRIPT    "/etc/rc.d/rc.init"     /* Initscript. */
- #define PWRSTAT               "/etc/powerstatus"      /* COMPAT: SIGPWR reason (OK/BAD) */
- 
- #if 0
---- sysvinit-2.85.orig/src/utmpdump.c  Tue Sep 12 23:14:24 2000
-+++ sysvinit-2.85/src/utmpdump.c       Thu Apr 24 12:05:06 2003
-@@ -265,14 +265,14 @@
-       }
- 
-       if (optind < argc) {
--              fprintf(stderr, "Utmp %sdump of %s\n", reverse ? "un" : "", argv[optind]);
-+              fprintf(stderr, "Utmpx %sdump of %s\n", reverse ? "un" : "", argv[optind]);
-               if ((fp = fopen(argv[optind], "r")) == NULL) {
-                       perror("Unable to open file");
-                       exit(1);
-               }
-       }
-       else {
--              fprintf(stderr, "Utmp %sdump of stdin\n", reverse ? "un" : "");
-+              fprintf(stderr, "Utmpx %sdump of stdin\n", reverse ? "un" : "");
-               fp = stdin;
-       }
- 
---- sysvinit-2.86/doc/Propaganda~      1996-01-02 20:20:54.000000000 +0200
-+++ sysvinit-2.86/doc/Propaganda       2009-11-23 00:55:49.324465562 +0200
-@@ -46,7 +46,7 @@
+--- sysvinit-2.88dsf/doc/Propaganda.wiget      2009-09-10 10:28:49.000000000 +0200
++++ sysvinit-2.88dsf/doc/Propaganda    2011-12-03 22:25:33.574721688 +0100
+@@ -46,7 +46,7 @@ Some other general changes:
    /var/run/utmp (it's also shown on the command line if you do a "ps").
  - unreckognized options are silently ignored (such as the infamous
    "ro" - mount root file system read only).
@@ -69,8 +9,8 @@
    all programs that init starts (so that you can set a generic
    umask, ulimit eg for ALL processes - see initscript.sample).
  - A "sulogin" program added that always asks for the root
---- sysvinit-2.86/src/initscript.sample~       1997-11-26 15:06:33.000000000 +0200
-+++ sysvinit-2.86/src/initscript.sample        2009-11-23 01:00:22.490804927 +0200
+--- sysvinit-2.88dsf/src/initscript.sample.wiget       2009-09-10 10:28:49.000000000 +0200
++++ sysvinit-2.88dsf/src/initscript.sample     2011-12-03 22:25:33.574721688 +0100
 @@ -1,14 +1,14 @@
  #
 -# initscript  If this script is intalled as /etc/initscript,
@@ -89,3 +29,14 @@
  #
  # Version:    @(#)initscript 1.10 10-Dec-1995 MvS.
  #
+--- sysvinit-2.88dsf/src/paths.h.wiget 2010-04-11 11:30:27.000000000 +0200
++++ sysvinit-2.88dsf/src/paths.h       2011-12-03 22:30:54.881898668 +0100
+@@ -34,7 +34,7 @@
+ #define SDPID         "/var/run/shutdown.pid" /* PID of shutdown program */
+ #define SHELL         "/bin/sh"               /* Default shell */
+ #define SULOGIN               "/sbin/sulogin"         /* Sulogin */
+-#define INITSCRIPT    "/etc/initscript"       /* Initscript. */
++#define INITSCRIPT    "/etc/rc.d/rc.init"     /* Initscript. */
+ #define PWRSTAT_OLD   "/etc/powerstatus"      /* COMPAT: SIGPWR reason (OK/BAD) */
+ #define PWRSTAT               "/var/run/powerstatus"  /* COMPAT: SIGPWR reason (OK/BAD) */
+