- splitted out pkcipe package

Changed files:
    cipe.spec -> 1.9

diff --git a/cipe.spec b/cipe.spec
index b158abbd46e8c7ee231010e3c6e903ac6129f8df..f5fbf8ab5a5d679de800dd2e1b9770e8d30d4db5 100644 (file)
--- a/cipe.spec
+++ b/cipe.spec
@@ -7,15 +7,15 @@ Summary:      CIPE - encrypted IP over UDP tunneling
 Summary(pl):   CIPE - szyfrowany tunel IP po UDP
 Name:          cipe
 Version:       1.5.2
-Release:       2
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
 Source0:       http://sites.inka.de/bigred/sw/%{name}-%{version}.tar.gz
+Source1:       %{name}.inetd
 Patch0:                %{name}-autoconf.patch
 Patch1:                %{name}-makefile.patch
-Prereq:                %{_bindir}/openssl
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.6
@@ -36,6 +36,32 @@ tworzenia szyfrowanych tuneli IP. Mo
 routerów szyfruj±cych w VPNach (Prywatnych Sieciach Wirtualnych) i
 podobnych zastosowaniach.
 
+%package pkcipe
+Summary:       The PKCIPE public key tool for CIPE
+Summary(pl):   PKCIPE - narzêdzie do wykorzystania kluczy publicznych w CIPE
+Group:         Networking/Daemons
+Group(de):     Netzwerkwesen/Server
+Group(pl):     Sieciowe/Serwery
+Prereq:                %{_bindir}/openssl
+Requires:      %{name} = %{version}
+
+%description pkcipe
+CIPE (the name is shortened from *Crypto IP Encapsulation*) is a
+package for an encrypting IP tunnel device. This can be used to build
+encrypting routers for VPN (Virtual Private Networks) and similar
+applications.
+This package contains PKCIPE, which simplifies setup of CIPE tunnels by
+using autoconfiguration and public/private key mechanisms.
+
+%description pkcipe -l pl
+CIPE (nazwa to skrót od *Crypto IP Encapsulation*) to pakiet do
+tworzenia szyfrowanych tuneli IP. Mo¿na je wykorzystaæ do budowania
+routerów szyfruj±cych w VPNach (Prywatnych Sieciach Wirtualnych) i
+podobnych zastosowaniach.
+Ten pakiet zawiera PKCIPE, który uprasza ustawienie tuneli CIPE przez
+korzystanie z autokonfiguracji oraz mechanizmów kluczy
+publicznych/prywatnych.
+
 %package -n kernel%{smpstr}-cipe
 Summary:       CIPE kernel module
 Summary(pl):   Modu³ j±dra CIPE
@@ -86,25 +112,40 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_infodir}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/cipe/pk \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc \
-       $RPM_BUILD_ROOT%{_var}/run/cipe
+       $RPM_BUILD_ROOT%{_var}/run/cipe \
+       $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd
 
 install pkcipe/pkcipe $RPM_BUILD_ROOT%{_sbindir}
 install pkcipe/rsa-keygen $RPM_BUILD_ROOT%{_bindir}
 install */cipcb.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 install */ciped-cb $RPM_BUILD_ROOT%{_sbindir}
 install cipe.info $RPM_BUILD_ROOT%{_infodir}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/pkcipe
+
 gzip -9nf README* tcpdump.patch CHANGES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f %{_sysconfdir}/cipe/identity.priv ] && %{_bindir}/rsa-keygen %{_sysconfdir}/cipe/identity
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
+%post pkcipe
+[ ! -f %{_sysconfdir}/cipe/identity.priv ] && %{_bindir}/rsa-keygen %{_sysconfdir}/cipe/identity
+if [ -f /var/lock/subsys/rc-inetd ]; then
+        /etc/rc.d/init.d/rc-inetd reload 1>&2
+else
+        echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
+fi
+
+%postun pkcipe
+if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
+       /etc/rc.d/init.d/rc-inetd reload
+fi
+
 %post -n kernel%{smpstr}-cipe
 /sbin/depmod -a
 
@@ -115,12 +156,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc *.gz samples
 %{_infodir}/*
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/ciped-cb
 %dir %{_sysconfdir}/cipe
-%attr(700,root,root) %dir %{_sysconfdir}/cipe/pk
 %attr(755,root,root) %dir %{_var}/run/cipe
 
+%files pkcipe
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rsa-keygen
+%attr(755,root,root) %{_sbindir}/pkcipe
+%attr(700,root,root) %dir %{_sysconfdir}/cipe/pk
+%attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/rc-inetd/pkcipe
+
 %files -n kernel%{smpstr}-cipe
 %defattr(644,root,root,755)
 %attr(600,root,root) /lib/modules/*/misc/cipcb.o