- merge translations from KSI and Conectiva,

- added no_libnsl patch (with correct tetection is linking with libnsl is neccessary),
- merge security patch from MDK,
- move uucp locks to /var/lock/uucp (patch lock) owbed by uucp.uucp,
- merge pipe patch from RH (fix to deny to use address in pipe ports).

Changed files:
    uucp.spec -> 1.29

diff --git a/uucp.spec b/uucp.spec
index 58224cd6a49ed4c974e6ea1a5b1e238c46b3be9a..8eff511cea2cb75d7187c98b089c2dbedde50b57 100644 (file)
--- a/uucp.spec
+++ b/uucp.spec
@@ -1,8 +1,12 @@
 Summary:       GNU uucp
-Summary(de):   GNU-uucp 
+Summary(de):   GNU-uucp
+Summary(es):   Uucp de la GNU
 Summary(fr):   uucp de GNU
 Summary(pl):   GNU uucp
+Summary(pt_BR):        Uucp da GNU
+Summary(ru):   GNU uucp
 Summary(tr):   GNU uucp sistemi
+Summary(uk):   GNU uucp
 Name:          uucp
 Version:       1.06.2
 Release:       4
@@ -12,11 +16,15 @@ Source0:    ftp://prep.ai.mit.edu/pub/gnu/uucp/%{name}-%{version}.tar.gz
 Source1:       %{name}.logrotate
 Source2:       %{name}.inetd
 Source3:       %{name}.crontab
-Source4:       uucp-non-english-man-pages.tar.bz2
+Source4:       %{name}-non-english-man-pages.tar.bz2
 Patch0:                %{name}-misc.patch
 Patch1:                %{name}-debian.patch
 Patch2:                %{name}-buggy_autoconf.patch
 Patch3:                %{name}-ac.patch
+Patch4:                %{name}-security.patch
+Patch5:                %{name}-lock.patch
+Patch6:                %{name}-pipe.patch
+Patch7:                %{name}-no_libnsl.patch
 BuildRequires: autoconf
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,6 +41,12 @@ verwendet, um E-Mail- und News-Dateien von entfernten auf lokale
 Rechner herunter- bzw. umgekehrt hochzuladen. Wie Sie wahrscheinlich
 wissen, müssen Sie das Paket wahrscheinlich nicht installieren. :-)
 
+%description -l es
+UUCP es un mecanismo de transferencia de Unix para Unix. Se usa
+primeramente en sitios remotos para hacer download y upload de
+archivos de mail y news para máquinas locales. Si no lo sabias,
+probablemente no necesitas de este paquete instalado. :-)
+
 %description -l fr
 UUCP est un mécanisme de transfert d'UNIX à UNIX. Il est
 principalement utilisés par les sites de connexion pour télécharger ou
@@ -46,29 +60,52 @@ protoko
 pobierania przesy³ek newsów oraz poczty elektronicznej mêdzy maszynami
 po³±czonymi np. przez modem.
 
+%description -l pt_BR
+UUCP é um mecanismo de transferência de Unix para Unix. Ele é usado
+primeiramente em sites remotos para fazer download e upload de
+arquivos de mail e news para máquinas locais. Se você não sabia disso,
+você provavelmente não precisa deste pacote instalado. :-)
+
+%description -l ru
+UUCP - ÜÔÏ ÍÅÈÁÎÉÚÍ ÐÅÒÅÄÁÞÉ ÆÁÊÌÏ× ÍÅÖÄÕ UNIX-ÓÉÓÔÅÍÁÍÉ. ÷ ÏÓÎÏ×ÎÏÍ
+ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÏÂÍÅÎÁ ÐÏÞÔÏÊ É ÔÅÌÅËÏÎÆÅÒÅÎÃÉÑÍÉ ÍÅÖÄÕ ÍÁÛÉÎÁÍÉ.
+åÓÌÉ ×Ù ÜÔÏÇÏ ÎÅ ÚÎÁÌÉ, ×ÁÍ ÜÔÏÔ ÐÁËÅÔ ÎÅ ÎÕÖÅÎ :-))
+
 %description -l tr
 UUCP bir Unix'ten Unix'e iletim mekanizmasýdýr. Uzak sitelerden yerel
 sisteme e-posta ve haber öbekleri aktarýmý için kullanýlýr. Bunun ne
-olduðunu bilmiyorsanýz, büyük olasýlýkla iþinize de yaramayacaktýr. :-)
+olduðunu bilmiyorsanýz, büyük olasýlýkla iþinize de yaramayacaktýr.
+:-)
+
+%description -l uk
+UUCP - ÃÅ ÍÅÈÁΦÚÍ ÐÅÒÅÄÁÞ¦ ÆÁÊÌ¦× Í¦Ö UNIX-ÓÉÓÔÅÍÁÍÉ. úÄŦÌØÛÏÇÏ
+×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÏÂͦÎÕ ÐÏÛÔÏÀ ÔÁ ÔÅÌÅËÏÎÆÅÒÅÎæÑÍÉ Í¦Ö ÍÁÛÉÎÁÍÉ.
+ñËÝÏ ×É ÃØÏÇÏ ÎÅ ÚÎÁÌÉ, ×ÁÍ ÃÅÊ ÐÁËÅÔ ÎÅ ÐÏÔÒ¦ÂÅÎ :-))
 
 %package server
 Summary:       GNU uucp server
