diff options
Diffstat (limited to 'devel/cvs/patches')
| -rw-r--r-- | devel/cvs/patches/patch-aa | 10 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-aq | 19 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-ar | 18 | ||||
| -rw-r--r-- | devel/cvs/patches/patch-av | 34 |
4 files changed, 25 insertions, 56 deletions
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa index 5880c798f7c..dfe53993b75 100644 --- a/devel/cvs/patches/patch-aa +++ b/devel/cvs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2002/11/24 21:31:22 hubertf Exp $ +$NetBSD: patch-aa,v 1.6 2003/01/15 22:49:37 wiz Exp $ ---- Makefile.in.orig Wed Apr 17 21:47:32 2002 +--- Makefile.in.orig Sat Dec 28 19:04:33 2002 +++ Makefile.in -@@ -96,7 +96,7 @@ +@@ -102,7 +102,7 @@ install_sh = @install_sh@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake @@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.5 2002/11/24 21:31:22 hubertf Exp $ # All other subdirs: SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ windows-NT os2 emx vms -@@ -124,7 +124,7 @@ +@@ -130,7 +130,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h $(top_builddir)/src/options.h + CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile +CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile DIST_SOURCES = diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq index a77d6e1ffa2..e05732d50a5 100644 --- a/devel/cvs/patches/patch-aq +++ b/devel/cvs/patches/patch-aq @@ -1,22 +1,13 @@ -$NetBSD: patch-aq,v 1.3 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-aq,v 1.4 2003/01/15 22:49:38 wiz Exp $ ---- src/recurse.c.orig Wed Jun 27 06:20:51 2001 +--- src/recurse.c.orig Sat Dec 28 19:01:30 2002 +++ src/recurse.c -@@ -511,7 +511,7 @@ +@@ -511,7 +511,7 @@ do_recursion (frame) if (frame->flags == R_SKIP_ALL) return (0); -- should_readlock = noexec ? 0 : frame->readlock; -+ should_readlock = nolock ? 0 : frame->readlock; +- locktype = noexec ? CVS_LOCK_NONE : frame->locktype; ++ locktype = nolock ? CVS_LOCK_NONE : frame->locktype; /* The fact that locks are not active here is what makes us fail to have the -@@ -553,7 +553,7 @@ - */ - if (server_active - /* If there are writelocks around, we cannot pause here. */ -- && (should_readlock || noexec)) -+ && (should_readlock || nolock)) - server_pause_check(); - #endif - diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar index 09533fb3958..e53f427a093 100644 --- a/devel/cvs/patches/patch-ar +++ b/devel/cvs/patches/patch-ar @@ -1,24 +1,24 @@ -$NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ ---- src/server.c.orig Tue Mar 19 20:15:45 2002 +--- src/server.c.orig Wed Jan 15 23:00:31 2003 +++ src/server.c -@@ -782,6 +782,7 @@ +@@ -772,6 +772,7 @@ E Protocol error: Root says \"%s\" but p nothing. But for rsh, we need to do it now. */ parse_config (current_parsed_root->directory); + if (!nolock) { - path = malloc (strlen (current_parsed_root->directory) + path = xmalloc (strlen (current_parsed_root->directory) + sizeof (CVSROOTADM) + 2); -@@ -799,6 +800,7 @@ +@@ -789,6 +790,7 @@ E Protocol error: Root says \"%s\" but p pending_error = save_errno; } free (path); + } #ifdef HAVE_PUTENV - env = malloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); -@@ -2181,6 +2183,8 @@ + env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); +@@ -2174,6 +2176,8 @@ serve_global_option (arg) { case 'n': noexec = 1; @@ -27,7 +27,7 @@ $NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ break; case 'q': quiet = 1; -@@ -5283,6 +5287,7 @@ +@@ -5237,6 +5241,7 @@ switch_to_user (username) const char *username; { struct passwd *pw; @@ -35,7 +35,7 @@ $NetBSD: patch-ar,v 1.5 2002/11/24 21:31:25 hubertf Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5342,7 +5347,15 @@ +@@ -5296,7 +5301,15 @@ error 0 %s: no such user\n", username); } } diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av index 34938afe826..53c923268b0 100644 --- a/devel/cvs/patches/patch-av +++ b/devel/cvs/patches/patch-av @@ -1,30 +1,8 @@ -$NetBSD: patch-av,v 1.6 2002/11/24 21:31:25 hubertf Exp $ +$NetBSD: patch-av,v 1.7 2003/01/15 22:49:38 wiz Exp $ ---- configure.in.orig Tue Mar 26 17:16:02 2002 +--- configure.in.orig Wed Jan 15 23:00:31 2003 +++ configure.in -@@ -223,16 +223,19 @@ - dnl libkrb in the system libraries, so --with-krb4=value needs to - dnl override the system -lkrb. - dnl --KRB4=/usr/kerberos -+KRB4= - define(WITH_KRB4,[ - AC_ARG_WITH([krb4], - [ --with-krb4=value set default \$(KRB4) from value], -- [KRB4=$withval], -+ [if test X"$withval" != X"no"; then KRB4=$withval; fi], - )dnl -+if test X"$KRB4" != X""; then - echo "default place for krb4 is $KRB4" -+fi - AC_SUBST(KRB4)])dnl - WITH_KRB4 - -+if test X"$KRB4" != X""; then - krb_h= - AC_MSG_CHECKING([for krb.h]) - if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then -@@ -272,7 +275,7 @@ +@@ -345,7 +345,7 @@ if test -n "$krb_h"; then [LDFLAGS=$hold_ldflags # Using open here instead of printf so we don't # get confused by the cached value for printf from above. @@ -33,9 +11,9 @@ $NetBSD: patch-av,v 1.6 2002/11/24 21:31:25 hubertf Exp $ LDFLAGS=$hold_ldflags else AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=]) -@@ -280,7 +283,7 @@ - if test -n "$krb_lib"; then - AC_DEFINE(HAVE_KERBEROS) +@@ -354,7 +354,7 @@ if test -n "$krb_h"; then + AC_DEFINE([HAVE_KERBEROS], 1, + [Define if you have MIT Kerberos version 4 available.]) test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}" - LIBS="${LIBS} -lkrb" + LIBS="${LIBS} -lkrb -ldes -lcom_err -lroken -lcrypt" |