[packages/rc-scripts] - up to 0.4.19 - removed patches merged upstream - delete broken 95229.patch
baggins
baggins at pld-linux.org
Sat Feb 8 11:06:13 CET 2020
commit 999974db13192ba4b7c1c4a350e290685fd63de6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Feb 8 11:03:51 2020 +0100
- up to 0.4.19
- removed patches merged upstream
- delete broken 95229.patch
27a3470.patch | 31 ----------------
95229.patch | 28 ---------------
rc-scripts-bond.patch | 99 ---------------------------------------------------
rc-scripts.spec | 16 +++------
tmpfiles.patch | 57 -----------------------------
5 files changed, 5 insertions(+), 226 deletions(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index f522f7f..6c77706 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -10,20 +10,17 @@ 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.18
-Release: 6
+Version: 0.4.19
+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: 19a80f3b7ac8abd1008ecad71ddc9294
+# Source0-md5: a123c2dd45a676bafab5a14e2c066a35
Source1: rc-local.service
Source2: sys-chroots.service
Source3: %{name}.tmpfiles
Patch0: 95229.patch
-Patch1: 27a3470.patch
-Patch2: %{name}-bond.patch
-Patch3: tmpfiles.patch
URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
BuildRequires: autoconf
BuildRequires: automake
@@ -34,6 +31,8 @@ BuildRequires: glib2-devel
BuildRequires: libcap-devel >= 1:2.17
BuildRequires: linux-libc-headers >= 7:2.6.27
BuildRequires: pkgconfig
+BuildRequires: pcre-devel
+%{?with_static:BuildRequires: pcre-static}
BuildRequires: popt-devel
BuildRequires: rpm >= 4.4.9-56
Requires(post): fileutils
@@ -141,11 +140,6 @@ po cichu ignorowane.
%prep
%setup -q
-# broken: --pid is alias to --pidfile, not --pid
-#%patch0 -p3 -d lib
-%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"
diff --git a/27a3470.patch b/27a3470.patch
deleted file mode 100644
index ca7b379..0000000
--- a/27a3470.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 27a3470a3eca2ab9b6d5ac5b7b8c7fdb65b66435 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm at maven.pl>
-Date: Wed, 6 Feb 2019 15:45:43 +0100
-Subject: [PATCH] Don't delete base pidfile if other pid file was specified.
- Delete it instead. It was deleting aaa.pid even if we did killproc -p bbb.pid
- aaa and our service name was aaa.
-
----
- lib/functions | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/functions b/lib/functions
-index 9716981..b696738 100644
---- a/lib/functions
-+++ b/lib/functions
-@@ -976,7 +976,11 @@ killproc() {
-
- # Remove pid file if any.
- if [ "$notset" = "1" ]; then
-- rm -f /var/run/${base}.pid
-+ if [ -f "${pidfile}" ] ; then
-+ rm -f "$pidfile"
-+ else
-+ rm -f /var/run/${base}.pid
-+ fi
- fi
-
- return $result
---
-2.20.1
-
diff --git a/95229.patch b/95229.patch
deleted file mode 100644
index 4945bca..0000000
--- a/95229.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- /etc/init.d/functions~ 2018-09-07 16:57:25.000000000 +0300
-+++ /etc/init.d/functions 2018-09-07 17:02:41.443552246 +0300
-@@ -884,12 +883,19 @@
- # 3. kill with KILL, wait $waitretry
- retry="--retry ${sig#-}/${delay}/${sig#-}/${waittime}/KILL/${waitretry}"
- fi
-- /sbin/start-stop-daemon -q --stop \
-- $retry \
-- ${waitname:+--name $waitname} \
-- -s ${sig#-} \
-- ${pidfile:+--pidfile $pidfile}
-- result=$?
-+
-+ # expand if pidfile has multiple pids
-+ result=0
-+ local pid
-+
-+ for pid in $(cat $pidfile); do
-+ /sbin/start-stop-daemon -q --stop \
-+ $retry \
-+ ${waitname:+--name $waitname} \
-+ -s ${sig#-} \
-+ --pid $pid || result=$?
-+ done
-+
- if [ "$result" -eq 0 ]; then
- ok
- else
diff --git a/rc-scripts-bond.patch b/rc-scripts-bond.patch
deleted file mode 100644
index c178258..0000000
--- a/rc-scripts-bond.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-commit 83014f96551132c825ff52d94330e366148f20cb
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date: Mon Mar 4 10:19:27 2019 +0100
-
- Create bond master interface if it doesn't exist when slave interface is being ifuped.
-
-diff --git a/lib/ifup b/lib/ifup
-index dee4e58..38780bf 100755
---- a/lib/ifup
-+++ b/lib/ifup
-@@ -125,6 +125,9 @@ if [ -n "$ETHTOOL_OPTS" ] ; then
- fi
-
- if is_yes "$SLAVE" && [ -n "$MASTER" ] ; then
-+ # create master if it doesn't exist yet
-+ [ ! -d "/sys/class/net/${MASTER}" ] && ip link add "${MASTER}" type bond
-+
- nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
- ip link set "$DEVICE" master "$MASTER"
- ip link set "$DEVICE" up
-commit d67c5d59733955d1e6def78a6fc6f5917e214247
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date: Mon Mar 4 10:32:13 2019 +0100
-
- Create bondX interfaces when ifcfg-bondX is called with ifup and interface doesn't exist, yet.
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 4b19bc7..e90f21e 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -16,6 +16,7 @@ scripts_SCRIPTS = \
- ifdown-sl \
- ifdown-vlan \
- ifup-aliases \
-+ ifup-bond \
- ifup-br \
- ifup-ipx \
- ifup-irda \
-diff --git a/lib/functions.network b/lib/functions.network
-index d151b04..86bc978 100644
---- a/lib/functions.network
-+++ b/lib/functions.network
-@@ -226,7 +226,7 @@ setup_ip_param ()
-
- # set handling for bridge
- case "$DEVICETYPE" in
-- br|atm|lec|irda|vlan)
-+ bond|br|atm|lec|irda|vlan)
- HANDLING=1
- ;;
- esac
-diff --git a/lib/ifup-bond b/lib/ifup-bond
-new file mode 100755
-index 0000000..b0bc0c9
---- /dev/null
-+++ b/lib/ifup-bond
-@@ -0,0 +1,42 @@
-+#!/bin/sh
-+#
-+# ifup-bond - Bonding configuration script
-+# Copyright (C) 2019 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+#
-+#
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin
-+
-+cd /lib/rc-scripts
-+. /etc/sysconfig/network
-+. /etc/rc.d/init.d/functions
-+. /lib/rc-scripts/functions.network
-+
-+CONFIG=$1
-+source_config
-+
-+if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
-+ exit
-+fi
-+
-+. /etc/sysconfig/network
-+
-+# set all major variables
-+setup_ip_param
-+
-+if [ ! -d "/sys/class/net/${DEVICE}" ]; then
-+ ip link add "${DEVICE}" type bond
-+fi
diff --git a/tmpfiles.patch b/tmpfiles.patch
deleted file mode 100644
index 973cf65..0000000
--- a/tmpfiles.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit a268fbbd235b78d863a4181bc1b7d5bdbbe3c1e4
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date: Wed Jan 15 14:56:29 2020 +0100
-
- Clean and recreate systemd tmpfiles (even if not using systemd).
-
-diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
-index 936244b..083b080 100755
---- a/rc.d/rc.sysinit
-+++ b/rc.d/rc.sysinit
-@@ -1029,6 +1029,8 @@ touch /var/log/wtmp
- chown root:utmp /var/run/utmp /var/log/wtmp
- chmod 0664 /var/run/utmp /var/log/wtmp
-
-+[ -x /bin/systemd-tmpfiles ] && /bin/systemd-tmpfiles --clean --boot
-+
- # Clean /tmp
- if is_yes "$CLEAN_TMP" && ! is_fsmounted tmpfs /tmp; then
- LC_ALL=C rm -rf /tmp/* /tmp/.[a-zA-Z0-9]*
-@@ -1039,6 +1041,8 @@ mkdir -m 1777 -p /tmp/.ICE-unix > /dev/null 2>&1
- chown root:root /tmp/.ICE-unix
- is_yes "$SELINUX" && restorecon /tmp/.ICE-unix >/dev/null 2>&1
-
-+[ -x /bin/systemd-tmpfiles ] && /bin/systemd-tmpfiles --create --boot
-+
- test -d /var/run/netreport || mkdir -m 770 /var/run/netreport
-
- if ! is_yes "$VSERVER"; then
-
-commit 4b8afb999975a31089c08cdcfcdce5dd466a1bbf
-Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
-Date: Wed Jan 15 15:12:43 2020 +0100
-
- Silence notices (like 'Line references path below legacy directory /var/run/...').
-
-diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
-index 083b080..b55f0cc 100755
---- a/rc.d/rc.sysinit
-+++ b/rc.d/rc.sysinit
-@@ -1029,7 +1029,7 @@ touch /var/log/wtmp
- chown root:utmp /var/run/utmp /var/log/wtmp
- chmod 0664 /var/run/utmp /var/log/wtmp
-
--[ -x /bin/systemd-tmpfiles ] && /bin/systemd-tmpfiles --clean --boot
-+[ -x /bin/systemd-tmpfiles ] && SYSTEMD_LOG_LEVEL=warning /bin/systemd-tmpfiles --clean --boot
-
- # Clean /tmp
- if is_yes "$CLEAN_TMP" && ! is_fsmounted tmpfs /tmp; then
-@@ -1041,7 +1041,7 @@ mkdir -m 1777 -p /tmp/.ICE-unix > /dev/null 2>&1
- chown root:root /tmp/.ICE-unix
- is_yes "$SELINUX" && restorecon /tmp/.ICE-unix >/dev/null 2>&1
-
--[ -x /bin/systemd-tmpfiles ] && /bin/systemd-tmpfiles --create --boot
-+[ -x /bin/systemd-tmpfiles ] && SYSTEMD_LOG_LEVEL=warning /bin/systemd-tmpfiles --create --boot
-
- test -d /var/run/netreport || mkdir -m 770 /var/run/netreport
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/999974db13192ba4b7c1c4a350e290685fd63de6
More information about the pld-cvs-commit
mailing list