[packages/rc-scripts] - up to 0.4.20

[baggins]

commit aa0de7b7e2f3e65ba6ca88c678f2e303c26a7458
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 11 20:16:13 2021 +0200

    - up to 0.4.20

 lsmod-fix.patch    | 12 ------------
 lxd-loopback.patch | 12 ------------
 rc-scripts.spec    | 14 +++++---------
 3 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index f9743f7..42b3348 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -10,18 +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.19
-Release:	3
+Version:	0.4.20
+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:	a123c2dd45a676bafab5a14e2c066a35
+# Source0-md5:	cde72affb846648781f8f8540a39037b
 Source1:	rc-local.service
 Source2:	sys-chroots.service
 Source3:	%{name}.tmpfiles
-Patch0:		lsmod-fix.patch
-Patch1:		lxd-loopback.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -43,6 +41,7 @@ Requires:	agetty
 Requires:	/bin/awk
 Requires:	/bin/basename
 Requires:	/bin/gettext
+Requires:	/bin/ipcalc
 Requires:	/bin/nice
 Requires:	/bin/ps
 Requires:	SysVinit-tools >= 2.88-1
@@ -61,6 +60,7 @@ Requires:	fsck
 Requires:	gettext
 Requires:	grep
 Requires:	hostname
+Requires:	ipcalc >= 1.0.1-2
 Requires:	iproute2
 Requires:	iputils-arping
 Requires:	libutempter >= 1.1.6-2
@@ -141,8 +141,6 @@ po cichu ignorowane.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
 
 # 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"
@@ -313,7 +311,6 @@ done
 %attr(755,root,root) /etc/profile.d/lang.*sh
 
 %attr(755,root,root) %{_bindir}/doexec
-%attr(755,root,root) %{_bindir}/ipcalc
 %attr(755,root,root) %{_bindir}/resolvesymlink
 %attr(755,root,root) %{_bindir}/usleep
 
@@ -420,7 +417,6 @@ done
 %{_mandir}/man1/genhostid.1*
 %{_mandir}/man1/getkey.1*
 %{_mandir}/man1/initlog.1*
-%{_mandir}/man1/ipcalc.1*
 %{_mandir}/man1/netreport.1*
 %{_mandir}/man1/usleep.1*
 %{_mandir}/man8/ppp-watch.8*
diff --git a/lsmod-fix.patch b/lsmod-fix.patch
deleted file mode 100644
index 38664e9..0000000
--- a/lsmod-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/functions	2020-02-08 10:48:07.000000000 +0100
-+++ lib/functions.lsmod	2020-03-13 10:59:06.029459498 +0100
-@@ -1106,6 +1106,9 @@
-
- # module is needed (ie. is requested, is available and isn't loaded already)
- is_module() {
-+	# return false if /sbin/lsmod not exists (like in containers)
-+	[ -x /sbin/lsmod ] || return 1
-+
- 	# module name without .o at end
- 	if ! lsmod | grep -q "$1"; then
- 		if ls -1R /lib/modules/$(uname -r)/ 2> /dev/null | grep -q "^${1}.\(\|k\)o\(\|.gz\)"; then
diff --git a/lxd-loopback.patch b/lxd-loopback.patch
deleted file mode 100644
index daeb475..0000000
--- a/lxd-loopback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/functions.network	2020-02-08 10:48:07.000000000 +0100
-+++ lib/functions.network.loopback	2020-03-13 11:19:35.602818930 +0100
-@@ -345,7 +345,8 @@
- # Add ONLY IPv4 address (IPv6 address is added automaticly)
- set_up_loopback()
- {
--	if is_yes "$IPV4_NETWORKING"; then
-+	# test if addr is assigned already as lxd(lxc?) initializes loopback upfront
-+	if is_yes "$IPV4_NETWORKING" && ! ip addr show lo | grep -q "127\.0\.0\.1"; then
- 		ip addr add 127.0.0.1/8 dev lo
- 	fi
- 	ip link set dev lo up
================================================================

---- gitweb:

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