- rel 3; fix sysctl.d/ handling

diff --git a/rc-scripts-sysctl.patch b/rc-scripts-sysctl.patch
new file mode 100644 (file)
index 0000000..6b2f701
--- /dev/null
+++ b/rc-scripts-sysctl.patch
@@ -0,0 +1,26 @@
+commit 2cb59275d1432da76a021416a7e65718476cebea
+Author: Arkadiusz Miśkiewicz <arekm@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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index f439f8369ce75f00c7a823bf89609cf6f3b1aea2..c0f60eb27b100ea5e90c0a1a3fba6a383fd564de 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -11,7 +11,7 @@ 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:       2
+Release:       3
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -23,6 +23,7 @@ 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
@@ -143,6 +144,7 @@ po cichu ignorowane.
 #%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"