- massive attack, adding Source-md5

[packages/cvs-nserver.git] / cvs-nserver.spec

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index f632abcb22774d9f4ac46dc34f9e5cb56d85cb78..d5f8fa3f326501144f410e26dce1be94e6703c09 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -5,10 +5,11 @@ Summary(pl):  Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
 Version:       1.11.1.52
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: 357fb5f37cc556977dad79175e9c2d97
 Source1:       %{name}.inetd
 Source2:       cvs-pserver.inetd
 Patch0:                %{name}-cvspasswd.patch
@@ -20,6 +21,7 @@ Patch5:               %{name}-ssl-link.patch
 Patch6:                %{name}-fix_doc_CVSUSER.patch
 Patch7:                %{name}-segv.patch
 Patch8:                %{name}-initgroups-rootonly.patch
+Patch9:                %{name}-zlibfix.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.7
@@ -106,14 +108,14 @@ Klient CVS.
 Summary:       Concurrent Versions System - common files
 Summary(pl):   Concurrent Versions System - wspólne pliki
 Group:         Development/Version Control
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/group
 Requires(pre): cvs-nserver-client
 Requires(pre): fileutils
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 Requires:      cvs-nserver-client
 Obsoletes:     cvs-nserver
 
@@ -163,6 +165,7 @@ Serwer CVS - pliki nservera.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__aclocal}
@@ -214,40 +217,40 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre common
 if [ -n "`getgid cvs`" ]; then
-       if [ "`getgid cvs`" != "52" ]; then
-               echo "Error: group cvs doesn't have gid=52. Correct this before installing cvs-nserver." 1>&2
-               exit 1
-       fi
+       if [ "`getgid cvs`" != "52" ]; then
+               echo "Error: group cvs doesn't have gid=52. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
 else
-       echo "Adding group cvs GID=52."
-       /usr/sbin/groupadd -g 52 -r -f cvs
+       echo "Adding group cvs GID=52."
+       /usr/sbin/groupadd -g 52 -r -f cvs
 fi
 if [ -n "`getgid cvsadmin`" ]; then
-       if [ "`getgid cvsadmin`" != "53" ]; then
-               echo "Error: group cvsadmin doesn't have gid=53. Correct this before installing cvs-nserver." 1>&2
-               exit 1
-       fi
+       if [ "`getgid cvsadmin`" != "53" ]; then
+               echo "Error: group cvsadmin doesn't have gid=53. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
 else
-       echo "Adding group cvsadmin GID=53."
-       /usr/sbin/groupadd -g 53 -r -f cvsadmin
+       echo "Adding group cvsadmin GID=53."
+       /usr/sbin/groupadd -g 53 -r -f cvsadmin
 fi
 if [ -n "`id -u cvs 2>/dev/null`" ]; then
-       if [ "`id -u cvs`" != "52" ]; then
-               echo "Error: user cvs doesn't have uid=52. Correct this before installing cvs-nserver." 1>&2
-               exit 1
-       fi
+       if [ "`id -u cvs`" != "52" ]; then
+               echo "Error: user cvs doesn't have uid=52. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
 else
-       echo "Adding user cvs UID=52."
-       /usr/sbin/useradd -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs 1>&2
+       echo "Adding user cvs UID=52."
+       /usr/sbin/useradd -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs 1>&2
 fi
 if [ -n "`id -u cvsadmin 2>/dev/null`" ]; then
-       if [ "`id -u cvsadmin`" != "53" ]; then
-               echo "Error: user cvsadmin doesn't have uid=53. Correct this before installing cvs-nserver." 1>&2
-               exit 1
-       fi
+       if [ "`id -u cvsadmin`" != "53" ]; then
+               echo "Error: user cvsadmin doesn't have uid=53. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
 else
-       echo "Adding user cvsadmin UID=53."
-       /usr/sbin/useradd -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin 1>&2
+       echo "Adding user cvsadmin UID=53."
+       /usr/sbin/useradd -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin 1>&2
 fi
 if [ "$1" = 1 ]; then
        echo "Initializing repository..."
@@ -257,14 +260,14 @@ fi
 
 %postun common
 if [ "$1" = "0" ]; then
-       echo "Removing user cvs."
-       /usr/sbin/userdel cvs
-       echo "Removing user cvsadmin."
-       /usr/sbin/userdel cvsadmin
-       echo "Removing group cvs."
-       /usr/sbin/groupdel cvs
-       echo "Removing group cvsadmin."
-       /usr/sbin/groupdel cvsadmin
+       echo "Removing user cvs."
+       /usr/sbin/userdel cvs
+       echo "Removing user cvsadmin."
+       /usr/sbin/userdel cvsadmin
+       echo "Removing group cvs."
+       /usr/sbin/groupdel cvs
+       echo "Removing group cvsadmin."
+       /usr/sbin/groupdel cvsadmin
 fi
 
 %post pserver
@@ -302,7 +305,9 @@ fi
 %attr(4754,cvsadmin,cvs) %{_bindir}/cvspasswd
 %attr(755,root,root) %{_bindir}/cvschkpw
 %attr(755,root,root) %{_bindir}/rcs2log
-%dir %{_datadir}/cvs-nserver/contrib/*
+%dir %{_datadir}/cvs-nserver
+%dir %{_datadir}/cvs-nserver/contrib
+%{_datadir}/cvs-nserver/contrib/*
 %attr(770,cvsadmin,cvs) %dir %{_cvsroot}
 %{_mandir}/man8/cvs-server.8*