-diff -Nur rc-scripts-0.3.1.orig/rc.d/rc.shutdown rc-scripts-0.3.1/rc.d/rc.shutdown
---- rc-scripts-0.3.1.orig/rc.d/rc.shutdown 2002-01-27 03:13:29.000000000 +0100
-+++ rc-scripts-0.3.1/rc.d/rc.shutdown 2003-08-12 22:10:22.520436368 +0200
+--- rc-scripts-0.4.0.2/rc.d/rc.shutdown.orig 2003-10-12 15:24:49.000000000 +0200
++++ rc-scripts-0.4.0.2/rc.d/rc.shutdown 2003-10-12 15:26:49.901497848 +0200
@@ -29,8 +29,9 @@
halt -w
if [ -x /sbin/quotaoff ]; then
run_cmd "Turning off quotas for local filesystems" /sbin/quotaoff -a
-diff -Nur rc-scripts-0.3.1.orig/rc.d/rc.sysinit rc-scripts-0.3.1/rc.d/rc.sysinit
---- rc-scripts-0.3.1.orig/rc.d/rc.sysinit 2003-08-12 22:06:07.000000000 +0200
-+++ rc-scripts-0.3.1/rc.d/rc.sysinit 2003-08-12 22:08:49.104637728 +0200
-@@ -550,8 +550,8 @@
+--- rc-scripts-0.4.0.2/rc.d/rc.sysinit.orig 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/rc.d/rc.sysinit 2003-10-12 15:27:42.869445496 +0200
+@@ -610,8 +610,8 @@
fi
# Turn on process accounting
-if [ -x /sbin/accton ] ; then
- run_cmd "Turning on process accounting" /sbin/accton /var/log/pacct
-+if [ -x /etc/rc.d/rc.acct ] ; then
-+ /etc/rc.d/rc.acct start
++if [ -x /etc/rc.d/rc.acct ]; then
++ /etc.rc.d/rc.acct start
fi
# Set the clock if timezone definition wasn't available (eg. /usr not mounted)
+--- rc-scripts-0.4.0.2/po/rc-scripts.pot.orig 2003-10-02 20:47:28.000000000 +0200
++++ rc-scripts-0.4.0.2/po/rc-scripts.pot 2003-10-12 15:28:18.477032320 +0200
+@@ -24,7 +24,7 @@
+
+ #: ../rc.d/.svn/text-base/rc.shutdown.svn-base:31
+ #: ../rc.d/rc.shutdown:31
+-msgid "Turning off swap and accounting"
++msgid "Turning off swap"
+ msgstr ""
+
+ #: ../sysconfig/network-scripts/.svn/text-base/ifup-aliases.svn-base:14
+@@ -447,12 +447,6 @@
+ msgid "(RAID Repair)# "
+ msgstr ""
+
+-#: ../rc.d/.svn/text-base/rc.sysinit.svn-base:613
+-#: ../rc.d/rc.sysinit~:614
+-#: ../rc.d/rc.sysinit:613
+-msgid "Turning on process accounting"
+-msgstr ""
+-
+ #: ../rc.d/.svn/text-base/rc.sysinit.svn-base:76
+ #: ../rc.d/rc.sysinit~:76
+ #: ../rc.d/rc.sysinit:76
+--- rc-scripts-0.4.0.2/po/pl.po.orig 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/po/pl.po 2003-10-12 15:28:38.561978944 +0200
+@@ -58,8 +58,8 @@
+ msgstr "Wysylanie do wszystkich procesów sygnalu KILL"
+
+ #: ./rc.d/rc.shutdown:32
+-msgid "Turning off swap and accounting"
+-msgstr "Wylaczanie swapa i zliczania"
++msgid "Turning off swap"
++msgstr "Wylaczanie swapa"
+
+ #: ./rc.d/rc.shutdown:36
+ msgid "Turning off quotas for local filesystems"
+@@ -283,10 +283,6 @@
+ msgid "Turning on quotas for local filesystems"
+ msgstr "Wlaczanie quot na lokalnych systemach plików"
+
+-#: ./rc.d/rc.sysinit:542
+-msgid "Turning on process accounting"
+-msgstr "Wlaczanie zliczania procesów"
+-
+ #: ./rc.d/rc.sysinit:558
+ msgid "Setting %s seconds for kernel reboot after panic"
+ msgstr "Restart systemu po %s sekundach od zawieszenia sie jadra"
+--- rc-scripts-0.4.0.2/po/de.po.orig 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/po/de.po 2003-10-12 15:29:34.916411768 +0200
+@@ -125,7 +125,7 @@
+
+ #: ../rc.d/rc.shutdown:32
+ msgid "Turning off swap and accounting"
+-msgstr "Die Auslagerung und das Protokollieren werden ausgeschaltet"
++msgstr "Die Auslagerung wird ausgeschaltet"
+
+ #: ../rc.d/rc.shutdown:42 ../rc.d/rc.sysinit:190 ../rc.d/rc.sysinit:346
+ #: ../rc.d/rc.sysinit:375
---- ./po/pl.po.org Thu Jan 24 15:09:34 2002
-+++ ./po/pl.po Thu Jul 25 17:53:38 2002
-@@ -553,8 +553,8 @@
- msgstr "Ustawianie statycznych wpisów RARP"
-
- #: ./rc.d/rc.sysinit:55
--msgid "\t\t\t%sPowered by %sPLD GNU/Linux%s"
--msgstr "\t\t\t%sNapedzane przez %sPLD GNU/Linux%s"
-+msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s"
-+msgstr "\t\t\t%sNapedzane przez %sPLD Linux Distribution%s"
-
- #: ./rc.d/init.d/functions:110
- msgid "ERROR: Networking is down. %s can't be run."
---- ./po/rc-scripts.pot.org Sun Jan 27 05:04:18 2002
-+++ ./po/rc-scripts.pot Thu Jul 25 17:54:39 2002
-@@ -576,7 +576,7 @@
- msgstr ""
-
- #: ../rc.d/rc.sysinit:55
--msgid "\t\t\t%sPowered by %sPLD GNU/Linux%s"
-+msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s"
- msgstr ""
-
- #: ../rc.d/init.d/functions:123
---- ./rc.d/rc.sysinit.org Sun Jan 27 03:13:50 2002
-+++ ./rc.d/rc.sysinit Thu Jul 25 17:52:40 2002
-@@ -53,7 +53,7 @@
- fi
-
- # Print welcome message
--nls "\t\t\t%sPowered by %sPLD GNU/Linux%s" "$(termput setaf 6)" "$(termput setaf 2)" "$(termput setaf 7)"
-+nls "\t\t\t%sPowered by %sPLD Linux Distribution%s" "$(termput setaf 6)" "$(termput setaf 2)" "$(termput setaf 7)"
- if is_yes "$PROMPT"; then
- nls -n "\t\t Press %sI%s to enter interactive startup." "$(termput setaf 1)" "$(termput setaf 7)"
- echo
---- rc-scripts-0.3.1.orig/README Tue May 15 18:05:58 2001
-+++ rc-scripts-0.3.1/README Tue Jul 30 15:18:59 2002
-@@ -36,5 +36,5 @@
- use our Bug Tracking System ( http://bugs.pld.org.pl/ ).
-
- --
--PLD GNU/Linux rc-scripts Team,
-+PLD Linux rc-scripts Team,
-
---- rc-scripts-0.3.1.orig/rc.d/init.d/functions.network Mon Nov 19 20:07:17 2001
-+++ rc-scripts-0.3.1/rc.d/init.d/functions.network Tue Jul 30 15:19:41 2002
-@@ -140,7 +140,7 @@
+--- rc-scripts-0.4.0.2/sysconfig/network-scripts/functions.network.orig 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/sysconfig/network-scripts/functions.network 2003-10-12 15:36:26.392857840 +0200
+@@ -64,7 +64,7 @@
fi
}
-# PLD GNU/Linux network functions
-+# PLD Linux network functions
- # Copyright (C) 1999, 2000 Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
++# PLD Linux Distribution network functions
+ # Copyright (C) 1999, 2000 Arkadiusz Mi¶kiewicz <misiek@pld-linux.org>
# Setup Network Address Translation (NAT)
-diff -Nur rc-scripts-0.3.1.orig/rc.d/init.d/functions rc-scripts-0.3.1/rc.d/init.d/functions
---- rc-scripts-0.3.1.orig/rc.d/init.d/functions 2002-01-13 04:40:42.000000000 +0100
-+++ rc-scripts-0.3.1/rc.d/init.d/functions 2003-08-12 23:35:08.555241552 +0200
-@@ -238,13 +238,18 @@
+diff -Nur rc-scripts-0.4.0.2.orig/rc.d/init.d/functions rc-scripts-0.4.0.2/rc.d/init.d/functions
+--- rc-scripts-0.4.0.2.orig/rc.d/init.d/functions 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/rc.d/init.d/functions 2003-10-12 15:50:17.035580952 +0200
+@@ -263,13 +263,18 @@
return $exit_code
}
-# A function to start a program (now it's usefull on read-only filesystem too)
+# A function to start a program (now it's useful on read-only filesystem too)
- daemon()
+ daemon()
{
- typeset errors="" prog=""
+ typeset errors="" prog="" limits=""
+ # Test syntax. Don't use -o instead || here - this will break ksh --misiek
while [ "$1" != "${1##-}" ] || [ "$1" != "${1##+}" ]; do
case $1 in
- '') msg_usage " daemon [--user user] [+/-nicelevel] {program}"
-@@ -273,20 +279,19 @@
+ '')
+@@ -299,20 +304,18 @@
prog="$prog $*"
fi
+ limits="${SERVICE_LIMITS:-$DEFAULT_SERVICE_LIMITS}"
# elif [ -n "`$SH -c 'echo ${.sh.version}' 2>/dev/null`" ]; then
fi
-+ # soft limits first - it's impossible to set hard limit lower than existing soft
+ while echo "$limits" | grep -q '[^ ]'; do
+ ulimit `echo ${limits} | sed -e 's/^ *\(-[^-]*\)\(-.*\)\?$/\1/'`
+ limits="`echo ${limits} | sed -e 's/^ *\(-[^-]*\)\(-.*\)\?$/\2/'`"
# And start it up.
busy
-diff -Nur rc-scripts-0.3.1.orig/sysconfig/system rc-scripts-0.3.1/sysconfig/system
---- rc-scripts-0.3.1.orig/sysconfig/system 2001-05-15 18:05:59.000000000 +0200
-+++ rc-scripts-0.3.1/sysconfig/system 2003-08-12 23:32:38.022126064 +0200
+diff -Nur rc-scripts-0.4.0.2.orig/sysconfig/system rc-scripts-0.4.0.2/sysconfig/system
+--- rc-scripts-0.4.0.2.orig/sysconfig/system 2003-10-02 20:46:49.000000000 +0200
++++ rc-scripts-0.4.0.2/sysconfig/system 2003-10-12 15:50:53.502037208 +0200
@@ -17,6 +17,17 @@
# $SERVICE_RUN_NICE_LEVEL is not defined in /etc/sysconfig/<service>
DEFAULT_SERVICE_RUN_NICE_LEVEL=0
+# users' limits are set via pam_limits.
+DEFAULT_SERVICE_LIMITS="-u unlimited -c 0"
+
- # Run isapnp at system startup ?
- RUN_ISAPNP=yes
-
+ # Setup PNP using userspace tools?
+ RUN_USERPNP=yes
+ # Setup kernel space PNP (2.4.x)
-# $Id: rc-scripts.spec,v 1.127 2003-10-08 14:56:09 havner Exp $
+# $Id: rc-scripts.spec,v 1.128 2003-10-12 19:05:30 qboosh Exp $
+#
+# Conditional build:
+%bcond_without static # link binaries with glib dynamically
+#
Summary: inittab and /etc/rc.d scripts
Summary(de): inittab und /etc/rc.d Scripts
Summary(fr): inittab et scripts /etc/rc.d
Source0: %{name}-%{version}.tar.gz
# Source0-md5: 1b5e2d3a0cb8f699ed54321404f64cba
URL: http://cvs.pld-linux.org/rc-scripts/
-Patch0: rc-scripts-sysfs.patch
+Patch0: %{name}-sysfs.patch
+Patch1: %{name}-killgnu.patch
+Patch2: %{name}-acct.patch
+Patch3: %{name}-ulimits.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: glib-devel
-%{!?_without_static:BuildRequires: glib-static}
+%{?with_static:BuildRequires: glib-static}
BuildRequires: popt-devel
Requires(post): fileutils
Requires: /bin/awk
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__aclocal}
%configure \
--with-localedir=%{localedir}
%{__make} \
- %{?_without_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
+ %{!?with_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- %{?_without_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
+ %{!?with_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
for i in 0 1 2 3 4 5 6; do
install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
projects / packages / rc-scripts.git / commitdiff