This commit was manufactured by cvs2git to create branch 'RA-branch'.

Sprout from master 2004-06-11 13:23:33 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- rel 12, multiple security fixes: CAN-2004-0414, CAN-2004-0416, CAN-2004-0417, CAN-2004-0418'
Cherrypick from master 2002-05-19 09:27:23 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> 'c6808a39dbe1271aa2b3ed74587dd0ae  cvs-nserver-1.11.1.4.tar.gz':
    cvs-nserver-PAM_fix.patch -> 1.1
    cvs-nserver-zlib.patch -> 1.1

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