X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cvs-nserver.spec;h=a055bcfb4176bd8490f32ae83a658975a94dac42;hb=bfb8fe664cc2941e479bc254452a6481fa2894e9;hp=a84e2b839435711d224dfaf0754ca13a75a7dd6d;hpb=05c877ffee7494d5079c40fb0e934072ca950aab;p=packages%2Fcvs-nserver.git

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index a84e2b8..a055bcf 100644
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -1,26 +1,54 @@
-Summary:	Concurrent Versions System
-Summary(de):	Concurrent-Versioning-System
-Summary(fr):	Un système pour maintenir à jour des fichiers
-Summary(pl):	Concurrent Versions System
-Summary(tr):	Sürüm denetim sistemi
+# TODO:
+# - trigger for upgrade from old cvs - after that package stays without any
+#   users and nserver-common is not installed...
+# - cvschkpw causes sig11 when run without CVSSERVER variable set.
+Summary:	Concurrent Versions System - nserver
+Summary(de.UTF-8):	Concurrent-Versioning-System - nserver
+Summary(fr.UTF-8):	Un système pour maintenir à jour des fichiers - nserver
+Summary(pl.UTF-8):	Concurrent Versions System - nserver
+Summary(tr.UTF-8):	Sürüm denetim sistemi - nserver
 Name:		cvs-nserver
-Version:	1.11.1.2
-Release:	1
+Version:	1.11.1.52
+Release:	28
 License:	GPL
 Group:		Development/Version Control
-Group(de):	Entwicklung/Versionkontrolle
-Group(pl):	Programowanie/Zarz±dzanie wersjami
-Source0:	http://alexm.here.ru/cvs-nserver/download/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
+# Source0-md5:	357fb5f37cc556977dad79175e9c2d97
 Source1:	%{name}.inetd
 Source2:	cvs-pserver.inetd
 Patch0:		%{name}-cvspasswd.patch
 Patch1:		%{name}-info.patch
-# outdated, but maybe will be needed for checkpasswd (outside programs):
-Patch3:		%{name}-PAM_fix.patch
+Patch2:		%{name}-am_ac.patch
+Patch3:		%{name}-cvspass.patch
+Patch4:		%{name}-home_etc.patch
+Patch5:		%{name}-ssl-link.patch
+Patch6:		%{name}-fix_doc_CVSUSER.patch
+Patch7:		%{name}-segv.patch
+Patch8:		%{name}-initgroups-rootonly.patch
+Patch9:		%{name}-zlibfix.patch
+Patch10:	%{name}-home_etc2.patch
+Patch11:	%{name}-posix.patch
+Patch12:	%{name}-CAN-2002-0844.patch
+Patch13:	%{name}-CAN-2003-0015.patch
+Patch14:	%{name}-CAN-2003-0977-and-CAN-2004-0180.patch
+Patch15:	%{name}-CAN-2004-0396.patch
+Patch16:	%{name}-CAN-2004-0414.patch
+Patch17:	%{name}-CAN-2004-0416-0417-0418.patch
+Patch18:	%{name}-dblshutdown.patch
+Patch19:	%{name}-krb5.patch
+Patch20:	%{name}-cvspasswd-mode.patch
+Patch21:	%{name}-getline.patch
+URL:		http://cvs-nserver.sourceforge.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	heimdal-devel
+BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_cvsroot	/home/cvsroot
+%define		_cvsroot	/var/lib/cvs
 
 %description
 CVS is a version control system, which allows you to keep old versions
@@ -33,219 +61,281 @@ and to control the concurrent editing of source files among multiple
 authors. CVS allows triggers to enable/log/control various operations
 and works well over a wide area network.
 
