diff --git a/redhat-lsb-lsb_start_daemon-fix.patch b/redhat-lsb-lsb_start_daemon-fix.patch new file mode 100644 index 0000000..69f5f28 --- /dev/null +++ b/redhat-lsb-lsb_start_daemon-fix.patch @@ -0,0 +1,43 @@ +diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon +--- redhat-lsb-3.1/lsb_start_daemon.orig 2009-05-15 11:20:17.000000000 -0400 ++++ redhat-lsb-3.1/lsb_start_daemon 2009-05-15 11:33:03.000000000 -0400 +@@ -4,6 +4,9 @@ + + nice= + force= ++pidfile= ++user= ++check= + RETVAL= + while [ "$1" != "${1##[-+]}" ]; do + case $1 in +@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do + nice=$2 + shift 2 + ;; ++ -p) ++ pidfile="--pidfile $2" ++ shift 2 ++ ;; ++ -u) ++ user="--user $2" ++ shift 2 ++ ;; ++ -c) ++ check="--check $2" ++ shift 2 ++ ;; ++ *) ++ echo "Unknown Option $1" ++ echo "Options are:" ++ echo "-f" ++ echo "-p {pidfile}" ++ echo "-n [+/-nicelevel]" ++ echo "-u {user}" ++ echo "-c {base}" ++ exit 1;; + esac + done +-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $* ++LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $* + exit $? diff --git a/redhat-lsb.spec b/redhat-lsb.spec index b0e8560..a496c66 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -49,10 +49,11 @@ Summary: LSB support for Red Hat Linux Name: redhat-lsb Version: 3.2 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 Patch0: lsb-release-3.1-update-init-functions.patch +Patch1: redhat-lsb-lsb_start_daemon-fix.patch License: GPLv2 Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-root @@ -526,6 +527,7 @@ installed on the system. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build cd lsb-release-%{upstreamlsbrelver} @@ -645,6 +647,9 @@ fi #/usr/X11R6/lib/X11/rgb.txt %changelog +* Wed Oct 21 2009 Tom "spot" Callaway - 3.2-6 +- apply fix from bz485367 (thanks to Jon Thomas) + * Sun Jul 26 2009 Fedora Release Engineering - 3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild