--- rpms/initscripts/sme9/initscripts.spec	2013/03/09 03:31:44	1.3
+++ rpms/initscripts/sme9/initscripts.spec	2015/07/09 19:55:24	1.10
@@ -2,15 +2,13 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.03.38
+Version: 9.03.46
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?dist}
+Release: 3%{?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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp
 Requires: /sbin/sysctl
@@ -21,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
@@ -49,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.
 
@@ -68,8 +73,12 @@ Currently, this consists of various memo
 
 %prep
 %setup -q
+%patch1 -p1 
 %patch1000 -p1
 %patch2000 -p1
+%patch2001 -p1
+%patch2002 -p1
+%patch2003 -p1
 
 %build
 make
@@ -110,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
 
@@ -220,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*/*
@@ -241,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)
@@ -248,12 +259,88 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
-* Fri Mar 8 2013 Shad L. Lords <slords@mail.com> - 9.03.38-1.el6.sme
-- Add hack for running rc7.d script during runlevel 4 [SME: 7217]
+* Thu Jul 9 2015 Daniel Berteaud <daniel@firewall-services.com> - 9.03.46-3.sme.1
+- Don't try to run plymouth if disabled [SME: 8375]
+  Code from Charlie Brady
 
-* Thu Feb 21 2013 Johnny Hughes <johnny@centos.org> 9.03.38-1.el6.centos
+* Thu Jul 9 2015 Daniel Berteaud <daniel@firewall-services.com> - 9.03.46-2.sme.1
+- Rebase on upstream 9.03.46 [SME: 8658]
+
+* Tue Nov  4 2014 Johnny Hughes <johnny@centos.org> - 9.03.46-1.1
 - Roll in CentOS Branding
 
+* Fri Oct 24 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.03.46-1.1
+- ifup: also set multicast_snooping after the bridge is up
+
+* Tue Jul 22 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.03.46-1
+- ifup,vlan: fix typo
+
+* Tue Jul 08 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 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 <lnykryn@redhat.com> - 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 <lnykryn@redhat.com> - 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 <lnykryn@redhat.com> - 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 <lnykryn@redhat.com> - 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, <xjakub@fi.muni.cz>)
+- bonding: set master up before slaves
+- Fix greps to correctly handle comments and quotation (#915659)
+
 * Wed Jan 09 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 9.03.38-1
 - call ip link up on master after slaves are up (#893395)