- up to 1.11.1.52, updated am_ac patch, removed obsolete zlib,PAM_fix patches

- enabled SSL support (client only, server has to be tunelled)
- added ssl-link patch to link with -lssl -lcrypto only where necessary
- pserver Obsoletes: cvs-pserver

Changed files:
    cvs-nserver-PAM_fix.patch -> 1.2
    cvs-nserver-am_ac.patch -> 1.2
    cvs-nserver-ssl-link.patch -> 1.1
    cvs-nserver-zlib.patch -> 1.2
    cvs-nserver.spec -> 1.40

diff --git a/cvs-nserver-PAM_fix.patch b/cvs-nserver-PAM_fix.patch
deleted file mode 100644 (file)
index 940cd73..0000000
--- a/cvs-nserver-PAM_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru cvs-nserver-1.10.8.3/checkpassword/log_pam.c cvs-nserver-1.10.8.3.new/checkpassword/log_pam.c
---- cvs-nserver-1.10.8.3/checkpassword/log_pam.c       Sun May 21 18:14:31 2000
-+++ cvs-nserver-1.10.8.3.new/checkpassword/log_pam.c   Wed Sep 13 23:18:24 2000
-@@ -23,7 +23,7 @@
- #include <security/pam_misc.h>
- #include <security/pam_appl.h>
- #include <security/pam_modules.h>
--#include <security/pam_filter.h>
-+
- /* Static variables used to communicate between the conversation function
-  * and the server_login function
-  */

diff --git a/cvs-nserver-am_ac.patch b/cvs-nserver-am_ac.patch
index ddc65856a13af102dee30c2383797e8a883a40aa..11afbe9f06cda4ffdff3fce4c90eb8a3ace2d05a 100644 (file)
--- a/cvs-nserver-am_ac.patch
+++ b/cvs-nserver-am_ac.patch
@@ -1,6 +1,26 @@
-diff -urN cvs-nserver-1.11.1.4.org/configure.in cvs-nserver-1.11.1.4/configure.in
---- cvs-nserver-1.11.1.4.org/configure.in      Sun May 19 11:06:44 2002
-+++ cvs-nserver-1.11.1.4/configure.in  Sun May 19 11:10:49 2002
+diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configure.in
+--- cvs-nserver-1.11.1.52.orig/configure.in    Sun May 19 11:06:44 2002
++++ cvs-nserver-1.11.1.52/configure.in Sun May 19 11:10:49 2002
+@@ -10,7 +10,6 @@
+ # initialize test framework
+ AC_CONFIG_TESTDIR(tests)
+ AC_CONFIG_FILES([tests/Makefile \
+-                 tests/atconfig \
+                  tests/package.m4 \
+                  tests/cvs:tests/wrapsh.in],
+                 [chmod +x tests/cvs])
+@@ -22,10 +21,7 @@
+ # their path, the installer can configure with a path that has GNU m4
+ # first and get that path embedded in the installed autoconf and
+ # autoheader scripts.
+-AC_PROG_GNU_M4
+-if test x"$ac_cv_prog_gnu_m4" != xyes; then
+-  AC_MSG_ERROR([GNU m4 1.4 is required])
+-fi
++AC_CHECK_PROG(M4,m4)
+ # This is needed because Automake does not seem to realize there is
+ # a AC-SUBST inside AC-PROG-GNU-M4.  Grmph!
+ AC_SUBST(M4)
 @@ -172,7 +172,7 @@
  
  AC_FUNC_FNMATCH
@@ -28,6 +48,14 @@ diff -urN cvs-nserver-1.11.1.4.org/configure.in cvs-nserver-1.11.1.4/configure.i
    LIBS="$LIBS -ladvapi32"
  
    dnl On Windows you can only change file times if you can write to
+@@ -453,7 +453,6 @@
+         lib/Makefile \
+         man/Makefile \
+         os2/Makefile \
+-        scripts/Makefile \
+         src/Makefile \
+           src/tests/Makefile \
+         tools/Makefile \
 diff -urN cvs-nserver-1.11.1.4.org/doc/Makefile.am cvs-nserver-1.11.1.4/doc/Makefile.am
 --- cvs-nserver-1.11.1.4.org/doc/Makefile.am   Sun May 19 11:06:44 2002
 +++ cvs-nserver-1.11.1.4/doc/Makefile.am       Sun May 19 11:13:13 2002

