packages: rc-scripts/rc-scripts-svn.patch, rc-scripts/rc-scripts.spec - fix...

[glen]

Author: glen                         Date: Wed Dec 14 17:17:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix nice calc for ksh

---- Files affected:
packages/rc-scripts:
   rc-scripts-svn.patch (1.15 -> 1.16) , rc-scripts.spec (1.379 -> 1.380) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts-svn.patch
diff -u packages/rc-scripts/rc-scripts-svn.patch:1.15 packages/rc-scripts/rc-scripts-svn.patch:1.16
--- packages/rc-scripts/rc-scripts-svn.patch:1.15	Mon Nov 28 21:21:13 2011
+++ packages/rc-scripts/rc-scripts-svn.patch	Wed Dec 14 18:17:47 2011
@@ -1,37 +1,11 @@
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit	(wersja 12419)
-+++ rc.d/rc.sysinit	(kopia robocza)
-@@ -465,25 +465,25 @@
- 	[ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+--- lib/functions	2011-12-14 13:23:27.000000000 +0200
++++ lib/functions	2011-12-14 19:16:08.333233967 +0200
+@@ -643,7 +643,7 @@
+ 		nice=${nice:-0}
  
- 	# Enter root, /proc, /sys and other into mtab.
--	mount -f /
--	mount -f /proc
-+	mount -f / 2> /dev/null
-+	mount -f /proc 2> /dev/null
- 	if is_fsmounted tmpfs /run; then
--		mount -f -t tmpfs run /run
-+		mount -f -t tmpfs run /run 2> /dev/null
- 	fi
+ 		# make nice level absolute, not to be dependant of nice level of shell where service started
+-		nice=$((nice-$(nice)))
++		nice=$(($nice - $(nice)))
  
- 	if is_fsmounted usbfs /proc/bus/usb; then
--		mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb
-+		mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb 2> /dev/null
- 	fi
- 
- 	if is_fsmounted sysfs /sys; then
--		mount -f -t sysfs sysfs /sys
-+		mount -f -t sysfs sysfs /sys 2> /dev/null
- 		if is_fsmounted securityfs /sys/kernel/security ; then
--			mount -f -t securityfs securityfs /sys/kernel/security
-+			mount -f -t securityfs securityfs /sys/kernel/security 2> /dev/null
- 		fi
- 	fi
- 
- 	if is_fsmounted selinuxfs /selinux; then
--		mount -f -t selinuxfs selinuxfs /selinux
-+		mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
- 	fi
- 
- 	emit --no-wait root-filesystem
+ 		if [ "$closefds" = 1 ]; then
+ 			exec 1>&-

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.379 packages/rc-scripts/rc-scripts.spec:1.380
--- packages/rc-scripts/rc-scripts.spec:1.379	Wed Dec 14 12:35:58 2011
+++ packages/rc-scripts/rc-scripts.spec	Wed Dec 14 18:17:47 2011
@@ -10,7 +10,7 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.5.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -19,7 +19,7 @@
 Source1:	rc-scripts-systemd-tmpfiles.d.conf
 Source2:	rc-local.service
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
-#Patch0:		%{name}-svn.patch
+Patch0:		%{name}-svn.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
@@ -118,7 +118,7 @@
 
 %prep
 %setup -q
-#%patch0 -p0
+%patch0 -p0
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -392,6 +392,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.380  2011/12/14 17:17:47  glen
+- fix nice calc for ksh
+
 Revision 1.379  2011/12/14 11:35:58  glen
 - up to 0.4.5.2
 
@@ -493,7 +496,7 @@
 - 0.4.4.0
 
 Revision 1.347  2011/03/10 08:19:59  arekm
-R: iputils-arping
+- R: iputils-arping
 
 Revision 1.346  2011/02/11 14:20:01  sparky
 - static BR: glibc-static
@@ -541,7 +544,7 @@
 - disable upstart on ac
 
 Revision 1.331  2010/06/18 06:35:59  cactus
-- patch0 - fix shutdown/restart on kernels with devtmpfs
+- fix shutdown/restart on kernels with devtmpfs
 
 Revision 1.330  2010/06/16 16:20:36  glen
 - udev conflict was too heavy for ac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.379&r2=1.380&f=u