X-Git-Url: http://git.pld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts.spec;h=3f198a095434feff94854300f3c0997f145d6e6c;hp=e1410331690e742ebcff86e78fe2c68065a08803;hb=09a40b569898b4815b4b0c5884129824fe1c08a3;hpb=b863c1843d0e6ce1aff56ea11d0daf2daa469c12

diff --git a/rc-scripts.spec b/rc-scripts.spec
index e141033..3f198a0 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,4 +1,6 @@
 #
+# TODO: move inittab file to SysVinit
+#
 # Conditional build:
 %bcond_without	static		# link binaries with glib dynamically
 
@@ -8,27 +10,30 @@ Summary(fr.UTF-8):	inittab et scripts /etc/rc.d
 Summary(pl.UTF-8):	inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
-Version:	0.4.5.4
-Release:	3
+Version:	0.4.19
+Release:	2
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	e073e75ca6220e463bd659d25feefde6
+# Source0-md5:	a123c2dd45a676bafab5a14e2c066a35
 Source1:	rc-local.service
 Source2:	sys-chroots.service
 Source3:	%{name}.tmpfiles
-Patch0:		%{name}-dot_named_ifaces.patch
+Patch0:		lsmod-fix.patch
+Patch1:		lxd-loopback.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel
 %{?with_static:BuildRequires:	glib2-static}
 %{?with_static:BuildRequires:	glibc-static}
 BuildRequires:	libcap-devel >= 1:2.17
 BuildRequires:	linux-libc-headers >= 7:2.6.27
 BuildRequires:	pkgconfig
+BuildRequires:	pcre-devel
+%{?with_static:BuildRequires:	pcre-static}
 BuildRequires:	popt-devel
 BuildRequires:	rpm >= 4.4.9-56
 Requires(post):	fileutils
@@ -40,11 +45,12 @@ Requires:	/bin/basename
 Requires:	/bin/gettext
 Requires:	/bin/nice
 Requires:	/bin/ps
-Requires:	virtual(init-daemon)
 Requires:	SysVinit-tools >= 2.88-1
 Requires:	blockdev
 Requires:	coreutils
 Requires:	ethtool
+Requires:	run-parts = %{version}-%{release}
+Requires:	virtual-init-daemon
 %if "%{pld_release}" == "ac"
 Requires:	filesystem >= 3.0-11
 %else
@@ -57,21 +63,21 @@ Requires:	grep
 Requires:	hostname
 Requires:	iproute2
 Requires:	iputils-arping
-Requires:	mingetty
+Requires:	libutempter >= 1.1.6-2
 Requires:	mktemp
 Requires:	mount >= 2.12
 Requires:	procps >= 1:3.2.6-1.1
 Requires:	psmisc >= 22.5-2
-Requires:	utempter
-Requires:	util-linux
+Requires:	util-linux >= 2.22.1
 Requires:	virtual(module-tools)
 Suggests:	libcgroup
-Provides:	initscripts
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
 Conflicts:	LPRng < 3.8.0-2
 Conflicts:	dev < 2.9.0-22
 Conflicts:	iputils-arping < 2:s20070202-1
+# character classes support required
+Conflicts:	mawk < 1.3.4-0.20090727
 Conflicts:	openssh-server < 2:3.6.1p2-6
 Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
@@ -80,14 +86,15 @@ Conflicts:	udev-core < 1:135-2
 %else
 Conflicts:	udev-core < 1:124-3
 %endif
+Conflicts:	SysVinit < 2.88-16
 Conflicts:	lvm2 < 2.02.83
-Conflicts:	upstart-SysVinit < 2.86-25
+Conflicts:	upstart
 Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
 %define		localedir	/etc/sysconfig/locale
-%define 	_bindir		/bin
+%define		_bindir		/bin
 %define		_sbindir	/sbin
 
 %description
@@ -116,9 +123,26 @@ düzgün bir şekilde kapatmak için gereken dosyaları içerir. Ayrıca pek
 çok bilgisayar ağı arayüzlerini etkinleştiren ya da edilginleştiren
 programcıklar içerir.
 
+%package -n run-parts
+Summary:	Run scripts or programs in a directory
+Summary(pl.UTF-8):	Uruchamianie skryptów lub programów z katalogu
+Group:		Base
+Conflicts:	rc-scripts < 0.4.14-2
+
+%description -n run-parts
+run-parts runs all the executable files named within specific
+constraints, found in directory directory. Other files and directories
+are silently ignored.
+
+%description -n run-parts -l pl.UTF-8
+Program run-parts pozwala na uruchamianie wszystkich plików zgodnych z
+pewnymi ograniczeniami, obecnych w katalogu. Inne pliki i katalogi są
+po cichu ignorowane.
+
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -138,12 +162,16 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
 	$RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