-%description -l de
-CVS ist ein Frontend für das RCS(1)-Revisionskontrollsystem, das den
+%description -l de.UTF-8
+CVS ist ein Frontend für das RCS(1)-Revisionskontrollsystem, das den
 Begriff der Revisionskontrolle von einer Sammlung von Dateien in einem
 einzelnen Verzeichnis auf eine ganze Hierarchie ausweitet, bestehend
 aus revisionskontrollierten Dateien. Diese Verzeichnisse und Dateien
 lassen sich zu einer Software-Release kombinieren. CVS bietet die
 Funktionen, die zur Verwaltung von Software-Releases und zur
-Überwachung der gleichzeitigen Bearbeitung von Quelldateien durch
+Überwachung der gleichzeitigen Bearbeitung von Quelldateien durch
 mehrere Software- Entwickler notwendig sind.
 
-%description -l fr
-"CVS" signifie "Concurrent Version System". C'est un système de
+%description -l fr.UTF-8
+"CVS" signifie "Concurrent Version System". C'est un système de
 comparaison de versions de fichiers, qui peut garder une trace des
-changements apportés à des fichiers (le plus souvent, les fichiers des
-sources d'un programme). CVS conserve seulement les différences, et
-non l'intégralité d'un fichier récent et d'un fichier plus ancien. A
+changements apportés à des fichiers (le plus souvent, les fichiers des
+sources d'un programme). CVS conserve seulement les différences, et
+non l'intégralité d'un fichier récent et d'un fichier plus ancien. A
 chaque modification d'un fichier, CVS garde (entre autres) le nom de
 la personne ayant fait la modification, la raison justifiant cette
-modification, et la date à laquelle celle-ci a eu lieu. CVS est très
-utile pour gérer la mise en commun des modifications apportées par
-plusieurs personnes travaillant en parallèle sur les mêmes fichiers.
+modification, et la date à laquelle celle-ci a eu lieu. CVS est très
+utile pour gérer la mise en commun des modifications apportées par
+plusieurs personnes travaillant en parallèle sur les mêmes fichiers.
 Au lieu de garder plusieurs versions des fichiers dans un seul
-répertoire, CVS crée une série de répertoires, chacun contenant une
-nouvelle version des fichiers. Ces répertoires et ces fichiers peuvent
-ensuite être regroupés pour former la version la plus à jour du
+répertoire, CVS crée une série de répertoires, chacun contenant une
+nouvelle version des fichiers. Ces répertoires et ces fichiers peuvent
+ensuite être regroupés pour former la version la plus à jour du
 logiciel. Installez ce package si vous avez besoin d'utiliser un
-système de contrôle de version.
-
-%description -l pl
-CVS jest nak³adk± na rcs (Revision Control System, czyli w wolnym
-t³umaczeniu system kontroli wersji zasobów), który rozszerza
-mo¿liwo¶ci rcs'a z narzêdzia do kontroli zbioru plików w pojedynczym
-katalogu o mo¿liwo¶æ kontroli zbioru hierarchicznie u³o¿onych
-katalogów z plikami. Z pomoc± CVS w ³atwy sposób mo¿na zarz±dzaæ kodem
-¼ród³owym opracowywanym przez nawet bardzo du¿e zespó³y programistów
-umo¿liwiaj±c ¶ledzenie i kontrolê wszystkich zmian w trakcie pracy nad
-projektami i wypuszczaniem pe³nych wersji oprogramowania (release).
-
-%description -l tr
+système de contrôle de version.
+
+%description -l pl.UTF-8
+CVS jest nakładką na rcs (Revision Control System, czyli w wolnym
+tłumaczeniu system kontroli wersji zasobów), który rozszerza
+możliwości rcs'a z narzędzia do kontroli zbioru plików w pojedynczym
+katalogu o możliwość kontroli zbioru hierarchicznie ułożonych
+katalogów z plikami. Z pomocą CVS w łatwy sposób można zarządzać kodem
+źródłowym opracowywanym przez nawet bardzo duże zespoły programistów
+umożliwiając śledzenie i kontrolę wszystkich zmian w trakcie pracy nad
+projektami i wypuszczaniem pełnych wersji oprogramowania (release).
+
+%description -l tr.UTF-8
 CVS (Concurrent Versioning System), tek bir dizindeki dosya
-topluluðunun sürüm denetimini, denetimi yapýlmýþ dizinlerin hiyerarþik
-topluluðuna geniþleten rcs(1) sürüm denetim sisteminin ön yüzüdür. Bu
-dizin ve dosyalar, bir yazýlým yayýný oluþturma amacýyla biraraya
-getirilebilir. CVS, bu yazýlým yayýnlarýnýn yönetilmesini ve kaynak
-dosyalarý bakýmýnýn birden çok yazýlým geliþtiricisi tarafýndan
-eþzamanlý olarak yapýlmasýný kontrol etmek için gereken iþlevleri
-saðlar.
-
-%package -n cvs-nclient
-Summary:	Concurrent Versions System - common
-Summary(pl):	Concurrent Versions System
+topluluğunun sürüm denetimini, denetimi yapılmış dizinlerin hiyerarşik
+topluluğuna genişleten rcs(1) sürüm denetim sisteminin ön yüzüdür. Bu
+dizin ve dosyalar, bir yazılım yayını oluşturma amacıyla biraraya
+getirilebilir. CVS, bu yazılım yayınlarının yönetilmesini ve kaynak
+dosyaları bakımının birden çok yazılım geliştiricisi tarafından
+eşzamanlı olarak yapılmasını kontrol etmek için gereken işlevleri
+sağlar.
+
+%package client
+Summary:	Concurrent Versions System - client
+Summary(pl.UTF-8):	Concurrent Versions System - klient
 Group:		Development/Version Control
-Group(de):	Entwicklung/Versionkontrolle
-Group(pl):	Programowanie/Zarz±dzanie wersjami
+Provides:	cvs-client = %{version}
+Obsoletes:	cvs-client
+Obsoletes:	cvs-npclient
+Conflicts:	cvs
 
-%description -n cvs-nclient
-Client and some common files.
+%description client
+CVS client.
 
-%description -l pl -n cvs-nclient
-Klient CVS i trochê wspólnych plików.
+%description client -l pl.UTF-8
+Klient CVS.
 
-%package -n cvs-nserver-common
-Summary:	Concurrent Versions System - common
-Summary(pl):	Concurrent Versions System
+%package common
+Summary:	Concurrent Versions System - common files
+Summary(pl.UTF-8):	Concurrent Versions System - wspólne pliki
 Group:		Development/Version Control
-Group(de):	Entwicklung/Versionkontrolle
-Group(pl):	Programowanie/Zarz±dzanie wersjami
-
-%description -n cvs-nserver-common
-Client and some common files.
-
-%description -l pl -n cvs-nserver-common
-Klient CVS i trochê wspólnych plików.
-
-%package -n cvs-npserver
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires(pre):	cvs-nserver-client
+Requires(pre):	fileutils
+Requires:	%{name}-client = %{version}-%{release}
+Provides:	group(cvs)
+Provides:	group(cvsadmin)
+Provides:	user(cvs)
+Provides:	user(cvsadmin)
+Obsoletes:	cvs-nserver
+
+%description common
+CVS - common server files.
+
+%description common -l pl.UTF-8
+Wspólne pliki serwerów CVS.
+
+%package pserver
 Summary:	Concurrent Versions System - pserver
-Summary(pl):	Concurrent Versions System - pserver
+Summary(pl.UTF-8):	Concurrent Versions System - pserver
 Group:		Development/Version Control
-Group(de):	Entwicklung/Versionkontrolle
-Group(pl):	Programowanie/Zarz±dzanie wersjami
-Obsoletes:	cvs-nserver,cvs
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-inetd
+Obsoletes:	cvs-npserver
+Obsoletes:	cvs-pserver
 
-%description -n cvs-npserver
-Server - pserver
+%description pserver
+CVS server - pserver files.
 
-%description -l pl -n cvs-npserver
-Server - pserver
+%description pserver -l pl.UTF-8
+Serwer CVS - pliki pservera.
 
-%package -n cvs-nserver-experimental
+%package nserver
 Summary:	Concurrent Versions System - nserver
-Summary(pl):	Concurrent Versions System - nserver
+Summary(pl.UTF-8):	Concurrent Versions System - nserver
 Group:		Development/Version Control
-Group(de):	Entwicklung/Versionkontrolle
-Group(pl):	Programowanie/Zarz±dzanie wersjami
-Obsoletes:	cvs-npserver,cvs
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-inetd
+Obsoletes:	cvs-nserver
 
-%description -n cvs-nserver-experimental
-Server - nserver
+%description nserver
+CVS server - nserver files.
 
-%description -l pl -n cvs-nserver-experimental
-Server - nserver
+%description nserver -l pl.UTF-8
+Serwer CVS - pliki nservera.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
-autoconf
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
 	--enable-encryption \
 	--enable-client \
 	--enable-server \
-	--enable-setuid
-%{__make}
+	--enable-setuid \
+	--with-openssl \
+	--with-gssapi
+
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/sysconfig/rc-inetd,%{_cvsroot}}
+install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-inetd,%{_cvsroot},/var/lock/cvs}
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} -j1 install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs-nserver
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs-pserver
 
 cat << EOF >$RPM_BUILD_ROOT%{_bindir}/cvs-pserver-script
 #!/bin/sh