diff --git a/cvs-nserver-ssl-link.patch b/cvs-nserver-ssl-link.patch
new file mode 100644 (file)
index 0000000..85eb621
--- /dev/null
+++ b/cvs-nserver-ssl-link.patch
@@ -0,0 +1,31 @@
+--- cvs-nserver-1.11.1.52/configure.in.orig    Sat Jan 18 11:30:19 2003
++++ cvs-nserver-1.11.1.52/configure.in Sat Jan 18 11:38:45 2003
+@@ -325,12 +325,15 @@
+ AC_DEFINE([HAVE_OPENSSL])
+ ], [ AC_MSG_RESULT([no])])
+ 
++SSL_LIBS=""
+ if test "$with_openssl" = yes; then
+   AC_CHECK_HEADERS(openssl/ssl.h)
++  save_LIBS="$LIBS"; LIBS=""
+   AC_SEARCH_LIBS(CRYPTO_malloc, crypto)
+   AC_SEARCH_LIBS(SSL_CTX_new, ssl)
++  SSL_LIBS="$LIBS"; LIBS="$save_LIBS"
+ fi
+-
++AC_SUBST(SSL_LIBS)
+ 
+ # Check for options requesting client and server feature. If none are
+ # given and we have connect(), we want the full client & server arrangement.
+--- cvs-nserver-1.11.1.52/src/Makefile.am.orig Sat Jan 18 11:30:19 2003
++++ cvs-nserver-1.11.1.52/src/Makefile.am      Sat Jan 18 11:39:38 2003
+@@ -156,7 +156,8 @@
+       ../diff/libdiff.a \
+       ../lib/libcvs.a \
+       ../acl/libcvsacl.a \
+-      libncli.a
++      libncli.a \
++      $(SSL_LIBS)
+ 
+ cvschkpw_SOURCES = \
+       cvschkpw.c \