+	$RPM_BUILD_ROOT{%{_sysconfdir},%{_prefix}/lib}/sysctl.d \
 	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	%{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
+# deprecated shell version
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/run-parts.sh
+
 for i in 0 1 2 3 4 5 6; do
 	install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
 done
@@ -188,14 +216,13 @@ done
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
 # systemd
-install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
 ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service
-install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-%if "%{pld_release}" == "ac"
-rm -rf $RPM_BUILD_ROOT/etc/init
-%endif
+# packaged into SysVinit and systemd-init (supported options differ)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,7 +244,17 @@ chown root:root /var/cache/rc-scripts/msg.cache
 
 # move network interfaces description files to new location
 %triggerpostun -- initscripts
-mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+[ -d /etc/sysconfig/network-scripts ] || exit 0
+cd /etc/sysconfig/network-scripts
+for iface in ifcfg-* ; do
+	[ -f $iface ] || continue
+	if [ -f /etc/sysconfig/interfaces/$iface ]; then
+		echo "/etc/sysconfig/interfaces/$iface renamed to /etc/sysconfig/interfaces/$iface.rpmnew"
+		mv -f /etc/sysconfig/interfaces/$iface{,.rpmnew}
+	fi
+	echo "/etc/sysconfig/network-scripts/$iface moved to /etc/sysconfig/interfaces/$iface"
+	mv -f /etc/sysconfig/network-scripts/$iface /etc/sysconfig/interfaces
+done
 
 %files
 %defattr(644,root,root,755)
@@ -235,20 +272,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 /etc/init.d
 /etc/rc.d/init.d/functions
 
-%if "%{pld_release}" != "ac"
-%config(noreplace) %verify(not md5 mtime size) /etc/init/allowlogin.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/cpusets.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/cryptsetup.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/local.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/modules.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/random.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rc.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS-sulogin.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/sys-chroots.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/udev.conf
-%endif
-
 %attr(754,root,root) /etc/rc.d/init.d/allowlogin
 %attr(754,root,root) /etc/rc.d/init.d/cpusets
 %attr(754,root,root) /etc/rc.d/init.d/cryptsetup
@@ -292,14 +315,14 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_bindir}/doexec
 %attr(755,root,root) %{_bindir}/ipcalc
 %attr(755,root,root) %{_bindir}/resolvesymlink
-%attr(755,root,root) %{_bindir}/run-parts
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
 %attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/getkey
 %attr(755,root,root) %{_sbindir}/hwprofile
-%attr(755,root,root) %{_sbindir}/if*
+%attr(755,root,root) %{_sbindir}/ifdown
+%attr(755,root,root) %{_sbindir}/ifup
 %attr(755,root,root) %{_sbindir}/initlog
 %attr(755,root,root) %{_sbindir}/loglevel
 %attr(755,root,root) %{_sbindir}/minilogd
@@ -309,7 +332,8 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_sbindir}/setsysfont
 %attr(755,root,root) %{_sbindir}/setuidgid
 %attr(755,root,root) %{_sbindir}/start-stop-daemon
-%attr(755,root,root) %{_sbindir}/tnl*
+%attr(755,root,root) %{_sbindir}/tnldown
+%attr(755,root,root) %{_sbindir}/tnlup
 %attr(4755,root,root) %{_sbindir}/usernetctl
 
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
@@ -327,6 +351,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) /lib/rc-scripts/ifdown-sl
 %attr(755,root,root) /lib/rc-scripts/ifdown-vlan
 /lib/rc-scripts/ifup-aliases
+%attr(755,root,root) /lib/rc-scripts/ifup-bond
 %attr(755,root,root) /lib/rc-scripts/ifup-br
 %attr(755,root,root) /lib/rc-scripts/ifup-ipx
 %attr(755,root,root) /lib/rc-scripts/ifup-irda
@@ -339,11 +364,19 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 /lib/rc-scripts/ifup-routes
 %attr(755,root,root) /lib/rc-scripts/ifup-sl
 %attr(755,root,root) /lib/rc-scripts/ifup-vlan
+%attr(755,root,root) /lib/rc-scripts/makepid
 /lib/rc-scripts/functions.network
 /lib/rc-scripts/functions
 
 %dir %{_sysconfdir}/ppp
-%attr(754,root,root) %{_sysconfdir}/ppp/*
+%attr(754,root,root) %{_sysconfdir}/ppp/auth-down
+%attr(754,root,root) %{_sysconfdir}/ppp/auth-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ip-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ip-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ipv6-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ipv6-up
+%attr(754,root,root) %{_sysconfdir}/ppp/ipx-down
+%attr(754,root,root) %{_sysconfdir}/ppp/ipx-up
 %dir /etc/sysconfig/cpusets
 %dir /etc/sysconfig/hwprofiles
 %dir /etc/sysconfig/interfaces
@@ -351,10 +384,10 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %dir /etc/sysconfig/isapnp
 
 %dir /etc/sysconfig/interfaces/down.d
-%dir /etc/sysconfig/interfaces/down.d/*
-%dir /etc/sysconfig/interfaces/up.d
-%dir /etc/sysconfig/interfaces/up.d/*
+%dir /etc/sysconfig/interfaces/down.d/ppp
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/down.d/ppp/logger
+%dir /etc/sysconfig/interfaces/up.d
+%dir /etc/sysconfig/interfaces/up.d/ppp
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/up.d/ppp/logger
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/isapnp/isapnp-kernel.conf
 
@@ -379,7 +412,20 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system
 
-%{_mandir}/man?/*
+%dir %{_sysconfdir}/sysctl.d
+%dir %{_prefix}/lib/sysctl.d
+
+%{_mandir}/man1/consoletype.1*
+%{_mandir}/man1/doexec.1*
+%{_mandir}/man1/genhostid.1*
+%{_mandir}/man1/getkey.1*
+%{_mandir}/man1/initlog.1*
+%{_mandir}/man1/ipcalc.1*
+%{_mandir}/man1/netreport.1*
+%{_mandir}/man1/usleep.1*
+%{_mandir}/man8/ppp-watch.8*
+%{_mandir}/man8/start-stop-daemon.8*
+%{_mandir}/man8/usernetctl.8*
 %lang(de) %{_mandir}/de/man?/*
 %lang(es) %{_mandir}/es/man?/*
 %lang(fr) %{_mandir}/fr/man?/*
@@ -390,3 +436,8 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %dir %{localedir}
 %lang(de) %{localedir}/de
 %lang(pl) %{localedir}/pl
+
+%files -n run-parts
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/run-parts
+%{_mandir}/man8/run-parts.8*