--- rpms/initscripts/sme9/initscripts.spec 2013/12/15 01:17:14 1.5 +++ rpms/initscripts/sme9/initscripts.spec 2017/04/05 22:43:40 1.14 @@ -2,26 +2,30 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.40 +Version: 9.03.58 # 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 -Patch1000: centos-initscripts.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 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid -Requires: module-init-tools +Requires: module-init-tools >= 3.9-25 Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 -Requires: sysvinit-tools >= 2.87 +Requires: sysvinit-tools >= 2.87-6 %if with_upstart -Requires: upstart >= 0.6.0 +Requires: upstart >= 0.6.5-11 %else Requires: SysVinit >= 2.85-38 %endif @@ -30,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 @@ -38,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 @@ -49,11 +54,9 @@ Requires(post): /sbin/chkconfig, coreuti Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: 0001-remove-duplicit-then.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. @@ -70,9 +73,12 @@ Currently, this consists of various memo %prep %setup -q -%patch0 -p1 + %patch1000 -p1 %patch2000 -p1 +%patch2001 -p1 +%patch2002 -p1 +%patch2003 -p1 %build make @@ -113,8 +119,8 @@ chmod 600 /var/log/btmp /sbin/chkconfig --add network /sbin/chkconfig --add netconsole -if [ ! -f /var/lib/random-seed ] ; then - dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=512 2>/dev/null +if [ ! -f /var/lib/random-seed -a -e /dev/urandom ] ; then + dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=4096 2>/dev/null chmod 600 /var/lib/random-seed fi @@ -205,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 @@ -253,12 +260,138 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Sat Dec 14 2013 Ian Wells - 9.03.40-2.sme -- Add hack for running rc7.d script during runlevel 4 [SME: 7217] +* Tue Mar 21 2017 Johnny Hughes - 9.03.58-1 - Roll in CentOS Branding -* Thu Oct 10 2013 Lukas Nykryn - 9.03.40-2 -- fix duplicit then (#1015065) +* 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 +- network-functions: fix change_resolv_conf after grep update + +* Mon Mar 02 2015 Lukáš Nykrýn - 9.03.48-1 +- use new -m option to pidof + +* Fri Feb 27 2015 Lukáš Nykrýn - 9.03.47-1 +- rc.sysinit: be more verbose +- init.d/functions: rc.debug option to debug initscripts +- ifup-aliases: inherit ARPCHECK from parent device +- netfs: don't race NFS umount to network shutdown +- network: report that we can't shut down network for root on netfs +- Fix tcsh + grep-2.7. (#636552) +- sysctl.conf: move bridge setting to module-init-tools +- rc.sysinit: set affinity also for current shell +- ifdown-eth: use scope host for lo +- improve_check_for_bond_master_in_install_bonding_driver +- network-functions: fix check in install_bonding_driver +- ifdown-post: remove resolv.conf only in specific cases +- netconsole: lets run earlier +- ipcalc: support RFC3021 (#997271) +- halt: add delay after upsdrvctl shutdown +- ifup: also set multicast_snooping after the bridge is up + +* Tue Jul 22 2014 Lukáš Nykrýn - 9.03.46-1 +- ifup,vlan: fix typo + +* Tue Jul 08 2014 Lukáš Nykrýn - 9.03.45-1 +- ifup,vlan: fix typo + +* Wed Jun 18 2014 Lukáš Nykrýn - 9.03.44-1 +- init.d/functions: fix typo in pid_dir + +* Tue Jun 10 2014 Lukáš Nykrýn - 9.03.43-1 +- ifup-aliases: arpcheck - check for parent operstate and carrier +- ifdown: don't wait for aliases +- hotplug: don't call ifup when new vlan appears +- ifup-wireless: add support for wowlan (second part) +- readonly-root: remount rpc_pipefs if readonly-root is used + +* Fri Jun 06 2014 Lukáš Nykrýn - 9.03.42-1 +- ipcalc: -c allow netmask +- ipcalc: parse prefix more safely +- vi.po: fix parentheses +- network-functions: handle BONDING_OPTS better +- custom naming for VLAN devices +- bonding: match whole name of interface +- network-functions: ETHTOOL_DELAY introduction patch +- ifup-wireless: add support for wowlan +- Remove NETWORKING_IPV6 from sysconfig.txt (#918622) +- bridging: add possibility to set prio and ageing + +* Wed Apr 30 2014 Lukáš Nykrýn - 9.03.41-1 +- netfs: implicitly handle glusterfs as a network filesystemd +- 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 +- rc.sysinit: apply sysctl settings before starting udev +- ifup: add possibility to specify value for -w parameter of arping +- ifup-tunnel: call ifup-ipv6 in the end +- pids_var_run: handle '(deleted)' +- require correct version of upstart +- rc.sysinit: use 'vgchange --ignoreskippedcluster' +- during install do not create /var/lib/random-seed if /dev/urandom does not exist +- rc.sysinit: increase the saved random-seed to 4K (#1023471) +- umount-loop: make sure that we don't kill our own process +- umount-loop: don't use xargs +- ifup-eth: remove ipx relic (#1028135) +- init.d/functions: add -b optin to status and killproc (#1047948) +- remove duplicit then * Thu Oct 10 2013 Lukas Nykryn - 9.03.40-1 - sync disks before halt (#1006294)