-Summary(de):   GNU-uucp 
+Summary(de):   GNU-uucp
 Summary(fr):   uucp de GNU
 Summary(pl):   Serwer GNU uucp
 Group:         Networking
 Requires:      %{name} = %{version}
 
 %description server
+GNU uucp server.
 
-%description -l pl server
+%description server -l pl
+Serwer GNU uucp.
 
 %prep
 %setup -q -n uucp-1.06.1
-%patch0 -p1 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 find . -name "*.perlpath" | xargs rm -f
 
@@ -76,39 +113,33 @@ find . -name "*.perlpath" | xargs rm -f
 %{__autoconf}
 %configure
 
-%{__make} clean; make 
+%{__make} clean; make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{1,8},%{_infodir}}
-
-%{__make} \
-    prefix=$RPM_BUILD_ROOT%{_prefix} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    sbindir=$RPM_BUILD_ROOT%{_sbindir} \
-    man1dir=$RPM_BUILD_ROOT%{_mandir}/man1 \
-    man8dir=$RPM_BUILD_ROOT%{_mandir}/man8 \
-    owner=`id -u` \
-    install install-info 
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{1,8},%{_infodir}} \
+       $RPM_BUILD_ROOT{%{_libdir}/uucp,/var/{lock/uucp,spool/{uucp,uucppublic}}} \
+       $RPM_BUILD_ROOT/var/log/{uucp,archiv/uucp} \
+$RPM_BUILD_ROOT%{_sysconfdir}/{uucp/oldconfig,sysconfig/rc-inetd,cron.d,logrotate.d}
+
+%{__make} install install-info \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       infodir=$RPM_BUILD_ROOT%{_infodir} \
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
+       sbindir=$RPM_BUILD_ROOT%{_sbindir} \
+       man1dir=$RPM_BUILD_ROOT%{_mandir}/man1 \
+       man8dir=$RPM_BUILD_ROOT%{_mandir}/man8 \
+       owner=`id -u`
+
+gzip -9nf sample/*
 
-gzip -9nf sample/* 
-
-install -d $RPM_BUILD_ROOT/var/spool/{uucp,uucppublic}
-install -d $RPM_BUILD_ROOT/etc/{uucp/oldconfig,sysconfig/rc-inetd,cron.d}
-
-install -d $RPM_BUILD_ROOT%{_libdir}/uucp
 ln -sf ../../sbin/uucico $RPM_BUILD_ROOT%{_libdir}/uucp/uucico
 
-install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/uucp
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/uucp
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/uucp
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-install -d $RPM_BUILD_ROOT/var/log/uucp
-install -d $RPM_BUILD_ROOT/var/log/archiv/uucp
-
 # Create empty files
 for n in Log Stats Debug; do
        touch $RPM_BUILD_ROOT/var/log/uucp/$n
@@ -118,16 +149,13 @@ for i in dial passwd port dialcode sys call ; do
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/uucp/$i <<EOF
 # This is an example of a $i file. This file have the syntax compatible
 # with Taylor UUCP (not HDB, not anything else). Please check uucp
-# documentation if you are not sure how Taylor config files are supposed to 
+# documentation if you are not sure how Taylor config files are supposed to
 # look like. Edit it as appropriate for your system.
 
 # Everything after a '#' character is a comment.
 EOF
 done
 
-# some more documentation
-texi2html -monolithic uucp.texi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,15 +179,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog MANIFEST NEWS sample contrib 
+%doc README ChangeLog MANIFEST NEWS sample contrib
 
-%attr(750,uucp,root) %dir /etc/uucp
-%attr(755,uucp,root) %dir /etc/uucp/oldconfig
+%attr(750,uucp,root) %dir %{_sysconfdir}/uucp
+%attr(755,uucp,root) %dir %{_sysconfdir}/uucp/oldconfig
 
-%attr(640,uucp,root) %config %verify(not size mtime md5) /etc/uucp/ca*
-%attr(640,uucp,root) %config %verify(not size mtime md5) /etc/uucp/di*
-%attr(640,uucp,root) %config %verify(not size mtime md5) /etc/uucp/p*
-%attr(640,uucp,root) %config %verify(not size mtime md5) /etc/uucp/sys
+%attr(640,uucp,root) %config %verify(not size mtime md5) %{_sysconfdir}/uucp/ca*
+%attr(640,uucp,root) %config %verify(not size mtime md5) %{_sysconfdir}/uucp/di*
+%attr(640,uucp,root) %config %verify(not size mtime md5) %{_sysconfdir}/uucp/p*
+%attr(640,uucp,root) %config %verify(not size mtime md5) %{_sysconfdir}/uucp/sys
 
 %attr(640,root,root) %config /etc/logrotate.d/uucp
 
@@ -193,9 +221,11 @@ fi
 
 %attr(750,uucp,root) %dir /var/log/uucp
 %attr(750,uucp,root) %dir /var/log/archiv/uucp
+%attr(750,uucp,root) %dir /var/lock/uucp
 %attr(640,uucp,root) %config(noreplace) %verify(not size mtime md5) /var/log/uucp/Debug
 %attr(640,uucp,root) %config(noreplace) %verify(not size mtime md5) /var/log/uucp/Log
 %attr(640,uucp,root) %config(noreplace) %verify(not size mtime md5) /var/log/uucp/Stats
 
 %files server
+%defattr(644,root,root,755)
 %attr(640,root,root) %config /etc/sysconfig/rc-inetd/uucp