[packages/rc-scripts] - up to 0.4.17

adwol adwol at pld-linux.org
Tue Sep 4 17:33:57 CEST 2018


commit cb4a6d8007d3873a80444fcd2bd7e97bae28cb96
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Tue Sep 4 17:33:19 2018 +0200

    - up to 0.4.17

 rc-scripts-git.patch            | 39 ---------------------------------------
 rc-scripts-modprobe-cache.patch | 10 ----------
 rc-scripts-selinuxfs.patch      | 40 ----------------------------------------
 rc-scripts-sysctl.patch         | 26 --------------------------
 rc-scripts.spec                 | 15 +++------------
 5 files changed, 3 insertions(+), 127 deletions(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index ad8205e..c01a208 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -10,20 +10,16 @@ Summary(fr.UTF-8):	inittab et scripts /etc/rc.d
 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.16
-Release:	6
+Version:	0.4.17
+Release:	1
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	3dada9e3d2a9e182116e906df25f80b3
+# Source0-md5:	5a8bc27f5efb34301ef7f285acc20c98
 Source1:	rc-local.service
 Source2:	sys-chroots.service
 Source3:	%{name}.tmpfiles
-Patch0:		%{name}-git.patch
-Patch1:		%{name}-modprobe-cache.patch
-Patch2:		%{name}-selinuxfs.patch
-Patch3:		%{name}-sysctl.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -141,10 +137,6 @@ po cichu ignorowane.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -260,7 +252,6 @@ done
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
 %doc doc/*.txt doc/template.init
 %doc sysconfig/interfaces/data/chat-ppp*
 %doc sysconfig/interfaces/ifc*
diff --git a/rc-scripts-git.patch b/rc-scripts-git.patch
deleted file mode 100644
index 25428a9..0000000
--- a/rc-scripts-git.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
-index 99bb078..6fdca19 100755
---- a/rc.d/rc.sysinit
-+++ b/rc.d/rc.sysinit
-@@ -326,8 +326,15 @@ init_mdadm() {
- 	fi
- 
- 	show "Starting up RAID devices"; busy
--	/sbin/mdadm --assemble --scan --auto=yes
-+	mdadm_out=$(/sbin/mdadm --assemble --scan --auto=yes 2>&1)
- 	rc=$?
-+
-+	if (echo -n "$mdadm_out" | grep -q "Found some drive for an array that is already active:"); then
-+		rc=0
-+	fi
-+
-+	echo -n "$MDADM_OUT" >&2
-+
- 	if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
- 		# rc is used later too, so set sane value
- 		rc=0
-commit 5d2ee544efe6d27d1b6bc263385c5c9b5bf1b00d
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date:   Thu Jan 18 10:41:54 2018 +0100
-
-    Onlink doesn't work for IPv6, so add gate route manually first.
-
-diff --git a/lib/functions.network b/lib/functions.network
-index bb7a525..d151b04 100644
---- a/lib/functions.network
-+++ b/lib/functions.network
-@@ -299,6 +299,7 @@ setup_ip_gw_ro ()
- 		if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
- 			# set up default route
- 			if [ "${IPV6_GLOBALROUTEGW}" ]; then
-+				ip -6 route add ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
- 				ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
- 			elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
- 				ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
diff --git a/rc-scripts-modprobe-cache.patch b/rc-scripts-modprobe-cache.patch
deleted file mode 100644
index 98a80f8..0000000
--- a/rc-scripts-modprobe-cache.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rc-scripts-0.4.15/rc.d/rc.sysinit.orig	2016-06-19 20:27:45.987376063 +0200
-+++ rc-scripts-0.4.15/rc.d/rc.sysinit	2016-06-19 20:27:50.154042707 +0200
-@@ -47,6 +47,7 @@
- 
- 	# filter only what is wanted by this script: aliases and options
- 	modprobe_c_cache=$(modprobe -c | grep -E '^(alias|options)')
-+	echo "$modprobe_c_cache"
- }
- 
- # parse kernel cmdline
diff --git a/rc-scripts-selinuxfs.patch b/rc-scripts-selinuxfs.patch
deleted file mode 100644
index 56396b7..0000000
--- a/rc-scripts-selinuxfs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- rc-scripts-0.4.15/rc.d/rc.sysinit.orig	2016-06-19 20:33:41.190705364 +0200
-+++ rc-scripts-0.4.15/rc.d/rc.sysinit	2016-06-19 20:51:05.967360163 +0200
-@@ -124,10 +124,11 @@
- 	if ! grep -Fq selinuxfs /proc/filesystems; then
- 		# no support in kernel, no chance
- 		SELINUX=no
-+		return
- 	fi
- 
--	if ! is_fsmounted selinuxfs /selinux; then
--		mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
-+	if ! is_fsmounted selinuxfs $selinuxfsdir; then
-+		mount -n -o gid=17 -t selinuxfs selinuxfs $selinuxfsdir
- 	fi
- 
- 	# Check SELinux status
-@@ -424,6 +425,12 @@
- 		mount -n -o gid=17 -t securityfs securityfs /sys/kernel/security
- 	fi
- 
-+	if [ -d /sys/fs/selinux ]; then
-+		# Linux 3.0+
-+		selinuxfsdir=/sys/fs/selinux
-+	else
-+		selinuxfsdir=/selinux
-+	fi
- 	init_selinux
- 
- 	# PLD Linux LiveCD support
-@@ -695,8 +702,8 @@
- 		fi
- 	fi
- 
--	if is_fsmounted selinuxfs /selinux; then
--		mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
-+	if is_fsmounted selinuxfs $selinuxfsdir; then
-+		mount -f -t selinuxfs selinuxfs $selinuxfsdir 2> /dev/null
- 	fi
- 
- 	if [ ! -f /proc/modules ]; then
diff --git a/rc-scripts-sysctl.patch b/rc-scripts-sysctl.patch
deleted file mode 100644
index 6b2f701..0000000
--- a/rc-scripts-sysctl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 2cb59275d1432da76a021416a7e65718476cebea
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date:   Fri Jan 5 19:32:28 2018 +0100
-
-    Quote filename when checking. Without that * is expanded causing problems.
-
-diff --git a/lib/functions b/lib/functions
-index 74f4c95..9716981 100644
---- a/lib/functions
-+++ b/lib/functions
-@@ -182,12 +182,12 @@ apply_sysctl() {
- 
- 	local file
- 	for file in /usr/lib/sysctl.d/*.conf; do
--		[ -f /run/sysctl.d/${file##*/} ] && continue
--		[ -f /etc/sysctl.d/${file##*/} ] && continue
-+		[ -f "/run/sysctl.d/${file##*/}" ] && continue
-+		[ -f "/etc/sysctl.d/${file##*/}" ] && continue
- 		test -f "$file" && sysctl -q -e -p "$file"
- 	done
- 	for file in /run/sysctl.d/*.conf; do
--		[ -f /etc/sysctl.d/${file##*/} ] && continue
-+		[ -f "/etc/sysctl.d/${file##*/}" ] && continue
- 		test -f "$file" && sysctl -q -e -p "$file"
- 	done
- 	for file in /etc/sysctl.d/*.conf; do
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/cb4a6d8007d3873a80444fcd2bd7e97bae28cb96



More information about the pld-cvs-commit mailing list