-CVSPASSWD=%{_bindir}/cvspasswd \
-exec %{_bindir}/cvs-pserver %{_cvsroot} -- \
+REPOSITORY="%{_cvsroot}"
+if [ -f /etc/sysconfig/cvs ]; then
+	. /etc/sysconfig/cvs
+fi
+
+CVSPASSWD=%{_bindir}/cvspasswd CVSSERVER=pserver \
+exec %{_bindir}/cvs-pserver \$REPOSITORY -- \
 %{_bindir}/cvschkpw %{_bindir}/cvs pserver
 EOF
 
 cat << EOF >$RPM_BUILD_ROOT%{_bindir}/cvs-nserver-script
 #!/bin/sh
-CVSPASSWD=%{_bindir}/cvspasswd \
-exec %{_bindir}/cvs-nserver %{_cvsroot} -- \
+REPOSITORY="%{_cvsroot}"
+if [ -f /etc/sysconfig/cvs ]; then
+	. /etc/sysconfig/cvs
+fi
+
+CVSPASSWD=%{_bindir}/cvspasswd CVSSERVER=nserver \
+exec %{_bindir}/cvs-nserver \$REPOSITORY -- \
 %{_bindir}/cvschkpw %{_bindir}/cvs nserver
 EOF
 
-mv	$RPM_BUILD_ROOT%{_datadir}/cvs-nserver/contrib/rcs2log \
+cat << EOF >$RPM_BUILD_ROOT/etc/sysconfig/cvs
+# In this file you can specify additional repositories (separated with space)
+# or just set different location.
+# Default is "%{_cvsroot}".
+#REPOSITORY="%{_cvsroot}"
+# According to FHS 2.3 you can use some subdirectory in /srv, e.g.:
+#REPOSITORY="/srv/cvs"
+EOF
+
+mv -f	$RPM_BUILD_ROOT%{_datadir}/cvs-nserver/contrib/rcs2log \
 	$RPM_BUILD_ROOT%{_bindir}
 
