--- rpms/initscripts/sme9/initscripts.spec 2013/02/12 23:27:20 1.1 +++ rpms/initscripts/sme9/initscripts.spec 2015/07/09 19:55:24 1.10 @@ -2,16 +2,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.31 +Version: 9.03.46 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2%{?dist}.1 +Release: 3%{?dist}.1 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch1: initscripts-9.03.31-nis.patch -Patch2: initscripts-9.03.31-vlan.patch -Patch1000: centos-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -22,7 +19,7 @@ Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87 %if with_upstart -Requires: upstart >= 0.6.0 +Requires: upstart >= 0.6.5-11 %else Requires: SysVinit >= 2.85-38 %endif @@ -39,7 +36,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.65 +Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.97-2 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 @@ -50,9 +47,16 @@ Requires(post): /sbin/chkconfig, coreuti Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch1: 0001-ifup-also-set-multicast_snooping-after-the-bridge-is.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 Red Hat or Fedora system, change runlevels, and shut the system down +your SME Server system, change runlevels, and shut the system down cleanly. Initscripts also contains the scripts that activate and deactivate most network interfaces. @@ -69,9 +73,12 @@ Currently, this consists of various memo %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch1 -p1 %patch1000 -p1 +%patch2000 -p1 +%patch2001 -p1 +%patch2002 -p1 +%patch2003 -p1 %build make @@ -112,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 @@ -222,6 +229,7 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check +/lib/udev/udev-kvm-check /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -243,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp +%ghost %attr(0644,root,root) /etc/sysconfig/kvm %files -n debugmode %defattr(-,root,root) @@ -250,14 +259,125 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Sep 17 2012 Johnny Hughes - 9.03.31-2.1.el6.centos +* 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] + +* Tue Nov 4 2014 Johnny Hughes - 9.03.46-1.1 - Roll in CentOS Branding -* Thu Sep 06 2012 Václav Pavlín 9.03.31-2.1 -- be less strict about VLAN name (#854852) +* Fri Oct 24 2014 Lukáš Nykrýn - 9.03.46-1.1 +- 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 May 23 2012 Bill Nottingham 9.03.31-2 -- fix the NIS domain setting (#704919) +* 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) +- provide KVM guest count and limit info message (#1014731) +- add ability to disable LVM activation on boot (#1015065) + +* Fri Aug 09 2013 Lukáš Nykrýn - 9.03.39-1 +- remount /proc to set attributes from fstab #984003 +- print something when arping is detecting colliding ip addresses +- try dhcpv6 after v4 failed +- Allow dhclient configuration files for DHCPv6 as well. (#815676) +- ifdown: don't call nmcli on interface that is alread down +- call flush addresses with scope global +- init: inform users about .override files in .conf files +- netfs: do not force NFS exports to be mounted before _netdev mounts +- set net.ipv6.conf..autoconf in ifup-ipv6 +- mention rule6 files +- securetty: check if the device is in the file before attempting to write to it +- Process rule6-* for sit devices (#840009) +- Killproc -d should parse same values as sleep +- Make killproc more granular when delay is passed. (#428029, ) +- bonding: set master up before slaves +- Fix greps to correctly handle comments and quotation (#915659) + +* Wed Jan 09 2013 Lukáš Nykrýn - 9.03.38-1 +- call ip link up on master after slaves are up (#893395) + +* Thu Dec 13 2012 Lukáš Nykrýn - 9.03.37-1 +- don't apply BONDING_OPTS on device with active slaves (#885235) + +* Wed Nov 28 2012 Lukáš Nykrýn - 9.03.36-1 +- improve duplicate ip address check in ifup-aliases (#880684) + +* Fri Nov 23 2012 Lukáš Nykrýn - 9.03.35-1 +- fix typo in ifup-aliases duplicate check (#879243) + +* Thu Nov 15 2012 Václav Pavlín - 9.03.34-1 +- there should be crypttab instead of crypptab in man page (#870025) +- sysconfig.txt advised saslauthd -a instad of -v (#869075) + +* Thu Nov 08 2012 Lukáš Nykrýn - 9.03.33-1 +- apply BONDING_OPT on ifup of master (#874030) + +* Mon Oct 08 2012 Lukáš Nykrýn - 9.03.32-1 +- check an IP address for existence in ifup-alias +- remount /dev/shm in sysinit to apply attributes from fstab +- sets BONDING_OPTS before interface is brougth up and checks if it is not already added +- Add support for setting random bridge options via BRIDGING_OPTS +- use vgchange -aay in rc.sysinit and netfs init script +- script should not kill itself during shutdown +- fix the NIS domain setting +- be less strict about VLAN name +- clarification of work with white spaces in crypttab manpage +- re-read sysctl values for VLANs on ifup +- pass useful arguments to halt.local +- start serial console when we return from runlevel1 +- move VLAN= docs to the interface configuration section, rather than /etc/sysconfig/network. +- don't accidentally match other bonding devices +- add usage stanzas for tty.conf and serial.conf +- rename_device: skip VLAN=yes configuration files +- allow duplicate address dectection to be disabled * Fri Apr 27 2012 Lukas Nykryn 9.03.31-1 - set NIS domain (#704919)