From 83c96f9c5aa7371dfac8b57ebbf18a2807d7514a093fc3c23b2cc37a9cf82432 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 10 Jan 2008 02:15:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=14 --- startpar-0.50.dif | 109 +++++++++++++++++++++++++++++++++++++++++++++- sysvinit.changes | 5 +++ sysvinit.spec | 6 ++- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/startpar-0.50.dif b/startpar-0.50.dif index c6c8b53..eb3ead3 100644 --- a/startpar-0.50.dif +++ b/startpar-0.50.dif @@ -1,3 +1,26 @@ +--- COPYING ++++ COPYING 2008-01-07 15:43:31.885812792 +0100 +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -304,8 +304,9 @@ the "copyright" line and a pointer to wh + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ along with this program; if not, write to the ++ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ MA 02110-1301, USA. + + + Also add information on how to contact you by electronic and paper mail. --- makeboot.c +++ makeboot.c 2007-10-31 18:42:03.145266987 +0100 @@ -339,6 +339,10 @@ struct makenode *pickup_task(void) @@ -48,8 +71,78 @@ + return 0; +} +#endif +--- proc.c ++++ proc.c 2008-01-07 15:43:31.809803114 +0100 +@@ -13,8 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING); if not, write to the +- * Free Software Foundation, Inc., +- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + **************************************************************** + */ +@@ -69,6 +69,7 @@ int read_proc(unsigned long int * const + } + fclose(stat); + ++ /* These fields are not present in /proc/stat for 2.4 kernels */ + running = scan_one(StatBuf, "procs_running"); + blocked = scan_one(StatBuf, "procs_blocked"); + +--- proc.h ++++ proc.h 2008-01-07 15:43:31.913816357 +0100 +@@ -12,8 +12,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING); if not, write to the +- * Free Software Foundation, Inc., +- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + **************************************************************** + */ +--- startpar.8 ++++ startpar.8 2008-01-07 15:43:31.845807697 +0100 +@@ -85,11 +85,11 @@ like behaviour. This option takes three + .IR boot ", " start ", and " stop + for reading + .IR .depend.boot " or " .depend.start " or " .depend.stop +-repectivly in the directory ++respectively in the directory + .IR /etc/init.d/ . + By scanning the boot and runlevel directories in + .I /etc/init.d/ +-it then executes the appropiate scripts in parallel. ++it then executes the appropriate scripts in parallel. + + .SH FILES + .I /etc/init.d/.depend.boot +@@ -101,7 +101,7 @@ it then executes the appropiate scripts + .SH SEE ALSO + .BR init.d (7), + .BR insserv (8), +-.BR startproc (8) ++.BR startproc (8). + + .SH COPYRIGHT + 2003,2004 SuSE Linux AG, Nuernberg, Germany. --- startpar.c -+++ startpar.c 2007-10-31 17:49:27.179001593 +0100 ++++ startpar.c 2008-01-07 15:43:31.801802095 +0100 +@@ -12,8 +12,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING); if not, write to the +- * Free Software Foundation, Inc., +- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + **************************************************************** + */ @@ -72,7 +72,7 @@ struct prg { static struct prg *prgs; static int inpar, par; @@ -83,3 +176,17 @@ break; default: usage(1); +@@ -1036,9 +1036,13 @@ int main(int argc, char **argv) + exit (1); + } + #endif ++#if VERBOSE + printf(i ? " %d" : "%d", resvec[i]); ++#endif /* VERBOSE */ + } ++#if VERBOSE + printf("\n"); ++#endif /* VERBOSE */ + } + return 0; + } diff --git a/sysvinit.changes b/sysvinit.changes index a74c1b5..9b50d79 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 7 15:45:23 CET 2008 - werner@suse.de + +- Add cosmetic patch for startpar from the Debian people + ------------------------------------------------------------------- Fri Nov 30 14:00:20 CET 2007 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index 6cd4530..0d5d1fd 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -1,7 +1,7 @@ # # spec file for package sysvinit (Version 2.86) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -22,7 +22,7 @@ Group: System/Base PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 112 +Release: 118 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: sysvinit-2.86.tar.bz2 @@ -284,6 +284,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_mandir}/man8/startpar.8.gz %changelog +* Mon Jan 07 2008 - werner@suse.de +- Add cosmetic patch for startpar from the Debian people * Fri Nov 30 2007 - werner@suse.de - New version 2.13 of killproc * Add support for more than one ignore pid file (bug #343227)