-gzip -9nf AUTHORS BUGS NEWS NEWS.nserver PROJECTS TODO
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%pre -n cvs-nserver-common
-GROUP=cvs; GID=52; %groupadd
-USER=cvs; UID=52; HOMEDIR=%{_cvsroot}; COMMENT="CVS user"; %useradd
-GROUP=cvsadmin; GID=53; %groupadd
-USER=cvsadmin; UID=53; HOMEDIR=%{_cvsroot}; COMMENT="CVS user"; %useradd
+%post client	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%post -n cvs-nclient
-%fix-info-dir
+%postun client	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%post -n cvs-nserver-experimental 
-if [ "$1" = 1 ]; then
-	echo "Initialise repository"
-	%{_bindir}/cvs -d :local:%{_cvsroot} init
-	chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
-fi
-%rc_inetd_post
+%pre common
+%groupadd -P %{name}-common -g 52 -r cvs
+%groupadd -P %{name}-common -g 53 -r cvsadmin
+%useradd -P %{name}-common -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs
+%useradd -P %{name}-common -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin
 
-%post -n cvs-npserver
 if [ "$1" = 1 ]; then
-	echo "Initialise repository"
+	echo "Initializing repository..."
 	%{_bindir}/cvs -d :local:%{_cvsroot} init