diff --git a/cvs-nserver-zlib.patch b/cvs-nserver-zlib.patch
deleted file mode 100644 (file)
index f4575ea..0000000
--- a/cvs-nserver-zlib.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urN cvs-nserver-1.11.1.4.org/Makefile.am cvs-nserver-1.11.1.4/Makefile.am
---- cvs-nserver-1.11.1.4.org/Makefile.am       Sun May 19 11:15:31 2002
-+++ cvs-nserver-1.11.1.4/Makefile.am   Sun May 19 11:16:39 2002
-@@ -17,7 +17,7 @@
- ## Subdirectories to run make in for the primary targets.
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
-       windows-NT os2 emx vms
-diff -urN cvs-nserver-1.11.1.4.org/configure.in cvs-nserver-1.11.1.4/configure.in
---- cvs-nserver-1.11.1.4.org/configure.in      Sun May 19 11:15:31 2002
-+++ cvs-nserver-1.11.1.4/configure.in  Sun May 19 11:16:23 2002
-@@ -375,6 +375,8 @@
-   AC_DEFINE(HAVE_SETMODE)
- fi
- 
-+AC_CHECK_LIB(z, zlibVersion)
-+
- test -f src/options.h && (
-   AC_MSG_WARN(saving ./src/options.h in ./src/options.h-SAVED)
-   AC_MSG_WARN(You may wish to check that local options have not been lost.)
-@@ -405,8 +407,7 @@
-         tools/Makefile \
-         vms/Makefile \
-         windows-NT/Makefile \
--        windows-NT/SCC/Makefile \
--        zlib/Makefile],
-+        windows-NT/SCC/Makefile],
-         [chmod -f +x \
-         contrib/clmerge \
-         contrib/cln_hist \
-diff -urN cvs-nserver-1.11.1.4.org/src/Makefile.am cvs-nserver-1.11.1.4/src/Makefile.am
---- cvs-nserver-1.11.1.4.org/src/Makefile.am   Sun May 19 11:15:31 2002
-+++ cvs-nserver-1.11.1.4/src/Makefile.am       Sun May 19 11:17:19 2002
-@@ -20,7 +20,7 @@
- # try and remove naming conflicts and fix Automake to allow particular includes
- # to be attached only to particular object files.  Short term fix is either or.
- ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- 
- bin_PROGRAMS = cvs cvs-nserver cvs-pserver cvschkpw
- bin_SCRIPTS = cvsbug
-@@ -114,7 +114,6 @@
- cvs_LDADD = \
-       ../diff/libdiff.a \
-       ../lib/libcvs.a \
--      ../zlib/libz.a \
-       version.o
- cvs_EXTRA_DIST = version.c
- 

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index a341866b605fd4b7bffb481b9a40db3303b20d31..a9ea478a46902dd93c4ae80824d00c5d74bd6029 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -4,24 +4,24 @@ Summary(fr):  Un syst
 Summary(pl):   Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
-Version:       1.11.1.4
-Release:       4
+Version:       1.11.1.52
+Release:       1
 License:       GPL
 Group:         Development/Version Control
-Source0:       http://unc.dl.sourceforge.net/sourceforge/cvs-nserver/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/cvs-nserver/%{name}-%{version}.tar.gz
 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
-Patch4:                %{name}-am_ac.patch
-Patch5:                %{name}-zlib.patch
-Patch6:                %{name}-cvspass.patch
-Patch7:                %{name}-home_etc.patch
+Patch2:                %{name}-am_ac.patch
+Patch3:                %{name}-cvspass.patch
+Patch4:                %{name}-home_etc.patch
+Patch5:                %{name}-ssl-link.patch
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: openssl-devel
 BuildRequires: texinfo
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _cvsroot        /home/services/cvsroot
@@ -85,26 +85,23 @@ dosyalar
 eþzamanlý olarak yapýlmasýný kontrol etmek için gereken iþlevleri
 saðlar.
 
-%package -n cvs-nserver-client
+%package client
 Summary:       Concurrent Versions System - client
 Summary(pl):   Concurrent Versions System - klient
 Group:         Development/Version Control
 Obsoletes:     cvs-npclient
 Obsoletes:     cvs
 
-%description -n cvs-nserver-client
+%description client
 CVS client.
 
-%description -n cvs-nserver-client -l pl
+%description client -l pl
 Klient CVS.
 
-%package -n cvs-nserver-common
+%package common
 Summary:       Concurrent Versions System - common files
 Summary(pl):   Concurrent Versions System - wspólne pliki
 Group:         Development/Version Control
-Requires:      cvs-nserver-client
-Obsoletes:     cvs-nserver
-Obsoletes:     cvs
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
@@ -113,49 +110,53 @@ 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
+Obsoletes:     cvs
 
-%description -n cvs-nserver-common
+%description common
 CVS - common server files.
 
-%description -n cvs-nserver-common -l pl
+%description common -l pl
 Wspólne pliki serwerów CVS.
 
-%package -n cvs-nserver-pserver
+%package pserver
 Summary:       Concurrent Versions System - pserver
 Summary(pl):   Concurrent Versions System - pserver
 Group:         Development/Version Control
+PreReq:                rc-inetd
 Requires:      cvs-nserver-common
 Obsoletes:     cvs-npserver
-PreReq:                rc-inetd
+Obsoletes:     css-pserver
 
-%description -n cvs-nserver-pserver
+%description pserver
 CVS server - pserver files.
 
-%description -n cvs-nserver-pserver -l pl
+%description pserver -l pl
 Serwer CVS - pliki pservera.
 
-%package -n cvs-nserver-nserver
+%package nserver
 Summary:       Concurrent Versions System - nserver
 Summary(pl):   Concurrent Versions System - nserver
 Group:         Development/Version Control
+PreReq:                rc-inetd
 Requires:      cvs-nserver-common
 Obsoletes:     cvs-nserver
-PreReq:                rc-inetd
 
-%description -n cvs-nserver-nserver
+%description nserver
 CVS server - nserver files.
 
-%description -n cvs-nserver-nserver -l pl
+%description nserver -l pl
 Serwer CVS - pliki nservera.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal}
@@ -166,6 +167,7 @@ Serwer CVS - pliki nservera.
        --enable-client \
        --enable-server \
        --enable-setuid \
+       --with-openssl \
        --without-gssapi
 %{__make}
 
@@ -281,7 +283,8 @@ fi
 
 %files -n cvs-nserver-client
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS NEWS PROJECTS TODO FAQ
+%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*