- rel.2 - makepid functionality to daemon function

Changed files:
    rc-scripts-makepid.patch -> 1.1
    rc-scripts.spec -> 1.293

diff --git a/rc-scripts-makepid.patch b/rc-scripts-makepid.patch
new file mode 100644 (file)
index 0000000..30bb2f8
--- /dev/null
+++ b/rc-scripts-makepid.patch
@@ -0,0 +1,37 @@
+Index: rc.d/init.d/functions
+===================================================================
+--- rc.d/init.d/functions      (wersja 10098)
++++ rc.d/init.d/functions      (kopia robocza)
+@@ -497,12 +497,12 @@
+       typeset errors="" prog="" end="" waitname="" waittime=""
+       typeset -i exit_code=0
+       local nice=$SERVICE_RUN_NICE_LEVEL
+-      local fork user closefds pidfile chdir=/
++      local fork user closefds pidfile makepid chdir=/
+ 
+       while [ $# -gt 0 ]; do
+               case $1 in
+               '')
+-                      msg_usage " daemon [--user user] [--fork] [--waitforname procname] [--waitfortime seconds] [+/-nicelevel] {program} <program args>"
++              msg_usage " daemon [--check] [--user user] [--fork] [--chdir directory] [--closefds] [--waitforname procname] [--waitfortime seconds] [--pidfile file] [--makepid] [+/-nicelevel] {program} <program args>"
+                       return 2
+                       ;;
+               --check)
+@@ -539,6 +539,9 @@
+                       shift
+                       pidfile="$1"
+                       ;;
++              --makepid)
++                      makepid=1
++                      ;;
+               -*|+*)
+                       nice=$1
+                       shift
+@@ -601,6 +604,7 @@
+                               ${user:+-c $user} \
+                               ${chdir:+--chdir "$chdir"} \
+                               ${fork:+-b} \
++                              ${makepid:+-m} \
+                               --exec "$prog" \
+                               -- ${1:+"$@"}
+               else

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 7fbdd2f4133acb9ed67408b94b363d4c57afc33a..d0d90d1fc24a94db269b0400ed8bf00dd8f3f2d6 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,12 +9,13 @@ Summary(pl.UTF-8):    inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.1.26
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: d4d44fd0c8003b19392ae0d9a90b8eb5
+Patch0:                %{name}-makepid.patch
 URL:           http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -96,6 +97,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__aclocal}