--- rpms/initscripts/sme9/initscripts.spec 2015/09/30 10:01:17 1.12 +++ rpms/initscripts/sme9/initscripts.spec 2017/04/05 22:46:44 1.15 @@ -2,13 +2,19 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.49 +Version: 9.03.58 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1.1 +Release: 1%{?dist}.1 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 +Patch1000: centos-initscripts.patch +Patch2000: initscripts-9.03.31-runlevel7.patch +Patch2001: initscripts-9.03.40-dmesg.patch +Patch2002: initscripts-9.03.40-slapd_alias_ldap.patch +Patch2003: initscripts-9.03.46-dont_run_plymouth_if_disabled.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -28,6 +34,7 @@ Requires: /etc/system-release Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: cpio +Requires: plymouth Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 12:4.1.0-6 @@ -36,7 +43,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.8.3-9 Conflicts: s390utils < 2:1.8.2-11 -Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.97-2 +Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.100-5 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 @@ -46,16 +53,10 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch1: 0001-rc.sysinit-apply-quotas-after-system-is-relabeled.patch -Patch1000: centos-initscripts.patch -Patch2000: initscripts-9.03.31-runlevel7.patch -Patch2001: initscripts-9.03.40-dmesg.patch -Patch2002: initscripts-9.03.40-slapd_alias_ldap.patch -Patch2003: initscripts-9.03.46-dont_run_plymouth_if_disabled.patch %description The initscripts package contains the basic system scripts used to boot -your SME Server system, change runlevels, and shut the system down +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. @@ -73,7 +74,6 @@ Currently, this consists of various memo %prep %setup -q -%patch1 -p1 %patch1000 -p1 %patch2000 -p1 %patch2001 -p1 @@ -211,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/rc.d/rc.local /etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf +%dir /etc/sysctl.d %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig @@ -259,13 +260,70 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Wed Sep 30 2015 Daniel Berteaud - 9.03.49-1.sme.1.1 -- Rebase on upstream 9.03.49 [SME: 9081] +* Wed Apr 05 2017 Jean-Philipe Pialasse 9.03.58-1.sme.1 +- rebase on 9.03.58-1 [SME: 10215] -* Tue Sep 22 2015 Johnny Hughes - 9.03.49-1.centos.1 +* Tue Mar 21 2017 Johnny Hughes - 9.03.58-1 - Roll in CentOS Branding -* Thu Aug 13 2015 Lukáš Nykrýn - 9.03.49-1.1 +* Wed Jan 18 2017 David Kaspar [Dee'Kej] - 9.03.58-1 +- regression in commit bab72274889 fixed [missing $() for DAD detection] + +* Tue Jan 10 2017 David Kaspar [Dee'Kej] - 9.03.57-1 +- regression in commit ca3cea691b6 fixed [quotes for $DHCLIENTARGS removed] + +* Mon Nov 21 2016 David Kaspar [Dee'Kej] - 9.03.56-1 +- regression in commit ca3cea691b6 fixed [${LEASEFILE} not specified] + +* Wed Nov 16 2016 David Kaspar [Dee'Kej] - 9.03.55-1 +- ipcalc: detect invalid mask +- ifup-aliases: send gratuitous ARPs when adding addresses +- network: treat other tunnel interfaces (fixes ifdown stage) +- kexec-disable.conf: release kexec memory properly +- network-functions: do not send hostname via dhclient everytime +- sysconfig/network: NO_DHCP_HOSTNAME option introduced +- ipv6_add_addr_on_device: replace the existing address on NIC + +* Mon Nov 7 2016 David Kaspar [Dee'Kej] - 9.03.54-1 +- specfile: require newer lvm +- ifdown-eth: add timeout for when flushing global scope +- functions: support boolean values in is_true() & is_false() +- ifup-aliases: do not return with error when arping fails +- netconsole: resolve domain name via 'getent' instead of 'hosts' + +* Tue Apr 12 2016 Lukáš Nykrýn - 9.03.53-1 +- functions: parse -d first + +* Mon Apr 11 2016 Lukáš Nykrýn - 9.03.52-1 +- functions: fix ignored delay in killproc + +* Tue Feb 23 2016 Lukáš Nykrýn - 9.03.51-1 +- netfs: only unmount loopback device mounted on top of netdev or with back-file on netdev + +* Tue Jan 19 2016 Lukáš Nykrýn - 9.03.50-1 +- functions: improve killing loops +- netfs: tweak nfs umount +- sysctl.conf: mention sysctl -a +- sysconfig.txt: document PPPOE_EXTRA and PPPD_EXTRA +- spec: require plymouth +- fix mangled sysconfig/init.s390 +- rc.sysinit: don't perform fsck twice with /.autorelabel +- ifdown-eth: fix comparison +- ifup-eth: if arping fails, output responding MAC +- network-functions: fix change_resolv_conf after grep update +- spec: add sysctl.d dir +- rc.sysinit: fix typo in fs +- rename_devices: comments need to have a blank before them +- rename_device: remove comments and trailing whitespaces +- bonding: warn if the ifup for slave device failed +- clarify daemon() usage message +- ifdown: clean ipv4 localhost addresses +- ifup-post: check resolve.conf also with DNS2 +- ifup: add missing quotes +- ifup-eth: some bridge options are applied later +- init.d/halt: give init some time to reexecute +- network-scripts: DEVICE and HWADRR could be quoted by apostrophe +- ifup-wireless: fix calling of phy_wireless_device - rc.sysinit: apply quotas after system is relabeled * Thu Apr 09 2015 Lukáš Nykrýn - 9.03.49-1