--- rpms/initscripts/sme9/initscripts.spec 2014/03/17 06:04:27 1.7 +++ rpms/initscripts/sme9/initscripts.spec 2015/09/30 09:59:17 1.11 @@ -2,26 +2,24 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.40 +Version: 9.03.49 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2.2%{?dist} +Release: 1%{?dist}.1.1 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch2000: initscripts-9.03.31-runlevel7.patch -Patch2001: initscripts-9.03.40-dmesg.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 @@ -48,12 +46,16 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig - -Patch0: 0001-remove-duplicit-then.patch +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. @@ -70,9 +72,13 @@ Currently, this consists of various memo %prep %setup -q -%patch0 -p1 + +%patch1 -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 @@ -253,20 +259,84 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Sun Mar 16 2014 Ian Wells - 9.03.40-2.2.sme -- Add -n 1 to the dmesg line in rc.sysinit to prevent unwanted - messages appearing on the console [SME: 8277] - -* Sun Mar 16 2014 Ian Wells - 9.03.40-2.1.sme -- Correct offest in runlevel7 patch to avoid .orig file [SME: 8277] -- Remove CentOS Branding patch +* Wed Sep 30 2015 Daniel Berteaud - 9.03.49-1.sme.1.1 +- Rebase on upstream 9.03.49 [SME: 9081] -* Sat Dec 14 2013 Ian Wells - 9.03.40-2.sme -- Add hack for running rc7.d script during runlevel 4 [SME: 7217] +* Tue Sep 22 2015 Johnny Hughes - 9.03.49-1.centos.1 - Roll in CentOS Branding -* Thu Oct 10 2013 Lukas Nykryn - 9.03.40-2 -- fix duplicit then (#1015065) +* Thu Aug 13 2015 Lukáš Nykrýn - 9.03.49-1.1 +- 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)