- ACL patch updated to 1.2.1, release 3

[packages/cvs.git] / cvs-zlib.patch

diff --git a/cvs-zlib.patch b/cvs-zlib.patch
index 424401255c908f3c562b4fd456d8534cba69e6d8..b84758868dfab68385d0abe648b0a3b773f439ab 100644 (file)
--- a/cvs-zlib.patch
+++ b/cvs-zlib.patch
@@ -1,37 +1,23 @@
-diff -ur cvs-1.11.1/Makefile.am cvs-1.11.1.zlib/Makefile.am
---- cvs-1.11.1/Makefile.am     Wed Jan  3 16:50:41 2001
-+++ cvs-1.11.1.zlib/Makefile.am        Wed May 30 21:46:41 2001
-@@ -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 -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
---- cvs-1.11.1/configure.in    Wed Apr 25 23:51:25 2001
-+++ cvs-1.11.1.zlib/configure.in       Wed May 30 21:48:59 2001
-@@ -300,6 +300,8 @@
-   enable_server=yes
- fi])
+--- cvs-1.11.4/configure.in.orig       Sat Dec 28 19:02:11 2002
++++ cvs-1.11.4/configure.in    Fri Jan 17 19:30:29 2003
+@@ -848,6 +848,7 @@
+ dnl end --enable-*
+ dnl
  
 +AC_CHECK_LIB(z, zlibVersion)
-+
- dnl The auth server needs to be able to check passwords against passwd
- dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
- dnl find the crypt function. 
-@@ -366,8 +368,7 @@
+ 
+ dnl For the moment we will assume that all systems which have
+ dnl the unixyness to run configure are unixy enough to do the
+@@ -916,8 +917,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 \
+-        zlib/Makefile])
++        windows-NT/SCC/Makefile])
+ 
+ dnl and we're done
+ AC_OUTPUT
 diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
 --- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
 +++ cvs-1.11.1.zlib/src/Makefile.am    Wed May 30 21:47:19 2001
@@ -44,11 +30,24 @@ diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
  
  bin_PROGRAMS = cvs
  bin_SCRIPTS = cvsbug
-@@ -95,7 +95,6 @@
+@@ -100,8 +100,7 @@
+ 
  cvs_LDADD = \
        ../diff/libdiff.a \
-       ../lib/libcvs.a \
--      ../zlib/libz.a \
-       version.o
- cvs_EXTRA_DIST = version.c
+-      ../lib/libcvs.a \
+-      ../zlib/libz.a
++      ../lib/libcvs.a
  
+ # extra clean targets
+ # wish this could be distclean-hdr-local but it's not part of automake
+--- cvs-1.11.2/Makefile.am~    Thu Sep 13 21:08:15 2001
++++ cvs-1.11.2/Makefile.am     Sat May 11 01:30:51 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