c6808a39dbe1271aa2b3ed74587dd0ae cvs-nserver-1.11.1.4.tar.gz

Changed files:
    cvs-nserver-am_ac.patch -> 1.1
    cvs-nserver-cvspasswd.patch -> 1.2
    cvs-nserver-zlib.patch -> 1.1

diff --git a/cvs-nserver-am_ac.patch b/cvs-nserver-am_ac.patch
new file mode 100644 (file)
index 0000000..ddc6585
--- /dev/null
+++ b/cvs-nserver-am_ac.patch
@@ -0,0 +1,42 @@
+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
+@@ -172,7 +172,7 @@
+ 
+ AC_FUNC_FNMATCH
+ if test "$ac_cv_func_fnmatch_works" = no; then
+-  LIBOBJS="$LIBOBJS fnmatch.o"
++  AC_LIBOBJ([fnmatch])
+ fi
+ 
+ # Try to find connect and gethostbyname.
+@@ -277,7 +277,7 @@
+   AC_DEFINE(ENCRYPTION)
+ fi
+ 
+-AC_CHECK_FUNC(gethostname, :, LIBOBJS="$LIBOBJS hostname.o")
++AC_CHECK_FUNC(gethostname, :, AC_LIBOBJ([hostname]))
+ 
+ # Check for options requesting client and server feature. If none are
+ # given and we have connect(), we want the full client & server arrangement.
+@@ -361,7 +361,7 @@
+ [AC_TRY_COMPILE([], [return __CYGWIN32__;],
+ ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)])
+ if test $ccvs_cv_sys_cygwin32 = yes; then
+-  LIBOBJS="$LIBOBJS fncase.o"
++  AC_LIBOBJ([fncase])
+   LIBS="$LIBS -ladvapi32"
+ 
+   dnl On Windows you can only change file times if you can write to
+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
+@@ -14,7 +14,7 @@
+ 
+ #DISTFILES = \
+ #     .cvsignore \
+-#     RCSFILES \
++#     RCSFILES
+ 
+ # AUTOMAKE_OPTIONS = no-texinfo.tex
+ 

diff --git a/cvs-nserver-cvspasswd.patch b/cvs-nserver-cvspasswd.patch
index 47e1e0588d9ba209b0b05bfed41f2fbc71b62df7..07e8381a71957fea320196312eafecc010e67469 100644 (file)
--- a/cvs-nserver-cvspasswd.patch
+++ b/cvs-nserver-cvspasswd.patch
@@ -1,12 +1,14 @@
---- ./src/Makefile.in.orig     Sat Jul 21 12:32:51 2001
-+++ ./src/Makefile.in  Sat Jul 21 12:44:56 2001
-@@ -705,8 +705,7 @@
+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:23:37 2002
+@@ -181,8 +181,8 @@
  
  install-exec-local:
    ifeq ($(enable_setuid), yes)
 -      $(INSTALL_PROGRAM) -o $(setuid_user) -g $(setuid_group) -m 4750 \
 -                      cvspasswd $(bindir)/cvspasswd
-+      $(INSTALL_PROGRAM) cvspasswd $(DESTDIR)$(bindir)/cvspasswd
++      $(INSTALL_PROGRAM) -m 4750 \
++                      cvspasswd $(DESTDIR)$(bindir)/cvspasswd
    endif
  
- # version.c
+ ## MAINTAINER Targets

diff --git a/cvs-nserver-zlib.patch b/cvs-nserver-zlib.patch
new file mode 100644 (file)
index 0000000..f4575ea
--- /dev/null
+++ b/cvs-nserver-zlib.patch
@@ -0,0 +1,54 @@
+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
+