--- rpms/initscripts/sme9/initscripts.spec 2015/07/09 19:55:24 1.10 +++ rpms/initscripts/sme9/initscripts.spec 2015/09/30 09:59:17 1.11 @@ -2,11 +2,11 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.46 +Version: 9.03.49 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 3%{?dist}.1 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -14,10 +14,10 @@ Requires: mingetty, /bin/awk, /bin/sed, 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.5-11 %else @@ -46,8 +46,7 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig - -Patch1: 0001-ifup-also-set-multicast_snooping-after-the-bridge-is.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 @@ -56,7 +55,7 @@ Patch2003: initscripts-9.03.46-dont_run_ %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 +72,8 @@ Currently, this consists of various memo %prep %setup -q -%patch1 -p1 + +%patch1 -p1 %patch1000 -p1 %patch2000 -p1 %patch2001 -p1 @@ -259,17 +259,37 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Jul 9 2015 Daniel Berteaud - 9.03.46-3.sme.1 -- Don't try to run plymouth if disabled [SME: 8375] - Code from Charlie Brady - -* Thu Jul 9 2015 Daniel Berteaud - 9.03.46-2.sme.1 -- Rebase on upstream 9.03.46 [SME: 8658] +* Wed Sep 30 2015 Daniel Berteaud - 9.03.49-1.sme.1.1 +- Rebase on upstream 9.03.49 [SME: 9081] -* Tue Nov 4 2014 Johnny Hughes - 9.03.46-1.1 +* Tue Sep 22 2015 Johnny Hughes - 9.03.49-1.centos.1 - Roll in CentOS Branding -* Fri Oct 24 2014 Lukáš Nykrýn - 9.03.46-1.1 +* 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