From f1984484cc0852f529946effd19a0b18128d24a0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 18:11:16 -0400 Subject: [PATCH 001/103] fix license handling --- initscripts.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index a2ef80a..65218a6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.54 License: GPLv2 Group: System Environment/Base -Release: 4%{?dist} +Release: 5%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -193,7 +193,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport -%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING +%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 +%{!?_licensedir:%global license %%doc} +%license COPYING /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp @@ -210,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Sat Jul 12 2014 Tom Callaway - 9.54-5 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 9.54-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 80893f4dcc5133412d3893f6d06f386b67aee5ca Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 22 Jul 2014 14:01:56 +0200 Subject: [PATCH 002/103] 9.55-1 --- .gitignore | 1 + initscripts.spec | 23 ++++++++++------------- sources | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1cb58c5..d42145f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /initscripts-9.52.tar.bz2 /initscripts-9.53.tar.bz2 /initscripts-9.54.tar.bz2 +/initscripts-9.55.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 65218a6..983a55b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.54 +Version: 9.55 License: GPLv2 Group: System Environment/Base -Release: 5%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,8 +34,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch0: 0001-remove-ppp-from-translation.patch - %description The initscripts package contains the basic system scripts used to boot your Red Hat or Fedora system, change runlevels, and shut the system down @@ -55,8 +53,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%autopatch -p1 - %build make @@ -212,14 +208,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Sat Jul 12 2014 Tom Callaway - 9.54-5 +* Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling - -* Sat Jun 07 2014 Fedora Release Engineering - 9.54-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Lukáš Nykrýn - 9.54-3 -- don't require sysctl, it is in procps anyway +- ipcalc: -c allow netmask +- ipcalc: parse prefix more safely +- inittab: fix path and mention set-default +- don't require /sbin/sysctl +- init.d/functions: check parent dir of pid file for accessibility +- ifup-eth: some options for bridge can be applied after the bridge is up +- remove ppp from translation * Tue Apr 15 2014 Lukáš Nykrýn - 9.54-1 - move ppp support to ppp package diff --git a/sources b/sources index fa129ca..566d078 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf63862785d224394053f081865eb853 initscripts-9.54.tar.bz2 +0672f648a9ee8607a2df65835c54f5e5 initscripts-9.55.tar.bz2 From 8c1e6907e1082241b8ec537b5336e736d04a8bed Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 21:35:16 +0000 Subject: [PATCH 003/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 983a55b..38812a7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.55 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 9.55-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling - ipcalc: -c allow netmask From 6ee1b79261931910095ef7f10ea6ce4481472be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Oct 2014 11:54:07 -0400 Subject: [PATCH 004/103] Update fedora-import-state --- 0001-fedora-import-state-do-not-clobber.patch | 33 +++++++++++++++++++ initscripts.spec | 8 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-fedora-import-state-do-not-clobber.patch diff --git a/0001-fedora-import-state-do-not-clobber.patch b/0001-fedora-import-state-do-not-clobber.patch new file mode 100644 index 0000000..8ef1b93 --- /dev/null +++ b/0001-fedora-import-state-do-not-clobber.patch @@ -0,0 +1,33 @@ +From 83d0e2588efadf2ae4b53f01ff31921f60906419 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 6 Oct 2014 11:45:14 -0400 +Subject: [PATCH] fedora-import-state: do not clobber / + +Also, do not fail on filenames containing spaces. + +https://bugzilla.redhat.com/show_bug.cgi?id=1149419 +--- + systemd/fedora-import-state | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/systemd/fedora-import-state b/systemd/fedora-import-state +index a853ab9cda..f23692a6c7 100755 +--- a/systemd/fedora-import-state ++++ b/systemd/fedora-import-state +@@ -1,14 +1,11 @@ + #!/bin/bash + # fedora-import-state: import state files from initramfs (e.g. network config) + +-# exit early if root isn't writeable +-[ -w / ] || exit 0 +- + # copy state into root + cd /run/initramfs/state +-cp -a -t / . ++find . -mindepth 1 -maxdepth 1 -exec cp -av -t / {} \; + + # run restorecon on the copied files + if [ -e /sys/fs/selinux/enforce ]; then +- find . | ( cd /; restorecon -i -f -; ) || : ++ find . -mindepth 1 | { cd / && xargs -t restorecon -i; } || : + fi diff --git a/initscripts.spec b/initscripts.spec index 38812a7..007a545 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.55 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 3%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,6 +34,8 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service +Patch0001: 0001-fedora-import-state-do-not-clobber.patch + %description The initscripts package contains the basic system scripts used to boot your Red Hat or Fedora system, change runlevels, and shut the system down @@ -53,6 +55,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch0001 -p1 %build make @@ -208,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Oct 06 2014 Zbigniew Jędrzejewski-Szmek- 9.55-3 +- Update fedora-import-state for bug #1149419. + * Sat Aug 16 2014 Fedora Release Engineering - 9.55-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ed75de05f9a6f04c07763d18bce5f09a9d261cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Oct 2014 17:17:29 -0400 Subject: [PATCH 005/103] 9.56.1-1 --- .gitignore | 1 + 0001-fedora-import-state-do-not-clobber.patch | 33 -- 0001-remove-ppp-from-translation.patch | 500 ------------------ initscripts.spec | 69 +-- sources | 2 +- 5 files changed, 37 insertions(+), 568 deletions(-) delete mode 100644 0001-fedora-import-state-do-not-clobber.patch delete mode 100644 0001-remove-ppp-from-translation.patch diff --git a/.gitignore b/.gitignore index d42145f..0edb983 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /initscripts-9.53.tar.bz2 /initscripts-9.54.tar.bz2 /initscripts-9.55.tar.bz2 +/initscripts-9.56.1.tar.bz2 diff --git a/0001-fedora-import-state-do-not-clobber.patch b/0001-fedora-import-state-do-not-clobber.patch deleted file mode 100644 index 8ef1b93..0000000 --- a/0001-fedora-import-state-do-not-clobber.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 83d0e2588efadf2ae4b53f01ff31921f60906419 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 6 Oct 2014 11:45:14 -0400 -Subject: [PATCH] fedora-import-state: do not clobber / - -Also, do not fail on filenames containing spaces. - -https://bugzilla.redhat.com/show_bug.cgi?id=1149419 ---- - systemd/fedora-import-state | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/systemd/fedora-import-state b/systemd/fedora-import-state -index a853ab9cda..f23692a6c7 100755 ---- a/systemd/fedora-import-state -+++ b/systemd/fedora-import-state -@@ -1,14 +1,11 @@ - #!/bin/bash - # fedora-import-state: import state files from initramfs (e.g. network config) - --# exit early if root isn't writeable --[ -w / ] || exit 0 -- - # copy state into root - cd /run/initramfs/state --cp -a -t / . -+find . -mindepth 1 -maxdepth 1 -exec cp -av -t / {} \; - - # run restorecon on the copied files - if [ -e /sys/fs/selinux/enforce ]; then -- find . | ( cd /; restorecon -i -f -; ) || : -+ find . -mindepth 1 | { cd / && xargs -t restorecon -i; } || : - fi diff --git a/0001-remove-ppp-from-translation.patch b/0001-remove-ppp-from-translation.patch deleted file mode 100644 index b54c213..0000000 --- a/0001-remove-ppp-from-translation.patch +++ /dev/null @@ -1,500 +0,0 @@ -From e1f4ca4ebaab97166a315e0e54231ea8dbf7588c Mon Sep 17 00:00:00 2001 -From: Lukas Nykryn -Date: Thu, 24 Apr 2014 13:59:06 +0200 -Subject: [PATCH] remove ppp from translation - ---- - po/Makefile | 2 +- - po/initscripts.pot | 166 ++++++++++++++++++++--------------------------------- - 2 files changed, 62 insertions(+), 106 deletions(-) - -diff --git a/po/Makefile b/po/Makefile -index fb81b9a..a5658ec 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -10,7 +10,7 @@ NLSPACKAGE = initscripts - CATALOGS = $(shell ls *.po) - FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS)) - --POTFILES = ../ppp/ip* $(shell ls ../sysconfig/network-scripts/* | grep -v ifcfg-) \ -+POTFILES = $(shell ls ../sysconfig/network-scripts/* | grep -v ifcfg-) \ - ../service ../sys-unconfig ../systemd/fedora-* ../rc.d/init.d/* - - all: $(NLSPACKAGE).pot $(FMTCATALOGS) -diff --git a/po/initscripts.pot b/po/initscripts.pot -index cd791f1..99d9cf8 100644 ---- a/po/initscripts.pot -+++ b/po/initscripts.pot -@@ -8,7 +8,7 @@ msgstr "" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8-bit\n" - --#: ../sysconfig/network-scripts/ifup-eth:231 -+#: ../sysconfig/network-scripts/ifup-eth:245 - msgid "Error, some other host already uses address ${ipaddr[$idx]}." - msgstr "" - -@@ -24,10 +24,6 @@ msgstr "" - msgid "Missing remote IPv4 address of tunnel, configuration is not valid" - msgstr "" - --#: ../service:78 --msgid "Redirecting to /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service" --msgstr "" -- - #: ../rc.d/init.d/functions:410 - msgid "${base} status unknown due to insufficient privileges." - msgstr "" -@@ -40,7 +36,7 @@ msgstr "" - msgid "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:123 ../sysconfig/network-scripts/ifup-ipv6:226 -+#: ../sysconfig/network-scripts/ifup-ipv6:226 - msgid "Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" - msgstr "" - -@@ -48,7 +44,7 @@ msgstr "" - msgid "Unsupported reason '$reason' for sending trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup:103 ../sysconfig/network-scripts/ifup-eth:78 -+#: ../sysconfig/network-scripts/ifup:104 ../sysconfig/network-scripts/ifup-eth:85 - msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization." - msgstr "" - -@@ -64,12 +60,8 @@ msgstr "" - msgid "*** when you leave the shell." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:75 --msgid "ifup-ppp for ${DEVNAME} exiting" --msgstr "" -- --#: ../sysconfig/network-scripts/ifup-ppp:142 --msgid "pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}" -+#: ../sysconfig/network-scripts/ifup-eth:179 -+msgid "Determining IP information for ${DEVICE}..." - msgstr "" - - #: ../rc.d/init.d/functions:463 -@@ -88,12 +80,8 @@ msgstr "" - msgid "$base startup" - msgstr "" - --#: ../ppp/ip-down.ipv6to4:35 ../ppp/ip-up.ipv6to4:41 --msgid "Argument 1 is empty but should contain interface name - skip IPv6to4 initialization" --msgstr "" -- --#: ../ppp/ip-up.ipv6to4:189 ../sysconfig/network-scripts/ifup-ipv6:292 --msgid "radvd control enabled, but config is not complete" -+#: ../sysconfig/network-scripts/ifup-eth:43 -+msgid "Device ${DEVICE} has different MAC address than expected, ignoring." - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:383 -@@ -104,11 +92,11 @@ msgstr "" - msgid "Server address not specified in /etc/sysconfig/netconsole" - msgstr "" - --#: ../sysconfig/network-scripts/network-functions-ipv6:798 --msgid "Missing parameter 'IPv6 MTU' (arg 2)" -+#: ../rc.d/init.d/functions:419 -+msgid "${base} dead but subsys locked" - msgstr "" - --#: ../rc.d/init.d/network:67 -+#: ../rc.d/init.d/network:65 - msgid "Bringing up loopback interface: " - msgstr "" - -@@ -124,27 +112,35 @@ msgstr "" - msgid "Missing parameter 'selection' (arg 2)" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:91 ../sysconfig/network-scripts/ifup-ipv6:211 -+#: ../sysconfig/network-scripts/ifup-ipv6:211 - msgid "IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" - msgstr "" - -+#: ../sysconfig/network-scripts/ifup-aliases:165 -+msgid "error in $FILE: invalid alias number" -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifup-aliases:190 - msgid "error iN $FILE: didn't specify netmask or prefix" - msgstr "" - -+#: ../sysconfig/network-scripts/ifup-aliases:264 -+msgid "Error, some other host already uses address ${IPADDR}." -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifdown-tunnel:36 ../sysconfig/network-scripts/ifup-tunnel:63 - msgid "Device '$DEVICE' isn't supported as a valid GRE device name." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:43 --msgid "Device ${DEVICE} has different MAC address than expected, ignoring." -+#: ../sysconfig/network-scripts/ifup-ipv6:292 -+msgid "radvd control enabled, but config is not complete" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-aliases:264 --msgid "Error, some other host already uses address ${IPADDR}." -+#: ../sysconfig/network-scripts/ifup-eth:279 -+msgid "Error adding default gateway for ${REALDEVICE}." - msgstr "" - --#: ../rc.d/init.d/network:271 -+#: ../rc.d/init.d/network:244 - msgid "Usage: $0 {start|stop|status|restart|reload|force-reload}" - msgstr "" - -@@ -156,7 +152,7 @@ msgstr "" - msgid "Initializing netconsole" - msgstr "" - --#: ../sysconfig/network-scripts/ifdown-eth:42 ../sysconfig/network-scripts/ifdown-eth:48 -+#: ../sysconfig/network-scripts/ifdown-eth:46 ../sysconfig/network-scripts/ifdown-eth:52 - msgid "Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." - msgstr "" - -@@ -164,7 +160,7 @@ msgstr "" - msgid "FAILED" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:286 -+#: ../sysconfig/network-scripts/ifup-eth:301 - msgid "Determining IPv6 information for ${DEVICE}..." - msgstr "" - -@@ -176,8 +172,8 @@ msgstr "" - msgid "$0: Usage: daemon [+/-nicelevel] {program}" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-aliases:165 --msgid "error in $FILE: invalid alias number" -+#: ../sysconfig/network-scripts/network-functions-ipv6:798 -+msgid "Missing parameter 'IPv6 MTU' (arg 2)" - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:159 -@@ -188,7 +184,7 @@ msgstr "" - msgid "Usage: ifup " - msgstr "" - --#: ../sysconfig/network-scripts/ifup:126 ../sysconfig/network-scripts/ifup:127 -+#: ../sysconfig/network-scripts/ifup:127 ../sysconfig/network-scripts/ifup:128 - msgid "ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" - msgstr "" - -@@ -196,11 +192,11 @@ msgstr "" - msgid "ERROR: ${DEVICE} did not come up!" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:138 ../sysconfig/network-scripts/ifup-ipv6:240 -+#: ../sysconfig/network-scripts/ifup-ipv6:240 - msgid "Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" - msgstr "" - --#: ../rc.d/init.d/network:133 ../rc.d/init.d/network:140 -+#: ../rc.d/init.d/network:121 ../rc.d/init.d/network:128 - msgid "Bringing up interface $i: " - msgstr "" - -@@ -208,7 +204,7 @@ msgstr "" - msgid "Usage: $0 {start|stop|reload|restart|showsysctl}" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:80 -+#: ../sysconfig/network-scripts/ifup-eth:87 - msgid "Device ${DEVICE} does not seem to be present, delaying initialization." - msgstr "" - -@@ -220,7 +216,7 @@ msgstr "" - msgid "Missing parameter 'device' (arg 1)" - msgstr "" - --#: ../rc.d/init.d/network:82 -+#: ../rc.d/init.d/network:70 - msgid "No 802.1Q VLAN support available in kernel." - msgstr "" - -@@ -256,7 +252,7 @@ msgstr "" - msgid "error in $FILE: IPADDR_START greater than IPADDR_END" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:260 -+#: ../sysconfig/network-scripts/ifup-eth:275 - msgid "Error adding default gateway ${GATEWAY} for ${DEVICE}." - msgstr "" - -@@ -264,7 +260,7 @@ msgstr "" - msgid " OK " - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:540 -+#: ../sysconfig/network-scripts/network-functions:545 - msgid "INFO " - msgstr "" - -@@ -276,7 +272,7 @@ msgstr "" - msgid "Users cannot control this device." - msgstr "" - --#: ../sysconfig/network-scripts/ifup:89 -+#: ../sysconfig/network-scripts/ifup:90 - msgid "PHYSDEV should be set for device ${DEVICE}" - msgstr "" - -@@ -284,7 +280,7 @@ msgstr "" - msgid "radvd not (properly) installed, triggering failed" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:177 ../sysconfig/network-scripts/ifup-eth:290 -+#: ../sysconfig/network-scripts/ifup-eth:191 ../sysconfig/network-scripts/ifup-eth:305 - msgid " failed." - msgstr "" - -@@ -296,7 +292,7 @@ msgstr "" - msgid "*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. " - msgstr "" - --#: ../rc.d/init.d/network:258 -+#: ../rc.d/init.d/network:231 - msgid "Configured devices:" - msgstr "" - -@@ -332,23 +328,15 @@ msgstr "" - msgid "Invalid tunnel type $TYPE" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:48 --msgid "pppd does not exist or is not executable for ${DEVICE}" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup:37 - msgid "$0: configuration for ${1} not found." - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:165 --msgid "Determining IP information for ${DEVICE}..." --msgstr "" -- - #: ../systemd/fedora-autorelabel:19 - msgid "*** /etc/selinux/config indicates you want to manually fix labeling" - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:537 -+#: ../sysconfig/network-scripts/network-functions:542 - msgid "WARN " - msgstr "" - -@@ -360,10 +348,6 @@ msgstr "" - msgid "netconsole: can't resolve MAC address of $SYSLOGADDR" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:46 --msgid "ifup-ppp for ${DEVICE} exiting" --msgstr "" -- - #: ../sysconfig/network-scripts/ifdown-routes:5 - msgid "usage: ifdown-routes []" - msgstr "" -@@ -372,7 +356,7 @@ msgstr "" - msgid "Bridge support not available: brctl not found" - msgstr "" - --#: ../rc.d/init.d/network:261 -+#: ../rc.d/init.d/network:234 - msgid "Currently active devices:" - msgstr "" - -@@ -388,7 +372,7 @@ msgstr "" - msgid "Missing parameter 'IPv4 address' (arg 1)" - msgstr "" - --#: ../rc.d/init.d/network:232 -+#: ../rc.d/init.d/network:213 - msgid "Shutting down interface $i: " - msgstr "" - -@@ -432,10 +416,6 @@ msgstr "" - msgid "Missing parameter 'global IPv4 address' (arg 2)" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:74 --msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist" --msgstr "" -- - #: ../rc.d/init.d/netconsole:114 - msgid "netconsole module not loaded" - msgstr "" -@@ -452,10 +432,6 @@ msgstr "" - msgid "6to4 configuration is not valid" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:82 --msgid "Setting up a new ${PEERCONF} config file" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup-aliases:316 - msgid "error in $FILE: IPADDR_START and IPADDR_END don't agree" - msgstr "" -@@ -464,11 +440,7 @@ msgstr "" - msgid "$base $killlevel" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:59 --msgid "adsl-start does not exist or is not executable for ${DEVICE}" --msgstr "" -- --#: ../sysconfig/network-scripts/ifup-eth:167 -+#: ../sysconfig/network-scripts/ifup-eth:181 - msgid " failed; no link present. Check cable?" - msgstr "" - -@@ -480,14 +452,14 @@ msgstr "" - msgid "Device '$device' enabling didn't work" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:77 --msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}" --msgstr "" -- - #: ../sysconfig/network-scripts/network-functions-ipv6:186 - msgid "Cannot add IPv6 address '$address' on dev '$device'" - msgstr "" - -+#: ../service:81 -+msgid "The service command supports only basic LSB actions (start, stop, restart, try-restart, reload, force-reload, status). For other actions, please try to use systemctl." -+msgstr "" -+ - #: ../sysconfig/network-scripts/ifup-ippp:376 - msgid "Warning: link doesn't support IPv6 using encapsulation 'rawip'" - msgstr "" -@@ -508,35 +480,27 @@ msgstr "" - msgid "Disabling netconsole" - msgstr "" - --#: ../systemd/fedora-configure:19 --msgid "Resetting hostname ${HOSTNAME}: " --msgstr "" -- --#: ../rc.d/init.d/network:246 -+#: ../rc.d/init.d/network:219 - msgid "Shutting down loopback interface: " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:264 --msgid "Erorr adding default gateway for ${REALDEVICE}." --msgstr "" -- - #: ../systemd/fedora-autorelabel:28 - msgid "*** system size and speed of hard drives." - msgstr "" - --#: ../sysconfig/network-scripts/network-functions:531 --msgid "DEBUG " -+#: ../sysconfig/network-scripts/network-functions-ipv6:710 -+msgid "Unsupported selection '$selection' specified (arg 2)" - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:959 - msgid "No reason given for sending trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ipx:7 --msgid "usage: $0 " -+#: ../service:78 -+msgid "Redirecting to /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:174 ../sysconfig/network-scripts/ifup-eth:288 -+#: ../sysconfig/network-scripts/ifup-eth:188 ../sysconfig/network-scripts/ifup-eth:303 - msgid " done." - msgstr "" - -@@ -560,10 +524,6 @@ msgstr "" - msgid "$STRING" - msgstr "" - --#: ../rc.d/init.d/functions:419 --msgid "${base} dead but subsys locked" --msgstr "" -- - #: ../sysconfig/network-scripts/ifup-aliases:175 - msgid "error in $FILE: already seen ipaddr $IPADDR in $ipseen" - msgstr "" -@@ -572,19 +532,19 @@ msgstr "" - msgid "Stopping $prog (via systemctl): " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:237 -+#: ../sysconfig/network-scripts/ifup-eth:252 - msgid "Error adding address ${ipaddr[$idx]} for ${DEVICE}." - msgstr "" - --#: ../sysconfig/network-scripts/network-functions-ipv6:710 --msgid "Unsupported selection '$selection' specified (arg 2)" -+#: ../sysconfig/network-scripts/network-functions:536 -+msgid "DEBUG " - msgstr "" - - #: ../sysconfig/network-scripts/network-functions-ipv6:1014 - msgid "Pidfile '$pidfile' is empty, cannot send trigger to radvd" - msgstr "" - --#: ../sysconfig/network-scripts/ifup-eth:201 -+#: ../sysconfig/network-scripts/ifup-eth:215 - msgid "Failed to bring up ${DEVICE}." - msgstr "" - -@@ -592,7 +552,7 @@ msgstr "" - msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel" - msgstr "" - --#: ../rc.d/init.d/network:152 -+#: ../rc.d/init.d/network:140 - msgid "Legacy static-route support not available: /sbin/route not found" - msgstr "" - -@@ -612,7 +572,7 @@ msgstr "" - msgid "${base} (pid $pid) is running..." - msgstr "" - --#: ../sysconfig/network-scripts/ifup:96 -+#: ../sysconfig/network-scripts/ifup:97 - msgid "No 802.1Q VLAN support available in kernel for device ${DEVICE}" - msgstr "" - -@@ -620,11 +580,11 @@ msgstr "" - msgid "Given IPv6 default device '$device' doesn't exist or isn't up" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:87 ../sysconfig/network-scripts/ifup-ipv6:198 -+#: ../sysconfig/network-scripts/ifup-ipv6:198 - msgid "Given IPv4 address '$ipv4addr' is not globally usable" - msgstr "" - --#: ../ppp/ip-up.ipv6to4:186 ../sysconfig/network-scripts/ifup-ipv6:289 -+#: ../sysconfig/network-scripts/ifup-ipv6:289 - msgid "Error occurred while calculating the IPv6to4 prefix" - msgstr "" - -@@ -632,11 +592,7 @@ msgstr "" - msgid "Restarting $prog (via systemctl): " - msgstr "" - --#: ../sysconfig/network-scripts/ifup-ppp:45 --msgid "pppd does not exist or is not executable" --msgstr "" -- --#: ../sysconfig/network-scripts/network-functions:534 -+#: ../sysconfig/network-scripts/network-functions:539 - msgid "ERROR " - msgstr "" - --- -1.9.0 - diff --git a/initscripts.spec b/initscripts.spec index 007a545..b86296a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ -Summary: The inittab file and the /etc/init.d scripts +Summary: Scripts to bring up network interfaces Name: initscripts -Version: 9.55 +Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 3%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,28 +34,23 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch0001: 0001-fedora-import-state-do-not-clobber.patch - %description -The initscripts package contains the basic system scripts used to boot -your Red Hat or Fedora system, change runlevels, and shut the system down -cleanly. Initscripts also contains the scripts that activate and -deactivate most network interfaces. +This package contains the script that activates and deactivates most +network interfaces, some utilities, and other legacy files. %package -n debugmode -Summary: Scripts for running in debugging mode +Summary: Scripts for running in debug mode Requires: initscripts Group: System Environment/Base %description -n debugmode The debugmode package contains some basic scripts that are used to run -the system in a debugging mode. +the system in a debug mode. Currently, this consists of various memory checking code. %prep %setup -q -%patch0001 -p1 %build make @@ -74,22 +69,11 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif -touch $RPM_BUILD_ROOT/etc/crypttab -chmod 600 $RPM_BUILD_ROOT/etc/crypttab - rm -f $RPM_BUILD_ROOT/etc/rc.d/rc.local $RPM_BUILD_ROOT/etc/rc.local touch $RPM_BUILD_ROOT/etc/rc.d/rc.local chmod 755 $RPM_BUILD_ROOT/etc/rc.d/rc.local -%pre -/usr/sbin/groupadd -g 22 -r -f utmp - %post -touch /var/log/wtmp /var/run/utmp /var/log/btmp -chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp -chmod 664 /var/log/wtmp /var/run/utmp -chmod 600 /var/log/btmp - /usr/sbin/chkconfig --add network /usr/sbin/chkconfig --add netconsole if [ $1 -eq 1 ]; then @@ -164,16 +148,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/statetab.d /usr/lib/systemd/fedora-* /usr/lib/systemd/system/* -/etc/inittab %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d /etc/rc[0-9].d %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local -%config(noreplace) /etc/sysctl.conf /usr/lib/sysctl.d/00-system.conf -/etc/sysctl.d/99-sysctl.conf %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig @@ -193,13 +174,10 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 +%doc examples %{!?_licensedir:%global license %%doc} %license COPYING /var/lib/stateless -%ghost %attr(0600,root,utmp) /var/log/btmp -%ghost %attr(0664,root,utmp) /var/log/wtmp -%ghost %attr(0664,root,utmp) /var/run/utmp -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/initscripts.conf %dir /usr/libexec/initscripts @@ -211,11 +189,34 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Oct 06 2014 Zbigniew Jędrzejewski-Szmek- 9.55-3 -- Update fedora-import-state for bug #1149419. +* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.56.1-1 +- Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp -* Sat Aug 16 2014 Fedora Release Engineering - 9.55-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Tue Oct 07 2014 Lukáš Nykrýn - 9.56-1 +- network_function: return immediately when device is pres +ent +- add configurable DEVTIMEOUT +- fedora-import-state: do not clobber / +- network-functions: grep->fgrep in bonding masters matchi +ng +- man: update sys-unconfig.8 +- rename_devices: comments need to have a blank before them +- add example ifcfg files +- network-functions: improve bonding_masters grep +- ifup: if we were unable to determine DEVICE always call nmcli up +- ifup-tunnel: call ifup-ipv6 in the end +- ifup: also set multicast_snooping after the bridge is up +- network-functions: ETHTOOL_DELAY introduction patch +- use pie and relro by default +- custom naming for VLAN devices +- vi.po: fix parentheses +- ifup-wireless: add support for wowlan +- ifup-wireless: add support for wowlan (second part) +- ifup-aliases: do not bring up ipv6 for range files +- sys-unconfig: use poweroff instead of halt +- ifup-aliases: improve duplicate address detection +- network-functions: handle BONDING_OPTS better +- network: tell nm to wake the slaves * Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 - fix license handling diff --git a/sources b/sources index 566d078..abecb85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0672f648a9ee8607a2df65835c54f5e5 initscripts-9.55.tar.bz2 +8ca2abb3877e8019a5e726c25501e8e3 initscripts-9.56.1.tar.bz2 From fab7fb2c58ecfcf9f58cbbebe9fcd1970be1856f Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 13 Oct 2014 16:39:20 +0200 Subject: [PATCH 006/103] 9.56.1-2 --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index b86296a..19df947 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.56.1 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -14,7 +14,7 @@ Requires: module-init-tools Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: procps-ng >= 3.3.8-16 -Conflicts: systemd < 23-1 +Conflicts: systemd < 216-3 Conflicts: systemd-units < 23-1 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Oct 13 2014 Lukáš Nykrýn - 9.56.1-2 +- Conflict with older systemd due to move of files + * Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.56.1-1 - Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp From a8ac62456ee0b188191914aff79e6147848b9fc0 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 6 Nov 2014 11:01:49 +0100 Subject: [PATCH 007/103] 9.58-1 --- .gitignore | 1 + initscripts.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0edb983..a8413f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /initscripts-9.54.tar.bz2 /initscripts-9.55.tar.bz2 /initscripts-9.56.1.tar.bz2 +/initscripts-9.58.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 19df947..6079867 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ -Summary: Scripts to bring up network interfaces +Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.56.1 +Version: 9.58 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -189,10 +189,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Oct 13 2014 Lukáš Nykrýn - 9.56.1-2 -- Conflict with older systemd due to move of files +* Thu Nov 06 2014 Lukáš Nykrýn - 9.58-1 +- ifup,vlan: fix typo +- doc: be consistent and use BOOTPROTO=none -* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.56.1-1 +* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.57 - Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp * Tue Oct 07 2014 Lukáš Nykrýn - 9.56-1 diff --git a/sources b/sources index abecb85..95e33b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ca2abb3877e8019a5e726c25501e8e3 initscripts-9.56.1.tar.bz2 +9efe03e3ebbd6945a01ccdc9fd593943 initscripts-9.58.tar.bz2 From 53f566228b5c77e9e1e15291255acd5562e16db1 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 12 Nov 2014 13:00:52 +0100 Subject: [PATCH 008/103] 9.59-1 --- .gitignore | 1 + initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a8413f8..7890cba 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /initscripts-9.55.tar.bz2 /initscripts-9.56.1.tar.bz2 /initscripts-9.58.tar.bz2 +/initscripts-9.59.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6079867..65a6583 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.58 +Version: 9.59 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Nov 12 2014 Lukáš Nykrýn - 9.59-1 +- adjust LINKDELAY when STP is on + * Thu Nov 06 2014 Lukáš Nykrýn - 9.58-1 - ifup,vlan: fix typo - doc: be consistent and use BOOTPROTO=none diff --git a/sources b/sources index 95e33b4..11bc31f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9efe03e3ebbd6945a01ccdc9fd593943 initscripts-9.58.tar.bz2 +5c223f5f61e96115e08b1030c27f9dbe initscripts-9.59.tar.bz2 From 245053800f883278c34431329c900a7b89d4c656 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 8 Dec 2014 13:54:15 +0100 Subject: [PATCH 009/103] improve check for bond_master in install bonding driver Conflicts: initscripts.spec --- ...r_bond_master_in_install_bonding_dri.patch | 56 +++++++++++++++++++ initscripts.spec | 9 ++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0001-improve_check_for_bond_master_in_install_bonding_dri.patch diff --git a/0001-improve_check_for_bond_master_in_install_bonding_dri.patch b/0001-improve_check_for_bond_master_in_install_bonding_dri.patch new file mode 100644 index 0000000..cdd1e0d --- /dev/null +++ b/0001-improve_check_for_bond_master_in_install_bonding_dri.patch @@ -0,0 +1,56 @@ +From 30ecd15eb772de10f9c2f94cc9bad4eac5439d24 Mon Sep 17 00:00:00 2001 +From: Ashish Samant +Date: Wed, 29 Oct 2014 17:47:29 -0700 +Subject: [PATCH] improve_check_for_bond_master_in_install_bonding_driver + +The current grep check (fgrep -sqx) in install_bonding_driver, to determine +whether bond master exists, fails when there are multiple bond masters. +The fix assumes that multiple bond masters are on different lines in the file +"/sys/class/net/bonding_masters", while they are in fact on the same line. +Since fgrep -sqx checks for the entire line,it will never match any one bond +master within the line and always fail if there are multiple bonds. + +This patch improves the check by creating a new function, bond_master_exists() +to handle this and other conditions. + +Orabug: 19897586 + +Signed-off-by: Ashish Samant +Signed-off-by: John Haxby +Acked-by: Mukesh Kacker +--- + sysconfig/network-scripts/network-functions | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 0e86efd..e6273bb 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -458,10 +458,22 @@ phy_wireless_device () + cat /sys/class/net/$1/phy80211/name + } + ++bond_master_exists () ++{ ++ local bond_name ++ [ -z "${1}" ] && return 1 ++ [ ! -f /sys/class/net/bonding_masters ] && return 1 ++ ++ for bond_name in $(< /sys/class/net/bonding_masters); do ++ [ "${bond_name}" == "${1}" ] && return 0 ++ done ++ return 1 ++} ++ + install_bonding_driver () + { +- [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 ) +- if ! fgrep -sqx "$1" /sys/class/net/bonding_masters; then ++ if ! bond_master_exists ${1}; then ++ modprobe bonding || return 1 + echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null + fi + ( +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index 65a6583..14f3525 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.59 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,6 +34,8 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service +Patch1: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch + %description This package contains the script that activates and deactivates most network interfaces, some utilities, and other legacy files. @@ -52,6 +54,8 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 + %build make @@ -189,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Dec 08 2014 Lukáš Nykrýn - 9.59-2 +- improve check for bond_master in install bonding driver + * Wed Nov 12 2014 Lukáš Nykrýn - 9.59-1 - adjust LINKDELAY when STP is on From 6ebdb7b94e0a2d3f4a81ac59d6cce5683f841bc8 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 16 Dec 2014 15:48:17 +0100 Subject: [PATCH 010/103] 9.60-1 --- .gitignore | 1 + ...r_bond_master_in_install_bonding_dri.patch | 56 ------------------- initscripts.spec | 15 +++-- sources | 2 +- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 0001-improve_check_for_bond_master_in_install_bonding_dri.patch diff --git a/.gitignore b/.gitignore index 7890cba..e142bdc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /initscripts-9.56.1.tar.bz2 /initscripts-9.58.tar.bz2 /initscripts-9.59.tar.bz2 +/initscripts-9.60.tar.bz2 diff --git a/0001-improve_check_for_bond_master_in_install_bonding_dri.patch b/0001-improve_check_for_bond_master_in_install_bonding_dri.patch deleted file mode 100644 index cdd1e0d..0000000 --- a/0001-improve_check_for_bond_master_in_install_bonding_dri.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 30ecd15eb772de10f9c2f94cc9bad4eac5439d24 Mon Sep 17 00:00:00 2001 -From: Ashish Samant -Date: Wed, 29 Oct 2014 17:47:29 -0700 -Subject: [PATCH] improve_check_for_bond_master_in_install_bonding_driver - -The current grep check (fgrep -sqx) in install_bonding_driver, to determine -whether bond master exists, fails when there are multiple bond masters. -The fix assumes that multiple bond masters are on different lines in the file -"/sys/class/net/bonding_masters", while they are in fact on the same line. -Since fgrep -sqx checks for the entire line,it will never match any one bond -master within the line and always fail if there are multiple bonds. - -This patch improves the check by creating a new function, bond_master_exists() -to handle this and other conditions. - -Orabug: 19897586 - -Signed-off-by: Ashish Samant -Signed-off-by: John Haxby -Acked-by: Mukesh Kacker ---- - sysconfig/network-scripts/network-functions | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 0e86efd..e6273bb 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -458,10 +458,22 @@ phy_wireless_device () - cat /sys/class/net/$1/phy80211/name - } - -+bond_master_exists () -+{ -+ local bond_name -+ [ -z "${1}" ] && return 1 -+ [ ! -f /sys/class/net/bonding_masters ] && return 1 -+ -+ for bond_name in $(< /sys/class/net/bonding_masters); do -+ [ "${bond_name}" == "${1}" ] && return 0 -+ done -+ return 1 -+} -+ - install_bonding_driver () - { -- [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 ) -- if ! fgrep -sqx "$1" /sys/class/net/bonding_masters; then -+ if ! bond_master_exists ${1}; then -+ modprobe bonding || return 1 - echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null - fi - ( --- -1.8.3.1 - diff --git a/initscripts.spec b/initscripts.spec index 14f3525..528a330 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.59 +Version: 9.60 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -34,8 +34,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch1: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch - %description This package contains the script that activates and deactivates most network interfaces, some utilities, and other legacy files. @@ -54,8 +52,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch1 -p1 - %build make @@ -193,8 +189,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Dec 08 2014 Lukáš Nykrýn - 9.59-2 -- improve check for bond_master in install bonding driver +* Tue Dec 16 2014 Lukáš Nykrýn - 9.60-1 +- improve_check_for_bond_master_in_install_bonding_driver +- network-functions: reeplace iwconfig with iw +- ifup: fix typo +- ifdown-ipv6: reset addrgenmode to eui64 for device * Wed Nov 12 2014 Lukáš Nykrýn - 9.59-1 - adjust LINKDELAY when STP is on diff --git a/sources b/sources index 11bc31f..ece0b1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c223f5f61e96115e08b1030c27f9dbe initscripts-9.59.tar.bz2 +5c9cd83e4e04257fef3ffd8e549b7f81 initscripts-9.60.tar.bz2 From 53878cc54c57e115da404c28b777be97aa49048d Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 26 Jan 2015 12:27:06 +0100 Subject: [PATCH 011/103] 9.61-1 --- .gitignore | 1 + initscripts.spec | 200 +++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 101 insertions(+), 102 deletions(-) diff --git a/.gitignore b/.gitignore index e142bdc..eead565 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /initscripts-9.58.tar.bz2 /initscripts-9.59.tar.bz2 /initscripts-9.60.tar.bz2 +/initscripts-9.61.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 528a330..7b3ba86 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,13 +1,12 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.60 +Version: 9.61 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Obsoletes: initscripts-legacy <= 9.39 Requires: /bin/awk, sed, coreutils Requires: grep Requires: module-init-tools @@ -15,14 +14,12 @@ Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: procps-ng >= 3.3.8-16 Conflicts: systemd < 216-3 -Conflicts: systemd-units < 23-1 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 Requires: systemd Requires: iproute, /sbin/arping, findutils # Not strictly required, but nothing else requires it Requires: /etc/system-release -Requires: udev >= 125-1 Requires: cpio Requires: hostname Conflicts: ipsec-tools < 0.8.0-2 @@ -31,7 +28,7 @@ Conflicts: ppp < 2.4.6-4 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig -BuildRequires: glib2-devel popt-devel gettext pkgconfig +BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd Provides: /sbin/service %description @@ -56,141 +53,142 @@ Currently, this consists of various memory checking code. make %install -rm -rf $RPM_BUILD_ROOT -make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install +make ROOT=%{buildroot} SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install %find_lang %{name} %ifnarch s390 s390x rm -f \ - $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ + %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc \ %else rm -f \ - $RPM_BUILD_ROOT/etc/sysconfig/init.s390 + %{buildroot}%{_sysconfdir}/sysconfig/init.s390 %endif -rm -f $RPM_BUILD_ROOT/etc/rc.d/rc.local $RPM_BUILD_ROOT/etc/rc.local -touch $RPM_BUILD_ROOT/etc/rc.d/rc.local -chmod 755 $RPM_BUILD_ROOT/etc/rc.d/rc.local +rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.local +touch %{buildroot}%{_sysconfdir}/rc.d/rc.local +chmod 755 %{buildroot}%{_sysconfdir}/rc.d/rc.local %post -/usr/sbin/chkconfig --add network -/usr/sbin/chkconfig --add netconsole +/usr/sbin/chkconfig --add network > /dev/null 2>&1 || : +/usr/sbin/chkconfig --add netconsole > /dev/null 2>&1 || : if [ $1 -eq 1 ]; then - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : + /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : fi %preun if [ $1 = 0 ]; then - /usr/sbin/chkconfig --del network - /usr/sbin/chkconfig --del netconsole + /usr/sbin/chkconfig --del network > /dev/null 2>&1 || : + /usr/sbin/chkconfig --del netconsole > /dev/null 2>&1 || : fi -%triggerun -- initscripts < 7.62 -/usr/sbin/chkconfig --del random -/usr/sbin/chkconfig --del rawdevices -exit 0 - %postun if [ $1 -ge 1 ]; then /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : fi -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root) -%dir /etc/sysconfig/network-scripts -%config(noreplace) %verify(not md5 mtime size) /etc/adjtime -%config(noreplace) /etc/sysconfig/init -%config(noreplace) /etc/sysconfig/netconsole -%config(noreplace) /etc/sysconfig/readonly-root -/etc/sysconfig/network-scripts/ifdown -/usr/sbin/ifdown -/etc/sysconfig/network-scripts/ifdown-post -/etc/sysconfig/network-scripts/ifup -/usr/sbin/ifup -%dir /etc/sysconfig/console -%dir /etc/sysconfig/modules -/etc/sysconfig/network-scripts/network-functions -/etc/sysconfig/network-scripts/network-functions-ipv6 -/etc/sysconfig/network-scripts/init.ipv6-global -%config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo -/etc/sysconfig/network-scripts/ifup-post -/etc/sysconfig/network-scripts/ifup-routes -/etc/sysconfig/network-scripts/ifdown-routes -/etc/sysconfig/network-scripts/ifup-plip -/etc/sysconfig/network-scripts/ifup-plusb -/etc/sysconfig/network-scripts/ifup-bnep -/etc/sysconfig/network-scripts/ifdown-bnep -/etc/sysconfig/network-scripts/ifup-eth -/etc/sysconfig/network-scripts/ifdown-eth -/etc/sysconfig/network-scripts/ifup-ipv6 -/etc/sysconfig/network-scripts/ifdown-ipv6 -/etc/sysconfig/network-scripts/ifup-sit -/etc/sysconfig/network-scripts/ifdown-sit -/etc/sysconfig/network-scripts/ifup-tunnel -/etc/sysconfig/network-scripts/ifdown-tunnel -/etc/sysconfig/network-scripts/ifup-aliases -/etc/sysconfig/network-scripts/ifup-ippp -/etc/sysconfig/network-scripts/ifdown-ippp -/etc/sysconfig/network-scripts/ifup-wireless -/etc/sysconfig/network-scripts/ifup-isdn -/etc/sysconfig/network-scripts/ifdown-isdn +%dir %{_sysconfdir}/sysconfig/network-scripts +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime +%config(noreplace) %{_sysconfdir}/sysconfig/init +%config(noreplace) %{_sysconfdir}/sysconfig/netconsole +%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root +%{_sysconfdir}/sysconfig/network-scripts/ifdown +%{_sbindir}/ifdown +%{_sysconfdir}/sysconfig/network-scripts/ifdown-post +%{_sysconfdir}/sysconfig/network-scripts/ifup +%{_sbindir}/ifup +%dir %{_sysconfdir}/sysconfig/console +%dir %{_sysconfdir}/sysconfig/modules +%{_sysconfdir}/sysconfig/network-scripts/network-functions +%{_sysconfdir}/sysconfig/network-scripts/network-functions-ipv6 +%{_sysconfdir}/sysconfig/network-scripts/init.ipv6-global +%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo +%{_sysconfdir}/sysconfig/network-scripts/ifup-post +%{_sysconfdir}/sysconfig/network-scripts/ifup-routes +%{_sysconfdir}/sysconfig/network-scripts/ifdown-routes +%{_sysconfdir}/sysconfig/network-scripts/ifup-plip +%{_sysconfdir}/sysconfig/network-scripts/ifup-plusb +%{_sysconfdir}/sysconfig/network-scripts/ifup-bnep +%{_sysconfdir}/sysconfig/network-scripts/ifdown-bnep +%{_sysconfdir}/sysconfig/network-scripts/ifup-eth +%{_sysconfdir}/sysconfig/network-scripts/ifdown-eth +%{_sysconfdir}/sysconfig/network-scripts/ifup-ipv6 +%{_sysconfdir}/sysconfig/network-scripts/ifdown-ipv6 +%{_sysconfdir}/sysconfig/network-scripts/ifup-sit +%{_sysconfdir}/sysconfig/network-scripts/ifdown-sit +%{_sysconfdir}/sysconfig/network-scripts/ifup-tunnel +%{_sysconfdir}/sysconfig/network-scripts/ifdown-tunnel +%{_sysconfdir}/sysconfig/network-scripts/ifup-aliases +%{_sysconfdir}/sysconfig/network-scripts/ifup-ippp +%{_sysconfdir}/sysconfig/network-scripts/ifdown-ippp +%{_sysconfdir}/sysconfig/network-scripts/ifup-wireless +%{_sysconfdir}/sysconfig/network-scripts/ifup-isdn +%{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn %ifarch s390 s390x -/etc/sysconfig/network-scripts/ifup-ctc +%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc %endif -%config(noreplace) /etc/networks -/etc/rwtab -%dir /etc/rwtab.d -/etc/statetab -%dir /etc/statetab.d -/usr/lib/systemd/fedora-* -/usr/lib/systemd/system/* -%dir /etc/rc.d -%dir /etc/rc.d/rc[0-9].d -/etc/rc[0-9].d -%dir /etc/rc.d/init.d -/etc/rc.d/init.d/* -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local -/usr/lib/sysctl.d/00-system.conf -%exclude /etc/profile.d/debug* -/etc/profile.d/* -/usr/sbin/sys-unconfig -/usr/bin/ipcalc -/usr/bin/usleep -%attr(4755,root,root) /usr/sbin/usernetctl -/usr/sbin/consoletype -/usr/sbin/genhostid -/usr/sbin/sushell -%attr(2755,root,root) /usr/sbin/netreport -/usr/lib/udev/rules.d/* -/usr/lib/udev/rename_device -/usr/sbin/service +%config(noreplace) %{_sysconfdir}/networks +%{_sysconfdir}/rwtab +%dir %{_sysconfdir}/rwtab.d +%{_sysconfdir}/statetab +%dir %{_sysconfdir}/statetab.d +%{_prefix}/lib/systemd/fedora-* +%{_prefix}/lib/systemd/system/* +%dir %{_sysconfdir}/rc.d +%dir %{_sysconfdir}/rc.d/rc[0-9].d +%{_sysconfdir}/rc[0-9].d +%dir %{_sysconfdir}/rc.d/init.d +%{_sysconfdir}/rc.d/init.d/* +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local +%{_prefix}/lib/sysctl.d/00-system.conf +%exclude %{_sysconfdir}/profile.d/debug* +%{_sysconfdir}/profile.d/* +%{_sbindir}/sys-unconfig +%{_bindir}/ipcalc +%{_bindir}/usleep +%attr(4755,root,root) %{_sbindir}/usernetctl +%{_sbindir}/consoletype +%{_sbindir}/genhostid +%{_sbindir}/sushell +%attr(2755,root,root) %{_sbindir}/netreport +%{_udevrulesdir}/* +%{_prefix}/lib/udev/rename_device +%{_sbindir}/service %{_mandir}/man*/* %dir %attr(775,root,root) /var/run/netreport -%dir /etc/NetworkManager -%dir /etc/NetworkManager/dispatcher.d -/etc/NetworkManager/dispatcher.d/00-netreport +%dir %{_sysconfdir}/NetworkManager +%dir %{_sysconfdir}/NetworkManager/dispatcher.d +%{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 %doc examples %{!?_licensedir:%global license %%doc} %license COPYING -/var/lib/stateless -%dir /usr/lib/tmpfiles.d -/usr/lib/tmpfiles.d/initscripts.conf -%dir /usr/libexec/initscripts -%dir /usr/libexec/initscripts/legacy-actions +%{_sharedstatedir}/stateless +%{_tmpfilesdir}/initscripts.conf +%dir %{_libexecdir}/initscripts +%dir %{_libexecdir}/initscripts/legacy-actions %files -n debugmode %defattr(-,root,root) -%config(noreplace) /etc/sysconfig/debug -/etc/profile.d/debug* +%config(noreplace) %{_sysconfdir}/sysconfig/debug +%{_sysconfdir}/profile.d/debug* %changelog +* Thu Jan 22 2015 Lukáš Nykrýn - 9.61-1 +- specfile cleanup +- ifup-ipv6: set accept_ra to 2 when IPV6FORWARDING=yes and IPV6_AUTOCONF=yes +- ifup-post: check resolve.conf also with DNS2 +- ifup-aliases: do not fail when only ipv6 addr is specified +- fedora-import-state.service: run a little bit later +- fedora-readonly: Updates for systemd random-seed handling +- network-functions: is_available_wait should wait even in the case that is_available returns 2 +- ifdown-post: remove resolv.conf only in specific cases +- network-functions: fix check in install_bonding_driver + * Tue Dec 16 2014 Lukáš Nykrýn - 9.60-1 -- improve_check_for_bond_master_in_install_bonding_driver +- improve check for bond master in install bonding driver - network-functions: reeplace iwconfig with iw - ifup: fix typo - ifdown-ipv6: reset addrgenmode to eui64 for device diff --git a/sources b/sources index ece0b1b..3cc3254 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c9cd83e4e04257fef3ffd8e549b7f81 initscripts-9.60.tar.bz2 +892006be882b41f680109cb7336949d1 initscripts-9.61.tar.bz2 From 4567b472f6a9f51a39325e6157e48a2e349d4110 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 9 Apr 2015 16:20:59 +0200 Subject: [PATCH 012/103] 9.62-1 --- .gitignore | 1 + initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eead565..4d29280 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /initscripts-9.59.tar.bz2 /initscripts-9.60.tar.bz2 /initscripts-9.61.tar.bz2 +/initscripts-9.62.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 7b3ba86..73909ca 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.61 +Version: 9.62 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -176,6 +176,14 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Thu Apr 09 2015 Lukáš Nykrýn - 9.62-1 +- network-functions: fix change_resolv_conf after grep update +- ifup-aliases: don't return with error when arping fails +- init.d/functions: rc.debug option to debug initscripts +- ifup-aliases: inherit ARPCHECK from parent device +- network: report that we can't shut down network for root on netfs +- ifdown-eth: use scope host for lo + * Thu Jan 22 2015 Lukáš Nykrýn - 9.61-1 - specfile cleanup - ifup-ipv6: set accept_ra to 2 when IPV6FORWARDING=yes and IPV6_AUTOCONF=yes diff --git a/sources b/sources index 3cc3254..b0de21b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -892006be882b41f680109cb7336949d1 initscripts-9.61.tar.bz2 +76033ca59b3da44531b6e97eabf79c5b initscripts-9.62.tar.bz2 From c777c519e044b4f366d1b4ab50c4bbe5bf5fbc87 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 18 May 2015 15:13:36 +0200 Subject: [PATCH 013/103] 9.63-1 --- .gitignore | 1 + initscripts.spec | 14 ++++++++++++-- sources | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d29280..622b344 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /initscripts-9.60.tar.bz2 /initscripts-9.61.tar.bz2 /initscripts-9.62.tar.bz2 +/initscripts-9.63.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 73909ca..805b4c9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.62 +Version: 9.63 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -13,6 +13,7 @@ Requires: module-init-tools Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: procps-ng >= 3.3.8-16 +Requires: ipcalc Conflicts: systemd < 216-3 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 @@ -146,7 +147,6 @@ fi %exclude %{_sysconfdir}/profile.d/debug* %{_sysconfdir}/profile.d/* %{_sbindir}/sys-unconfig -%{_bindir}/ipcalc %{_bindir}/usleep %attr(4755,root,root) %{_sbindir}/usernetctl %{_sbindir}/consoletype @@ -176,6 +176,16 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon May 18 2015 Lukáš Nykrýn - 9.63-1 +- remove ipcalc, it has its own package now +- network: tell NM to reload its configuration during start +- bonding: warn if the ifup for slave device failed +- sysctl.conf: drop SHMALL and SHMMAX, they have sane default values in kernel +- ifup: don't call NM for loopback +- clarify daemon() usage message +- rename_device: allow non-channel nics for s390x machines +- ifup: add missing quotes + * Thu Apr 09 2015 Lukáš Nykrýn - 9.62-1 - network-functions: fix change_resolv_conf after grep update - ifup-aliases: don't return with error when arping fails diff --git a/sources b/sources index b0de21b..9fd9468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76033ca59b3da44531b6e97eabf79c5b initscripts-9.62.tar.bz2 +1ae0f15e54a904ac30185548d43daa1c initscripts-9.63.tar.bz2 From b68d903213601c32d448b4c872f0f26cce21d63a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:25:01 +0000 Subject: [PATCH 014/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 805b4c9..5bc9222 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.63 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -176,6 +176,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 9.63-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 18 2015 Lukáš Nykrýn - 9.63-1 - remove ipcalc, it has its own package now - network: tell NM to reload its configuration during start From 15694203da445eb981c919fb53e38b5ee78627a6 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 6 Aug 2015 16:49:01 +0200 Subject: [PATCH 015/103] 9.64-1 --- .gitignore | 1 + initscripts.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 622b344..5235cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /initscripts-9.61.tar.bz2 /initscripts-9.62.tar.bz2 /initscripts-9.63.tar.bz2 +/initscripts-9.64.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5bc9222..c2f29a1 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.63 +Version: 9.64 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -176,8 +176,12 @@ fi %{_sysconfdir}/profile.d/debug* %changelog -* Wed Jun 17 2015 Fedora Release Engineering - 9.63-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Thu Aug 06 2015 Lukáš Nykrýn - 9.64-1 +- network-functions: fix wireless detection +- fedora-readonly: use --make-slave with --bind mounts +- import-state: don't run restorecon when it does not exist +- network: modem type interfaces should explicitly start after and stop before common interfaces +- ifup-post: should be interpreted in bash * Mon May 18 2015 Lukáš Nykrýn - 9.63-1 - remove ipcalc, it has its own package now diff --git a/sources b/sources index 9fd9468..eb6b45b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ae0f15e54a904ac30185548d43daa1c initscripts-9.63.tar.bz2 +9cce2ae1009750e84be37c09a028757e initscripts-9.64.tar.bz2 From 443c9aaa405e4dba9381a8ae91a18b2c31e0df16 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 7 Dec 2015 14:41:15 +0100 Subject: [PATCH 016/103] 9.65-1 --- .gitignore | 1 + initscripts.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5235cfb..3e52c00 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /initscripts-9.62.tar.bz2 /initscripts-9.63.tar.bz2 /initscripts-9.64.tar.bz2 +/initscripts-9.65.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index c2f29a1..e7e0fce 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.64 +Version: 9.65 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -176,6 +176,16 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 +- init.d/functions: end with 0 +- fedora-loadmodules: we don't have readahead anymore +- network-scripts: DEVICE and HWADRR could be quoted by apostrophe +- ifup-wireless: fix calling of phy_wireless_device +- ifdown: clean ipv4 localhost addresses +- ifup-eth: some bridge options are applied later +- service: improve status and stop function for daemon with intscripts +- init.d/functions: reload systemd if it can't see an initscript + * Thu Aug 06 2015 Lukáš Nykrýn - 9.64-1 - network-functions: fix wireless detection - fedora-readonly: use --make-slave with --bind mounts diff --git a/sources b/sources index eb6b45b..df500c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cce2ae1009750e84be37c09a028757e initscripts-9.64.tar.bz2 +ef3dbd5515ab66d9cc616d5f20799b0a initscripts-9.65.tar.bz2 From 371337903483f0faaab2fc295d06935d9946ea2d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:32:09 +0000 Subject: [PATCH 017/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index e7e0fce..950fd81 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.65 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -176,6 +176,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 9.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 - init.d/functions: end with 0 - fedora-loadmodules: we don't have readahead anymore From bd7342c31a605894dcccb51db512ce6f62ce0c95 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 25 Apr 2016 15:34:39 +0200 Subject: [PATCH 018/103] 9.66-1 --- .gitignore | 1 + initscripts.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3e52c00..c8a8cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /initscripts-9.63.tar.bz2 /initscripts-9.64.tar.bz2 /initscripts-9.65.tar.bz2 +/initscripts-9.66.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 950fd81..d7680a9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.65 +Version: 9.66 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -17,6 +17,7 @@ Requires: ipcalc Conflicts: systemd < 216-3 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 +Conflicts: policycoreutils < 2.5-6 Requires: systemd Requires: iproute, /sbin/arping, findutils # Not strictly required, but nothing else requires it @@ -176,8 +177,13 @@ fi %{_sysconfdir}/profile.d/debug* %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 9.65-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Mon Apr 25 2016 Lukáš Nykrýn - 9.66-1 +- remove autorelabel stuff +- autorelabel: turn quota off before relabeling +- network: Treat other tunnel interfaces, fixes ifdown stage +- autorelabel: call dracut-initramfs-restore before forced reboot +- sysconfig.txt: document PPPOE_EXTRA and PPPD_EXTRA +- ifdown-eth: fix comparison * Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 - init.d/functions: end with 0 diff --git a/sources b/sources index df500c3..c8d3a12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef3dbd5515ab66d9cc616d5f20799b0a initscripts-9.65.tar.bz2 +f63245531974a2aa19cc602ce540b634 initscripts-9.66.tar.bz2 From a14ce69b231dcb6b3467a897ee222e675a21d273 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 19 Jul 2016 13:47:24 +0200 Subject: [PATCH 019/103] 9.67-1 --- .gitignore | 1 + initscripts.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c8a8cf7..f9ac6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /initscripts-9.64.tar.bz2 /initscripts-9.65.tar.bz2 /initscripts-9.66.tar.bz2 +/initscripts-9.67.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d7680a9..5513016 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.66 +Version: 9.67 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -177,6 +177,18 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Tue Jul 19 2016 Lukáš Nykrýn - 9.67-1 +- import-state: restore also sensitivity part of SELinux context +- network: run after network-pre.target +- ifup-eth: fix setting preferred_lft and valid_lft +- ifup: don't call nmcli on any lo device +- source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no +- ipv6: wait for all global IPv6 addresses to leave the "tentative" state +- rwtab: /var/lib/nfs needs to copy the files +- functions: improve killing loops +- ifup: set valid_lft and preferred_lft to forever for static ip +- service: use systemd mangle for given service + * Mon Apr 25 2016 Lukáš Nykrýn - 9.66-1 - remove autorelabel stuff - autorelabel: turn quota off before relabeling diff --git a/sources b/sources index c8d3a12..ccea6a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f63245531974a2aa19cc602ce540b634 initscripts-9.66.tar.bz2 +e3684fd3729014dbe813365476eba426 initscripts-9.67.tar.bz2 From 959a96814ceebf4e6a8af348843401e5cdf75122 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 9 Aug 2016 15:29:15 +0200 Subject: [PATCH 020/103] 9.68-1 --- .gitignore | 1 + initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f9ac6bb..73c97df 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /initscripts-9.65.tar.bz2 /initscripts-9.66.tar.bz2 /initscripts-9.67.tar.bz2 +/initscripts-9.68.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5513016..54b7bcb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.67 +Version: 9.68 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -177,6 +177,10 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Tue Aug 9 2016 David Kaspar [Dee'Kej] - 9.68-1 +- fedora-import-state: skip modifying of existing folders (#1347436) +- functions: systemctl show now returns an error when unit does not exist + * Tue Jul 19 2016 Lukáš Nykrýn - 9.67-1 - import-state: restore also sensitivity part of SELinux context - network: run after network-pre.target diff --git a/sources b/sources index ccea6a1..53b3113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3684fd3729014dbe813365476eba426 initscripts-9.67.tar.bz2 +6a51a5af38e01445f53989ed0727c3e1 initscripts-9.68.tar.bz2 From 37ba55c6e660cf787f0670350c64204e7bb854d3 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 30 Aug 2016 15:43:36 +0200 Subject: [PATCH 021/103] 9.69-1 --- .gitignore | 1 + initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 73c97df..d922cae 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /initscripts-9.66.tar.bz2 /initscripts-9.67.tar.bz2 /initscripts-9.68.tar.bz2 +/initscripts-9.69.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 54b7bcb..8f1bfdb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.68 +Version: 9.69 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -177,6 +177,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Tue Aug 30 2016 David Kaspar [Dee'Kej] - 9.69-1 +- fedora-import-state should no longer try to create folder with empty name (#1370259) + * Tue Aug 9 2016 David Kaspar [Dee'Kej] - 9.68-1 - fedora-import-state: skip modifying of existing folders (#1347436) - functions: systemctl show now returns an error when unit does not exist diff --git a/sources b/sources index 53b3113..e992667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a51a5af38e01445f53989ed0727c3e1 initscripts-9.68.tar.bz2 +2bdb3052f825e13708313f4b0b505703 initscripts-9.69.tar.bz2 From f259f7b866b548929aa63352f7195dfa9376f930 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:26:32 +0000 Subject: [PATCH 022/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 8f1bfdb..13bf760 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.69 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -177,6 +177,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 9.69-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Aug 30 2016 David Kaspar [Dee'Kej] - 9.69-1 - fedora-import-state should no longer try to create folder with empty name (#1370259) From 049c81f2d3e2aac907375522d446d6a8df551c2a Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 28 Feb 2017 10:18:52 +0100 Subject: [PATCH 023/103] 9.70 --- .gitignore | 1 + initscripts.spec | 13 ++++++------- rebase.sh | 7 +++++++ sources | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100755 rebase.sh diff --git a/.gitignore b/.gitignore index d922cae..a23dbc4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /initscripts-9.67.tar.bz2 /initscripts-9.68.tar.bz2 /initscripts-9.69.tar.bz2 +/initscripts-9.70.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 13bf760..039b627 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,12 +1,11 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.69 +Version: 9.70 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} -URL: http://fedorahosted.org/releases/i/n/initscripts/ -Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Release: 1%{?dist} +URL: https://github.com/fedora-sysv/initscripts +Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils Requires: grep Requires: module-init-tools @@ -177,8 +176,8 @@ fi %{_sysconfdir}/profile.d/debug* %changelog -* Fri Feb 10 2017 Fedora Release Engineering - 9.69-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Fri Feb 24 2017 Lukáš Nykrýn - 9.70-1 +- move source to github * Tue Aug 30 2016 David Kaspar [Dee'Kej] - 9.69-1 - fedora-import-state should no longer try to create folder with empty name (#1370259) diff --git a/rebase.sh b/rebase.sh new file mode 100755 index 0000000..4612cc2 --- /dev/null +++ b/rebase.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscripts.spec -o initscripts.spec +git add initscripts.spec +spectool -g initscripts.spec +fedpkg new-sources $(basename $(spectool -S -l initscripts.spec | awk '{print $2;}')) +git commit -m $(grep Version initscripts.spec | awk '{print $2;}') diff --git a/sources b/sources index e992667..6ea913c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bdb3052f825e13708313f4b0b505703 initscripts-9.69.tar.bz2 +SHA512 (initscripts-9.70.tar.gz) = b32767a6f4bffc96494ee09e8786df49676874cffa698e5f0f6b4b2d03b0e5624c19eec5345a56d1bfcdbe1a7c22a8dd8168e33a98308528a04c98cc912a703a From a11c2d64d6a0fc99fdb5b5fc4713381452648fff Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 25 May 2017 11:27:59 +0200 Subject: [PATCH 024/103] 9.71 --- .gitignore | 1 + initscripts.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a23dbc4..867baa9 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /initscripts-9.68.tar.bz2 /initscripts-9.69.tar.bz2 /initscripts-9.70.tar.gz +/initscripts-9.71.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 039b627..d947fda 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.70 +Version: 9.71 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -131,9 +131,9 @@ fi %{_sysconfdir}/sysconfig/network-scripts/ifup-ctc %endif %config(noreplace) %{_sysconfdir}/networks -%{_sysconfdir}/rwtab +%config(noreplace) %{_sysconfdir}/rwtab +%config(noreplace) %{_sysconfdir}/statetab %dir %{_sysconfdir}/rwtab.d -%{_sysconfdir}/statetab %dir %{_sysconfdir}/statetab.d %{_prefix}/lib/systemd/fedora-* %{_prefix}/lib/systemd/system/* @@ -176,6 +176,21 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Wed May 24 2017 David Kaspar [Dee'Kej] - 9.71-1 +- usleep: print deprecation warning from now on +- sysconfig.txt: mention previously introduced NO_DHCP_HOSTNAME option +- DHCP_FQDN and DHCP_SEND_HOSTNAME introduced +- re-add missing $HOSTNAME initialization +- ifup: add support for VLAN_EGRESS_PRIORITY_MAP +- specfile: mark 'rwtab' and 'statetab' as config files +- killproc/status: add missing '-b ' option +- ifdown-eth: we need to flush global scope as well +- ifup-eth: remove quote marks +- po: download latest translations from zanata +- rwtab: add /var/lib/systemd/timers +- Update initscripts.pot +- Port headers in xgettext_sh.py to 2017 + * Fri Feb 24 2017 Lukáš Nykrýn - 9.70-1 - move source to github diff --git a/sources b/sources index 6ea913c..22431e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.70.tar.gz) = b32767a6f4bffc96494ee09e8786df49676874cffa698e5f0f6b4b2d03b0e5624c19eec5345a56d1bfcdbe1a7c22a8dd8168e33a98308528a04c98cc912a703a +SHA512 (initscripts-9.71.tar.gz) = 96dc7c425d65e8518fd511e396fe83a62e79288649fe3a84c84cf9b8e5533f0cd432ba79a0a8da7ad4c7e559e3fce143203a9d8a8ba562a8797b3a66237a0ef8 From 243b64adc19b7c1077b416850f03158637dd78b4 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 25 May 2017 17:59:35 +0200 Subject: [PATCH 025/103] 9.72 --- .gitignore | 1 + initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 867baa9..c079e54 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /initscripts-9.69.tar.bz2 /initscripts-9.70.tar.gz /initscripts-9.71.tar.gz +/initscripts-9.72.tar.gz diff --git a/initscripts.spec b/initscripts.spec index d947fda..1568770 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.71 +Version: 9.72 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -176,6 +176,11 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Thu May 25 2017 David Kaspar [Dee'Kej] - 9.72-1 +- rename_device.c: rewrite of isCfg() function +- Add *.old to list of ignored files +- Replace usleep(1) calls with sleep(1) calls + * Wed May 24 2017 David Kaspar [Dee'Kej] - 9.71-1 - usleep: print deprecation warning from now on - sysconfig.txt: mention previously introduced NO_DHCP_HOSTNAME option diff --git a/sources b/sources index 22431e1..2c8ad29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.71.tar.gz) = 96dc7c425d65e8518fd511e396fe83a62e79288649fe3a84c84cf9b8e5533f0cd432ba79a0a8da7ad4c7e559e3fce143203a9d8a8ba562a8797b3a66237a0ef8 +SHA512 (initscripts-9.72.tar.gz) = b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32 From c8768ae27bad44fd46d58d2953fe69b735e265de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 13:34:18 +0000 Subject: [PATCH 026/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 1568770..b0f89aa 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.72 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -176,6 +176,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 9.72-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu May 25 2017 David Kaspar [Dee'Kej] - 9.72-1 - rename_device.c: rewrite of isCfg() function - Add *.old to list of ignored files From b6ab9a6dbfbb9baf518b2b4197c14775586186a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:47:46 +0000 Subject: [PATCH 027/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index b0f89aa..ae42143 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.72 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -176,6 +176,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 9.72-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 9.72-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From eaffb9550b6a82c0dd4973cb9aa887d639e74e35 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 4 Aug 2017 16:53:29 +0200 Subject: [PATCH 028/103] 9.74 --- .gitignore | 1 + initscripts.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c079e54..a0594ba 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /initscripts-9.70.tar.gz /initscripts-9.71.tar.gz /initscripts-9.72.tar.gz +/initscripts-9.74.tar.gz diff --git a/initscripts.spec b/initscripts.spec index ae42143..387fcb9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.72 +Version: 9.74 License: GPLv2 Group: System Environment/Base -Release: 3%{?dist} +Release: 1%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -143,7 +143,6 @@ fi %dir %{_sysconfdir}/rc.d/init.d %{_sysconfdir}/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local -%{_prefix}/lib/sysctl.d/00-system.conf %exclude %{_sysconfdir}/profile.d/debug* %{_sysconfdir}/profile.d/* %{_sbindir}/sys-unconfig @@ -176,11 +175,16 @@ fi %{_sysconfdir}/profile.d/debug* %changelog -* Wed Aug 02 2017 Fedora Release Engineering - 9.72-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Fri Aug 04 2017 David Kaspar [Dee'Kej] - 9.74-1 +- Makefile: fix whitespace error in commit b119d37d1 -* Wed Jul 26 2017 Fedora Release Engineering - 9.72-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Thu Aug 03 2017 David Kaspar [Dee'Kej] - 9.73-1 +- Makefile: replace /var/run with /run +- Replace /var/run with /run everywhere +- Update references to sysctl.conf +- Drop sysctl.d/00-system.conf +- Drop 256term.{sh,csh} +- ARPUPDATE introduced * Thu May 25 2017 David Kaspar [Dee'Kej] - 9.72-1 - rename_device.c: rewrite of isCfg() function diff --git a/sources b/sources index 2c8ad29..538a2c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.72.tar.gz) = b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32 +SHA512 (initscripts-9.74.tar.gz) = d5fee290a99d6324fe9ca69c834e836ca0856779c2f5f15387fabd1bb06c5f9e8362b6a75b4a2c6084ef9a1bfb1a8fd99f4ecba3418bb7c56755457801d0ee0e From ee6edab6e60f227da071d7fcec486d6c5c7e8baa Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Mon, 7 Aug 2017 14:46:31 +0200 Subject: [PATCH 029/103] 9.75 --- .gitignore | 1 + initscripts.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a0594ba..b62cb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /initscripts-9.71.tar.gz /initscripts-9.72.tar.gz /initscripts-9.74.tar.gz +/initscripts-9.75.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 387fcb9..4082b36 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.74 +Version: 9.75 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -175,6 +175,13 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.75-1 +- Makefile: $ROOT variable is now empty by default +- Makefile: Fix additional error in commit b119d37d1 +- ifup-eth: wait for STP to complete setup on bridge if $DELAY is not set +- init.d/functions: is_true() & is_false() extended by ON/OFF support +- init.d/functions: convert2sec() function added + * Fri Aug 04 2017 David Kaspar [Dee'Kej] - 9.74-1 - Makefile: fix whitespace error in commit b119d37d1 diff --git a/sources b/sources index 538a2c3..7d0c761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.74.tar.gz) = d5fee290a99d6324fe9ca69c834e836ca0856779c2f5f15387fabd1bb06c5f9e8362b6a75b4a2c6084ef9a1bfb1a8fd99f4ecba3418bb7c56755457801d0ee0e +SHA512 (initscripts-9.75.tar.gz) = c1a6e2700ee9b849f28276ef1c1455d252be94c71540a63df64d88242439c2b1a24dd0088b33a7b51d37d512e0e43f5052c98ddb32dccea6fa14762c0393d998 From 8e43169ab0bffba162dca9daf8216302efdfb4de Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Mon, 7 Aug 2017 17:02:27 +0200 Subject: [PATCH 030/103] 9.76 --- .gitignore | 1 + initscripts.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b62cb1a..5fd5ded 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /initscripts-9.72.tar.gz /initscripts-9.74.tar.gz /initscripts-9.75.tar.gz +/initscripts-9.76.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 4082b36..4ce3ce6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.75 +Version: 9.76 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -156,7 +156,7 @@ fi %{_prefix}/lib/udev/rename_device %{_sbindir}/service %{_mandir}/man*/* -%dir %attr(775,root,root) /var/run/netreport +%dir %attr(775,root,root) /run/netreport %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d %{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport @@ -175,6 +175,10 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.76-1 +- Makefile: return make archive for testing purposes +- Revert "Makefile: replace /var/run with /run" + * Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.75-1 - Makefile: $ROOT variable is now empty by default - Makefile: Fix additional error in commit b119d37d1 diff --git a/sources b/sources index 7d0c761..f525bd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.75.tar.gz) = c1a6e2700ee9b849f28276ef1c1455d252be94c71540a63df64d88242439c2b1a24dd0088b33a7b51d37d512e0e43f5052c98ddb32dccea6fa14762c0393d998 +SHA512 (initscripts-9.76.tar.gz) = fd472a02ee4dfcd89eb604d6f96da811693304026d40a8cae02071a170e0bcba12e72fa30723baef7636de1e3add59d50ac0cae6838911fb368cfaf9fcace47e From d3caf21a29dc0b61a609abbcf362c19690e2b557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 10 Aug 2017 15:29:31 -0400 Subject: [PATCH 031/103] Fix compilation on s390x --- initscripts.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/initscripts.spec b/initscripts.spec index 4ce3ce6..c76a4d3 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -143,6 +143,9 @@ fi %dir %{_sysconfdir}/rc.d/init.d %{_sysconfdir}/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local +%ifarch s390 s390x +%{_prefix}/lib/sysctl.d/00-system.conf +%endif %exclude %{_sysconfdir}/profile.d/debug* %{_sysconfdir}/profile.d/* %{_sbindir}/sys-unconfig From 14f11104dd0e8435c424144c19595b3b1745f064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Aug 2017 06:57:06 -0400 Subject: [PATCH 032/103] Rebuild after builds with rpm 4.14 were untagged --- initscripts.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index c76a4d3..29d73ec 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.76 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 1%{?dist}.1 URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -178,6 +178,10 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Fri Aug 11 2017 Zbigniew Jędrzejewski-Szmek - 9.76-1.1 +- Rebuild after builds with rpm 4.14 were untagged + (see https://bugzilla.redhat.com/show_bug.cgi?id=1480407) + * Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.76-1 - Makefile: return make archive for testing purposes - Revert "Makefile: replace /var/run with /run" From c155b1dbdad52a12f4e984bb0d92de66a16c4d8f Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 15 Aug 2017 14:35:16 +0200 Subject: [PATCH 033/103] 9.77 --- .gitignore | 1 + initscripts.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5fd5ded..6c020f8 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /initscripts-9.74.tar.gz /initscripts-9.75.tar.gz /initscripts-9.76.tar.gz +/initscripts-9.77.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 29d73ec..8298556 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.76 +Version: 9.77 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -129,6 +129,7 @@ fi %{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn %ifarch s390 s390x %{_sysconfdir}/sysconfig/network-scripts/ifup-ctc +%{_prefix}/lib/sysctl.d/00-system.conf %endif %config(noreplace) %{_sysconfdir}/networks %config(noreplace) %{_sysconfdir}/rwtab @@ -143,9 +144,6 @@ fi %dir %{_sysconfdir}/rc.d/init.d %{_sysconfdir}/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local -%ifarch s390 s390x -%{_prefix}/lib/sysctl.d/00-system.conf -%endif %exclude %{_sysconfdir}/profile.d/debug* %{_sysconfdir}/profile.d/* %{_sbindir}/sys-unconfig @@ -178,9 +176,9 @@ fi %{_sysconfdir}/profile.d/debug* %changelog -* Fri Aug 11 2017 Zbigniew Jędrzejewski-Szmek - 9.76-1.1 -- Rebuild after builds with rpm 4.14 were untagged - (see https://bugzilla.redhat.com/show_bug.cgi?id=1480407) +* Tue Aug 15 2017 David Kaspar [Dee'Kej] - 9.77-1 +- specfile: Fix failing build for s390* architecture +- Drop no longer supported SPARC architecture * Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.76-1 - Makefile: return make archive for testing purposes diff --git a/sources b/sources index f525bd2..4d55d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.76.tar.gz) = fd472a02ee4dfcd89eb604d6f96da811693304026d40a8cae02071a170e0bcba12e72fa30723baef7636de1e3add59d50ac0cae6838911fb368cfaf9fcace47e +SHA512 (initscripts-9.77.tar.gz) = a5ce5f2256182265b040f4fdd0d4fb865754a248d6b796298be4050b6ac263c3e312beef1aa7bab2ba27830a24e636919db43853f17a7cb1dea0833154ef850d From dcade7bff5488cb503b78b94e89db53a906f5593 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 9 Nov 2017 11:27:23 +0100 Subject: [PATCH 034/103] 9.78 --- .gitignore | 1 + initscripts.spec | 68 +++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 6c020f8..7ec3cd6 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /initscripts-9.75.tar.gz /initscripts-9.76.tar.gz /initscripts-9.77.tar.gz +/initscripts-9.78.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 8298556..dcc4fea 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.77 +Version: 9.78 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -19,8 +19,6 @@ Conflicts: dmraid < 1.0.0.rc16-18 Conflicts: policycoreutils < 2.5-6 Requires: systemd Requires: iproute, /sbin/arping, findutils -# Not strictly required, but nothing else requires it -Requires: /etc/system-release Requires: cpio Requires: hostname Conflicts: ipsec-tools < 0.8.0-2 @@ -29,6 +27,7 @@ Conflicts: ppp < 2.4.6-4 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig +%{?systemd_requires} BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd Provides: /sbin/service @@ -36,17 +35,6 @@ Provides: /sbin/service This package contains the script that activates and deactivates most network interfaces, some utilities, and other legacy files. -%package -n debugmode -Summary: Scripts for running in debug mode -Requires: initscripts -Group: System Environment/Base - -%description -n debugmode -The debugmode package contains some basic scripts that are used to run -the system in a debug mode. - -Currently, this consists of various memory checking code. - %prep %setup -q @@ -61,9 +49,6 @@ make ROOT=%{buildroot} SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} %ifnarch s390 s390x rm -f \ %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc \ -%else -rm -f \ - %{buildroot}%{_sysconfdir}/sysconfig/init.s390 %endif rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.local @@ -71,28 +56,33 @@ touch %{buildroot}%{_sysconfdir}/rc.d/rc.local chmod 755 %{buildroot}%{_sysconfdir}/rc.d/rc.local %post +%systemd_post fedora-import-state.service fedora-loadmodules.service fedora-readonly.service + /usr/sbin/chkconfig --add network > /dev/null 2>&1 || : /usr/sbin/chkconfig --add netconsole > /dev/null 2>&1 || : -if [ $1 -eq 1 ]; then - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : -fi %preun +%systemd_preun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service + if [ $1 = 0 ]; then /usr/sbin/chkconfig --del network > /dev/null 2>&1 || : /usr/sbin/chkconfig --del netconsole > /dev/null 2>&1 || : fi %postun -if [ $1 -ge 1 ]; then - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : +%systemd_postun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service + +# This should be removed in Rawhide for Fedora 29: +%triggerun -- initscripts < 9.78 +if [ $1 -gt 1 ]; then + systemctl enable fedora-import-state.service fedora-readonly.service &> /dev/null || : + echo -e "\nUPGRADE: Automatically re-enabling default systemd units: fedora-import-state.service fedora-readonly.service\n" || : fi %files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/sysconfig/network-scripts %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime -%config(noreplace) %{_sysconfdir}/sysconfig/init %config(noreplace) %{_sysconfdir}/sysconfig/netconsole %config(noreplace) %{_sysconfdir}/sysconfig/readonly-root %{_sysconfdir}/sysconfig/network-scripts/ifdown @@ -129,7 +119,6 @@ fi %{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn %ifarch s390 s390x %{_sysconfdir}/sysconfig/network-scripts/ifup-ctc -%{_prefix}/lib/sysctl.d/00-system.conf %endif %config(noreplace) %{_sysconfdir}/networks %config(noreplace) %{_sysconfdir}/rwtab @@ -144,7 +133,6 @@ fi %dir %{_sysconfdir}/rc.d/init.d %{_sysconfdir}/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local -%exclude %{_sysconfdir}/profile.d/debug* %{_sysconfdir}/profile.d/* %{_sbindir}/sys-unconfig %{_bindir}/usleep @@ -170,12 +158,22 @@ fi %dir %{_libexecdir}/initscripts %dir %{_libexecdir}/initscripts/legacy-actions -%files -n debugmode -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/sysconfig/debug -%{_sysconfdir}/profile.d/debug* - %changelog +* Wed Nov 08 2017 David Kaspar [Dee'Kej] - 9.78-1 +- specfile: drop dependancy on /etc/system-release +- ifup-post: always update nameserver & search entries in /etc/resolv.conf +- network-scripts: forward DBus calls to /dev/null +- Spelling fixes +- Tell git to ignore *.o +- Use grep -E instead of deprecated egrep +- Avoid some unnecessary stat calls +- systemd/system: symlinks for fedora-* services removed +- network-scripts: firewall-cmd replaced with DBus calls +- 'debugmode' subpackage dropped completely +- sysconfig/init* files dropped +- sysctl.conf.s390 dropped +- usleep: change the error message to print the full replacement commandline + * Tue Aug 15 2017 David Kaspar [Dee'Kej] - 9.77-1 - specfile: Fix failing build for s390* architecture - Drop no longer supported SPARC architecture @@ -410,7 +408,7 @@ ng * Fri May 31 2013 Lukáš Nykrýn - 9.47-1 - network-functions: to determine state of nscd check socket not lock (#960779) -- sysconfig.txt advised saslauthd -a instad of -v +- sysconfig.txt advised saslauthd -a instead of -v - update translations from transifex - drop translation for other initscripts - tweak ifup/ifdown usage and man page (#961917) @@ -1056,7 +1054,7 @@ ng by booting) - serial: add a crude hack to wait for runlevels to finish (#437379) - serial: frob /etc/securetty when necessary (#437381) -- add a upstart-specific inittab +- add an upstart-specific inittab - translation updates: as, bn_IN, cs, de, es, fi, fr, gu, hi, it, ja, kn, ml, mr, nb, nl, pa, pl, pt_BR, ru, sk, sr, ta, te, zh_CN @@ -1547,7 +1545,7 @@ ng - network-functions: don't error out if hotplug doesn't exist (#140008) - ifup: always return errors on trying to bring up nonexistent devices (#131461) - ifup: fix error message (#143674) -- rc.sysinit: add a autorelabel boot target (#154496) +- rc.sysinit: add an autorelabel boot target (#154496) - prefdm: if something else is specified as $DISPLAYMANAGER, try that (#147304) - remove support for the old firewall type - network: optimize some (#138557, ) @@ -1873,7 +1871,7 @@ ng - readonly root fixes () * Tue May 25 2004 Karsten Hopp 7.56-1 -- special TYPE for qeth devices to differenciate them from ethX +- special TYPE for qeth devices to differentiate them from ethX * Mon May 24 2004 Bill Nottingham - fix pppd vs. ppp typo in conflicts (#123680) @@ -2397,7 +2395,7 @@ ng * Sun Sep 2 2001 Than Ngo - add ISDN patches from pekkas@netcore.fi and pb@bieringer.de (bug #52491) -- fix handling of ISDN LSZ Compresssion +- fix handling of ISDN LSZ Compression * Thu Aug 30 2001 Than Ngo - po/de.po: fix typo bug, lo instead 1o diff --git a/sources b/sources index 4d55d49..5fb4e72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.77.tar.gz) = a5ce5f2256182265b040f4fdd0d4fb865754a248d6b796298be4050b6ac263c3e312beef1aa7bab2ba27830a24e636919db43853f17a7cb1dea0833154ef850d +SHA512 (initscripts-9.78.tar.gz) = 47616074d98be47e896776ee072ce016253bca92ce0714801066a00d1b0108ee50b9fe40c194dd1b6f422701fbfbaefbec127b6081ecd810de79deca83fddbbf From 73d57eaa5bcef91b8f82aeff59b139e8d4828a7d Mon Sep 17 00:00:00 2001 From: esakaiev Date: Tue, 12 Dec 2017 18:49:11 +0200 Subject: [PATCH 035/103] Initial commit, adding .gitignore to the master branch --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 From 6c34f25ae16a9652e9ce0fe0839b3fbc44581e16 Mon Sep 17 00:00:00 2001 From: esakaiev Date: Tue, 12 Dec 2017 18:50:57 +0200 Subject: [PATCH 036/103] Adding initscripts tests to the new-tests branch --- tests/Sanity-init-scripts-LSB/Makefile | 64 +++++ tests/Sanity-init-scripts-LSB/PURPOSE | 3 + tests/Sanity-init-scripts-LSB/runtest.sh | 190 +++++++++++++++ tests/standard-inventory-qcow2 | 291 +++++++++++++++++++++++ tests/tests.yml | 12 + 5 files changed, 560 insertions(+) create mode 100644 tests/Sanity-init-scripts-LSB/Makefile create mode 100644 tests/Sanity-init-scripts-LSB/PURPOSE create mode 100755 tests/Sanity-init-scripts-LSB/runtest.sh create mode 100755 tests/standard-inventory-qcow2 create mode 100644 tests/tests.yml diff --git a/tests/Sanity-init-scripts-LSB/Makefile b/tests/Sanity-init-scripts-LSB/Makefile new file mode 100644 index 0000000..460c83f --- /dev/null +++ b/tests/Sanity-init-scripts-LSB/Makefile @@ -0,0 +1,64 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/initscripts/Sanity/init-scripts-LSB +# Description: Init scripts should meet LSB specifications +# Author: Yulia Kopkova +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2009 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# 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., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/initscripts/Sanity/init-scripts-LSB +export TESTVERSION=1.4 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Jan Scotka " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Init scripts should meet LSB specifications" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: initscripts" >> $(METADATA) + @echo "Requires: initscripts" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: RedHatEnterpriseLinux6" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Sanity-init-scripts-LSB/PURPOSE b/tests/Sanity-init-scripts-LSB/PURPOSE new file mode 100644 index 0000000..7246d5e --- /dev/null +++ b/tests/Sanity-init-scripts-LSB/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /CoreOS/initscripts/Sanity/init-scripts-LSB +Description: Init scripts should meet LSB specifications +Author: Yulia Kopkova diff --git a/tests/Sanity-init-scripts-LSB/runtest.sh b/tests/Sanity-init-scripts-LSB/runtest.sh new file mode 100755 index 0000000..bce25d6 --- /dev/null +++ b/tests/Sanity-init-scripts-LSB/runtest.sh @@ -0,0 +1,190 @@ +#!/bin/bash +# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/initscripts/Sanity/init-scripts-LSB +# Description: Init scripts should meet LSB specifications +# Author: Jan Scotka , Yulia Kopkova +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2009 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# 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., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include rhts environment +. /usr/bin/rhts-environment.sh +. /usr/share/rhts-library/rhtslib.sh + +PACKAGE="initscripts" + + +SRV_NETCONSOLE=netconsole +SRV_NETFS=netfs +SRV_NETWORK=network + +rlJournalStart + + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "useradd testuserqa" 0 "Add test user" + rlFileBackup /etc/sysconfig/netconsole + if rlIsRHEL '<7'; then #there is no syslog in rhel7 and highier + rlRun "sed -i -e 's,^# SYSLOGADDR=,SYSLOGADDR=redhat.com,' /etc/sysconfig/netconsole" 0 "Set remote syslog server address /etc/sysconfig/netconsole" + fi + rlPhaseEnd + + + rlPhaseStartTest "netconsole service LSB compliance test" +if ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*; then + rlRun "ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*" 0 + if rlIsRHEL '<7'; then + + SERVICE=$SRV_NETCONSOLE + rlServiceStop $SERVICE + rlLog ">>>>>>>>> service start" + rlRun "service $SERVICE start" 0 " Service must start without problem" + rlRun "service $SERVICE status" 0 " Then Status command " + rlRun "service $SERVICE start" 0 " Already started service " + rlRun "service $SERVICE status" 0 " Again status command " + + rlLog ">>>>>>>>> service restart" + rlRun "service $SERVICE restart" 0 " Restarting of service" + rlRun "service $SERVICE status" 0 " Status command " + + rlLog ">>>>>>>>> service stop" + rlRun "service $SERVICE stop" 0 " Stopping service " + rlRun "service $SERVICE status" 3 " Status of stopped service " + rlRun "service $SERVICE stop" 0 " Stopping service again " + rlRun "service $SERVICE status" 3 " Status of stopped service " + + rlLog ">>>>>>>>> insufficient rights" + rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " + rlRun "su testuserqa -c 'service $SERVICE restart'" 1 "Insufficient rights, restarting resrvice under nonprivileged user must fail" + + rlLog ">>>>>>>>> operations" + rlServiceStop $SERVICE + rlRun "service $SERVICE start" 0 " Service have to implement start function " + rlRun "service $SERVICE restart" 0 " Service have to implement restart function " + rlRun "service $SERVICE status" 0 " Service have to implement status function " + rlRun "service $SERVICE condrestart" 0 " Service have to implement condrestart function " + rlRun "service $SERVICE reload" 0 " Service have to implement reload function " + rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function " + + rlLog ">>>>>>>>> nonexist operations" + rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" + + rlServiceRestore $SERVICE + fi # rhel 6 or less +else + rlLog ">>>> no netconsole kernel module appear here" + rlRun "ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*" 1,2 +fi + rlLog "NIC should support polling, NETPOLL should be compliled in kernel and netconsole module should be loaded" + rlLog "`cat /usr/src/kernels/$(uname -r)/.config | grep -i poll`" + rlLog "netconsole module: `lsmod | grep -i netconsole && echo true || echo false`" + rlLog "`cat /var/log/messages | grep -i netconsole | tail -n 10`" + rlPhaseEnd + + # for RHEL6 and lower + if rlIsRHEL '<7'; then + rlPhaseStartTest "netfs service LSB compliance test" + + SERVICE=$SRV_NETFS + rlServiceStop $SERVICE + rlLog ">>>>>>>>> service start" + rlRun "service $SERVICE start" 0 " Service must start without problem" + rlRun "service $SERVICE status" 0 " Then Status command " + rlRun "service $SERVICE start" 0 " Already started service " + rlRun "service $SERVICE status" 0 " Again status command " + + rlLog ">>>>>>>>> service restart" + rlRun "service $SERVICE restart" 0 " Restarting of service" + rlRun "service $SERVICE status" 0 " Status command " + + rlLog ">>>>>>>>> service stop" + rlRun "service $SERVICE stop" 0 " Stopping service " + rlRun "service $SERVICE status" 3 " Status of stopped service " + rlRun "service $SERVICE stop" 0 " Stopping service again " + rlRun "service $SERVICE status" 3 " Status of stopped service " + + rlLog ">>>>>>>>> insufficient rights" + rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " + rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail" + + rlLog ">>>>>>>>> operations" + rlServiceStop $SERVICE + rlRun "service $SERVICE start" 0 " Service have to implement start function " + rlRun "service $SERVICE restart" 0 " Service have to implement restart function " + rlRun "service $SERVICE status" 0 " Service have to implement status function " + + rlLog ">>>>>>>>> nonexist operations" + rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" + + rlServiceRestore $SERVICE + fi #RHEL6 and lower + + rlPhaseEnd + + +# rlPhaseStartTest "$SRV_NETWORK service LSB compliance test" +# +# SERVICE=$SRV_NETWORK +# rlServiceStop $SERVICE +# rlLog ">>>>>>>>> service start" +# rlRun "service $SERVICE start" 0 " Service must start without problem" +# rlRun "service $SERVICE status" 0 " Then Status command " +# rlRun "service $SERVICE start" 1,0 " Already started service " +# rlRun "service $SERVICE status" 0 " Again status command " + +# rlLog ">>>>>>>>> service restart" +# rlRun "service $SERVICE restart" 0 " Restarting of service" +# rlRun "service $SERVICE status" 0 " Status command " + +# rlLog ">>>>>>>>> service stop" +# rlRun "service $SERVICE stop" 0 " Stopping service " +# rlRun "service $SERVICE status" 0 " Status of stopped service " +# rlRun "service $SERVICE stop" 0 " Stopping service again " +# rlRun "service $SERVICE status" 0 " Status of stopped service " + +# rlLog ">>>>>>>>> insufficient rights" +# rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " +# rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail" + +# rlLog ">>>>>>>>> operations" +# rlServiceStop $SERVICE +# rlRun "service $SERVICE start" 0 " Service have to implement start function " +# rlRun "service $SERVICE restart" 0 " Service have to implement restart function " +# rlRun "service $SERVICE status" 0 " Service have to implement status function " +# rlRun "service $SERVICE reload" 0 " Service have to implement reload function " +# rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function " + +# rlLog ">>>>>>>>> nonexist operations" +# rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" + +# rlServiceRestore $SERVICE +# service $SERVICE start + rlPhaseEnd + + + rlPhaseStartCleanup + rlRun "userdel -fr testuserqa" 0 "Remove test user" + rlFileRestore + rlPhaseEnd + +rlJournalPrintText +rlJournalEnd diff --git a/tests/standard-inventory-qcow2 b/tests/standard-inventory-qcow2 new file mode 100755 index 0000000..a9e2c64 --- /dev/null +++ b/tests/standard-inventory-qcow2 @@ -0,0 +1,291 @@ +#!/usr/bin/env python + +import argparse +import errno +import json +import os +import shutil +import shlex +import signal +import socket +import subprocess +import sys +import tempfile +import time +import distutils.util + +IDENTITY = """ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA1DrTSXQRF8isQQfPfK3U+eFC4zBrjur+Iy15kbHUYUeSHf5S +jXPYbHYqD1lHj4GJajC9okle9rykKFYZMmJKXLI6987wZ8vfucXo9/kwS6BDAJto +ZpZSj5sWCQ1PI0Ce8CbkazlTp5NIkjRfhXGP8mkNKMEhdNjaYceO49ilnNCIxhpb +eH5dH5hybmQQNmnzf+CGCCLBFmc4g3sFbWhI1ldyJzES5ZX3ahjJZYRUfnndoUM/ +TzdkHGqZhL1EeFAsv5iV65HuYbchch4vBAn8jDMmHh8G1ixUCL3uAlosfarZLLyo +3HrZ8U/llq7rXa93PXHyI/3NL/2YP3OMxE8baQIDAQABAoIBAQCxuOUwkKqzsQ9W +kdTWArfj3RhnKigYEX9qM+2m7TT9lbKtvUiiPc2R3k4QdmIvsXlCXLigyzJkCsqp +IJiPEbJV98bbuAan1Rlv92TFK36fBgC15G5D4kQXD/ce828/BSFT2C3WALamEPdn +v8Xx+Ixjokcrxrdeoy4VTcjB0q21J4C2wKP1wEPeMJnuTcySiWQBdAECCbeZ4Vsj +cmRdcvL6z8fedRPtDW7oec+IPkYoyXPktVt8WsQPYkwEVN4hZVBneJPCcuhikYkp +T3WGmPV0MxhUvCZ6hSG8D2mscZXRq3itXVlKJsUWfIHaAIgGomWrPuqC23rOYCdT +5oSZmTvFAoGBAPs1FbbxDDd1fx1hisfXHFasV/sycT6ggP/eUXpBYCqVdxPQvqcA +ktplm5j04dnaQJdHZ8TPlwtL+xlWhmhFhlCFPtVpU1HzIBkp6DkSmmu0gvA/i07Z +pzo5Z+HRZFzruTQx6NjDtvWwiXVLwmZn2oiLeM9xSqPu55OpITifEWNjAoGBANhH +XwV6IvnbUWojs7uiSGsXuJOdB1YCJ+UF6xu8CqdbimaVakemVO02+cgbE6jzpUpo +krbDKOle4fIbUYHPeyB0NMidpDxTAPCGmiJz7BCS1fCxkzRgC+TICjmk5zpaD2md +HCrtzIeHNVpTE26BAjOIbo4QqOHBXk/WPen1iC3DAoGBALsD3DSj46puCMJA2ebI +2EoWaDGUbgZny2GxiwrvHL7XIx1XbHg7zxhUSLBorrNW7nsxJ6m3ugUo/bjxV4LN +L59Gc27ByMvbqmvRbRcAKIJCkrB1Pirnkr2f+xx8nLEotGqNNYIawlzKnqr6SbGf +Y2wAGWKmPyEoPLMLWLYkhfdtAoGANsFa/Tf+wuMTqZuAVXCwhOxsfnKy+MNy9jiZ +XVwuFlDGqVIKpjkmJyhT9KVmRM/qePwgqMSgBvVOnszrxcGRmpXRBzlh6yPYiQyK +2U4f5dJG97j9W7U1TaaXcCCfqdZDMKnmB7hMn8NLbqK5uLBQrltMIgt1tjIOfofv +BNx0raECgYEApAvjwDJ75otKz/mvL3rUf/SNpieODBOLHFQqJmF+4hrSOniHC5jf +f5GS5IuYtBQ1gudBYlSs9fX6T39d2avPsZjfvvSbULXi3OlzWD8sbTtvQPuCaZGI +Df9PUWMYZ3HRwwdsYovSOkT53fG6guy+vElUEDkrpZYczROZ6GUcx70= +-----END RSA PRIVATE KEY----- +""" + +USER_DATA = """#cloud-config +users: + - default + - name: root + groups: sudo + shell: /bin/bash + ssh_authorized_keys: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUOtNJdBEXyKxBB898rdT54ULjMGuO6v4jLXmRsdRhR5Id/lKNc9hsdioPWUePgYlqML2iSV72vKQoVhkyYkpcsjr3zvBny9+5xej3+TBLoEMAm2hmllKPmxYJDU8jQJ7wJuRrOVOnk0iSNF+FcY/yaQ0owSF02Nphx47j2KWc0IjGGlt4fl0fmHJuZBA2afN/4IYIIsEWZziDewVtaEjWV3InMRLllfdqGMllhFR+ed2hQz9PN2QcapmEvUR4UCy/mJXrke5htyFyHi8ECfyMMyYeHwbWLFQIve4CWix9qtksvKjcetnxT+WWrutdr3c9cfIj/c0v/Zg/c4zETxtp standard-test-qcow2 +ssh_pwauth: True +chpasswd: + list: | + root:foobar + expire: False +runcmd: + - mkfs.ext4 /dev/sdb + - mount /dev/sdb /usr/local + - sudo mount -o remount,rw /usr + - mkdir /expected /output +""" + +def main(argv): + parser = argparse.ArgumentParser(description="Inventory for a QCow2 test image") + parser.add_argument("--list", action="store_true", help="Verbose output") + parser.add_argument('--host', help="Get host variables") + parser.add_argument("subjects", nargs="*", default=shlex.split(os.environ.get("TEST_SUBJECTS", ""))) + opts = parser.parse_args() + + try: + if opts.host: + data = host(opts.host) + else: + data = list(opts.subjects) + sys.stdout.write(json.dumps(data, indent=4, separators=(',', ': '))) + except RuntimeError as ex: + sys.stderr.write("{0}: {1}\n".format(os.path.basename(sys.argv[0]), str(ex))) + return 1 + + return 0 + + +def list(subjects): + hosts = [] + variables = {} + for subject in subjects: + if subject.endswith((".qcow2", ".qcow2c")): + vars = host(subject) + if vars: + hosts.append(subject) + variables[subject] = vars + return {"localhost": {"hosts": hosts, "vars": {}}, "subjects": {"hosts": hosts, "vars": {}}, + "_meta": {"hostvars": variables}} + + +def start_qemu(image, cloudinit, log, disk_directory=None, disk_size=None, portrange=(2222, 5555)): + for port in xrange(*portrange): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + try: + sock.bind(("127.0.0.3", port)) + + if disk_size: + return subprocess.Popen(["/usr/bin/qemu-system-x86_64", "-m", "1024", image, + "-enable-kvm", "-snapshot", "-cdrom", cloudinit, + "-hdb", disk_directory, + "-net", "nic,model=virtio", "-net", + "user,hostfwd=tcp:127.0.0.3:{0}-:22".format(port), + "-device", "isa-serial,chardev=pts2", "-chardev", "file,id=pts2,path=" + log, + "-display", "none"], stdout=open(os.devnull, 'w')), port + else: + return subprocess.Popen(["/usr/bin/qemu-system-x86_64", "-m", "1024", image, + "-enable-kvm", "-snapshot", "-cdrom", cloudinit, + "-net", "nic,model=virtio", "-net", + "user,hostfwd=tcp:127.0.0.3:{0}-:22".format(port), + "-device", "isa-serial,chardev=pts2", "-chardev", "file,id=pts2,path=" + log, + "-display", "none"], stdout=open(os.devnull, 'w')), port + except IOError: + pass + finally: + sock.close() + else: + raise RuntimeError("unable to find free local port to map SSH to") + + +def host(image): + null = open(os.devnull, 'w') + + try: + tty = os.open("/dev/tty", os.O_WRONLY) + os.dup2(tty, 2) + except OSError: + tty = None + pass + + # A directory for temporary stuff + directory = tempfile.mkdtemp(prefix="inventory-cloud") + identity = os.path.join(directory, "identity") + with open(identity, 'w') as f: + f.write(IDENTITY) + os.chmod(identity, 0o600) + metadata = os.path.join(directory, "meta-data") + with open(metadata, 'w') as f: + f.write("") + userdata = os.path.join(directory, "user-data") + with open(userdata, 'w') as f: + f.write(USER_DATA) + + # Create additional disk + disk_size = None + disk_directory = None + try: + disk_size = os.environ.get("EXTEND_DISK_SIZE") + if disk_size: + sys.stderr.write("\nCreate additional cloud init disk DISK SIZE {}\n".format(disk_size)) + + disk_directory = "{}/atomic-host-disk2-{}".format(directory, disk_size) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", disk_directory, disk_size], stdout=null) + + except KeyError: + sys.stderr.write("\nCouldn't create additional cloud init disk DISK SIZE\n") + pass + + # Create our cloud init so we can log in + cloudinit = os.path.join(directory, "cloud-init.iso") + subprocess.check_call(["/usr/bin/genisoimage", "-input-charset", "utf-8", + "-volid", "cidata", "-joliet", "-rock", "-quiet", + "-output", cloudinit, userdata, metadata], stdout=null) + + # Determine if virtual machine should be kept available for diagnosis after completion + try: + diagnose = distutils.util.strtobool(os.getenv("TEST_DEBUG", "0")) + except ValueError: + diagnose = 0 + + sys.stderr.write("Launching virtual machine for {0}\n".format(image)) + + # And launch the actual VM + artifacts = os.environ.get("TEST_ARTIFACTS", os.path.join(os.getcwd(), "artifacts")) + try: + os.makedirs(artifacts) + except OSError as exc: + if exc.errno != errno.EEXIST or not os.path.isdir(artifacts): + raise + log = os.path.join(artifacts, "{0}.log".format(os.path.basename(image))) + + proc = None # for failure detection + cpe = None # for exception scoping + for tries in xrange(0, 5): + try: + proc, port = start_qemu(image, cloudinit, log, disk_directory=disk_directory, disk_size=disk_size) + break + except subprocess.CalledProcessError as cpe: + time.sleep(1) + continue + if proc is None: + raise RuntimeError("Could not launch VM for qcow2 image" + " '{0}':{1}".format(image, cpe.output)) + + # The variables + variables = {"ansible_ssh_port": "{0}".format(port), + "ansible_ssh_host": "127.0.0.3", + "ansible_ssh_user": "root", + "ansible_ssh_pass": "foobar", + "ansible_ssh_private_key_file": identity, + "ansible_ssh_common_args": "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"} + + # Write out a handy inventory file, for our use and for debugging + args = " ".join(["{0}='{1}'".format(*item) for item in variables.items()]) + inventory = os.path.join(directory, "inventory") + with open(inventory, "w") as f: + f.write("[subjects]\nlocalhost {1}\n".format(image, args)) + + # Wait for ssh to come up + ping = ["/usr/bin/ansible", "--inventory", inventory, "localhost", "--module-name", "raw", "--args", "/bin/true"] + + for tries in xrange(0, 30): + try: + (pid, ret) = os.waitpid(proc.pid, os.WNOHANG) + if pid != 0: + raise RuntimeError("qemu failed to launch qcow2 image: {0}".format(image)) + subprocess.check_call(ping, stdout=null, stderr=null) + break + except subprocess.CalledProcessError: + time.sleep(3) + else: + # Kill the qemu process + try: + os.kill(proc.pid, signal.SIGTERM) + except OSError: + pass + raise RuntimeError("could not access launched qcow2 image: {0}".format(image)) + + # Process of our parent + ppid = os.getppid() + + child = os.fork() + if child: + return variables + + # Daemonize and watch the processes + os.chdir("/") + os.setsid() + os.umask(0) + + if tty is None: + tty = null.fileno() + + # Duplicate standard input to standard output and standard error. + os.dup2(null.fileno(), 0) + os.dup2(tty, 1) + os.dup2(tty, 2) + + # Now wait for the parent process to go away, then kill the VM + while True: + time.sleep(3) + try: + os.kill(ppid, 0) + os.kill(proc.pid, 0) + except OSError: + break # Either of the processes no longer exist + + if diagnose: + sys.stderr.write("\n") + sys.stderr.write("DIAGNOSE: ssh -p {0} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null " + "root@{1} # password: {2}\n".format(port, "127.0.0.3", "foobar")) + sys.stderr.write("DIAGNOSE: export ANSIBLE_INVENTORY={0}\n".format(inventory)) + sys.stderr.write("DIAGNOSE: kill {0} # when finished\n".format(os.getpid())) + + def _signal_handler(*args): + sys.stderr.write("\nDIAGNOSE ending...\n") + + signal.signal(signal.SIGTERM, _signal_handler) + signal.pause() + + # Kill the qemu process + try: + os.kill(proc.pid, signal.SIGTERM) + except OSError: + pass + + shutil.rmtree(directory) + sys.exit(0) + + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..2e7b831 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +--- +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + - container + - atomic + tests: + - Sanity-init-scripts-LSB + required_packages: + - initscripts From b847d3463c5ac999bb3c08dabe61857a3020c10a Mon Sep 17 00:00:00 2001 From: esakaiev Date: Thu, 14 Dec 2017 19:41:15 +0200 Subject: [PATCH 037/103] Removing .gitignore from new_tests branch --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 From b141ea22e97c25b132a4c7344936ba39f9005066 Mon Sep 17 00:00:00 2001 From: esakaiev Date: Tue, 19 Dec 2017 19:00:08 +0200 Subject: [PATCH 038/103] Adding cnhages in Sanity-init-scripts-LSB, according to the http://pkgs.devel.redhat.com/cgit/tests/initscripts/commit/ --- tests/Sanity-init-scripts-LSB/runtest.sh | 64 +++++++++++++++++++----- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/tests/Sanity-init-scripts-LSB/runtest.sh b/tests/Sanity-init-scripts-LSB/runtest.sh index bce25d6..a2274d0 100755 --- a/tests/Sanity-init-scripts-LSB/runtest.sh +++ b/tests/Sanity-init-scripts-LSB/runtest.sh @@ -35,6 +35,7 @@ PACKAGE="initscripts" SRV_NETCONSOLE=netconsole SRV_NETFS=netfs +TRG_REMOTEFS=remote-fs.target SRV_NETWORK=network rlJournalStart @@ -57,13 +58,13 @@ if ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*; then SERVICE=$SRV_NETCONSOLE rlServiceStop $SERVICE rlLog ">>>>>>>>> service start" - rlRun "service $SERVICE start" 0 " Service must start without problem" + rlRun "service $SERVICE start" 0 " Service must start without problem " rlRun "service $SERVICE status" 0 " Then Status command " rlRun "service $SERVICE start" 0 " Already started service " rlRun "service $SERVICE status" 0 " Again status command " rlLog ">>>>>>>>> service restart" - rlRun "service $SERVICE restart" 0 " Restarting of service" + rlRun "service $SERVICE restart" 0 " Restarting of service " rlRun "service $SERVICE status" 0 " Status command " rlLog ">>>>>>>>> service stop" @@ -74,7 +75,7 @@ if ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*; then rlLog ">>>>>>>>> insufficient rights" rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " - rlRun "su testuserqa -c 'service $SERVICE restart'" 1 "Insufficient rights, restarting resrvice under nonprivileged user must fail" + rlRun "su testuserqa -c 'service $SERVICE restart'" 1 "Insufficient rights, restarting resrvice under nonprivileged user must fail " rlLog ">>>>>>>>> operations" rlServiceStop $SERVICE @@ -86,7 +87,7 @@ if ls /lib*/modules/*/kernel/drivers/net/netconsole.ko*; then rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function " rlLog ">>>>>>>>> nonexist operations" - rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" + rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function " rlServiceRestore $SERVICE fi # rhel 6 or less @@ -107,13 +108,13 @@ fi SERVICE=$SRV_NETFS rlServiceStop $SERVICE rlLog ">>>>>>>>> service start" - rlRun "service $SERVICE start" 0 " Service must start without problem" + rlRun "service $SERVICE start" 0 " Service must start without problem " rlRun "service $SERVICE status" 0 " Then Status command " rlRun "service $SERVICE start" 0 " Already started service " rlRun "service $SERVICE status" 0 " Again status command " rlLog ">>>>>>>>> service restart" - rlRun "service $SERVICE restart" 0 " Restarting of service" + rlRun "service $SERVICE restart" 0 " Restarting of service " rlRun "service $SERVICE status" 0 " Status command " rlLog ">>>>>>>>> service stop" @@ -124,7 +125,7 @@ fi rlLog ">>>>>>>>> insufficient rights" rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " - rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail" + rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail " rlLog ">>>>>>>>> operations" rlServiceStop $SERVICE @@ -133,12 +134,49 @@ fi rlRun "service $SERVICE status" 0 " Service have to implement status function " rlLog ">>>>>>>>> nonexist operations" - rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" + rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function " rlServiceRestore $SERVICE - fi #RHEL6 and lower rlPhaseEnd + else + rlPhaseStartTest "remote-fs target LSB compliance test" + + TARGET=$TRG_REMOTEFS + rlServiceStop $TARGET + rlLog ">>>>>>>>> target start" + rlRun "service $TARGET start" 0 " Target must start without problem " + rlRun "service $TARGET status" 0 " Then Status command " + rlRun "service $TARGET start" 0 " Already started target " + rlRun "service $TARGET status" 0 " Again status command " + + rlLog ">>>>>>>>> target restart" + rlRun "service $TARGET restart" 0 " Restarting target " + rlRun "service $TARGET status" 0 " Status command " + + rlLog ">>>>>>>>> target stop" + rlRun "service $TARGET stop" 0 " Stopping target " + rlRun "service $TARGET status" 3 " Status of stopped target " + rlRun "service $TARGET stop" 0 " Stopping target again " + rlRun "service $TARGET status" 3 " Status of stopped target " + + rlLog ">>>>>>>>> insufficient rights" + rlRun "service $TARGET start " 0 " Starting target for restarting under nonpriv user " + rlRun "su testuserqa -c 'service $TARGET restart'" 1 " Insufficient rights, restarting target under nonprivileged user must fail " # returns 1 instead of 4 because of polkit + + rlLog ">>>>>>>>> operations" + rlServiceStop $TARGET + rlRun "service $TARGET start" 0 " Target have to implement start function " + rlRun "service $TARGET restart" 0 " Target have to implement restart function " + rlRun "service $TARGET status" 0 " Target have to implement status function " + + rlLog ">>>>>>>>> nonexist operations" + rlRun "service $TARGET noexistop" 2 " Testing proper return code when nonexisting function " + + rlServiceRestore $TARGET + + rlPhaseEnd + fi # rlPhaseStartTest "$SRV_NETWORK service LSB compliance test" @@ -146,13 +184,13 @@ fi # SERVICE=$SRV_NETWORK # rlServiceStop $SERVICE # rlLog ">>>>>>>>> service start" -# rlRun "service $SERVICE start" 0 " Service must start without problem" +# rlRun "service $SERVICE start" 0 " Service must start without problem " # rlRun "service $SERVICE status" 0 " Then Status command " # rlRun "service $SERVICE start" 1,0 " Already started service " # rlRun "service $SERVICE status" 0 " Again status command " # rlLog ">>>>>>>>> service restart" -# rlRun "service $SERVICE restart" 0 " Restarting of service" +# rlRun "service $SERVICE restart" 0 " Restarting of service " # rlRun "service $SERVICE status" 0 " Status command " # rlLog ">>>>>>>>> service stop" @@ -163,7 +201,7 @@ fi # rlLog ">>>>>>>>> insufficient rights" # rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user " -# rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail" +# rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting resrvice under nonprivileged user must fail " # rlLog ">>>>>>>>> operations" # rlServiceStop $SERVICE @@ -174,7 +212,7 @@ fi # rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function " # rlLog ">>>>>>>>> nonexist operations" -# rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function" +# rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function " # rlServiceRestore $SERVICE # service $SERVICE start From d98dff205af8d20f7aafd86839f10bba435bfbbb Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Tue, 2 Jan 2018 16:31:51 +0100 Subject: [PATCH 039/103] 9.79 --- .gitignore | 1 + initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ec3cd6..cccc196 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /initscripts-9.76.tar.gz /initscripts-9.77.tar.gz /initscripts-9.78.tar.gz +/initscripts-9.79.tar.gz diff --git a/initscripts.spec b/initscripts.spec index dcc4fea..c4d0e91 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.78 +Version: 9.79 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -159,6 +159,11 @@ fi %dir %{_libexecdir}/initscripts/legacy-actions %changelog +* Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.79-1 +- ifdown-post: fix logical error in commit 5d61564 +- network: add knob to optionally keep interfaces up during shutdown +- network-functions: use POSIX forwarding instead of bash-ism + * Wed Nov 08 2017 David Kaspar [Dee'Kej] - 9.78-1 - specfile: drop dependancy on /etc/system-release - ifup-post: always update nameserver & search entries in /etc/resolv.conf diff --git a/sources b/sources index 5fb4e72..e03a5f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.78.tar.gz) = 47616074d98be47e896776ee072ce016253bca92ce0714801066a00d1b0108ee50b9fe40c194dd1b6f422701fbfbaefbec127b6081ecd810de79deca83fddbbf +SHA512 (initscripts-9.79.tar.gz) = 359c51dcb8aa0a745a3dd3bb67386f41d33eabc781ff2de9b211aab2706dd5e84e885e9e237b88a33fc6cb3e5dd1dbccf7c4ab32f288de76ca16d1118144abd4 From 19f61713dccce0bc6bf75704c34f4a5a8692271a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 17:29:31 +0000 Subject: [PATCH 040/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index c4d0e91..19efd63 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.79 License: GPLv2 Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -159,6 +159,9 @@ fi %dir %{_libexecdir}/initscripts/legacy-actions %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 9.79-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.79-1 - ifdown-post: fix logical error in commit 5d61564 - network: add knob to optionally keep interfaces up during shutdown From 66424e8dfcdb62942e41dbdf84983818191b7c79 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:44 +0100 Subject: [PATCH 041/103] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 19efd63..0a50812 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.79 License: GPLv2 Group: System Environment/Base -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -159,6 +159,9 @@ fi %dir %{_libexecdir}/initscripts/legacy-actions %changelog +* Fri Feb 09 2018 Igor Gnatenko - 9.79-3 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 9.79-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -470,7 +473,7 @@ ng - check an IP address for existence in ifup-alias (#852005) - sync FSF address with GPL 2 text. - fix rpmlint's spaces vs tabs warning. -- fix bogus %changelog dates. +- fix bogus %%changelog dates. - build with $RPM_LD_FLAGS. - use -sf, not -s. (#901827) - add /usr/libexec/initscripts to file list (#894475) From ec7561937e99869aeac759c05a3810ffacbca97c Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 18 May 2018 10:46:44 +0200 Subject: [PATCH 042/103] 9.79-4: move /etc/adjtime to util-linux --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 0a50812..7a56dbe 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -3,7 +3,7 @@ Name: initscripts Version: 9.79 License: GPLv2 Group: System Environment/Base -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -23,6 +23,7 @@ Requires: cpio Requires: hostname Conflicts: ipsec-tools < 0.8.0-2 Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7 +Conflicts: util-linux < 2.32-5 Conflicts: ppp < 2.4.6-4 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils @@ -82,7 +83,6 @@ fi %files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/sysconfig/network-scripts -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime %config(noreplace) %{_sysconfdir}/sysconfig/netconsole %config(noreplace) %{_sysconfdir}/sysconfig/readonly-root %{_sysconfdir}/sysconfig/network-scripts/ifdown @@ -159,6 +159,9 @@ fi %dir %{_libexecdir}/initscripts/legacy-actions %changelog +* Fri May 18 2018 Karel Zak 9.79-4 +- move /etc/adjtime config from initscripts to util-linux + * Fri Feb 09 2018 Igor Gnatenko - 9.79-3 - Escape macros in %%changelog From ece91b602705cf5f14c77438195dbccfd051c0cb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 18 May 2018 11:02:43 +0200 Subject: [PATCH 043/103] remove adjtime from buildroot too --- initscripts.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/initscripts.spec b/initscripts.spec index 7a56dbe..45faa51 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -56,6 +56,8 @@ rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.loc touch %{buildroot}%{_sysconfdir}/rc.d/rc.local chmod 755 %{buildroot}%{_sysconfdir}/rc.d/rc.local +rm -f %{buildroot}%{_sysconfdir}/adjtime + %post %systemd_post fedora-import-state.service fedora-loadmodules.service fedora-readonly.service From b49d82372aa134540b93880eec22c804a1dba38b Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 25 May 2018 12:50:45 +0200 Subject: [PATCH 044/103] 9.80 --- .gitignore | 1 + initscripts.spec | 27 ++++++++++++++++----------- sources | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index cccc196..c1a4795 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /initscripts-9.77.tar.gz /initscripts-9.78.tar.gz /initscripts-9.79.tar.gz +/initscripts-9.80.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 45faa51..de81a67 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.79 +Version: 9.80 License: GPLv2 Group: System Environment/Base -Release: 4%{?dist} +Release: 1%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: /bin/awk, sed, coreutils @@ -29,7 +29,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig %{?systemd_requires} -BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd +BuildRequires: gcc glib2-devel popt-devel gettext pkgconfig systemd Provides: /sbin/service %description @@ -161,14 +161,19 @@ fi %dir %{_libexecdir}/initscripts/legacy-actions %changelog -* Fri May 18 2018 Karel Zak 9.79-4 -- move /etc/adjtime config from initscripts to util-linux - -* Fri Feb 09 2018 Igor Gnatenko - 9.79-3 -- Escape macros in %%changelog - -* Wed Feb 07 2018 Fedora Release Engineering - 9.79-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri May 25 2018 David Kaspar [Dee'Kej] - 9.80-1 +- sysconfig/readonly-root: Clarify the usage of readonly-root +- use proper shebang where appropriate +- network-functions: use tr to upper case strings rather than awk +- network-functions: add error messages for bonding installation +- ifdown-eth: no longer needed 'pidof -x dhclient' condition removed +- netconsole: LSB header added +- po/xgettext_sh*: converted to use to python3 +- network.service: 'reload' removed +- ifup-tunnel: Support 'external' tunnels +- spec: add gcc to BuildRequires +- init.d/functions: fix sourcing for ksh +- /etc/adjtime config moved from initscripts to util-linux * Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.79-1 - ifdown-post: fix logical error in commit 5d61564 diff --git a/sources b/sources index e03a5f2..7141d09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.79.tar.gz) = 359c51dcb8aa0a745a3dd3bb67386f41d33eabc781ff2de9b211aab2706dd5e84e885e9e237b88a33fc6cb3e5dd1dbccf7c4ab32f288de76ca16d1118144abd4 +SHA512 (initscripts-9.80.tar.gz) = 68405a89840bfe339ff5810216c94ab83af7bb189cf5d75c90854e599147e0b6c2c15b695a5498407fb5b972c451d5b4c8f73bd61e5f23cfb887e889ee512f97 From e68a9f6e5bfcfc5194c02912ddb1c584d36d8b1b Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 25 May 2018 13:03:17 +0200 Subject: [PATCH 045/103] specfile: fix of previous commit (triggerrun removed as intended) --- initscripts.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index de81a67..95c6626 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -75,13 +75,6 @@ fi %postun %systemd_postun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service -# This should be removed in Rawhide for Fedora 29: -%triggerun -- initscripts < 9.78 -if [ $1 -gt 1 ]; then - systemctl enable fedora-import-state.service fedora-readonly.service &> /dev/null || : - echo -e "\nUPGRADE: Automatically re-enabling default systemd units: fedora-import-state.service fedora-readonly.service\n" || : -fi - %files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/sysconfig/network-scripts @@ -164,6 +157,7 @@ fi * Fri May 25 2018 David Kaspar [Dee'Kej] - 9.80-1 - sysconfig/readonly-root: Clarify the usage of readonly-root - use proper shebang where appropriate +- specfile: remove the systemctl call in the %postun phase - network-functions: use tr to upper case strings rather than awk - network-functions: add error messages for bonding installation - ifdown-eth: no longer needed 'pidof -x dhclient' condition removed From cc0891ad5a8369f20a3e9289c48eec1cdecf3fa4 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 1 Jun 2018 14:54:01 +0200 Subject: [PATCH 046/103] 9.81 --- .gitignore | 1 + initscripts.spec | 346 ++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 225 insertions(+), 124 deletions(-) diff --git a/.gitignore b/.gitignore index c1a4795..2092552 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /initscripts-9.78.tar.gz /initscripts-9.79.tar.gz /initscripts-9.80.tar.gz +/initscripts-9.81.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 95c6626..4e9eeea 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,159 +1,260 @@ -Summary: Scripts to bring up network interfaces and legacy utilities -Name: initscripts -Version: 9.80 -License: GPLv2 -Group: System Environment/Base -Release: 1%{?dist} -URL: https://github.com/fedora-sysv/initscripts -Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Requires: /bin/awk, sed, coreutils -Requires: grep -Requires: module-init-tools -Requires: util-linux >= 2.16 -Requires: bash >= 3.0 -Requires: procps-ng >= 3.3.8-16 -Requires: ipcalc -Conflicts: systemd < 216-3 -Conflicts: lvm2 < 2.02.98-3 -Conflicts: dmraid < 1.0.0.rc16-18 -Conflicts: policycoreutils < 2.5-6 -Requires: systemd -Requires: iproute, /sbin/arping, findutils -Requires: cpio -Requires: hostname -Conflicts: ipsec-tools < 0.8.0-2 -Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7 -Conflicts: util-linux < 2.32-5 -Conflicts: ppp < 2.4.6-4 -Requires(pre): /usr/sbin/groupadd -Requires(post): /sbin/chkconfig, coreutils -Requires(preun): /sbin/chkconfig +# === GLOBAL MACROS =========================================================== + +# According to Fedora Package Guidelines, it is advised that packages that can +# process untrusted input are build with position-idenpendent code (PIC). +# +# Koji should override the compilation flags and add the -fPIC or -fPIE flags by +# default. This is here just in case this wouldn't happen for some reason. +# For more info: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE +%global _hardened_build 1 + +# ============================================================================= + +Name: initscripts +Summary: Scripts to bring up network interfaces & legacy utilities +Version: 9.81 +Release: 1%{?dist} + +License: GPLv2 + +URL: https://github.com/fedora-sysv/initscripts +Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz + +Requires: bash >= 3.0 +Requires: coreutils +Requires: cpio +Requires: filesystem >= 3 +Requires: findutils +Requires: gawk +Requires: grep +Requires: hostname +Requires: ipcalc +Requires: iproute +Requires: iputils +Requires: module-init-tools +Requires: procps-ng >= 3.3.8-16 +Requires: sed +Requires: setup +Requires: systemd +Requires: util-linux >= 2.16 + +Requires(pre): shadow-utils +Requires(post): chkconfig +Requires(post): coreutils +Requires(post): %{_sbindir}/update-alternatives + +Requires(preun): chkconfig +Requires(postun): %{_sbindir}/update-alternatives + +BuildRequires: filesystem >= 3 +BuildRequires: gcc +BuildRequires: git +BuildRequires: gettext +BuildRequires: glib2-devel +BuildRequires: pkgconfig +BuildRequires: popt-devel +BuildRequires: setup + %{?systemd_requires} -BuildRequires: gcc glib2-devel popt-devel gettext pkgconfig systemd -Provides: /sbin/service +BuildRequires: systemd + +Provides: /sbin/service + +Conflicts: dmraid < 1.0.0.rc16-18 +Conflicts: ipsec-tools < 0.8.0-2 +Conflicts: lvm2 < 2.02.98-3 +Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7 +Conflicts: policycoreutils < 2.5-6 +Conflicts: ppp < 2.4.6-4 +Conflicts: systemd < 216-3 + +# === PATCHES ================================================================= + +# NOTE: 'autosetup' macro (below) uses 'git' for applying the patches: +# ->> All the patches should be provided in 'git format-patch' format. +# ->> Auxiliary repository will be created during 'fedpkg prep', you +# can see all the applied patches there via 'git log'. + +# Upstream patches -- official upstream patches released by upstream since the +# ---------------- last rebase that are necessary for any reason: +#Patch000: example000.patch + + +# Downstream patches -- these should be always included when doing rebase: +# ------------------ +#Patch100: example100.patch + + +# Downstream patches for RHEL -- patches that we keep only in RHEL for various +# --------------------------- reasons, but are not enabled in Fedora: +%if %{defined rhel} || %{defined centos} +#Patch200: example200.patch +%endif + + +# Patches to be removed -- deprecated functionality which shall be removed at +# --------------------- some point in the future: + %description -This package contains the script that activates and deactivates most +This package contains the scripts that activates and deactivates most network interfaces, some utilities, and other legacy files. +# === BUILD INSTRUCTIONS ====================================================== + %prep -%setup -q +%autosetup -S git + +# --------------- %build -make +%make_build + +# --------------- %install -make ROOT=%{buildroot} SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install +%make_install +# This installs the NLS language files: %find_lang %{name} %ifnarch s390 s390x -rm -f \ - %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc \ + rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc %endif -rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.local -touch %{buildroot}%{_sysconfdir}/rc.d/rc.local -chmod 755 %{buildroot}%{_sysconfdir}/rc.d/rc.local +ln -s %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8 -rm -f %{buildroot}%{_sysconfdir}/adjtime +# We are now using alternatives approach to better co-exist with NetworkManager: +touch %{buildroot}%{_sbindir}/ifup +touch %{buildroot}%{_sbindir}/ifdown + +# --------------- %post -%systemd_post fedora-import-state.service fedora-loadmodules.service fedora-readonly.service +%systemd_post import-state.service loadmodules.service readonly-root.service -/usr/sbin/chkconfig --add network > /dev/null 2>&1 || : -/usr/sbin/chkconfig --add netconsole > /dev/null 2>&1 || : +chkconfig --add network > /dev/null 2>&1 || : +chkconfig --add netconsole > /dev/null 2>&1 || : + +[ -L %{_sbindir}/ifup ] || rm -f %{_sbindir}/ifup +[ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown + +%{_sbindir}/update-alternatives --install %{_sbindir}/ifup ifup %{_sysconfdir}/sysconfig/network-scripts/ifup 90 \ + --slave %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \ + --initscript network + +# --------------- %preun -%systemd_preun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service +%systemd_preun import-state.service loadmodules.service readonly-root.service -if [ $1 = 0 ]; then - /usr/sbin/chkconfig --del network > /dev/null 2>&1 || : - /usr/sbin/chkconfig --del netconsole > /dev/null 2>&1 || : +if [ $1 -eq 0 ]; then + chkconfig --del network > /dev/null 2>&1 || : + chkconfig --del netconsole > /dev/null 2>&1 || : + %{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup fi +# --------------- + %postun -%systemd_postun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service +%systemd_postun import-state.service loadmodules.service readonly-root.service + +# === PACKAGING INSTRUCTIONS ================================================== %files -f %{name}.lang -%defattr(-,root,root) -%dir %{_sysconfdir}/sysconfig/network-scripts -%config(noreplace) %{_sysconfdir}/sysconfig/netconsole -%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root -%{_sysconfdir}/sysconfig/network-scripts/ifdown -%{_sbindir}/ifdown -%{_sysconfdir}/sysconfig/network-scripts/ifdown-post -%{_sysconfdir}/sysconfig/network-scripts/ifup -%{_sbindir}/ifup -%dir %{_sysconfdir}/sysconfig/console -%dir %{_sysconfdir}/sysconfig/modules -%{_sysconfdir}/sysconfig/network-scripts/network-functions -%{_sysconfdir}/sysconfig/network-scripts/network-functions-ipv6 -%{_sysconfdir}/sysconfig/network-scripts/init.ipv6-global -%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo -%{_sysconfdir}/sysconfig/network-scripts/ifup-post -%{_sysconfdir}/sysconfig/network-scripts/ifup-routes -%{_sysconfdir}/sysconfig/network-scripts/ifdown-routes -%{_sysconfdir}/sysconfig/network-scripts/ifup-plip -%{_sysconfdir}/sysconfig/network-scripts/ifup-plusb -%{_sysconfdir}/sysconfig/network-scripts/ifup-bnep -%{_sysconfdir}/sysconfig/network-scripts/ifdown-bnep -%{_sysconfdir}/sysconfig/network-scripts/ifup-eth -%{_sysconfdir}/sysconfig/network-scripts/ifdown-eth -%{_sysconfdir}/sysconfig/network-scripts/ifup-ipv6 -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ipv6 -%{_sysconfdir}/sysconfig/network-scripts/ifup-sit -%{_sysconfdir}/sysconfig/network-scripts/ifdown-sit -%{_sysconfdir}/sysconfig/network-scripts/ifup-tunnel -%{_sysconfdir}/sysconfig/network-scripts/ifdown-tunnel -%{_sysconfdir}/sysconfig/network-scripts/ifup-aliases -%{_sysconfdir}/sysconfig/network-scripts/ifup-ippp -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ippp -%{_sysconfdir}/sysconfig/network-scripts/ifup-wireless -%{_sysconfdir}/sysconfig/network-scripts/ifup-isdn -%{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn -%ifarch s390 s390x -%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc -%endif -%config(noreplace) %{_sysconfdir}/networks -%config(noreplace) %{_sysconfdir}/rwtab -%config(noreplace) %{_sysconfdir}/statetab +%license COPYING +%doc doc/* + +# NOTE: /etc/profile.d/ is owned by setup package. +# /etc/sysconfig/ is owned by filesystem package. +%dir %{_sysconfdir}/rc.d +%dir %{_sysconfdir}/rc.d/init.d +%dir %{_sysconfdir}/rc.d/rc[0-6].d %dir %{_sysconfdir}/rwtab.d %dir %{_sysconfdir}/statetab.d -%{_prefix}/lib/systemd/fedora-* -%{_prefix}/lib/systemd/system/* -%dir %{_sysconfdir}/rc.d -%dir %{_sysconfdir}/rc.d/rc[0-9].d -%{_sysconfdir}/rc[0-9].d -%dir %{_sysconfdir}/rc.d/init.d -%{_sysconfdir}/rc.d/init.d/* -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local -%{_sysconfdir}/profile.d/* -%{_sbindir}/sys-unconfig -%{_bindir}/usleep -%attr(4755,root,root) %{_sbindir}/usernetctl +%dir %{_sysconfdir}/sysconfig/console +%dir %{_sysconfdir}/sysconfig/modules +%dir %{_sysconfdir}/sysconfig/network-scripts +%dir %{_libexecdir}/%{name} +%dir %{_libexecdir}/%{name}/legacy-actions +%dir %{_sharedstatedir}/stateless +%dir %{_sharedstatedir}/stateless/state +%dir %{_sharedstatedir}/stateless/writable + +# --------------- + +%config(noreplace) %{_sysconfdir}/rwtab +%config(noreplace) %{_sysconfdir}/statetab +%config(noreplace) %{_sysconfdir}/sysconfig/netconsole +%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root +%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo + +%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local + +%{_sysconfdir}/rc.d/init.d/functions +%{_sysconfdir}/rc.d/init.d/netconsole +%{_sysconfdir}/rc.d/init.d/network +%{_sysconfdir}/sysconfig/network-scripts/* + +# RC symlinks: +%{_sysconfdir}/rc[0-6].d + +# --------------- + +%{_bindir}/* %{_sbindir}/consoletype %{_sbindir}/genhostid -%{_sbindir}/sushell -%attr(2755,root,root) %{_sbindir}/netreport -%{_udevrulesdir}/* -%{_prefix}/lib/udev/rename_device %{_sbindir}/service -%{_mandir}/man*/* -%dir %attr(775,root,root) /run/netreport -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport -%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 -%doc examples -%{!?_licensedir:%global license %%doc} -%license COPYING -%{_sharedstatedir}/stateless -%{_tmpfilesdir}/initscripts.conf -%dir %{_libexecdir}/initscripts -%dir %{_libexecdir}/initscripts/legacy-actions + +%ghost %{_sbindir}/ifup +%ghost %{_sbindir}/ifdown + +%attr(4755,root,root) %{_sbindir}/usernetctl + +%{_prefix}/lib/systemd/import-state +%{_prefix}/lib/systemd/loadmodules +%{_prefix}/lib/systemd/readonly-root +%{_prefix}/lib/systemd/system/* +%{_prefix}/lib/udev/rename_device + +%{_udevrulesdir}/* + +%{_mandir}/man1/* +%{_mandir}/man8/* + +# --------------- %changelog +* Thu May 31 2018 David Kaspar [Dee'Kej] - 9.81-1 +- src/consoletype.c: deprecation warning added +- src/genhostid.c: deprecation warning added +- src/genhostid.c: fixed to not override /etc/hostid if it already exists +- src/usleep.c: GCC warnings fixed +- nis-domainname.service removed +- fedora-* services renamed to more general names +- specfile: missing fedora-domainname.service returned in systemd macros +- COPYING updated to latest GNU version (GPLv2+) +- network-scripts: control 'network' service with alternatives as well +- netreport functionality dropped +- networks moved into 'setup' package +- lang.{sh,csh} moved into setup package +- lang.{sh,csh} cleanup before moving to 'setup' package +- src/sushell moved into 'policycoreutils' package +- src/shvar.* removed +- po/xgettext_sh removed +- sys-unconfig removed +- Outdated files from doc/ folder removed +- make archive: ChangeLog generating removed +- network-scripts: ifup & ifdown -- use alternatives system +- adjtime moved into 'util-linux' package +- specfile: simplified & updated to new repository layout +- .gitignore files updated to new repository layout +- Makefile simplified & updated to new repository layout +- po/Makefile simplified & updated to new repository layout +- src/Makefile simplified & updated to new repository layout +- Repository scheme updated to new layout +- fedora-readonly: command substitution warning fixed (null-byte input) + * Fri May 25 2018 David Kaspar [Dee'Kej] - 9.80-1 - sysconfig/readonly-root: Clarify the usage of readonly-root - use proper shebang where appropriate @@ -167,7 +268,6 @@ fi - ifup-tunnel: Support 'external' tunnels - spec: add gcc to BuildRequires - init.d/functions: fix sourcing for ksh -- /etc/adjtime config moved from initscripts to util-linux * Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.79-1 - ifdown-post: fix logical error in commit 5d61564 @@ -477,7 +577,7 @@ ng - check an IP address for existence in ifup-alias (#852005) - sync FSF address with GPL 2 text. - fix rpmlint's spaces vs tabs warning. -- fix bogus %%changelog dates. +- fix bogus %changelog dates. - build with $RPM_LD_FLAGS. - use -sf, not -s. (#901827) - add /usr/libexec/initscripts to file list (#894475) diff --git a/sources b/sources index 7141d09..a07b8b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.80.tar.gz) = 68405a89840bfe339ff5810216c94ab83af7bb189cf5d75c90854e599147e0b6c2c15b695a5498407fb5b972c451d5b4c8f73bd61e5f23cfb887e889ee512f97 +SHA512 (initscripts-9.81.tar.gz) = 1b534725f3e3fdd702fc7ee467e822436aae5b25ec803ce4446397c5be0988055788ae12942b79adc0a4b8c1315708d4c37d93c7c8808ed48f89e3f90fa53be4 From 5d86e6ecbfdd836942d3daae52ba6f6bbe973355 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Mon, 4 Jun 2018 13:57:59 +0200 Subject: [PATCH 047/103] 9.82 --- .gitignore | 1 + initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2092552..b990121 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /initscripts-9.79.tar.gz /initscripts-9.80.tar.gz /initscripts-9.81.tar.gz +/initscripts-9.82.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 4e9eeea..e72c8bb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -12,7 +12,7 @@ Name: initscripts Summary: Scripts to bring up network interfaces & legacy utilities -Version: 9.81 +Version: 9.82 Release: 1%{?dist} License: GPLv2 @@ -225,6 +225,10 @@ fi # --------------- %changelog +* Mon Jun 04 2018 David Kaspar [Dee'Kej] - 9.82-1 +- Makefile: make the creation of symlinks relative to path again +- specfile: trailing file of netreport removed + * Thu May 31 2018 David Kaspar [Dee'Kej] - 9.81-1 - src/consoletype.c: deprecation warning added - src/genhostid.c: deprecation warning added diff --git a/sources b/sources index a07b8b1..a1ad12d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.81.tar.gz) = 1b534725f3e3fdd702fc7ee467e822436aae5b25ec803ce4446397c5be0988055788ae12942b79adc0a4b8c1315708d4c37d93c7c8808ed48f89e3f90fa53be4 +SHA512 (initscripts-9.82.tar.gz) = d69c14334aa7c90988e5f7df77efb69166bdaf3ccbe5eaf4b2c10e85a9a3b8dc61c0b2cd70296e199e58105428518d1c4b82166e48f2f119351dd7c462a9af16 From 828930f758aba869c3a1befcf24e2f4f5e8a4624 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 13 Jun 2018 13:47:33 +0200 Subject: [PATCH 048/103] upstream's README.md added --- README.md | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..00995ff --- /dev/null +++ b/README.md @@ -0,0 +1,97 @@ +# initscripts +This repository contains source code for **legacy** *System V [initscripts](https://en.wikipedia.org/wiki/Init)*, +which are primarily used in *[Linux](https://en.wikipedia.org/wiki/Linux) distributions like e.g.*: +* [Fedora](https://en.wikipedia.org/wiki/Fedora_(operating_system)) +* [Red Hat Enterprise Linux](https://en.wikipedia.org/wiki/Red_Hat_Enterprise_Linux) +* [CentOS](https://en.wikipedia.org/wiki/CentOS) +* and some others as well... + +Since most of the major Linux distributions have already switched to +*[systemd](https://en.wikipedia.org/wiki/Systemd)*, the *initscripts concept* is +quite outdated nowadays. *As a result, this repository provides primarily only +the support for other initscripts that might still exist out there.* + +The above mentioned support includes e.g. the +[`/etc/rc.d/init.d/functions`](https://github.com/fedora-sysv/initscripts/blob/master/etc/rc.d/init.d/functions) +or +[`/usr/sbin/service`](https://github.com/fedora-sysv/initscripts/blob/master/usr/sbin/service) +files. + +Another functionality this source code provides includes: + * [`network-scripts`](https://github.com/fedora-sysv/initscripts/tree/master/network-scripts) - **legacy** scripts for manipulating of network devices + * [`readonly-root`](https://github.com/fedora-sysv/initscripts/blob/master/usr/lib/systemd/readonly-root) - service for configuring the read-only root support + * [`netconsole`](https://github.com/fedora-sysv/initscripts/blob/master/etc/rc.d/init.d/netconsole) - service for initializing of network console logging + +For the *[RPM](https://en.wikipedia.org/wiki/Rpm_(software))* based distributions +we also provide a [`specfile`](https://github.com/fedora-sysv/initscripts/blob/master/initscripts.spec) +for easier packaging. + +## Future of initscripts +As mentioned above, the *initscripts concept* is outdated nowadays, and de-facto +obsolete. Most of the work on this repository is just a maintenance, and we do +**not** plan on extending the support for initscripts in the future in any way. + +We intend to convert the rest of the remaining services into *systemd* units, +and remove them eventually if possible. + +And we have also started our work on decomissioning of +[`network-scripts`](https://github.com/fedora-sysv/initscripts/tree/master/network-scripts) +as well. This means no new functionality will be added into them. In case you +need some you should ask for it to be implemented +in *[NetworkManager](https://en.wikipedia.org/wiki/NetworkManager)*, if it isn't +already. + +## No longer active branches +Follow the steps in our wiki - +[how to access inactive branches](https://github.com/fedora-sysv/initscripts/wiki/How-to-access-inactive-branches) - +in case you need to check out old git branches for any reason. + + + +## Bugs reporting +If you find a bug, we would like to hear about it -- although we can't guarantee +we will be able to fix it... The best way to report bugs differs for each +distribution: + * `RHEL | CentOS` - create a bug report in [bugzilla](https://bugzilla.redhat.com/enter_bug.cgi) for corresponding RHEL version + * `Fedora | Other` - create a [new issue](https://github.com/fedora-sysv/initscripts/issues/new) directly here on GitHub + +**NOTE:** Bug reports created for *Fedora* in [bugzilla](https://bugzilla.redhat.com/) usually take a lot of time to +resolve. *We advise to use GitHub instead.* From 5caa862561821bef8b0faadcddf560ac4513dfec Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 13 Jun 2018 13:49:27 +0200 Subject: [PATCH 049/103] Revert "upstream's README.md added" This reverts commit 828930f758aba869c3a1befcf24e2f4f5e8a4624. --- README.md | 97 ------------------------------------------------------- 1 file changed, 97 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 00995ff..0000000 --- a/README.md +++ /dev/null @@ -1,97 +0,0 @@ -# initscripts -This repository contains source code for **legacy** *System V [initscripts](https://en.wikipedia.org/wiki/Init)*, -which are primarily used in *[Linux](https://en.wikipedia.org/wiki/Linux) distributions like e.g.*: -* [Fedora](https://en.wikipedia.org/wiki/Fedora_(operating_system)) -* [Red Hat Enterprise Linux](https://en.wikipedia.org/wiki/Red_Hat_Enterprise_Linux) -* [CentOS](https://en.wikipedia.org/wiki/CentOS) -* and some others as well... - -Since most of the major Linux distributions have already switched to -*[systemd](https://en.wikipedia.org/wiki/Systemd)*, the *initscripts concept* is -quite outdated nowadays. *As a result, this repository provides primarily only -the support for other initscripts that might still exist out there.* - -The above mentioned support includes e.g. the -[`/etc/rc.d/init.d/functions`](https://github.com/fedora-sysv/initscripts/blob/master/etc/rc.d/init.d/functions) -or -[`/usr/sbin/service`](https://github.com/fedora-sysv/initscripts/blob/master/usr/sbin/service) -files. - -Another functionality this source code provides includes: - * [`network-scripts`](https://github.com/fedora-sysv/initscripts/tree/master/network-scripts) - **legacy** scripts for manipulating of network devices - * [`readonly-root`](https://github.com/fedora-sysv/initscripts/blob/master/usr/lib/systemd/readonly-root) - service for configuring the read-only root support - * [`netconsole`](https://github.com/fedora-sysv/initscripts/blob/master/etc/rc.d/init.d/netconsole) - service for initializing of network console logging - -For the *[RPM](https://en.wikipedia.org/wiki/Rpm_(software))* based distributions -we also provide a [`specfile`](https://github.com/fedora-sysv/initscripts/blob/master/initscripts.spec) -for easier packaging. - -## Future of initscripts -As mentioned above, the *initscripts concept* is outdated nowadays, and de-facto -obsolete. Most of the work on this repository is just a maintenance, and we do -**not** plan on extending the support for initscripts in the future in any way. - -We intend to convert the rest of the remaining services into *systemd* units, -and remove them eventually if possible. - -And we have also started our work on decomissioning of -[`network-scripts`](https://github.com/fedora-sysv/initscripts/tree/master/network-scripts) -as well. This means no new functionality will be added into them. In case you -need some you should ask for it to be implemented -in *[NetworkManager](https://en.wikipedia.org/wiki/NetworkManager)*, if it isn't -already. - -## No longer active branches -Follow the steps in our wiki - -[how to access inactive branches](https://github.com/fedora-sysv/initscripts/wiki/How-to-access-inactive-branches) - -in case you need to check out old git branches for any reason. - - - -## Bugs reporting -If you find a bug, we would like to hear about it -- although we can't guarantee -we will be able to fix it... The best way to report bugs differs for each -distribution: - * `RHEL | CentOS` - create a bug report in [bugzilla](https://bugzilla.redhat.com/enter_bug.cgi) for corresponding RHEL version - * `Fedora | Other` - create a [new issue](https://github.com/fedora-sysv/initscripts/issues/new) directly here on GitHub - -**NOTE:** Bug reports created for *Fedora* in [bugzilla](https://bugzilla.redhat.com/) usually take a lot of time to -resolve. *We advise to use GitHub instead.* From 10556b46740e23cde73db6212f0abdfc0c765412 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 13 Jun 2018 13:51:29 +0200 Subject: [PATCH 050/103] README.md pointing to upstream's description added --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..911f875 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# initscripts + +Check upstream's [README.md](https://github.com/fedora-sysv/initscripts/blob/master/README.md) for more info. From a9bd99de9a659c9dacdd51d6b608e9f83c65f8d7 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 13 Jun 2018 13:52:36 +0200 Subject: [PATCH 051/103] README.md updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 911f875..c4d7518 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# initscripts +# Additional information Check upstream's [README.md](https://github.com/fedora-sysv/initscripts/blob/master/README.md) for more info. From c1a3a2c4c9522874120e35c2a7f17612628eeabd Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Wed, 13 Jun 2018 14:24:57 +0200 Subject: [PATCH 052/103] rebase.sh updated to do a scratch build before push --- rebase.sh | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/rebase.sh b/rebase.sh index 4612cc2..e1065f0 100755 --- a/rebase.sh +++ b/rebase.sh @@ -1,7 +1,29 @@ #!/bin/bash + +# We always do a rebase to new upstream's tarball for Fedora Rawhide. +# +# For non-Rawhide Fedora releases, we can sometimes backport specific patches, +# if the rebase is not possible. +# +# This scripts automates this process. + +# Since we are operating in a dist-git repository where we can't fix things with +# --force-push if something goes wrong, we need to be extra careful and exit +# immediately if something fails. set -e -curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscripts.spec -o initscripts.spec -git add initscripts.spec + +curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscripts.spec -o initscripts.spec || exit 1 spectool -g initscripts.spec -fedpkg new-sources $(basename $(spectool -S -l initscripts.spec | awk '{print $2;}')) -git commit -m $(grep Version initscripts.spec | awk '{print $2;}') + +# Make a local scratch build in mock first. If it fails, do not upload new tarball! +srpm_file="$(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2)" +arch="$(uname -p)" + +mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2 + +# Scratch build passed, the build should pass in Koji as well. Let's proceed: +fedpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3 +git add initscripts.spec +git commit -m "$(grep Version initscripts.spec | gawk '{print $2;}')" + +git show From b401eaeb060df572b4fa6d27c8208814d389d3b4 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 14 Jun 2018 16:42:58 +0200 Subject: [PATCH 053/103] rebase.sh: relative path is now used for the SRPM --- rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebase.sh b/rebase.sh index e1065f0..a7c52bf 100755 --- a/rebase.sh +++ b/rebase.sh @@ -16,7 +16,7 @@ curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscript spectool -g initscripts.spec # Make a local scratch build in mock first. If it fails, do not upload new tarball! -srpm_file="$(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2)" +srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))" arch="$(uname -p)" mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2 From 7276c52c2cf057f5a82fd73498b1c7137a615e54 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 14 Jun 2018 16:45:12 +0200 Subject: [PATCH 054/103] 9.83 --- .gitignore | 1 + initscripts.spec | 284 ++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 220 insertions(+), 67 deletions(-) diff --git a/.gitignore b/.gitignore index b990121..c627bec 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /initscripts-9.80.tar.gz /initscripts-9.81.tar.gz /initscripts-9.82.tar.gz +/initscripts-9.83.tar.gz diff --git a/initscripts.spec b/initscripts.spec index e72c8bb..db613f5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -8,11 +8,17 @@ # For more info: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE %global _hardened_build 1 +%global shared_requirements \ +Requires: bash \ +Requires: filesystem >= 3 \ +Requires: coreutils \ +Requires: gawk \ + # ============================================================================= Name: initscripts -Summary: Scripts to bring up network interfaces & legacy utilities -Version: 9.82 +Summary: Basic support for legacy System V init scripts +Version: 9.83 Release: 1%{?dist} License: GPLv2 @@ -20,31 +26,17 @@ License: GPLv2 URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Requires: bash >= 3.0 -Requires: coreutils -Requires: cpio -Requires: filesystem >= 3 +%shared_requirements + Requires: findutils -Requires: gawk Requires: grep -Requires: hostname -Requires: ipcalc -Requires: iproute -Requires: iputils -Requires: module-init-tools -Requires: procps-ng >= 3.3.8-16 -Requires: sed +Requires: procps-ng Requires: setup Requires: systemd -Requires: util-linux >= 2.16 +Requires: util-linux Requires(pre): shadow-utils -Requires(post): chkconfig Requires(post): coreutils -Requires(post): %{_sbindir}/update-alternatives - -Requires(preun): chkconfig -Requires(postun): %{_sbindir}/update-alternatives BuildRequires: filesystem >= 3 BuildRequires: gcc @@ -60,13 +52,7 @@ BuildRequires: systemd Provides: /sbin/service -Conflicts: dmraid < 1.0.0.rc16-18 -Conflicts: ipsec-tools < 0.8.0-2 -Conflicts: lvm2 < 2.02.98-3 -Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7 -Conflicts: policycoreutils < 2.5-6 -Conflicts: ppp < 2.4.6-4 -Conflicts: systemd < 216-3 +Obsoletes: %{name} < 9.82-2 # === PATCHES ================================================================= @@ -97,8 +83,96 @@ Conflicts: systemd < 216-3 %description -This package contains the scripts that activates and deactivates most -network interfaces, some utilities, and other legacy files. +This package provides basic support for legacy System V init scripts, and some +other legacy tools & utilities. + +# === SUBPACKAGES ============================================================= + +%package -n network-scripts +Summary: Legacy scripts for manipulating of network devices +Requires: %{name}%{?_isa} = %{version}-%{release} + +%shared_requirements + +Requires: dbus +Requires: gawk +Requires: grep +Requires: hostname +Requires: iproute +Requires: ipcalc +Requires: kmod +Requires: procps-ng +Requires: sed +Requires: systemd + +Requires(post): chkconfig +Requires(preun): chkconfig + +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives + +Obsoletes: %{name} < 9.82-2 + +%description -n network-scripts +This package contains the legacy scripts for activating & deactivating of most +network interfaces. It also provides a legacy version of 'network' service. + +The 'network' service is enabled by default after installation of this package, +and if the network-scripts are installed alongside NetworkManager, then the +ifup/ifdown commands from network-scripts take precedence over the ones provided +by NetworkManager. + +If user has both network-scripts & NetworkManager installed, and wishes to +use ifup/ifdown from NetworkManager primarily, then they has to run command: + $ update-alternatives --config ifup + +Please note that running the command above will also disable the 'network' +service. + +# --------------- + +%package -n netconsole-service +Summary: Service for initializing of network console logging +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch + +%shared_requirements + +Requires: glibc-common +Requires: iproute +Requires: iputils +Requires: kmod +Requires: sed +Requires: util-linux + +Obsoletes: %{name} < 9.82-2 + +%description -n netconsole-service +This packages provides a 'netconsole' service for loading of netconsole kernel +module with the configured parameters. The netconsole kernel module itself then +allows logging of kernel messages over the network. + +# --------------- + +%package -n readonly-root +Summary: Service for configuring read-only root support +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch + +%shared_requirements + +Requires: cpio +Requires: findutils +Requires: hostname +Requires: iproute +Requires: ipcalc +Requires: util-linux + +Obsoletes: %{name} < 9.82-2 + +%description -n readonly-root +This package provides script & configuration file for setting up read-only root +support. Additional configuration is required after installation. # === BUILD INSTRUCTIONS ====================================================== @@ -122,19 +196,31 @@ network interfaces, some utilities, and other legacy files. rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc %endif -ln -s %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8 +# Additional ways to access documentation: +install -m 0755 -d %{buildroot}%{_docdir}/network-scripts + +ln -s %{_docdir}/%{name}/sysconfig.txt %{buildroot}%{_docdir}/network-scripts/ +ln -sr %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8 # We are now using alternatives approach to better co-exist with NetworkManager: touch %{buildroot}%{_sbindir}/ifup touch %{buildroot}%{_sbindir}/ifdown -# --------------- +# ============================================================================= %post -%systemd_post import-state.service loadmodules.service readonly-root.service +%systemd_post import-state.service loadmodules.service +%preun +%systemd_preun import-state.service loadmodules.service + +%postun +%systemd_postun import-state.service loadmodules.service + +# --------------- + +%post -n network-scripts chkconfig --add network > /dev/null 2>&1 || : -chkconfig --add netconsole > /dev/null 2>&1 || : [ -L %{_sbindir}/ifup ] || rm -f %{_sbindir}/ifup [ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown @@ -143,58 +229,55 @@ chkconfig --add netconsole > /dev/null 2>&1 || : --slave %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \ --initscript network -# --------------- - -%preun -%systemd_preun import-state.service loadmodules.service readonly-root.service - +%preun -n network-scripts if [ $1 -eq 0 ]; then chkconfig --del network > /dev/null 2>&1 || : - chkconfig --del netconsole > /dev/null 2>&1 || : %{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup fi # --------------- -%postun -%systemd_postun import-state.service loadmodules.service readonly-root.service +%post -n netconsole-service +%systemd_post netconsole.service + +%preun -n netconsole-service +%systemd_preun netconsole.service + +%postun -n netconsole-service +%systemd_postun netconsole.service + +# --------------- + +%post -n readonly-root +%systemd_post readonly-root.service + +%preun -n readonly-root +%systemd_preun readonly-root.service + +%postun -n readonly-root +%systemd_postun readonly-root.service # === PACKAGING INSTRUCTIONS ================================================== %files -f %{name}.lang %license COPYING -%doc doc/* +%doc doc/sysconfig.txt # NOTE: /etc/profile.d/ is owned by setup package. # /etc/sysconfig/ is owned by filesystem package. %dir %{_sysconfdir}/rc.d %dir %{_sysconfdir}/rc.d/init.d %dir %{_sysconfdir}/rc.d/rc[0-6].d -%dir %{_sysconfdir}/rwtab.d -%dir %{_sysconfdir}/statetab.d %dir %{_sysconfdir}/sysconfig/console %dir %{_sysconfdir}/sysconfig/modules -%dir %{_sysconfdir}/sysconfig/network-scripts %dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}/legacy-actions -%dir %{_sharedstatedir}/stateless -%dir %{_sharedstatedir}/stateless/state -%dir %{_sharedstatedir}/stateless/writable # --------------- -%config(noreplace) %{_sysconfdir}/rwtab -%config(noreplace) %{_sysconfdir}/statetab -%config(noreplace) %{_sysconfdir}/sysconfig/netconsole -%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root -%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo - %ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local %{_sysconfdir}/rc.d/init.d/functions -%{_sysconfdir}/rc.d/init.d/netconsole -%{_sysconfdir}/rc.d/init.d/network -%{_sysconfdir}/sysconfig/network-scripts/* # RC symlinks: %{_sysconfdir}/rc[0-6].d @@ -206,25 +289,94 @@ fi %{_sbindir}/genhostid %{_sbindir}/service -%ghost %{_sbindir}/ifup -%ghost %{_sbindir}/ifdown +%{_libexecdir}/import-state +%{_libexecdir}/loadmodules -%attr(4755,root,root) %{_sbindir}/usernetctl - -%{_prefix}/lib/systemd/import-state -%{_prefix}/lib/systemd/loadmodules -%{_prefix}/lib/systemd/readonly-root -%{_prefix}/lib/systemd/system/* +%{_prefix}/lib/systemd/system/import-state.service +%{_prefix}/lib/systemd/system/loadmodules.service %{_prefix}/lib/udev/rename_device %{_udevrulesdir}/* %{_mandir}/man1/* -%{_mandir}/man8/* +%{_mandir}/man8/service.* + +# ============================================================================= + +%files -n network-scripts +%doc doc/examples/ +%dir %{_sysconfdir}/sysconfig/network-scripts + +%{_sysconfdir}/rc.d/init.d/network +%{_sysconfdir}/sysconfig/network-scripts/* + +%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo + +%ghost %{_sbindir}/ifup +%ghost %{_sbindir}/ifdown +%attr(4755,root,root) %{_sbindir}/usernetctl + +%{_mandir}/man8/ifup.* +%{_mandir}/man8/ifdown.* +%{_mandir}/man8/usernetctl.* +%{_docdir}/network-scripts/* # --------------- +%files -n netconsole-service +%config(noreplace) %{_sysconfdir}/sysconfig/netconsole + +%{_libexecdir}/netconsole +%{_prefix}/lib/systemd/system/netconsole.service + +# --------------- + +%files -n readonly-root +%dir %{_sysconfdir}/rwtab.d +%dir %{_sysconfdir}/statetab.d +%dir %{_sharedstatedir}/stateless +%dir %{_sharedstatedir}/stateless/state +%dir %{_sharedstatedir}/stateless/writable + +%config(noreplace) %{_sysconfdir}/rwtab +%config(noreplace) %{_sysconfdir}/statetab +%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root + +%{_libexecdir}/readonly-root +%{_prefix}/lib/systemd/system/readonly-root.service + +# ============================================================================= + %changelog +* Thu Jun 14 2018 David Kaspar [Dee'Kej] - 9.83-1 +- network-scripts: Add previously dropped error checking +- network-scripts: Replace brctl with ip-link +- Makefile: new release-commit rule added +- src/rename_device.c: GCC warnings about unused return value suppressed +- src/usernetctl.c: GCC warnings about unused return value suppressed +- Makefile: allow sub-makefiles to run in parallel +- specfile: netconsole service moved to /usr/libexec +- specfile: services from /usr/lib/systemd moved to /usr/libexec +- specfile: summary & description updated +- specfile: no longer needed conflicts dropped +- specfile: requirements cleanup +- specfile: obsoletes on previous version of initscripts package added +- specfile: network-scripts subpackage created +- specfile: readonly-root subpackage created +- specfile: netconsole-service subpackage created +- README.md: Travis CI build icon added +- .travis.yml: check the 'make install' proceeds as well +- .travis.yml: initial commit +- README.md: bug reporting described +- README.dm: future of initscripts described +- README.md: description added +- README.md: references to old git branches added +- README.md: initial commit +- network-scripts: setting of firewall ZONE fixed +- ifdown-post: artifact whitespace removed from the DBus call +- l10n: drop .tx directory +- l10n: add zanata.xml + * Mon Jun 04 2018 David Kaspar [Dee'Kej] - 9.82-1 - Makefile: make the creation of symlinks relative to path again - specfile: trailing file of netreport removed diff --git a/sources b/sources index a1ad12d..303fff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.82.tar.gz) = d69c14334aa7c90988e5f7df77efb69166bdaf3ccbe5eaf4b2c10e85a9a3b8dc61c0b2cd70296e199e58105428518d1c4b82166e48f2f119351dd7c462a9af16 +SHA512 (initscripts-9.83.tar.gz) = 70b205f9d47801813004e09395b41fa9ed6a532197e377c2fc3c2084bf9a897005b589af2838542618dc449e28c6e5f000dbd342b445bc8d27745b0140a78586 From 8f1d188016731c398613adf2764a95af10312cae Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Fri, 15 Jun 2018 12:28:07 +0200 Subject: [PATCH 055/103] specfile: fix failing build because of incorrect use of %{_isa} --- initscripts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index db613f5..a654192 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -133,7 +133,7 @@ service. %package -n netconsole-service Summary: Service for initializing of network console logging -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} BuildArch: noarch %shared_requirements @@ -156,7 +156,7 @@ allows logging of kernel messages over the network. %package -n readonly-root Summary: Service for configuring read-only root support -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} BuildArch: noarch %shared_requirements From b218c701716a96349dc4a528b5ae1eab8e461393 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Thu, 21 Jun 2018 16:42:17 +0200 Subject: [PATCH 056/103] 10.00 --- .gitignore | 1 + initscripts.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c627bec..dd472c6 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /initscripts-9.81.tar.gz /initscripts-9.82.tar.gz /initscripts-9.83.tar.gz +/initscripts-10.00.tar.gz diff --git a/initscripts.spec b/initscripts.spec index a654192..248807c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 9.83 +Version: 10.00 Release: 1%{?dist} License: GPLv2 @@ -332,8 +332,6 @@ fi # --------------- %files -n readonly-root -%dir %{_sysconfdir}/rwtab.d -%dir %{_sysconfdir}/statetab.d %dir %{_sharedstatedir}/stateless %dir %{_sharedstatedir}/stateless/state %dir %{_sharedstatedir}/stateless/writable @@ -348,6 +346,10 @@ fi # ============================================================================= %changelog +* Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00-1 +- Move the /etc/rwtab.d & /etc/statetab.d folders to 'filesystem' +- specfile: fix failing build because of incorrect use of %{_isa} + * Thu Jun 14 2018 David Kaspar [Dee'Kej] - 9.83-1 - network-scripts: Add previously dropped error checking - network-scripts: Replace brctl with ip-link diff --git a/sources b/sources index 303fff5..2c74dd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-9.83.tar.gz) = 70b205f9d47801813004e09395b41fa9ed6a532197e377c2fc3c2084bf9a897005b589af2838542618dc449e28c6e5f000dbd342b445bc8d27745b0140a78586 +SHA512 (initscripts-10.00.tar.gz) = 837729253b700ab71cd0e2f828c840fdb6954344a2c7e303cd648a1e3fdc9730f8f71e4dd5550413b2c23a2216e50a04761417ed01149c36d9f8823a499beea9 From 99cbd9c2752681c49b6390d3958d7ac56c7116ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:44:00 +0000 Subject: [PATCH 057/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 248807c..43e33c2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.00 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -346,6 +346,9 @@ fi # ============================================================================= %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 10.00-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00-1 - Move the /etc/rwtab.d & /etc/statetab.d folders to 'filesystem' - specfile: fix failing build because of incorrect use of %{_isa} From 58901cdc4096ea44b009347cc6cc6e4973cdcd63 Mon Sep 17 00:00:00 2001 From: "David Kaspar [Dee'Kej]" Date: Mon, 6 Aug 2018 13:15:04 +0200 Subject: [PATCH 058/103] 10.01 --- .gitignore | 1 + initscripts.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dd472c6..620e226 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /initscripts-9.82.tar.gz /initscripts-9.83.tar.gz /initscripts-10.00.tar.gz +/initscripts-10.01.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 43e33c2..77abc7f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.00 -Release: 2%{?dist} +Version: 10.01 +Release: 1%{?dist} License: GPLv2 @@ -94,6 +94,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %shared_requirements +Requires: bc Requires: dbus Requires: gawk Requires: grep @@ -346,8 +347,11 @@ fi # ============================================================================= %changelog -* Fri Jul 13 2018 Fedora Release Engineering - 10.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Mon Aug 06 2018 David Kaspar [Dee'Kej] - 10.01-1 +- network/ifup/ifdown: deprecations warnings redirected to stderr +- ifup-eth: use 'bc' instead of 'expr' when computing $forward_delay +- network/ifup/ifdown: deprecation warnings for 'network-scripts' added +- network: parsing of /proc/mounts returned * Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00-1 - Move the /etc/rwtab.d & /etc/statetab.d folders to 'filesystem' diff --git a/sources b/sources index 2c74dd7..3e9dc9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.00.tar.gz) = 837729253b700ab71cd0e2f828c840fdb6954344a2c7e303cd648a1e3fdc9730f8f71e4dd5550413b2c23a2216e50a04761417ed01149c36d9f8823a499beea9 +SHA512 (initscripts-10.01.tar.gz) = 5b717cc258c9b81a96f20618a098f978388f970c68935d3f54abf7e20d898c5d7c72afa5aa33554b21ea81d7735a1ce7cf349fdc0d7309658e5089be8c1a7ed1 From a26dfde50576d41c3b7fc2dfc33a8aaf3456e909 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:23:13 +0000 Subject: [PATCH 059/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 77abc7f..6136599 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.01 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -347,6 +347,9 @@ fi # ============================================================================= %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 10.01-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Aug 06 2018 David Kaspar [Dee'Kej] - 10.01-1 - network/ifup/ifdown: deprecations warnings redirected to stderr - ifup-eth: use 'bc' instead of 'expr' when computing $forward_delay From c0178568366eda45aa99f620f9a796320bed5b39 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 28 Jun 2019 15:07:03 +0200 Subject: [PATCH 060/103] 10.02 --- .gitignore | 1 + initscripts.spec | 17 +++++++++++++---- sources | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 620e226..3831ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /initscripts-9.83.tar.gz /initscripts-10.00.tar.gz /initscripts-10.01.tar.gz +/initscripts-10.02.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 6136599..a09cafc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.01 -Release: 2%{?dist} +Version: 10.02 +Release: 1%{?dist} License: GPLv2 @@ -283,6 +283,8 @@ fi # RC symlinks: %{_sysconfdir}/rc[0-6].d +%{_sysconfdir}/init.d + # --------------- %{_bindir}/* @@ -347,8 +349,15 @@ fi # ============================================================================= %changelog -* Fri Feb 01 2019 Fedora Release Engineering - 10.01-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Fri Jun 28 2019 Jan Macku - 10.02-1 +- network: don't fail with IFDOWN_ON_SHUTDOWN +- rc.d/functions: remove support cgroups +- Create symlink (/etc/init.d) to /etc/rc.d/init.d +- Add option to wait until target is reachable +- ifup-eth: apply PERSISTENT_DHCLIENT to IPv6 dhclient daemon +- ifup-post: fix incorrect condition for RESOLV_MODS +- make tag: updated message +- make release-commit: do not create tag automatically * Mon Aug 06 2018 David Kaspar [Dee'Kej] - 10.01-1 - network/ifup/ifdown: deprecations warnings redirected to stderr diff --git a/sources b/sources index 3e9dc9e..8c041d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.01.tar.gz) = 5b717cc258c9b81a96f20618a098f978388f970c68935d3f54abf7e20d898c5d7c72afa5aa33554b21ea81d7735a1ce7cf349fdc0d7309658e5089be8c1a7ed1 +SHA512 (initscripts-10.02.tar.gz) = d233033c454040e3b07bb4ac80cc00fb3a68affca1297ab2c90fb82d917fa119c8c84b63532b8cd598afba2fa15fda05ec59c35fa064ab85005d7832253f0915 From 8bc17aea411cf7013ed8cd3599eb34a0028f5bd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:32:45 +0000 Subject: [PATCH 061/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index a09cafc..5ab641b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.02 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -349,6 +349,9 @@ fi # ============================================================================= %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 10.02-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Jan Macku - 10.02-1 - network: don't fail with IFDOWN_ON_SHUTDOWN - rc.d/functions: remove support cgroups From 20a3a8134f1e6f6cbf32f856315462941e51e94d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:28:40 +0000 Subject: [PATCH 062/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 5ab641b..2908aa6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.02 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 @@ -349,6 +349,9 @@ fi # ============================================================================= %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 10.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 10.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a6acd3cd5da8b4946349c2566e655520cb9dca9f Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 25 Mar 2020 10:09:06 +0100 Subject: [PATCH 063/103] 10.03 --- .gitignore | 1 + initscripts.spec | 30 +++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3831ee0..8d6cb4d 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /initscripts-10.00.tar.gz /initscripts-10.01.tar.gz /initscripts-10.02.tar.gz +/initscripts-10.03.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 2908aa6..e903878 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.02 -Release: 3%{?dist} +Version: 10.03 +Release: 1%{?dist} License: GPLv2 @@ -183,7 +183,7 @@ support. Additional configuration is required after installation. # --------------- %build -%make_build +%make_build PYTHON=%{__python3} # --------------- @@ -276,8 +276,6 @@ fi # --------------- -%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local - %{_sysconfdir}/rc.d/init.d/functions # RC symlinks: @@ -349,6 +347,28 @@ fi # ============================================================================= %changelog +* Tue Mar 24 2020 Jan Macku - 10.03-1 +- Replace grep -EL with subshell since -L changed behaviour +- Wait for scope link addresses as well as for scope global addresses +- Remove deprecated option -m of pidof +- Use function is_true for testing true conditions +- Adding new travis job for testing shell-scripts +- Remove zanata conf +- pull latest translations +- Update of translations and remove files with no translations +- Fix service network stop cmd +- Change spacing of service file to folow spacing of project +- network-function: bridges are created by ifup-eth +- Initscripts no longer care about rc.local +- Repalace hardcoded tests for yes and no with testing functions +- ifup-eth: Fix bridge setting stp option +- Fix bug in service(8) +- ifup-eth: Check that device name is set +- Fix missing python3 during build phase +- rc.d/functions: fix escape sequence being output under systemd service units +- Add ip6gre tunnel option +- ifup/ifdown: print DEPRECATION_WARNING_ISSUED waring info after source_config + * Wed Jan 29 2020 Fedora Release Engineering - 10.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8c041d3..2e7ba86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.02.tar.gz) = d233033c454040e3b07bb4ac80cc00fb3a68affca1297ab2c90fb82d917fa119c8c84b63532b8cd598afba2fa15fda05ec59c35fa064ab85005d7832253f0915 +SHA512 (initscripts-10.03.tar.gz) = daad34df1d0dac9e3ed8a60765e56fdf9d2b0b251761d4cbc7a50541055c9cb122ee4ff181c4140e8d2983a9eb33a35c64ac6c8cb9042efb878cb5959eba8a56 From 16097e4697bbdc3a3f221ba71d896b825ddf42e7 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 17 Jul 2020 09:05:08 +0200 Subject: [PATCH 064/103] 10.04 --- .gitignore | 1 + initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d6cb4d..2025f60 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /initscripts-10.01.tar.gz /initscripts-10.02.tar.gz /initscripts-10.03.tar.gz +/initscripts-10.04.tar.gz diff --git a/initscripts.spec b/initscripts.spec index e903878..45923c5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.03 +Version: 10.04 Release: 1%{?dist} License: GPLv2 @@ -347,6 +347,14 @@ fi # ============================================================================= %changelog +* Tue Jul 14 2020 Jan Macku - 10.04-1 +- Maintain permisision to set umask +- rwtab: Add support for chrony +- Correct spelling, IP, … +- Fix spelling, for more info +- Fix spelling of SELinux +- Translations update from Weblate + * Tue Mar 24 2020 Jan Macku - 10.03-1 - Replace grep -EL with subshell since -L changed behaviour - Wait for scope link addresses as well as for scope global addresses diff --git a/sources b/sources index 2e7ba86..918b0f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.03.tar.gz) = daad34df1d0dac9e3ed8a60765e56fdf9d2b0b251761d4cbc7a50541055c9cb122ee4ff181c4140e8d2983a9eb33a35c64ac6c8cb9042efb878cb5959eba8a56 +SHA512 (initscripts-10.04.tar.gz) = 919cba15dd14a3b747634cca734cb3b525a41a1907275bfee8d059a38fc968849ba910884ab059e5d61ebf4d291f5ce56ba7a023bdec5bad743af5dcf7b1113a From f8e9330962930fc75f428a2de3edb2e271500559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:49:17 +0000 Subject: [PATCH 065/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 45923c5..91a23dc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.04 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -347,6 +347,9 @@ fi # ============================================================================= %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 10.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Jan Macku - 10.04-1 - Maintain permisision to set umask - rwtab: Add support for chrony From dd1b01a7f2a65c084b2560e068bc7b914f7bfddf Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 6 Nov 2020 09:38:18 +0100 Subject: [PATCH 066/103] 10.05 --- .gitignore | 1 + initscripts.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2025f60..90451b8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /initscripts-10.02.tar.gz /initscripts-10.03.tar.gz /initscripts-10.04.tar.gz +/initscripts-10.05.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 91a23dc..4a1a8ae 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.04 -Release: 2%{?dist} +Version: 10.05 +Release: 1%{?dist} License: GPLv2 @@ -175,6 +175,9 @@ Obsoletes: %{name} < 9.82-2 This package provides script & configuration file for setting up read-only root support. Additional configuration is required after installation. +Please note that readonly-root package is considered deprecated with limited support. +Please use systemd-volatile-root functionality instead, if possible. + # === BUILD INSTRUCTIONS ====================================================== %prep @@ -347,6 +350,18 @@ fi # ============================================================================= %changelog +* Fri Nov 6 2020 Jan Macku - 10.05-1 +- service: Prevent variables from globbing +- init.d/functions: Make usage msgs more clear +- network-scripts: Use net_log() instead of logger +- Allow updating rfkill switch status while in readonly root mode +- Add info into specfile about readonly-root deprecation +- Allow updating mlocate.db while in readonly root mode +- rc.d/functions: replace grep's --quiet with -q +- Add warning to warn user when ETHTOOL_OPTS is set and ethtool binary is missing - Olav Vitters +- Fix spacing in Makefile +- Add optional 'dev' keyword + * Tue Jul 28 2020 Fedora Release Engineering - 10.04-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 918b0f8..1e66e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.04.tar.gz) = 919cba15dd14a3b747634cca734cb3b525a41a1907275bfee8d059a38fc968849ba910884ab059e5d61ebf4d291f5ce56ba7a023bdec5bad743af5dcf7b1113a +SHA512 (initscripts-10.05.tar.gz) = e8f2b8c038a7c96f63812257936932bfb71e6d2e708ae6f719a16c39524c8e6d85f38b44fea0ed531f926d5a16076392829fae475d8b89c813c7851ea05a4134 From f682f2cda4ccd91195605a16ddc8156bf6530538 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 13 Nov 2020 10:30:46 +0100 Subject: [PATCH 067/103] 10.06 --- .gitignore | 1 + initscripts.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 90451b8..bfca764 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /initscripts-10.03.tar.gz /initscripts-10.04.tar.gz /initscripts-10.05.tar.gz +/initscripts-10.06.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 4a1a8ae..693642a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.05 +Version: 10.06 Release: 1%{?dist} License: GPLv2 @@ -350,7 +350,11 @@ fi # ============================================================================= %changelog -* Fri Nov 6 2020 Jan Macku - 10.05-1 +* Fri Nov 13 2020 Jan Macku - 10.06-1 +- service: catch unsupported action keywords +- makefile: Use rpmdev-bumpspec's legacy date option + +* Fri Nov 06 2020 Jan Macku - 10.05-1 - service: Prevent variables from globbing - init.d/functions: Make usage msgs more clear - network-scripts: Use net_log() instead of logger diff --git a/sources b/sources index 1e66e24..62362c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.05.tar.gz) = e8f2b8c038a7c96f63812257936932bfb71e6d2e708ae6f719a16c39524c8e6d85f38b44fea0ed531f926d5a16076392829fae475d8b89c813c7851ea05a4134 +SHA512 (initscripts-10.06.tar.gz) = b326eb6502c7b5a6a6549b3ed4154061a67ae9b6253209fdd7352fa6dd669dec5e8fc1b6da66ecad14fad2e757a9c68849e644a7b7e9afe8064850638bbd40f8 From 8b9b6fa9838cc6b940483d6e185b6d3ebd2a3dce Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:49:40 +0000 Subject: [PATCH 068/103] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- initscripts.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/initscripts.spec b/initscripts.spec index 693642a..ddba1ee 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -49,6 +49,7 @@ BuildRequires: setup %{?systemd_requires} BuildRequires: systemd +BuildRequires: make Provides: /sbin/service From bf408b891a4d41baa78cd6724b3db9e204e80210 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 22 Jan 2021 09:09:03 +0100 Subject: [PATCH 069/103] 10.07 --- .gitignore | 1 + initscripts.spec | 25 +++++++++++++------------ sources | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index bfca764..f1cb803 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /initscripts-10.04.tar.gz /initscripts-10.05.tar.gz /initscripts-10.06.tar.gz +/initscripts-10.07.tar.gz diff --git a/initscripts.spec b/initscripts.spec index ddba1ee..096f958 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.06 +Version: 10.07 Release: 1%{?dist} License: GPLv2 @@ -49,7 +49,7 @@ BuildRequires: setup %{?systemd_requires} BuildRequires: systemd -BuildRequires: make +BuildRequires: make Provides: /sbin/service @@ -351,6 +351,16 @@ fi # ============================================================================= %changelog +* Fri Jan 22 2021 Jan Macku - 10.07-1 +- doc: Fix "Duplicated string found in the file." +- doc: Documents RES_OPTIONS option +- doc: Documents ifcfg option LINKSTATUS +- ci: use up to date keywords and fix some warnings +- network: fix set_link_up() +- network: add option to keep the link down +- Rework of shell ci +- Translations update from Weblate + * Fri Nov 13 2020 Jan Macku - 10.06-1 - service: catch unsupported action keywords - makefile: Use rpmdev-bumpspec's legacy date option @@ -367,9 +377,6 @@ fi - Fix spacing in Makefile - Add optional 'dev' keyword -* Tue Jul 28 2020 Fedora Release Engineering - 10.04-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Jul 14 2020 Jan Macku - 10.04-1 - Maintain permisision to set umask - rwtab: Add support for chrony @@ -400,12 +407,6 @@ fi - Add ip6gre tunnel option - ifup/ifdown: print DEPRECATION_WARNING_ISSUED waring info after source_config -* Wed Jan 29 2020 Fedora Release Engineering - 10.02-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 10.02-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Fri Jun 28 2019 Jan Macku - 10.02-1 - network: don't fail with IFDOWN_ON_SHUTDOWN - rc.d/functions: remove support cgroups @@ -728,7 +729,7 @@ ng * Tue Jan 14 2014 Lukáš Nykrýn 9.51-1 - readonly-root: bind-mount only necessary subset of entries in rwtab - readonly-root: Add /var/log/audit/audit.log to rwtab -- readonly-root: restore selinux context after bind mount +- readonly-root: restore SELinux context after bind mount - rename_device: remove comments and trailing whitespaces - service: suggest using systemctl if unknown action is used - ifup-eth: fix typo in error message diff --git a/sources b/sources index 62362c3..3dffe7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.06.tar.gz) = b326eb6502c7b5a6a6549b3ed4154061a67ae9b6253209fdd7352fa6dd669dec5e8fc1b6da66ecad14fad2e757a9c68849e644a7b7e9afe8064850638bbd40f8 +SHA512 (initscripts-10.07.tar.gz) = 1a182cae9ef9ba3eaea02732e8bcd50129c6a2a608a4d10f38a815720b977901835b9a8b3e4e71883fd82dcdc42d6606fb5f5ac7073acc1af0fe32b58ced29ef From a7d6b1722d5488ab20a0670aa9afacd11f618c16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:22:01 +0000 Subject: [PATCH 070/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 096f958..bc1c266 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.07 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -351,6 +351,9 @@ fi # ============================================================================= %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 10.07-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jan Macku - 10.07-1 - doc: Fix "Duplicated string found in the file." - doc: Documents RES_OPTIONS option From 72516ea425e2921949af5a284203c090c00a37de Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 4 Feb 2021 14:48:17 +0100 Subject: [PATCH 071/103] 10.08 --- .gitignore | 1 + initscripts.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1cb803..dd2a5de 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /initscripts-10.05.tar.gz /initscripts-10.06.tar.gz /initscripts-10.07.tar.gz +/initscripts-10.08.tar.gz diff --git a/initscripts.spec b/initscripts.spec index bc1c266..91d9fe0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.07 -Release: 2%{?dist} +Version: 10.08 +Release: 1%{?dist} License: GPLv2 @@ -46,10 +46,10 @@ BuildRequires: glib2-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: setup +BuildRequires: make %{?systemd_requires} BuildRequires: systemd -BuildRequires: make Provides: /sbin/service @@ -351,8 +351,9 @@ fi # ============================================================================= %changelog -* Tue Jan 26 2021 Fedora Release Engineering - 10.07-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Thu Feb 4 2021 Jan Macku - 10.08-1 +- network: fix condition in set_link_up() +- spec: sync with Fedora * Fri Jan 22 2021 Jan Macku - 10.07-1 - doc: Fix "Duplicated string found in the file." diff --git a/sources b/sources index 3dffe7f..a042169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.07.tar.gz) = 1a182cae9ef9ba3eaea02732e8bcd50129c6a2a608a4d10f38a815720b977901835b9a8b3e4e71883fd82dcdc42d6606fb5f5ac7073acc1af0fe32b58ced29ef +SHA512 (initscripts-10.08.tar.gz) = ffe0e8c9b795eb9b8db3898987ef3d72a2b6a1c6d387871ac461c4c1ebf83b07e85958792147de250e774a681d4213bfc31957ed2b65dac5f3b7b3760b35f97a From 78c183789412c5d214edf595fdddedc24618903a Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 15 Feb 2021 15:53:51 +0100 Subject: [PATCH 072/103] 10.09 --- .gitignore | 1 + initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd2a5de..e5d39da 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /initscripts-10.06.tar.gz /initscripts-10.07.tar.gz /initscripts-10.08.tar.gz +/initscripts-10.09.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 91d9fe0..8d35e30 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.08 +Version: 10.09 Release: 1%{?dist} License: GPLv2 @@ -351,6 +351,10 @@ fi # ============================================================================= %changelog +* Mon Feb 15 2021 Jan Macku - 10.09-1 +- doc: Document ARPING_WAIT and ARPING_UPDATE_WAIT +- network scripts: Avoid infinite loop of arping + * Thu Feb 4 2021 Jan Macku - 10.08-1 - network: fix condition in set_link_up() - spec: sync with Fedora diff --git a/sources b/sources index a042169..a229159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.08.tar.gz) = ffe0e8c9b795eb9b8db3898987ef3d72a2b6a1c6d387871ac461c4c1ebf83b07e85958792147de250e774a681d4213bfc31957ed2b65dac5f3b7b3760b35f97a +SHA512 (initscripts-10.09.tar.gz) = c8047d02565cbb166b76ce00c893b3a08d0e755fbaf16d11bc3b3a52ce305dd6968e7719b623e81645bece43eb2ed91f54079b10a8bdf02acbe5309062e4cb19 From e8db6a338d8ce706d29cf5d4e55bdf328fd79ced Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:35:29 +0000 Subject: [PATCH 073/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 8d35e30..48ecc35 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.09 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -351,6 +351,9 @@ fi # ============================================================================= %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 10.09-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 15 2021 Jan Macku - 10.09-1 - doc: Document ARPING_WAIT and ARPING_UPDATE_WAIT - network scripts: Avoid infinite loop of arping From 063292249ba17ee6534e7643902ffb3b9f1e8b29 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 26 Aug 2021 12:01:42 +0200 Subject: [PATCH 074/103] 10.10 --- .gitignore | 1 + initscripts.spec | 58 +++++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e5d39da..e4e1db0 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /initscripts-10.07.tar.gz /initscripts-10.08.tar.gz /initscripts-10.09.tar.gz +/initscripts-10.10.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 48ecc35..c573861 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.09 -Release: 2%{?dist} +Version: 10.10 +Release: 1%{?dist} License: GPLv2 @@ -34,6 +34,8 @@ Requires: procps-ng Requires: setup Requires: systemd Requires: util-linux +Requires: chkconfig +Recommends: initscripts-service Requires(pre): shadow-utils Requires(post): coreutils @@ -51,8 +53,6 @@ BuildRequires: make %{?systemd_requires} BuildRequires: systemd -Provides: /sbin/service - Obsoletes: %{name} < 9.82-2 # === PATCHES ================================================================= @@ -89,6 +89,23 @@ other legacy tools & utilities. # === SUBPACKAGES ============================================================= +%package -n initscripts-service +Summary: Support for service command +BuildArch: noarch + +%shared_requirements + +Requires: systemd + +Provides: /sbin/service + +Obsoletes: %{name} < 9.82-2 + +%description -n initscripts-service +This package provides service command. + +# --------------- + %package -n network-scripts Summary: Legacy scripts for manipulating of network devices Requires: %{name}%{?_isa} = %{version}-%{release} @@ -115,6 +132,12 @@ Requires(postun): %{_sbindir}/update-alternatives Obsoletes: %{name} < 9.82-2 +# This is legacy and deprecated, so nobody should depend on this! +# If ifcfg-style configuration is still desired, NetworkManager can do this. +# Thus, mark this as deprecated to ensure people know to not depend on it. +# Cf. https://docs.fedoraproject.org/en-US/packaging-guidelines/deprecating-packages/ +Provides: deprecated() + %description -n network-scripts This package contains the legacy scripts for activating & deactivating of most network interfaces. It also provides a legacy version of 'network' service. @@ -292,7 +315,6 @@ fi %{_bindir}/* %{_sbindir}/consoletype %{_sbindir}/genhostid -%{_sbindir}/service %{_libexecdir}/import-state %{_libexecdir}/loadmodules @@ -304,10 +326,20 @@ fi %{_udevrulesdir}/* %{_mandir}/man1/* -%{_mandir}/man8/service.* # ============================================================================= +%files -n initscripts-service + +%dir %{_libexecdir}/%{name} +%dir %{_libexecdir}/%{name}/legacy-actions + +%{_sbindir}/service + +%{_mandir}/man8/service.* + +# --------------- + %files -n network-scripts %doc doc/examples/ %dir %{_sysconfdir}/sysconfig/network-scripts @@ -351,6 +383,20 @@ fi # ============================================================================= %changelog +* Thu Aug 26 2021 Jan Macku - 10.10-1 +- Translated using Weblate (Friulian) (#381) +- Translations update from Weblate (#378) +- added veth support +- ifup-eth: add a new PERSISTENT_DHCLIENT_IPV6 option for IPv6 dhclient daemon +- ifdown removes veth pair if both peers are down +- rename_device: also support dracut-style kernel cmdline configuration +- spec: Mark network-scripts as deprecated +- spec: Initscripts now requires chkconfig (#374) +- Translations update from Weblate (#371) +- spec: Move service script into subpackage +- ci: Onboard initscripts to Packit +- ci: Migrate from Travis to GH Actions + * Thu Jul 22 2021 Fedora Release Engineering - 10.09-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index a229159..62ece37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.09.tar.gz) = c8047d02565cbb166b76ce00c893b3a08d0e755fbaf16d11bc3b3a52ce305dd6968e7719b623e81645bece43eb2ed91f54079b10a8bdf02acbe5309062e4cb19 +SHA512 (initscripts-10.10.tar.gz) = c406e9fdda734ea1a4d37767cd5aa54223e4d0cea72a8eaca8e9ee2ae142dfd6ac25d5b3cbd07dbe0e50200bb69b17bf53d109580dfa7ab5e64e8a08ecf13c69 From 98deefd061d738eea7b09109d55ff6817c3498d5 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 27 Aug 2021 09:58:25 +0200 Subject: [PATCH 075/103] 10.11 --- .gitignore | 1 + initscripts.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e4e1db0..efef749 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /initscripts-10.08.tar.gz /initscripts-10.09.tar.gz /initscripts-10.10.tar.gz +/initscripts-10.11.tar.gz diff --git a/initscripts.spec b/initscripts.spec index c573861..6d2ffae 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.10 +Version: 10.11 Release: 1%{?dist} License: GPLv2 @@ -99,7 +99,7 @@ Requires: systemd Provides: /sbin/service -Obsoletes: %{name} < 9.82-2 +Obsoletes: %{name} < 10.10-1 %description -n initscripts-service This package provides service command. @@ -383,6 +383,9 @@ fi # ============================================================================= %changelog +* Fri Aug 27 2021 Jan Macku - 10.11-1 +- specfile: Update obsoletes to allow upgrades (#385) + * Thu Aug 26 2021 Jan Macku - 10.10-1 - Translated using Weblate (Friulian) (#381) - Translations update from Weblate (#378) diff --git a/sources b/sources index 62ece37..96bc8da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.10.tar.gz) = c406e9fdda734ea1a4d37767cd5aa54223e4d0cea72a8eaca8e9ee2ae142dfd6ac25d5b3cbd07dbe0e50200bb69b17bf53d109580dfa7ab5e64e8a08ecf13c69 +SHA512 (initscripts-10.11.tar.gz) = e41a79a438f92b8333254ff526a3d1e451d747ee6595409e9c4218592ad5ed411f258c5b078d8b75d068637b5e7a62ba0d3c7144e71cea06d2b896337b4642a0 From 4118d1a47dc2f3d1c85686f6c4e5ab16f87d7790 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 3 Sep 2021 09:28:50 +0200 Subject: [PATCH 076/103] 10.12 --- .gitignore | 1 + initscripts.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index efef749..9533f7d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /initscripts-10.09.tar.gz /initscripts-10.10.tar.gz /initscripts-10.11.tar.gz +/initscripts-10.12.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 6d2ffae..caf1e08 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.11 +Version: 10.12 Release: 1%{?dist} License: GPLv2 @@ -35,7 +35,7 @@ Requires: setup Requires: systemd Requires: util-linux Requires: chkconfig -Recommends: initscripts-service +Requires: initscripts-service Requires(pre): shadow-utils Requires(post): coreutils @@ -53,7 +53,7 @@ BuildRequires: make %{?systemd_requires} BuildRequires: systemd -Obsoletes: %{name} < 9.82-2 +Obsoletes: %{name} < 10.10-1 # === PATCHES ================================================================= @@ -383,6 +383,9 @@ fi # ============================================================================= %changelog +* Fri Sep 03 2021 Jan Macku - 10.12-1 +- spec: Update relation between initscripts and initscripts-service (#386) + * Fri Aug 27 2021 Jan Macku - 10.11-1 - specfile: Update obsoletes to allow upgrades (#385) @@ -400,9 +403,6 @@ fi - ci: Onboard initscripts to Packit - ci: Migrate from Travis to GH Actions -* Thu Jul 22 2021 Fedora Release Engineering - 10.09-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Mon Feb 15 2021 Jan Macku - 10.09-1 - doc: Document ARPING_WAIT and ARPING_UPDATE_WAIT - network scripts: Avoid infinite loop of arping diff --git a/sources b/sources index 96bc8da..0b2394c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.11.tar.gz) = e41a79a438f92b8333254ff526a3d1e451d747ee6595409e9c4218592ad5ed411f258c5b078d8b75d068637b5e7a62ba0d3c7144e71cea06d2b896337b4642a0 +SHA512 (initscripts-10.12.tar.gz) = bde65b6f47335b430c7d201386119bbd70753d738393fea33457dbe5e423db406a176f56e02d9c98653483d296f25573e8a414000416913423843b627f0f8ba3 From fa679785552ad5b4fd4d88ba51470a7b11b0f441 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 13 Jan 2022 09:17:02 +0100 Subject: [PATCH 077/103] 10.13 --- .gitignore | 1 + initscripts.spec | 21 ++++++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9533f7d..d6673ca 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /initscripts-10.10.tar.gz /initscripts-10.11.tar.gz /initscripts-10.12.tar.gz +/initscripts-10.13.tar.gz diff --git a/initscripts.spec b/initscripts.spec index caf1e08..a0f5d5f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.12 +Version: 10.13 Release: 1%{?dist} License: GPLv2 @@ -383,6 +383,25 @@ fi # ============================================================================= %changelog +* Thu Jan 13 2022 Jan Macku - 10.13-1 +- ifup-routes: Log when using `ip $type replace` +- ifup-routes: Use `ip route repace` to avoid race +- Translated using Weblate (German) +- Add LGTM badges to README +- ci: set default merge method to rebase +- ci: disable comments under opened PR in order to fix CI +- network scripts: do not use c-style for-loop +- network scripts: replace "<<<" with pipe +- rc.d/functions: do not use "+=" to concatenate string +- ci: Use default github-token (#395) +- ci(Mergify): configuration update (#394) +- ci: Output shellcheck results using PR comments (#393) +- ci: Update path to csdiff repository (#391) +- spec: Fix issue with $NEXT_VERSION (#390) +- Translated using Weblate (Indonesian) +- Translated using Weblate (Spanish) +- Translated using Weblate (Czech) + * Fri Sep 03 2021 Jan Macku - 10.12-1 - spec: Update relation between initscripts and initscripts-service (#386) diff --git a/sources b/sources index 0b2394c..d55c576 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.12.tar.gz) = bde65b6f47335b430c7d201386119bbd70753d738393fea33457dbe5e423db406a176f56e02d9c98653483d296f25573e8a414000416913423843b627f0f8ba3 +SHA512 (initscripts-10.13.tar.gz) = f0d358f63b493815ed8007451eb699e3e1ad5aec64c7330c8678e402994f202ab290c3776779fd7d266de32297a1365b989469faec61af943b28675757ebda31 From bc7e32837e75ec9788c719e1a0eb952edcc7c258 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:18:41 +0000 Subject: [PATCH 078/103] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index a0f5d5f..b2ff29d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.13 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -383,6 +383,9 @@ fi # ============================================================================= %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 10.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 13 2022 Jan Macku - 10.13-1 - ifup-routes: Log when using `ip $type replace` - ifup-routes: Use `ip route repace` to avoid race From 19777187937fed6dd2925ace8cf48bb807163354 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 24 Jan 2022 12:33:16 +0100 Subject: [PATCH 079/103] 10.14 --- .gitignore | 1 + initscripts.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d6673ca..06c1a06 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /initscripts-10.11.tar.gz /initscripts-10.12.tar.gz /initscripts-10.13.tar.gz +/initscripts-10.14.tar.gz diff --git a/initscripts.spec b/initscripts.spec index b2ff29d..a5685d7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.13 -Release: 2%{?dist} +Version: 10.14 +Release: 1%{?dist} License: GPLv2 @@ -383,8 +383,11 @@ fi # ============================================================================= %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 10.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Mon Jan 24 2022 Jan Macku - 10.14-1 +- ifup-routes: Revert quotes +- ifup-routes: Use `ip replace` only on type `route` +- ci(Mergify): configuration update +- ci: remove testing branch from `shellcheck_test.yml` * Thu Jan 13 2022 Jan Macku - 10.13-1 - ifup-routes: Log when using `ip $type replace` diff --git a/sources b/sources index d55c576..7cdb14d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.13.tar.gz) = f0d358f63b493815ed8007451eb699e3e1ad5aec64c7330c8678e402994f202ab290c3776779fd7d266de32297a1365b989469faec61af943b28675757ebda31 +SHA512 (initscripts-10.14.tar.gz) = 1a263d4ef47dd92c85ee9726c941127845cb1f778944e9153fa71f08bcc7e2705de3fd396ce9e2dbabe10d0173ef3d16503ee363e49b016d4ceb41f9aac4813c From 8fcd375eb6425a0c7acb029967ff8988202b801e Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Tue, 15 Feb 2022 08:53:41 +0100 Subject: [PATCH 080/103] 10.15 --- .gitignore | 1 + initscripts.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 06c1a06..fe800e0 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /initscripts-10.12.tar.gz /initscripts-10.13.tar.gz /initscripts-10.14.tar.gz +/initscripts-10.15.tar.gz diff --git a/initscripts.spec b/initscripts.spec index a5685d7..db3e348 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.14 +Version: 10.15 Release: 1%{?dist} License: GPLv2 @@ -114,6 +114,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: bc Requires: dbus +Requires: dbus-tools Requires: gawk Requires: grep Requires: hostname @@ -383,6 +384,14 @@ fi # ============================================================================= %changelog +* Tue Feb 15 2022 Jan Macku - 10.15-1 +- spec: network-scripts needs to depend on dbus-tools for NetworkManager detection +- packit: Run copr builds on release as well +- ci: Update `.packit.yml` to run on `c8s` `c9s` and `rawhide` +- Translated using Weblate (Finnish) +- ci: Use Differential ShellCheck action +- ci(Mergify): configuration update + * Mon Jan 24 2022 Jan Macku - 10.14-1 - ifup-routes: Revert quotes - ifup-routes: Use `ip replace` only on type `route` diff --git a/sources b/sources index 7cdb14d..10101a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.14.tar.gz) = 1a263d4ef47dd92c85ee9726c941127845cb1f778944e9153fa71f08bcc7e2705de3fd396ce9e2dbabe10d0173ef3d16503ee363e49b016d4ceb41f9aac4813c +SHA512 (initscripts-10.15.tar.gz) = c7fc1f7b91d766be84ee7b71dcbbba604e1024e25481460f60736119c654f134506371ef758d3c1dccf6479640d56019797e7316891689a3267d96da5ee18707 From d22d9d9fa55b019b014e53ce7db13e9305c32c95 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 23 Feb 2022 14:56:02 +0100 Subject: [PATCH 081/103] 10.16 --- .gitignore | 1 + initscripts.spec | 29 +++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fe800e0..539d099 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /initscripts-10.13.tar.gz /initscripts-10.14.tar.gz /initscripts-10.15.tar.gz +/initscripts-10.16.tar.gz diff --git a/initscripts.spec b/initscripts.spec index db3e348..1e87fb3 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.15 +Version: 10.16 Release: 1%{?dist} License: GPLv2 @@ -36,6 +36,7 @@ Requires: systemd Requires: util-linux Requires: chkconfig Requires: initscripts-service +Requires: initscripts-rename-device Requires(pre): shadow-utils Requires(post): coreutils @@ -89,6 +90,18 @@ other legacy tools & utilities. # === SUBPACKAGES ============================================================= +%package -n initscripts-rename-device +Summary: Udev helper utility that provides network interface naming + +%shared_requirements + +Obsoletes: %{name} < 10.16-1 + +%description -n initscripts-rename-device +Udev helper utility that provides network interface naming + +# --------------- + %package -n initscripts-service Summary: Support for service command BuildArch: noarch @@ -322,14 +335,19 @@ fi %{_prefix}/lib/systemd/system/import-state.service %{_prefix}/lib/systemd/system/loadmodules.service -%{_prefix}/lib/udev/rename_device - -%{_udevrulesdir}/* %{_mandir}/man1/* # ============================================================================= +%files -n initscripts-rename-device + +%{_prefix}/lib/udev/rename_device + +%{_udevrulesdir}/* + +# --------------- + %files -n initscripts-service %dir %{_libexecdir}/%{name} @@ -384,6 +402,9 @@ fi # ============================================================================= %changelog +* Wed Feb 23 2022 Jan Macku - 10.16-1 +- spec: Move rename_device to subpackage `initscripts-rename-device` + * Tue Feb 15 2022 Jan Macku - 10.15-1 - spec: network-scripts needs to depend on dbus-tools for NetworkManager detection - packit: Run copr builds on release as well diff --git a/sources b/sources index 10101a0..2af89bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.15.tar.gz) = c7fc1f7b91d766be84ee7b71dcbbba604e1024e25481460f60736119c654f134506371ef758d3c1dccf6479640d56019797e7316891689a3267d96da5ee18707 +SHA512 (initscripts-10.16.tar.gz) = f2760175ddd17f66b0747d340b28b6635187ff939e0c487d6d5d7b679e7495819df2e6f66b398209f37c1f61cc89884e7e8edac0b63e56b242aebbffe622615e From 83747c72df32cb87a26a7c4aa2a4f3db943255b0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 23 Feb 2022 17:25:36 -0800 Subject: [PATCH 082/103] Drop unnecessary obsoletes Since initscripts requires these packages anyway, the obsoletes aren't necessary. They're only useful if you split off a new subpackage and *don't* have the main package require it, but you still want it to be installed on updates. In this case, initscripts requires both initscripts-rename-device and initscripts-service, so there's no need for them to obsolete older versions of it. The initscripts-rename-device obsoletes was somehow messing up live image creation during the openQA update test (caused the live image not to include initscripts at all). This fixes that. Signed-off-by: Adam Williamson --- initscripts.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 1e87fb3..be1938e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -54,7 +54,7 @@ BuildRequires: make %{?systemd_requires} BuildRequires: systemd -Obsoletes: %{name} < 10.10-1 +Obsoletes: %{name} < 10.16-1 # === PATCHES ================================================================= @@ -95,8 +95,6 @@ Summary: Udev helper utility that provides network interface naming %shared_requirements -Obsoletes: %{name} < 10.16-1 - %description -n initscripts-rename-device Udev helper utility that provides network interface naming @@ -112,8 +110,6 @@ Requires: systemd Provides: /sbin/service -Obsoletes: %{name} < 10.10-1 - %description -n initscripts-service This package provides service command. @@ -402,6 +398,9 @@ fi # ============================================================================= %changelog +* Wed Feb 23 2022 Adam Williamson - 10.16-2 +- Drop unnecessary obsoletes + * Wed Feb 23 2022 Jan Macku - 10.16-1 - spec: Move rename_device to subpackage `initscripts-rename-device` From 3620bdfb5b7ea21264453d6336509fb27941c866 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:41:01 +0000 Subject: [PATCH 083/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index be1938e..6ce75bc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.16 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 @@ -398,6 +398,9 @@ fi # ============================================================================= %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 10.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Feb 23 2022 Adam Williamson - 10.16-2 - Drop unnecessary obsoletes From 32dd2e2fe5637c1421d21ed77ab4b983141ee124 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 24 Aug 2022 10:02:50 +0200 Subject: [PATCH 084/103] 10.17 --- .gitignore | 1 + initscripts.spec | 22 ++++++++++++++++++---- sources | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 539d099..659f309 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /initscripts-10.14.tar.gz /initscripts-10.15.tar.gz /initscripts-10.16.tar.gz +/initscripts-10.17.tar.gz diff --git a/initscripts.spec b/initscripts.spec index 6ce75bc..e71756a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.16 -Release: 3%{?dist} +Version: 10.17 +Release: 1%{?dist} License: GPLv2 @@ -398,8 +398,22 @@ fi # ============================================================================= %changelog -* Thu Jul 21 2022 Fedora Release Engineering - 10.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Wed Aug 24 2022 Jan Macku - 10.17-1 +- service: Exit when `/etc/init.d` is missing +- ci: Update workflows to run on main branch +- ci: remove differential-shellcheck configs +- doc: Use main branch in links +- dependabot: Monthly updates +- ci(Mergify): configuration update +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- ci: Update `packit.yml` +- ci: Update Github workflows & add Dependabot +- Translated using Weblate (Estonian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Czech) +- Drop unnecessary obsoletes * Wed Feb 23 2022 Adam Williamson - 10.16-2 - Drop unnecessary obsoletes diff --git a/sources b/sources index 2af89bf..20ad471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initscripts-10.16.tar.gz) = f2760175ddd17f66b0747d340b28b6635187ff939e0c487d6d5d7b679e7495819df2e6f66b398209f37c1f61cc89884e7e8edac0b63e56b242aebbffe622615e +SHA512 (initscripts-10.17.tar.gz) = 6c99a7b52b5bc0ced1877a7b2a280b885778bb12e89dc0d606a5b5eda1aa87feecdea6c19803afab01953c9d352c409e59665914832f7107b6b3816d4740594c From 00bcdd18cfdc658ceb4012a1a4d697ba098ea59f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:10:56 +0000 Subject: [PATCH 085/103] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index e71756a..30ebc44 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 @@ -398,6 +398,9 @@ fi # ============================================================================= %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 10.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Aug 24 2022 Jan Macku - 10.17-1 - service: Exit when `/etc/init.d` is missing - ci: Update workflows to run on main branch From 2ed7bf1db0d999de9fe8adfe656e91f5e63ad50c Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 23 Mar 2023 10:03:23 +0100 Subject: [PATCH 086/103] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 3612 +++++++++++++++++++++++++++++++++++++++++++++ initscripts.spec | 3615 +--------------------------------------------- 2 files changed, 3614 insertions(+), 3613 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..abc304c --- /dev/null +++ b/changelog @@ -0,0 +1,3612 @@ +* Thu Jan 19 2023 Fedora Release Engineering - 10.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 24 2022 Jan Macku - 10.17-1 +- service: Exit when `/etc/init.d` is missing +- ci: Update workflows to run on main branch +- ci: remove differential-shellcheck configs +- doc: Use main branch in links +- dependabot: Monthly updates +- ci(Mergify): configuration update +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- ci: Update `packit.yml` +- ci: Update Github workflows & add Dependabot +- Translated using Weblate (Estonian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Czech) +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Adam Williamson - 10.16-2 +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Jan Macku - 10.16-1 +- spec: Move rename_device to subpackage `initscripts-rename-device` + +* Tue Feb 15 2022 Jan Macku - 10.15-1 +- spec: network-scripts needs to depend on dbus-tools for NetworkManager detection +- packit: Run copr builds on release as well +- ci: Update `.packit.yml` to run on `c8s` `c9s` and `rawhide` +- Translated using Weblate (Finnish) +- ci: Use Differential ShellCheck action +- ci(Mergify): configuration update + +* Mon Jan 24 2022 Jan Macku - 10.14-1 +- ifup-routes: Revert quotes +- ifup-routes: Use `ip replace` only on type `route` +- ci(Mergify): configuration update +- ci: remove testing branch from `shellcheck_test.yml` + +* Thu Jan 13 2022 Jan Macku - 10.13-1 +- ifup-routes: Log when using `ip $type replace` +- ifup-routes: Use `ip route repace` to avoid race +- Translated using Weblate (German) +- Add LGTM badges to README +- ci: set default merge method to rebase +- ci: disable comments under opened PR in order to fix CI +- network scripts: do not use c-style for-loop +- network scripts: replace "<<<" with pipe +- rc.d/functions: do not use "+=" to concatenate string +- ci: Use default github-token (#395) +- ci(Mergify): configuration update (#394) +- ci: Output shellcheck results using PR comments (#393) +- ci: Update path to csdiff repository (#391) +- spec: Fix issue with $NEXT_VERSION (#390) +- Translated using Weblate (Indonesian) +- Translated using Weblate (Spanish) +- Translated using Weblate (Czech) + +* Fri Sep 03 2021 Jan Macku - 10.12-1 +- spec: Update relation between initscripts and initscripts-service (#386) + +* Fri Aug 27 2021 Jan Macku - 10.11-1 +- specfile: Update obsoletes to allow upgrades (#385) + +* Thu Aug 26 2021 Jan Macku - 10.10-1 +- Translated using Weblate (Friulian) (#381) +- Translations update from Weblate (#378) +- added veth support +- ifup-eth: add a new PERSISTENT_DHCLIENT_IPV6 option for IPv6 dhclient daemon +- ifdown removes veth pair if both peers are down +- rename_device: also support dracut-style kernel cmdline configuration +- spec: Mark network-scripts as deprecated +- spec: Initscripts now requires chkconfig (#374) +- Translations update from Weblate (#371) +- spec: Move service script into subpackage +- ci: Onboard initscripts to Packit +- ci: Migrate from Travis to GH Actions + +* Mon Feb 15 2021 Jan Macku - 10.09-1 +- doc: Document ARPING_WAIT and ARPING_UPDATE_WAIT +- network scripts: Avoid infinite loop of arping + +* Thu Feb 4 2021 Jan Macku - 10.08-1 +- network: fix condition in set_link_up() +- spec: sync with Fedora + +* Fri Jan 22 2021 Jan Macku - 10.07-1 +- doc: Fix "Duplicated string found in the file." +- doc: Documents RES_OPTIONS option +- doc: Documents ifcfg option LINKSTATUS +- ci: use up to date keywords and fix some warnings +- network: fix set_link_up() +- network: add option to keep the link down +- Rework of shell ci +- Translations update from Weblate + +* Fri Nov 13 2020 Jan Macku - 10.06-1 +- service: catch unsupported action keywords +- makefile: Use rpmdev-bumpspec's legacy date option + +* Fri Nov 06 2020 Jan Macku - 10.05-1 +- service: Prevent variables from globbing +- init.d/functions: Make usage msgs more clear +- network-scripts: Use net_log() instead of logger +- Allow updating rfkill switch status while in readonly root mode +- Add info into specfile about readonly-root deprecation +- Allow updating mlocate.db while in readonly root mode +- rc.d/functions: replace grep's --quiet with -q +- Add warning to warn user when ETHTOOL_OPTS is set and ethtool binary is missing - Olav Vitters +- Fix spacing in Makefile +- Add optional 'dev' keyword + +* Tue Jul 14 2020 Jan Macku - 10.04-1 +- Maintain permisision to set umask +- rwtab: Add support for chrony +- Correct spelling, IP, … +- Fix spelling, for more info +- Fix spelling of SELinux +- Translations update from Weblate + +* Tue Mar 24 2020 Jan Macku - 10.03-1 +- Replace grep -EL with subshell since -L changed behaviour +- Wait for scope link addresses as well as for scope global addresses +- Remove deprecated option -m of pidof +- Use function is_true for testing true conditions +- Adding new travis job for testing shell-scripts +- Remove zanata conf +- pull latest translations +- Update of translations and remove files with no translations +- Fix service network stop cmd +- Change spacing of service file to folow spacing of project +- network-function: bridges are created by ifup-eth +- Initscripts no longer care about rc.local +- Repalace hardcoded tests for yes and no with testing functions +- ifup-eth: Fix bridge setting stp option +- Fix bug in service(8) +- ifup-eth: Check that device name is set +- Fix missing python3 during build phase +- rc.d/functions: fix escape sequence being output under systemd service units +- Add ip6gre tunnel option +- ifup/ifdown: print DEPRECATION_WARNING_ISSUED waring info after source_config + +* Fri Jun 28 2019 Jan Macku - 10.02-1 +- network: don't fail with IFDOWN_ON_SHUTDOWN +- rc.d/functions: remove support cgroups +- Create symlink (/etc/init.d) to /etc/rc.d/init.d +- Add option to wait until target is reachable +- ifup-eth: apply PERSISTENT_DHCLIENT to IPv6 dhclient daemon +- ifup-post: fix incorrect condition for RESOLV_MODS +- make tag: updated message +- make release-commit: do not create tag automatically + +* Mon Aug 06 2018 David Kaspar [Dee'Kej] - 10.01-1 +- network/ifup/ifdown: deprecations warnings redirected to stderr +- ifup-eth: use 'bc' instead of 'expr' when computing $forward_delay +- network/ifup/ifdown: deprecation warnings for 'network-scripts' added +- network: parsing of /proc/mounts returned + +* Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00-1 +- Move the /etc/rwtab.d & /etc/statetab.d folders to 'filesystem' +- specfile: fix failing build because of incorrect use of %{_isa} + +* Thu Jun 14 2018 David Kaspar [Dee'Kej] - 9.83-1 +- network-scripts: Add previously dropped error checking +- network-scripts: Replace brctl with ip-link +- Makefile: new release-commit rule added +- src/rename_device.c: GCC warnings about unused return value suppressed +- src/usernetctl.c: GCC warnings about unused return value suppressed +- Makefile: allow sub-makefiles to run in parallel +- specfile: netconsole service moved to /usr/libexec +- specfile: services from /usr/lib/systemd moved to /usr/libexec +- specfile: summary & description updated +- specfile: no longer needed conflicts dropped +- specfile: requirements cleanup +- specfile: obsoletes on previous version of initscripts package added +- specfile: network-scripts subpackage created +- specfile: readonly-root subpackage created +- specfile: netconsole-service subpackage created +- README.md: Travis CI build icon added +- .travis.yml: check the 'make install' proceeds as well +- .travis.yml: initial commit +- README.md: bug reporting described +- README.dm: future of initscripts described +- README.md: description added +- README.md: references to old git branches added +- README.md: initial commit +- network-scripts: setting of firewall ZONE fixed +- ifdown-post: artifact whitespace removed from the DBus call +- l10n: drop .tx directory +- l10n: add zanata.xml + +* Mon Jun 04 2018 David Kaspar [Dee'Kej] - 9.82-1 +- Makefile: make the creation of symlinks relative to path again +- specfile: trailing file of netreport removed + +* Thu May 31 2018 David Kaspar [Dee'Kej] - 9.81-1 +- src/consoletype.c: deprecation warning added +- src/genhostid.c: deprecation warning added +- src/genhostid.c: fixed to not override /etc/hostid if it already exists +- src/usleep.c: GCC warnings fixed +- nis-domainname.service removed +- fedora-* services renamed to more general names +- specfile: missing fedora-domainname.service returned in systemd macros +- COPYING updated to latest GNU version (GPLv2+) +- network-scripts: control 'network' service with alternatives as well +- netreport functionality dropped +- networks moved into 'setup' package +- lang.{sh,csh} moved into setup package +- lang.{sh,csh} cleanup before moving to 'setup' package +- src/sushell moved into 'policycoreutils' package +- src/shvar.* removed +- po/xgettext_sh removed +- sys-unconfig removed +- Outdated files from doc/ folder removed +- make archive: ChangeLog generating removed +- network-scripts: ifup & ifdown -- use alternatives system +- adjtime moved into 'util-linux' package +- specfile: simplified & updated to new repository layout +- .gitignore files updated to new repository layout +- Makefile simplified & updated to new repository layout +- po/Makefile simplified & updated to new repository layout +- src/Makefile simplified & updated to new repository layout +- Repository scheme updated to new layout +- fedora-readonly: command substitution warning fixed (null-byte input) + +* Fri May 25 2018 David Kaspar [Dee'Kej] - 9.80-1 +- sysconfig/readonly-root: Clarify the usage of readonly-root +- use proper shebang where appropriate +- specfile: remove the systemctl call in the %postun phase +- network-functions: use tr to upper case strings rather than awk +- network-functions: add error messages for bonding installation +- ifdown-eth: no longer needed 'pidof -x dhclient' condition removed +- netconsole: LSB header added +- po/xgettext_sh*: converted to use to python3 +- network.service: 'reload' removed +- ifup-tunnel: Support 'external' tunnels +- spec: add gcc to BuildRequires +- init.d/functions: fix sourcing for ksh + +* Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.79-1 +- ifdown-post: fix logical error in commit 5d61564 +- network: add knob to optionally keep interfaces up during shutdown +- network-functions: use POSIX forwarding instead of bash-ism + +* Wed Nov 08 2017 David Kaspar [Dee'Kej] - 9.78-1 +- specfile: drop dependancy on /etc/system-release +- ifup-post: always update nameserver & search entries in /etc/resolv.conf +- network-scripts: forward DBus calls to /dev/null +- Spelling fixes +- Tell git to ignore *.o +- Use grep -E instead of deprecated egrep +- Avoid some unnecessary stat calls +- systemd/system: symlinks for fedora-* services removed +- network-scripts: firewall-cmd replaced with DBus calls +- 'debugmode' subpackage dropped completely +- sysconfig/init* files dropped +- sysctl.conf.s390 dropped +- usleep: change the error message to print the full replacement commandline + +* Tue Aug 15 2017 David Kaspar [Dee'Kej] - 9.77-1 +- specfile: Fix failing build for s390* architecture +- Drop no longer supported SPARC architecture + +* Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.76-1 +- Makefile: return make archive for testing purposes +- Revert "Makefile: replace /var/run with /run" + +* Mon Aug 07 2017 David Kaspar [Dee'Kej] - 9.75-1 +- Makefile: $ROOT variable is now empty by default +- Makefile: Fix additional error in commit b119d37d1 +- ifup-eth: wait for STP to complete setup on bridge if $DELAY is not set +- init.d/functions: is_true() & is_false() extended by ON/OFF support +- init.d/functions: convert2sec() function added + +* Fri Aug 04 2017 David Kaspar [Dee'Kej] - 9.74-1 +- Makefile: fix whitespace error in commit b119d37d1 + +* Thu Aug 03 2017 David Kaspar [Dee'Kej] - 9.73-1 +- Makefile: replace /var/run with /run +- Replace /var/run with /run everywhere +- Update references to sysctl.conf +- Drop sysctl.d/00-system.conf +- Drop 256term.{sh,csh} +- ARPUPDATE introduced + +* Thu May 25 2017 David Kaspar [Dee'Kej] - 9.72-1 +- rename_device.c: rewrite of isCfg() function +- Add *.old to list of ignored files +- Replace usleep(1) calls with sleep(1) calls + +* Wed May 24 2017 David Kaspar [Dee'Kej] - 9.71-1 +- usleep: print deprecation warning from now on +- sysconfig.txt: mention previously introduced NO_DHCP_HOSTNAME option +- DHCP_FQDN and DHCP_SEND_HOSTNAME introduced +- re-add missing $HOSTNAME initialization +- ifup: add support for VLAN_EGRESS_PRIORITY_MAP +- specfile: mark 'rwtab' and 'statetab' as config files +- killproc/status: add missing '-b ' option +- ifdown-eth: we need to flush global scope as well +- ifup-eth: remove quote marks +- po: download latest translations from zanata +- rwtab: add /var/lib/systemd/timers +- Update initscripts.pot +- Port headers in xgettext_sh.py to 2017 + +* Fri Feb 24 2017 Lukáš Nykrýn - 9.70-1 +- move source to github + +* Tue Aug 30 2016 David Kaspar [Dee'Kej] - 9.69-1 +- fedora-import-state should no longer try to create folder with empty name (#1370259) + +* Tue Aug 9 2016 David Kaspar [Dee'Kej] - 9.68-1 +- fedora-import-state: skip modifying of existing folders (#1347436) +- functions: systemctl show now returns an error when unit does not exist + +* Tue Jul 19 2016 Lukáš Nykrýn - 9.67-1 +- import-state: restore also sensitivity part of SELinux context +- network: run after network-pre.target +- ifup-eth: fix setting preferred_lft and valid_lft +- ifup: don't call nmcli on any lo device +- source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no +- ipv6: wait for all global IPv6 addresses to leave the "tentative" state +- rwtab: /var/lib/nfs needs to copy the files +- functions: improve killing loops +- ifup: set valid_lft and preferred_lft to forever for static ip +- service: use systemd mangle for given service + +* Mon Apr 25 2016 Lukáš Nykrýn - 9.66-1 +- remove autorelabel stuff +- autorelabel: turn quota off before relabeling +- network: Treat other tunnel interfaces, fixes ifdown stage +- autorelabel: call dracut-initramfs-restore before forced reboot +- sysconfig.txt: document PPPOE_EXTRA and PPPD_EXTRA +- ifdown-eth: fix comparison + +* Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 +- init.d/functions: end with 0 +- fedora-loadmodules: we don't have readahead anymore +- network-scripts: DEVICE and HWADRR could be quoted by apostrophe +- ifup-wireless: fix calling of phy_wireless_device +- ifdown: clean ipv4 localhost addresses +- ifup-eth: some bridge options are applied later +- service: improve status and stop function for daemon with intscripts +- init.d/functions: reload systemd if it can't see an initscript + +* Thu Aug 06 2015 Lukáš Nykrýn - 9.64-1 +- network-functions: fix wireless detection +- fedora-readonly: use --make-slave with --bind mounts +- import-state: don't run restorecon when it does not exist +- network: modem type interfaces should explicitly start after and stop before common interfaces +- ifup-post: should be interpreted in bash + +* Mon May 18 2015 Lukáš Nykrýn - 9.63-1 +- remove ipcalc, it has its own package now +- network: tell NM to reload its configuration during start +- bonding: warn if the ifup for slave device failed +- sysctl.conf: drop SHMALL and SHMMAX, they have sane default values in kernel +- ifup: don't call NM for loopback +- clarify daemon() usage message +- rename_device: allow non-channel nics for s390x machines +- ifup: add missing quotes + +* Thu Apr 09 2015 Lukáš Nykrýn - 9.62-1 +- network-functions: fix change_resolv_conf after grep update +- ifup-aliases: don't return with error when arping fails +- init.d/functions: rc.debug option to debug initscripts +- ifup-aliases: inherit ARPCHECK from parent device +- network: report that we can't shut down network for root on netfs +- ifdown-eth: use scope host for lo + +* Thu Jan 22 2015 Lukáš Nykrýn - 9.61-1 +- specfile cleanup +- ifup-ipv6: set accept_ra to 2 when IPV6FORWARDING=yes and IPV6_AUTOCONF=yes +- ifup-post: check resolve.conf also with DNS2 +- ifup-aliases: do not fail when only ipv6 addr is specified +- fedora-import-state.service: run a little bit later +- fedora-readonly: Updates for systemd random-seed handling +- network-functions: is_available_wait should wait even in the case that is_available returns 2 +- ifdown-post: remove resolv.conf only in specific cases +- network-functions: fix check in install_bonding_driver + +* Tue Dec 16 2014 Lukáš Nykrýn - 9.60-1 +- improve check for bond master in install bonding driver +- network-functions: reeplace iwconfig with iw +- ifup: fix typo +- ifdown-ipv6: reset addrgenmode to eui64 for device + +* Wed Nov 12 2014 Lukáš Nykrýn - 9.59-1 +- adjust LINKDELAY when STP is on + +* Thu Nov 06 2014 Lukáš Nykrýn - 9.58-1 +- ifup,vlan: fix typo +- doc: be consistent and use BOOTPROTO=none + +* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.57 +- Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp + +* Tue Oct 07 2014 Lukáš Nykrýn - 9.56-1 +- network_function: return immediately when device is pres +ent +- add configurable DEVTIMEOUT +- fedora-import-state: do not clobber / +- network-functions: grep->fgrep in bonding masters matchi +ng +- man: update sys-unconfig.8 +- rename_devices: comments need to have a blank before them +- add example ifcfg files +- network-functions: improve bonding_masters grep +- ifup: if we were unable to determine DEVICE always call nmcli up +- ifup-tunnel: call ifup-ipv6 in the end +- ifup: also set multicast_snooping after the bridge is up +- network-functions: ETHTOOL_DELAY introduction patch +- use pie and relro by default +- custom naming for VLAN devices +- vi.po: fix parentheses +- ifup-wireless: add support for wowlan +- ifup-wireless: add support for wowlan (second part) +- ifup-aliases: do not bring up ipv6 for range files +- sys-unconfig: use poweroff instead of halt +- ifup-aliases: improve duplicate address detection +- network-functions: handle BONDING_OPTS better +- network: tell nm to wake the slaves + +* Tue Jul 22 2014 Lukáš Nykrýn - 9.55-1 +- fix license handling +- ipcalc: -c allow netmask +- ipcalc: parse prefix more safely +- inittab: fix path and mention set-default +- don't require /sbin/sysctl +- init.d/functions: check parent dir of pid file for accessibility +- ifup-eth: some options for bridge can be applied after the bridge is up +- remove ppp from translation + +* Tue Apr 15 2014 Lukáš Nykrýn - 9.54-1 +- move ppp support to ppp package +- remove fedora-configure +- network: detect if / is on netfs +- is_nm_handling: fix RE +- bonding: match whole name of interface +- network: add support for team devices +- ifup-wireless: fix syntax error +- fedora-readonly: fix prefix detection + +* Wed Mar 26 2014 Lukáš Nykrýn - 9.53-1 +- bridging: add possibility to set prio and ageing +- ifup: add possibility to specify value for -w parameter of arping +- network: try to not compete with NM during boot +- fedora-domainname: DefaultDependencies=no +- service: add condrestart to allowed commands +- update ifup/ifdown NetworkManager interaction once more(#1036701, #1061810) +- network: modify ifup-wireless so it doesn't call exit +- set shmmax and shmall defaults to match rhel6 values (#1056547) +- update ifup/ifdown NetworkManager interaction (#1036701, #1061810) +- service: fix action matching +- remove ifup-ipx from spec +- Delete IPX support. +- remove dependency on sysvinit-tools + +* Tue Jan 14 2014 Lukáš Nykrýn - 9.52-1 +- require procps-ng + +* Tue Jan 14 2014 Lukáš Nykrýn 9.51-1 +- readonly-root: bind-mount only necessary subset of entries in rwtab +- readonly-root: Add /var/log/audit/audit.log to rwtab +- readonly-root: restore SELinux context after bind mount +- rename_device: remove comments and trailing whitespaces +- service: suggest using systemctl if unknown action is used +- ifup-eth: fix typo in error message +- use iw instead of iwconfig and friends +- update functions who call nmcli +- ifdown: fix typo in nmcli call + +* Tue Sep 03 2013 Lukas Nykryn - 9.50-1 +- ipcalc: support RFC3021 (#997271) +- symlink /etc/sysctl.conf -> /etc/sysctl.d/ +- man: only action specified in LSB are redirected to systemd +- service: filter actions that are not supported by systemctl in service (#947823) +- install_bonding_driver: drop check for existing device (#991335) +- consider IPV6INIT undefined as YES +- don't care about network filesystems + +* Fri Jul 12 2013 Lukáš Nykrýn - 9.48-1 +- man: add systemd man pages to service.8 "see also" section +- add possibility to set domainname through /etc/sysconfig/network +- rename_device: don't wait for lock with lower permissions +- 256term.csh: remove quotes around variable (#979796) +- drop useless variables from /etc/sysconfig/init +- readonly-root: rpcidmapd restart is not needed anymore +- ifup-eth: print error only if arping is really called (#974603) +- readonly-root: Add /var/lib/samba to rwtab + +* Fri May 31 2013 Lukáš Nykrýn - 9.47-1 +- network-functions: to determine state of nscd check socket not lock (#960779) +- sysconfig.txt advised saslauthd -a instead of -v +- update translations from transifex +- drop translation for other initscripts +- tweak ifup/ifdown usage and man page (#961917) +- ctrl-alt-delete.target is provided by systemd package +- remove some defaults from arch specific sysctl.conf +- readonly-root: remount rpc_pipefs if readonly-root is used +- service: mention legacy actions and systemctl redirection in man page + +* Fri Apr 12 2013 Lukáš Nykrýn - 9.46-1 +- add /var/lib/NetworkManager +- add ipip6 tunneling support (#928232, raorn@raorn.name) +- bonding: set master up before slaves +- set net.ipv6.conf.SYSCTLDEVICE.autoconf in ifup-ipv6 +- ifdown: don't call nmcli on interface that is alread down +- remove some defaults from sysctl.conf (move to systemd) +- call flush addresses with scope global +- service: action should not be empty when calling legacy-actions (#947817) +- ifup-eth: ignore arping errors (#928379) +- replace tunctl with ip tuntap (#947875) +- reload sysctl settings for vlans on ifup +- try dhcpv6 after v4 failed (#846618) + +* Fri Mar 15 2013 Lukáš Nykrýn - 9.45-2 +- provides /sbin/service + +* Fri Mar 15 2013 Lukáš Nykrýn - 9.45-1 +- turn on symlink protections in sysctl (#922030) +- add systemd-random-seed.service to Before= in fedora-readonly.service (#888615) +- mention rule6 files in sysconfig.txt +- skip nmcli for wireless device (#863707) +- remove config-noreplace from /etc/inittab (#627474) +- remount-rootfs.service got renamed to systemd-remount-fs.service +- compile netreport and usernetctl with full RELRO and PIE (#853178) +- move stuff directly to /usr (#905492) +- Remove NETWORKING_IPV6 from sysconfig.txt (#918622) +- fix greps to correctly handle comments and quotation + +* Wed Feb 20 2013 Lukáš Nykrýn - 9.44-1 +- limit udev rule for network renaming (#907365, mschmidt@redhat.com) +- fix path for arpwatch, seems to be in /var/lib on Fedora 18 +- fix the path for lvm cache, there is no file /etc/lvm/.cache ( but there is one /etc/lvm/cache ) +- fix path for dhcpd, is /var/lib/dhcpd since 2005 ( see 31cdb58df77 on the dhcp package git ) +- fix the patch for apache modules in rwtab, that are now in /var/cache/httpd +- remove no longer used directory ( at least in Fedora ), hald is deprecated, + /var/tux cannot be found and xend seems to use a subdirectory of /var/lib/xen +- correct the path for puppet directory in /etc/rwtab, now use /var/lib/puppet by default +- allow passing -F from /.autorelabel to fixfiles when relabeling system (#904279) +- correctly detect Open vSwitch device types +- clear DEVICE and TYPE variables before every iteration (#902463) +- sets BONDING_OPTS before interface is brougth up +- check an IP address for existence in ifup-alias (#852005) +- sync FSF address with GPL 2 text. +- fix rpmlint's spaces vs tabs warning. +- fix bogus %changelog dates. +- build with $RPM_LD_FLAGS. +- use -sf, not -s. (#901827) +- add /usr/libexec/initscripts to file list (#894475) +- rename term256 to 256term (glob sort) (#849429) +- readd missing shebang. (#885821) +- migrate even further away from /etc/sysconfig/network for hostname, and /etc/sysconfig/i18n. + +* Fri Dec 7 2012 Bill Nottingham - 9.43-1 +- 60-net.rules: explicitly set the interface name (#870859) +- ifup-eth: set firewall zone before ifup-ipv6 for DHCPv6 (#802415) +- migrate to /etc/locale.conf, /etc/vconsole.conf (#881923) +- rename_device: fix bogus locking +- fix wireless device detection for kernel 3.6 (#875328) +- drop fedora-storage-init, fedora-wait-storage () + +* Wed Oct 31 2012 Bill Nottingham - 9.42-1 +- Halloween release! +- add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254) +- translation updates +- fedora-autorelabel: don't pass -F to fixfiles (#863662, ) +- fix calling of firewall-cmd in ifup-post/ifdown-post () + +* Fri Oct 5 2012 Bill Nottingham - 9.41-1 +- debugmode: MALLOC_CHECK_ is not thread safe. Don't enable it by default (#853175) +- Add support for 256 color terminals () +- ifdown-eth: be less strict about VLAN name (#505314, ) +- drop prefdm +- ifup-eth: allow duplicate address detection to be disabled () +- process rule6-* for sit devices (#840009, ) + +* Mon Aug 6 2012 Bill Nottingham - 9.40-1 +- drop support for booting non-systemd systems +- drop legacy commands: getkey, fstab-decode, testd + +* Fri Jun 29 2012 Bill Nottingham - 9.39-1 +- assorted documentation cleanups +- typo, spelling, licenese clean up () +- service: add support for legacy custom actions packaged in + /usr/libexec/initscripts/legacy-actions/