From 903e3caad9b1c399a5f2874c80ada61d00689bfe Mon Sep 17 00:00:00 2001 From: martti Date: Fri, 4 Jan 2008 06:48:05 +0000 Subject: Updated devel/scmcvs to 1.11.22 * The CVS client again correctly reports files with conflicts when using servers running CVS 1.11.20/1.12.12, or earlier (and maybe 3rd party servers). * The GSSAPI server should now build under HP-UX. * `cvs rtag' now correctly tags files that have been removed from the trunk. * Code efficiency has been improved slightly. * A rare race condition that could leave a lock on the val-tags file has been avoided. * A potential buffer overflow in the history command has been fixed. * Thanks to a report and patch from Garrett Rooney , paused trigger processes no longer cause the CVS server to consume 100% CPU. * Thanks to a suggestion from Joseph P. Skudlarek , an :extssh: has been added as a synonym of the :ext: access method, as a kindness to users of old version of Eclipse. * Misc documentation updates and minor bug fixes. --- devel/scmcvs/Makefile | 9 +++++---- devel/scmcvs/distinfo | 28 ++++++++++++++-------------- devel/scmcvs/options.mk | 6 +++--- devel/scmcvs/patches/patch-aa | 10 +++++----- devel/scmcvs/patches/patch-ab | 8 ++++---- devel/scmcvs/patches/patch-ac | 12 ++++++------ devel/scmcvs/patches/patch-ae | 18 +++++++++--------- devel/scmcvs/patches/patch-al | 8 ++++---- devel/scmcvs/patches/patch-ap | 18 +++++++++--------- devel/scmcvs/patches/patch-ar | 16 ++++++++-------- devel/scmcvs/patches/patch-at | 12 ++++++------ devel/scmcvs/patches/patch-au | 10 +++++----- devel/scmcvs/patches/patch-az | 8 ++++---- 13 files changed, 82 insertions(+), 81 deletions(-) (limited to 'devel/scmcvs') diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile index d8e602d1d4c..9f632a9fe4c 100644 --- a/devel/scmcvs/Makefile +++ b/devel/scmcvs/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.3 2007/08/30 19:47:16 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2008/01/04 06:48:05 martti Exp $ # -DISTNAME= cvs-1.11.21 +DISTNAME= cvs-1.11.22 CATEGORIES= devel scm -MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.21/ +MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.22/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://cvs.nongnu.org/ COMMENT= Concurrent Versions System +#LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -18,7 +19,7 @@ CHECK_INTERPRETER_SKIP= share/cvs/contrib/* .include "options.mk" -CONFIGURE_ENV+= PERL=${TOOLS_PERL5:Q} +CONFIGURE_ENV+= PERL=${TOOLS_PERL5} INFO_FILES= # PLIST USE_TOOLS+= makeinfo diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo index 1729b9a6e10..586af1c653e 100644 --- a/devel/scmcvs/distinfo +++ b/devel/scmcvs/distinfo @@ -1,28 +1,28 @@ -$NetBSD: distinfo,v 1.1 2007/05/27 09:49:50 schmonz Exp $ +$NetBSD: distinfo,v 1.2 2008/01/04 06:48:06 martti Exp $ -SHA1 (cvs-1.11.21.tar.bz2) = d114ed2943a4027f1277b04f57867a2e09a1f432 -RMD160 (cvs-1.11.21.tar.bz2) = bc3f15b506174de6d304e9608a26e80d3e2f0513 -Size (cvs-1.11.21.tar.bz2) = 2929933 bytes -SHA1 (patch-aa) = 57bcc59a51d44f436d2f79a0752e44e317589650 -SHA1 (patch-ab) = 6196c150bdb56419b59896d783070a8512755919 -SHA1 (patch-ac) = 24022b7dc3a276e91a45a28a36654c5c6611ba46 +SHA1 (cvs-1.11.22.tar.bz2) = 5dfa11da84a890d7d61516fd450c001dc24bcc0d +RMD160 (cvs-1.11.22.tar.bz2) = 882e7cc4affc2bb78ac367b5d18b89468a26c570 +Size (cvs-1.11.22.tar.bz2) = 2939294 bytes +SHA1 (patch-aa) = 89df7b7ca8be1a0ed309ec14202363dd71830093 +SHA1 (patch-ab) = 6cfd62a5cb7ce2fdd92a07431b762958d047e49b +SHA1 (patch-ac) = c51ddc21f06a54b0c4707e724d4ee5ef1faf5582 SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c -SHA1 (patch-ae) = a471c39b4700db2c86b10e480585ad979a2dc9b1 +SHA1 (patch-ae) = cb20f5a7cbdc2504c4d847618ef2e3c1d2e8e82a SHA1 (patch-af) = fe22f70e0d281822fb74e8b3c43715ca7f987e79 SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2 SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c -SHA1 (patch-al) = 3f20d43ed1423ae6e811d9ec2d35af4932e84b41 +SHA1 (patch-al) = 3212da07f9a9c151a20e3a39c44cebda60106a49 SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68 SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863 SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b -SHA1 (patch-ap) = c2b5da1fc02df7348b514d3b704984b53de213f5 +SHA1 (patch-ap) = ca220110350d6b71338a8bdd079dec5be163883f SHA1 (patch-aq) = a1fe8e522d05a8fdf3ac6dcb03892b6e6b9d8040 -SHA1 (patch-ar) = 32477a1cbd479225806bbefd04e84c496fbc4691 -SHA1 (patch-at) = 9df99f83f83da870e1d9c86854d04bb5816dc9ff -SHA1 (patch-au) = 8f8bbda565f0edd2eecb56030ed0301c6044b488 +SHA1 (patch-ar) = 71bde28be8013aa1990d773b183b5f4e32cf71fa +SHA1 (patch-at) = 712f5b9b2f8154d5fe5be6fd7c289d60feb56a10 +SHA1 (patch-au) = cc74afc89f98659524cabc8cb4e0a3debba0f11b SHA1 (patch-av) = 84da8f0a398ddf36412becb2aebd7008e3f80c44 SHA1 (patch-ay) = 6ba3315df137028fc5b2bebfef79aa3d540994c4 -SHA1 (patch-az) = 4b773728b228af6c69d4e10cf59f1677feaa54ea +SHA1 (patch-az) = a4b14163d50c43f130715d4d8540bb4316e4290a SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee diff --git a/devel/scmcvs/options.mk b/devel/scmcvs/options.mk index b15bf35048c..9efa2f869f0 100644 --- a/devel/scmcvs/options.mk +++ b/devel/scmcvs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/05/27 09:49:50 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2008/01/04 06:48:06 martti Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cvs PKG_SUPPORTED_OPTIONS= kerberos @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --disable-ipv6 .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --enable-encryption -CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE:Q} -CONFIGURE_ARGS+= --with-krb4=${KRB5BASE:Q} +CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-krb4=${KRB5BASE} . if ${OPSYS} == "Darwin" LDFLAGS+= -framework Kerberos . endif diff --git a/devel/scmcvs/patches/patch-aa b/devel/scmcvs/patches/patch-aa index 8496209aae2..5b997246374 100644 --- a/devel/scmcvs/patches/patch-aa +++ b/devel/scmcvs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2007/05/27 09:49:51 schmonz Exp $ +$NetBSD: patch-aa,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- Makefile.in.orig 2005-02-01 00:11:19.000000000 +0100 -+++ Makefile.in -@@ -65,7 +65,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat +--- Makefile.in.orig 2006-06-09 17:44:15.000000000 +0300 ++++ Makefile.in 2008-01-02 14:42:37.000000000 +0200 +@@ -65,7 +65,7 @@ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1 2007/05/27 09:49:51 schmonz Exp $ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -@@ -183,7 +183,7 @@ target_alias = @target_alias@ +@@ -184,7 +184,7 @@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake diff --git a/devel/scmcvs/patches/patch-ab b/devel/scmcvs/patches/patch-ab index 8840c5e5e6c..d8c8c65c06a 100644 --- a/devel/scmcvs/patches/patch-ab +++ b/devel/scmcvs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2007/05/27 09:49:51 schmonz Exp $ +$NetBSD: patch-ab,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- doc/cvs.texinfo.orig 2005-09-26 04:49:45.000000000 +0200 -+++ doc/cvs.texinfo -@@ -13578,6 +13578,11 @@ CPU intensive but is not recommended for +--- doc/cvs.texinfo.orig 2006-05-16 03:58:40.000000000 +0300 ++++ doc/cvs.texinfo 2008-01-02 14:42:58.000000000 +0200 +@@ -13596,6 +13596,11 @@ @xref{verifymsg}, for more information on how verifymsg may be used. diff --git a/devel/scmcvs/patches/patch-ac b/devel/scmcvs/patches/patch-ac index 962fa0ec125..81cecd4940f 100644 --- a/devel/scmcvs/patches/patch-ac +++ b/devel/scmcvs/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2007/05/27 09:49:51 schmonz Exp $ +$NetBSD: patch-ac,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- src/Makefile.in.orig 2005-09-28 05:32:23.000000000 +0200 -+++ src/Makefile.in -@@ -86,7 +86,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O +--- src/Makefile.in.orig 2006-06-09 17:44:11.000000000 +0300 ++++ src/Makefile.in 2008-01-02 14:43:16.000000000 +0200 +@@ -86,7 +86,7 @@ version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \ wrapper.$(OBJEXT) zlib.$(OBJEXT) cvs_OBJECTS = $(am_cvs_OBJECTS) @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2007/05/27 09:49:51 schmonz Exp $ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -199,7 +199,7 @@ target_alias = @target_alias@ +@@ -200,7 +200,7 @@ # some namespace hackery going on that maybe shouldn't be. Long term fix is to # try and remove naming ocnflicts and fix Automake to allow particular includes # to be attached only to particular object files. Short term fix is either or. @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1 2007/05/27 09:49:51 schmonz Exp $ bin_SCRIPTS = cvsbug # The cvs executable -@@ -278,7 +278,7 @@ cvs_SOURCES = \ +@@ -279,7 +279,7 @@ cvs_LDADD = \ ../diff/libdiff.a \ ../lib/libcvs.a \ diff --git a/devel/scmcvs/patches/patch-ae b/devel/scmcvs/patches/patch-ae index d4c0532abf7..ad55d7ac6fc 100644 --- a/devel/scmcvs/patches/patch-ae +++ b/devel/scmcvs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ +$NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- src/rcs.c.orig 2005-09-26 16:31:36.000000000 +0200 -+++ src/rcs.c -@@ -3534,7 +3534,7 @@ struct rcs_keyword +--- src/rcs.c.orig 2006-06-08 16:55:04.000000000 +0300 ++++ src/rcs.c 2008-01-02 14:43:41.000000000 +0200 +@@ -3533,7 +3533,7 @@ size_t len; }; #define KEYWORD_INIT(s) (s), sizeof (s) - 1 @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ { { KEYWORD_INIT ("Author") }, { KEYWORD_INIT ("Date") }, -@@ -3547,6 +3547,7 @@ static const struct rcs_keyword keywords +@@ -3546,6 +3546,7 @@ { KEYWORD_INIT ("Revision") }, { KEYWORD_INIT ("Source") }, { KEYWORD_INIT ("State") }, @@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ { NULL, 0 } }; enum keyword -@@ -3561,7 +3562,8 @@ enum keyword +@@ -3560,7 +3561,8 @@ KEYWORD_RCSFILE, KEYWORD_REVISION, KEYWORD_SOURCE, @@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ }; /* Convert an RCS date string into a readable string. This is like -@@ -3698,6 +3700,11 @@ expand_keywords (rcs, ver, name, log, lo +@@ -3697,6 +3699,11 @@ return; } @@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ /* If we are using -kkvl, dig out the locker information if any. */ locker = NULL; if (expand == KFLAG_KVL) -@@ -3789,6 +3796,7 @@ expand_keywords (rcs, ver, name, log, lo +@@ -3788,6 +3795,7 @@ case KEYWORD_HEADER: case KEYWORD_ID: @@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.1 2007/05/27 09:49:51 schmonz Exp $ { const char *path; int free_path; -@@ -4462,7 +4470,7 @@ RCS_checkout (rcs, workfile, rev, nameta +@@ -4466,7 +4474,7 @@ if (info != NULL) { /* If the size of `devtype' changes, fix the sscanf call also */ diff --git a/devel/scmcvs/patches/patch-al b/devel/scmcvs/patches/patch-al index cb5415d1180..6d358348da4 100644 --- a/devel/scmcvs/patches/patch-al +++ b/devel/scmcvs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1 2007/05/27 09:49:52 schmonz Exp $ +$NetBSD: patch-al,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- src/client.c.orig 2005-03-17 16:47:22.000000000 +0100 -+++ src/client.c -@@ -4528,6 +4528,16 @@ start_server () +--- src/client.c.orig 2006-06-08 17:36:03.000000000 +0300 ++++ src/client.c 2008-01-02 14:44:23.000000000 +0200 +@@ -4497,6 +4497,16 @@ error (1, 0, "This server does not support the global -n option."); } diff --git a/devel/scmcvs/patches/patch-ap b/devel/scmcvs/patches/patch-ap index 148ec9484af..080c613e268 100644 --- a/devel/scmcvs/patches/patch-ap +++ b/devel/scmcvs/patches/patch-ap @@ -1,16 +1,16 @@ -$NetBSD: patch-ap,v 1.1 2007/05/27 09:49:53 schmonz Exp $ +$NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $ ---- src/main.c.orig 2005-09-05 20:04:38.000000000 +0200 -+++ src/main.c -@@ -46,6 +46,7 @@ int really_quiet = 0; +--- src/main.c.orig 2006-05-16 06:12:35.000000000 +0300 ++++ src/main.c 2008-01-02 14:45:05.000000000 +0200 +@@ -46,6 +46,7 @@ int quiet = 0; int trace = 0; int noexec = 0; +int nolock = 0; int logoff = 0; - /* Set if we should be writing CVSADM directories at top level. At -@@ -54,6 +55,7 @@ int logoff = 0; + /* +@@ -60,6 +61,7 @@ int top_level_admin = 0; mode_t cvsumask = UMASK_DFLT; @@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.1 2007/05/27 09:49:53 schmonz Exp $ char *CurDir; -@@ -243,6 +245,7 @@ static const char *const opt_usage[] = +@@ -249,6 +251,7 @@ " -r Make checked-out files read-only.\n", " -w Make checked-out files read-write (default).\n", " -n Do not execute anything that will change the disk.\n", @@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.1 2007/05/27 09:49:53 schmonz Exp $ " -t Show trace of program execution -- try with -n.\n", " -v CVS version and copyright.\n", " -T tmpdir Use 'tmpdir' for temporary files.\n", -@@ -401,7 +404,7 @@ main (argc, argv) +@@ -407,7 +410,7 @@ int help = 0; /* Has the user asked for help? This lets us support the `cvs -H cmd' convention to give help for cmd. */ @@ -35,7 +35,7 @@ $NetBSD: patch-ap,v 1.1 2007/05/27 09:49:53 schmonz Exp $ static struct option long_options[] = { {"help", 0, NULL, 'H'}, -@@ -525,6 +528,11 @@ main (argc, argv) +@@ -531,6 +534,11 @@ break; case 'n': noexec = 1; diff --git a/devel/scmcvs/patches/patch-ar b/devel/scmcvs/patches/patch-ar index 2566aa1aefd..879dc0f5aa5 100644 --- a/devel/scmcvs/patches/patch-ar +++ b/devel/scmcvs/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2007/05/27 09:49:53 schmonz Exp $ +$NetBSD: patch-ar,v 1.2 2008/01/04 06:48:07 martti Exp $ ---- src/server.c.orig 2005-09-22 17:57:34.000000000 +0200 -+++ src/server.c -@@ -782,6 +782,7 @@ E Protocol error: Root says \"%s\" but p +--- src/server.c.orig 2006-06-08 17:34:20.000000000 +0300 ++++ src/server.c 2008-01-02 14:45:35.000000000 +0200 +@@ -782,6 +782,7 @@ nothing. But for rsh, we need to do it now. */ parse_config (current_parsed_root->directory); @@ -10,7 +10,7 @@ $NetBSD: patch-ar,v 1.1 2007/05/27 09:49:53 schmonz Exp $ path = xmalloc (strlen (current_parsed_root->directory) + sizeof (CVSROOTADM) + 2); -@@ -799,6 +800,7 @@ E Protocol error: Root says \"%s\" but p +@@ -799,6 +800,7 @@ pending_error = save_errno; } free (path); @@ -18,7 +18,7 @@ $NetBSD: patch-ar,v 1.1 2007/05/27 09:49:53 schmonz Exp $ #ifdef HAVE_PUTENV env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); -@@ -2283,8 +2285,12 @@ serve_global_option (arg) +@@ -2284,8 +2286,12 @@ break; case 'n': noexec = 1; @@ -31,7 +31,7 @@ $NetBSD: patch-ar,v 1.1 2007/05/27 09:49:53 schmonz Exp $ case 'q': quiet = 1; break; -@@ -5306,6 +5312,7 @@ switch_to_user (cvs_username, username) +@@ -5369,6 +5375,7 @@ const char *username; { struct passwd *pw; @@ -39,7 +39,7 @@ $NetBSD: patch-ar,v 1.1 2007/05/27 09:49:53 schmonz Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5384,7 +5391,15 @@ error 0 %s: no such system user\n", user +@@ -5447,7 +5454,15 @@ } } diff --git a/devel/scmcvs/patches/patch-at b/devel/scmcvs/patches/patch-at index 2fc7b5f9dc4..e3fed10dddc 100644 --- a/devel/scmcvs/patches/patch-at +++ b/devel/scmcvs/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2007/05/27 09:49:54 schmonz Exp $ +$NetBSD: patch-at,v 1.2 2008/01/04 06:48:07 martti Exp $ ---- src/logmsg.c.orig 2005-09-04 02:26:42.000000000 +0200 -+++ src/logmsg.c -@@ -227,6 +227,8 @@ do_editor (dir, messagep, repository, ch +--- src/logmsg.c.orig 2006-05-16 03:16:31.000000000 +0300 ++++ src/logmsg.c 2008-01-02 14:46:02.000000000 +0200 +@@ -227,6 +227,8 @@ (*messagep)[strlen (*messagep) - 1] != '\n') (void) fprintf (fp, "\n"); } @@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.1 2007/05/27 09:49:54 schmonz Exp $ if (repository != NULL) /* tack templates on if necessary */ -@@ -298,7 +300,7 @@ do_editor (dir, messagep, repository, ch +@@ -298,7 +300,7 @@ run_setup (editinfo_editor ? editinfo_editor : Editor); run_arg (fname); if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY, @@ -20,7 +20,7 @@ $NetBSD: patch-at,v 1.1 2007/05/27 09:49:54 schmonz Exp $ error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0, editinfo_editor ? "Logfile verification failed" : "warning: editor session failed"); -@@ -679,6 +681,15 @@ title_proc (p, closure) +@@ -680,6 +682,15 @@ strlen (str_list) + strlen (p->key) + 5); (void) strcat (str_list, p->key); break; diff --git a/devel/scmcvs/patches/patch-au b/devel/scmcvs/patches/patch-au index 0f107f68760..4caa1d9ea61 100644 --- a/devel/scmcvs/patches/patch-au +++ b/devel/scmcvs/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1 2007/05/27 09:49:54 schmonz Exp $ +$NetBSD: patch-au,v 1.2 2008/01/04 06:48:07 martti Exp $ ---- src/commit.c.orig 2005-09-22 09:56:20.000000000 +0200 -+++ src/commit.c -@@ -1024,7 +1024,9 @@ warning: file `%s' seems to still contai +--- src/commit.c.orig 2006-06-08 16:55:03.000000000 +0300 ++++ src/commit.c 2008-01-02 14:46:24.000000000 +0200 +@@ -1026,7 +1026,9 @@ xmalloc (sizeof (struct logfile_info))); li->type = status; li->tag = xstrdup (vers->tag); @@ -13,7 +13,7 @@ $NetBSD: patch-au,v 1.1 2007/05/27 09:49:54 schmonz Exp $ li->rev_new = NULL; p->data = li; (void) addnode (ulist, p); -@@ -1176,7 +1178,7 @@ precommit_proc (repository, filter) +@@ -1178,7 +1180,7 @@ run_setup (filter); run_arg (repository); (void) walklist (saved_ulist, precommit_list_proc, NULL); diff --git a/devel/scmcvs/patches/patch-az b/devel/scmcvs/patches/patch-az index 9b5442b5f8d..ff22f785841 100644 --- a/devel/scmcvs/patches/patch-az +++ b/devel/scmcvs/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.1 2007/05/27 09:49:54 schmonz Exp $ +$NetBSD: patch-az,v 1.2 2008/01/04 06:48:07 martti Exp $ ---- src/modules.c.orig 2005-03-16 23:01:21.000000000 +0100 -+++ src/modules.c -@@ -747,7 +747,8 @@ module `%s' is a request for a file in a +--- src/modules.c.orig 2006-06-08 16:55:04.000000000 +0300 ++++ src/modules.c 2008-01-02 14:46:53.000000000 +0200 +@@ -746,7 +746,8 @@ cvs_output ("'\n", 0); cvs_flushout (); } -- cgit v1.2.3