From ba7984db6c7d04f9062ed612fde1a326e1f1ffe1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Mar 2012 13:13:57 -0500 Subject: [PATCH 1/4] 9.34.1-1 --- .gitignore | 3 +-- 807a7f3.patch | 18 ------------------ initscripts.spec | 23 ++++++++++++++++------- sources | 3 +-- 4 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 807a7f3.patch diff --git a/.gitignore b/.gitignore index 3e93db8..5b2b94f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/initscripts-9.33.tar.bz2 -/initscripts-9.34.tar.bz2 +/initscripts-9.34.1.tar.bz2 diff --git a/807a7f3.patch b/807a7f3.patch deleted file mode 100644 index 5049915..0000000 --- a/807a7f3.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 807a7f34cd58c537d8b361694d0a4bad23d8aff9 -Author: Bill Nottingham -Date: Tue Oct 25 15:32:53 2011 -0400 - - Don't write to stderr that's not there (or a socket, or whatever, #746263) - -diff --git a/service b/service -index 6f17934..2e2d4ea 100755 ---- a/service -+++ b/service -@@ -69,6 +69,6 @@ done - if [ -f "${SERVICEDIR}/${SERVICE}" ]; then - env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${OPTIONS} - else -- echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr -+ [ -c /dev/stderr ] && echo $"Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" >/dev/stderr - exec /bin/systemctl ${OPTIONS} ${SERVICE}.service - fi diff --git a/initscripts.spec b/initscripts.spec index 56e208c..75943a6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,14 +4,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.34 +Version: 9.34.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and 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 -Patch: 807a7f3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -91,7 +90,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch -p1 %build make @@ -264,7 +262,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/fstab-decode /sbin/genhostid /sbin/getkey -/sbin/securetty /sbin/sushell %attr(2755,root,root) /sbin/netreport /lib/udev/rules.d/* @@ -273,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/service /sbin/ppp-watch %{_mandir}/man*/* +%exclude %{_mandir}/man*/securetty* %dir %attr(775,root,root) /var/run/netreport %dir /etc/ppp %dir /etc/ppp/peers @@ -311,6 +309,8 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rules.d/* /lib/udev/console_init /lib/udev/console_check +/sbin/securetty +%{_mandir}/man*/securetty* %files -n debugmode %defattr(-,root,root) @@ -318,10 +318,19 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue Oct 25 2011 Bill Nottingham - 9.34-2 +* Fri Mar 9 2012 Bill Nottingham - 9.34.1-1 +- sysconfig.txt: clean up section on disabling IPv6 +- ifup: allow for ifup-$TYPE/ifdown-$TYPE +- fedora-readonly.service: drop StandardInput=tty (#785662) +- sysconfig.txt: document additional ETHTOOL_OPTS enhancements () +- don't use ifconfig in ifup-aliases (#721010, 588993, based on ) +- fedora-storage-init: handle dmraid sets with spaces (#728795, ) +- fedora-readonly: don't exit with an error if SEinux isn't active. (#768628) +- fedora-wait-storage: drop stdin/stdout/stderr (#735867) + +* Tue Oct 25 2011 Bill Nottingham - 9.34-1 - read locale.conf if it exists (#706756) - ifdown: fix logic error with removing arp_ip_target (#745681) -- service: don't write to stderr that's not there (#746263) * Wed Oct 12 2011 Bill Nottingham - 9.33-1 - netconsole: only use the first ARP response (#744309, ) diff --git a/sources b/sources index 9af76c7..8ebbd73 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2 -b0c99414b92dc6d87bef7d9f762c567c initscripts-9.34.tar.bz2 +1bad2d13a43293f020f55c9473b101ba initscripts-9.34.1.tar.bz2 From ca3e201d46625e4d023ac88391ead8f7e814606b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 12 Mar 2012 14:11:50 -0400 Subject: [PATCH 2/4] 9.34.2-1 --- .gitignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5b2b94f..96f7a09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/initscripts-9.34.1.tar.bz2 +/initscripts-9.34.2.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 75943a6..e4194d8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.34.1 +Version: 9.34.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -318,6 +318,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Mar 12 2012 Bill Nottingham - 9.34.2-1 +- ifup-aliases: fix IFS usage mangling of device names (#802119) +- ifup/ifdown: fix typo (#802055, ) + * Fri Mar 9 2012 Bill Nottingham - 9.34.1-1 - sysconfig.txt: clean up section on disabling IPv6 - ifup: allow for ifup-$TYPE/ifdown-$TYPE diff --git a/sources b/sources index 8ebbd73..439d974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bad2d13a43293f020f55c9473b101ba initscripts-9.34.1.tar.bz2 +0bcc863dacb43e1080a09d5871dda3b4 initscripts-9.34.2.tar.bz2 From 5d10181e6e3bf7fa155f2cb3d1728090c8bf82c2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 6 Jul 2012 09:19:36 -0400 Subject: [PATCH 3/4] 9.34.3-1 --- .gitignore | 1 + initscripts.spec | 8 +++++++- sources | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 96f7a09..c7a6e54 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.34.2.tar.bz2 +/initscripts-9.34.3.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index e4194d8..43d1be0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.34.2 +Version: 9.34.3 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -292,6 +292,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /etc/tmpfiles.d /etc/tmpfiles.d/initscripts.conf +%dir /usr/libexec/initscripts/legacy-actions %files legacy %defattr(-,root,root) @@ -318,6 +319,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jul 6 2012 Bill Nottingham - 9.34.3-1 +- assorted documentation cleanups +- service: add support for legacy custom actions packaged in + /usr/libexec/initscripts/legacy-actions/