-	chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
+	chown -R cvsadmin:cvsadmin %{_cvsroot}/CVSROOT
 fi
-%rc_inetd_post
 
-%postun -n cvs-nserver-common
-USER=cvs; %userdel
-GROUP=cvs; %groupdel
-USER=cvsadmin; %userdel
-GROUP=cvsadmin; %groupdel
+%postun common
+if [ "$1" = "0" ]; then
+	%userremove cvs
+	%userremove cvsadmin
+	%groupremove cvs
+	%groupremove cvsadmin
+fi
 
-%postun -n cvs-nserver-experimental
-%rc_inetd_postun
+%post pserver
+%service -q rc-inetd reload
 
-%postun -n cvs-npserver
-%rc_inetd_postun
+%postun pserver
+%service -q rc-inetd reload
 
-%postun -n cvs-nclient
-%fix_info_dir
+%post nserver
+%service -q rc-inetd reload
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun nserver
+%service -q rc-inetd reload
 
-%files -n cvs-nclient
+%files client
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS BUGS ChangeLog FAQ FAQ.nserver NEWS NEWS.nserver PROJECTS
+%doc README README.checkpassword TODO
 %attr(755,root,root) %{_bindir}/cvs
 %attr(755,root,root) %{_bindir}/cvsbug
 %{_infodir}/cvs*
 %{_mandir}/man[15]/cvs.*
 %{_mandir}/man8/cvsbug.8*
 
-%files -n cvs-nserver-common
+%files common
 %defattr(644,root,root,755)
+%attr(640,root,cvs) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cvs
 %attr(4754,cvsadmin,cvs) %{_bindir}/cvspasswd
 %attr(755,root,root) %{_bindir}/cvschkpw
 %attr(755,root,root) %{_bindir}/rcs2log
-%dir %{_datadir}/cvs-nserver/contrib/*
-%{_mandir}/man8/cvs-server.8*
+%dir %{_datadir}/cvs-nserver
+%dir %{_datadir}/cvs-nserver/contrib
+%{_datadir}/cvs-nserver/contrib/*
 %attr(770,cvsadmin,cvs) %dir %{_cvsroot}
+%{_mandir}/man8/cvs-server.8*
+%attr(770,cvsadmin,cvs) %dir /var/lock/cvs
 
-%files -n cvs-nserver-experimental
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/cvs-nserver*
-/etc/sysconfig/rc-inetd/cvs-nserver
-%{_mandir}/man8/cvs-nserver.8*
-
-%files -n cvs-npserver
+%files pserver
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cvs-pserver
 %attr(755,root,root) %{_bindir}/cvs-pserver*
-/etc/sysconfig/rc-inetd/cvs-pserver
 %{_mandir}/man8/cvs-pserver.8*
+
+%files nserver
+%defattr(644,root,root,755)
+%doc NEWS.nserver FAQ.nserver
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cvs-nserver
+%attr(755,root,root) %{_bindir}/cvs-nserver*
+%{_mandir}/man8/cvs-nserver.8*