From 183c614c6da832d2541caad71f3c774369d729f0 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Mon, 13 Jun 2005 22:35:54 +0000 Subject: [PATCH] update cvs to 1.12.12 --- gnu/usr.bin/cvs/Makefile.inc | 4 +- gnu/usr.bin/cvs/cvs/diff.c.patch | 53 +++++------ gnu/usr.bin/cvs/cvs/parseinfo.c.patch | 18 ++-- gnu/usr.bin/cvs/lib/Makefile | 9 +- gnu/usr.bin/cvs/lib/config.h.proto | 111 +++++++++++++++++++---- gnu/usr.bin/cvs/lib/xgethostname.c.patch | 12 --- 6 files changed, 130 insertions(+), 77 deletions(-) delete mode 100644 gnu/usr.bin/cvs/lib/xgethostname.c.patch diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc index 2f72f52281..07dd314f63 100644 --- a/gnu/usr.bin/cvs/Makefile.inc +++ b/gnu/usr.bin/cvs/Makefile.inc @@ -1,9 +1,9 @@ -# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.5 2005/03/13 11:43:07 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.6 2005/06/13 22:35:54 corecode Exp $ # .if !defined(CVSDIR) -CVSDIR= $(.CURDIR)/../../../../contrib/cvs-1.12.11 +CVSDIR= $(.CURDIR)/../../../../contrib/cvs-1.12.12 .if exists(${.OBJDIR}/../lib) LIBCVSDIR= ${.OBJDIR}/../lib diff --git a/gnu/usr.bin/cvs/cvs/diff.c.patch b/gnu/usr.bin/cvs/cvs/diff.c.patch index 3de61616da..6aa71b2bc4 100644 --- a/gnu/usr.bin/cvs/cvs/diff.c.patch +++ b/gnu/usr.bin/cvs/cvs/diff.c.patch @@ -1,7 +1,7 @@ -$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $ ---- /usr/src/contrib/cvs-1.12.11/src/diff.c 2005-01-05 22:17:43.000000000 +0100 -+++ diff.c 2005-03-06 23:43:51.000000000 +0100 -@@ -47,6 +47,7 @@ +$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.3 2005/06/13 22:35:54 corecode Exp $ +--- /usr/src/contrib/cvs-1.12.12/src/diff.c 2005-04-21 08:33:15.000000000 +0200 ++++ diff.c 2005-06-13 23:32:45.000000000 +0200 +@@ -52,6 +52,7 @@ static char *diff_rev1, *diff_rev2; /* Command line dates, from -D option. Malloc'd. */ static char *diff_date1, *diff_date2; @@ -9,7 +9,7 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 static char *use_rev1, *use_rev2; static int have_rev1_label, have_rev2_label; -@@ -265,6 +266,8 @@ +@@ -273,6 +274,8 @@ diff_rev2 = NULL; diff_date1 = NULL; diff_date2 = NULL; @@ -18,7 +18,7 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 optind = 0; /* FIXME: This should really be allocating an argv to be passed to diff -@@ -275,7 +278,7 @@ +@@ -283,7 +286,7 @@ * to diff. */ while ((c = getopt_long (argc, argv, @@ -27,7 +27,7 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 longopts, &option_index)) != -1) { switch (c) -@@ -338,6 +341,26 @@ +@@ -346,6 +349,26 @@ free (options); options = RCS_check_kflag (optarg); break; @@ -52,31 +52,27 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 + } + break; case 'r': - if (diff_rev2 != NULL || diff_date2 != NULL) + if (diff_rev2 || diff_date2) error (1, 0, -@@ -386,13 +409,17 @@ +@@ -400,11 +423,15 @@ send_option_string (opts); if (options[0] != '\0') send_arg (options); -- if (diff_rev1) +- if (diff_orig1) + if (diff_join1) + option_with_arg ("-j", diff_join1); -+ else if (diff_rev1) - option_with_arg ("-r", diff_rev1); -- if (diff_date1) -+ else if (diff_date1) ++ else if (diff_orig1) + option_with_arg ("-r", diff_orig1); + else if (diff_date1) client_senddate (diff_date1); -- if (diff_rev2) +- if (diff_orig2) + if (diff_join2) + option_with_arg ("-j", diff_join2); -+ else if (diff_rev2) - option_with_arg ("-r", diff_rev2); -- if (diff_date2) -+ else if (diff_date2) ++ else if (diff_orig2) + option_with_arg ("-r", diff_orig2); + else if (diff_date2) client_senddate (diff_date2); - send_arg ("--"); - -@@ -406,12 +433,9 @@ +@@ -420,12 +447,9 @@ send_to_server ("diff\012", 0); err = get_responses_and_close (); @@ -91,16 +87,15 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 if (diff_rev1 != NULL) tag_check_valid (diff_rev1, argc, argv, local, 0, "", false); if (diff_rev2 != NULL) -@@ -428,7 +452,7 @@ - ( diff_fileproc, diff_filesdoneproc, diff_dirproc, - diff_dirleaveproc, NULL, argc, argv, local, - which, 0, CVS_LOCK_READ, (char *) NULL, 1, (char *) NULL ); -- +@@ -442,6 +466,7 @@ + diff_dirleaveproc, NULL, argc, argv, local, + which, 0, CVS_LOCK_READ, NULL, 1, NULL); + + } /* clean up */ free (options); options = NULL; -@@ -437,6 +461,10 @@ +@@ -450,6 +475,10 @@ free (diff_date1); if (diff_date2 != NULL) free (diff_date2); @@ -109,5 +104,5 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/diff.c.patch,v 1.2 2005/03/13 11:43:07 + if (diff_join2 != NULL) + free (diff_join2); - return (err); + return err; } diff --git a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch index f4226eba4d..2834bbce76 100644 --- a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch +++ b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch @@ -1,7 +1,7 @@ -$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.2 2005/03/13 11:43:07 corecode Exp $ ---- /usr/src/contrib/cvs-1.12.11/src/parseinfo.c 2005-01-05 22:17:43.000000000 +0100 -+++ parseinfo.c 2005-03-06 23:57:22.000000000 +0100 -@@ -333,8 +333,8 @@ +$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.3 2005/06/13 22:35:54 corecode Exp $ +--- /usr/src/contrib/cvs-1.12.12/src/parseinfo.c 2005-04-21 08:33:15.000000000 +0200 ++++ parseinfo.c 2005-06-13 23:44:05.000000000 +0200 +@@ -361,8 +361,8 @@ * * xmalloc() failures are fatal, per usual. */ @@ -12,7 +12,7 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.2 2005/03/13 11: { char *infopath; FILE *fp_info; -@@ -342,13 +342,13 @@ +@@ -371,13 +371,13 @@ size_t line_allocated = 0; size_t len; char *p; @@ -29,21 +29,21 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.2 2005/03/13 11: fp_info = CVS_FOPEN (infopath, "r"); if (fp_info == NULL) -@@ -431,9 +431,11 @@ +@@ -464,9 +464,11 @@ readBool (infopath, "SystemAuth", p, &dummy); } #endif - else if (strcmp (line, "LocalKeyword") == 0) + else if (strcmp (line, "LocalKeyword") == 0 || + strcmp (line, "tag") == 0) - RCS_setlocalid (&retval->keywords, p); + RCS_setlocalid (infopath, ln, &retval->keywords, p); - else if (strcmp (line, "KeywordExpand") == 0) + else if (strcmp (line, "KeywordExpand") == 0 || + strcmp (line, "tagexpand") == 0) RCS_setincexc (&retval->keywords, p); else if (strcmp (line, "PreservePermissions") == 0) - #ifdef PRESERVE_PERMISSIONS_SUPPORT -@@ -547,3 +549,15 @@ + { +@@ -583,3 +585,15 @@ free (line); return retval; } diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index e8987b29d5..1bf7182584 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.19.2.4 2003/01/21 23:06:52 peter Exp $ -# $DragonFly: src/gnu/usr.bin/cvs/lib/Makefile,v 1.10 2005/04/18 20:22:42 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/cvs/lib/Makefile,v 1.11 2005/06/13 22:35:54 corecode Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -14,7 +14,6 @@ CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H -DIN_LIBINTL YFLAGS= CLEANFILES+= config.h alloca.h getopt.h -PATCHES= xgethostname.c.patch CONTRIBDIR= ${CVSDIR}/lib VERSION!= sed < ${CVSDIR}/configure \ @@ -29,10 +28,10 @@ SRCS= config.h \ exitfail.c getdate.c getopt.h getopt.c getopt1.c gettime.c \ getnline.c md5.c save-cwd.c strftime.c xmalloc.c xalloc-die.c \ xgetcwd.c xgethostname.c xreadlink.c yesno.c \ - sunos57-select.c getline.c getndelim2.c mktime.c \ + pagealign_alloc.c getline.c getndelim2.c mktime.c \ getpass.c rpmatch.c vasnprintf.c printf-args.c printf-parse.c \ - asnprintf.c \ - ${PATCHES} + asnprintf.c getcwd.c closeout.c chdir-long.c quotearg.c \ + __fpending.c memrchr.c openat.c config.h: config.h.proto sed -e "s,@VERSION@,${VERSION}-DragonFly,g" \ diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto index 0659b4852f..a144a37c37 100644 --- a/gnu/usr.bin/cvs/lib/config.h.proto +++ b/gnu/usr.bin/cvs/lib/config.h.proto @@ -1,4 +1,4 @@ -/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.6 2005/03/13 11:43:08 corecode Exp $ */ +/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.7 2005/06/13 22:35:54 corecode Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -44,6 +44,10 @@ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ +/* Define if there is a member named d_ino in the struct describing directory + headers. */ +#define D_INO_IN_DIRENT 1 + /* The default editor to use, if one does not specify the "-e" option to cvs, or does not have an EDITOR environment variable. If this is not set to an absolute path to an executable, use the shell to find where the editor @@ -114,7 +118,18 @@ #define HAVE_ATEXIT 1 /* Define to 1 if you have the `btowc' function. */ -/* #undef HAVE_BTOWC */ +#define HAVE_BTOWC 1 + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define to 1 if you have the `chsize' function. */ +/* #undef HAVE_CHSIZE */ /* Define to 1 if you have the `clock_gettime' function. */ #define HAVE_CLOCK_GETTIME 1 @@ -180,6 +195,10 @@ you don't. */ #define HAVE_DECL_GETCHAR_UNLOCKED 1 +/* Define to 1 if you have the declaration of `getcwd', and to 0 if you don't. + */ +#define HAVE_DECL_GETCWD 1 + /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you don't. */ #define HAVE_DECL_GETC_UNLOCKED 1 @@ -192,6 +211,10 @@ don't. */ #define HAVE_DECL_GETPASS 1 +/* Define to 1 if you have the declaration of `memrchr', and to 0 if you + don't. */ +#define HAVE_DECL_MEMRCHR 0 + /* Define to 1 if you have the declaration of `nanosleep', and to 0 if you don't. */ #define HAVE_DECL_NANOSLEEP 1 @@ -208,6 +231,10 @@ don't. */ #define HAVE_DECL_STRERROR_R 1 +/* Define to 1 if you have the declaration of `__fpending', and to 0 if you + don't. */ +#define HAVE_DECL___FPENDING 0 + /* Define to 1 if you have the header file. */ /* #undef HAVE_DIRECT_H */ @@ -248,12 +275,6 @@ /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define if getcwd (NULL, 0) allocates memory for result. */ -#define HAVE_GETCWD_NULL 1 - /* Define to 1 if you have the `getdelim' function. */ /* #undef HAVE_GETDELIM */ @@ -321,6 +342,9 @@ /* Define to 1 if you have the `isascii' function. */ #define HAVE_ISASCII 1 +/* Define to 1 if you have the `iswprint' function. */ +#define HAVE_ISWPRINT 1 + /* Define if you have MIT Kerberos version 4 available. */ /* #undef HAVE_KERBEROS */ @@ -362,11 +386,21 @@ to 0 otherwise. */ #define HAVE_MALLOC 1 +/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including + config.h and . */ +#define HAVE_MAP_ANONYMOUS 1 + /* Define to 1 if you have the `mblen' function. */ #define HAVE_MBLEN 1 /* Define to 1 if you have the `mbrlen' function. */ -/* #undef HAVE_MBRLEN */ +#define HAVE_MBRLEN 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if you have the `mbsinit' function. */ +#define HAVE_MBSINIT 1 /* Define to 1 if you have the `mbsrtowcs' function. */ /* #undef HAVE_MBSRTOWCS */ @@ -386,8 +420,8 @@ /* Define to 1 if you have the `mempcpy' function. */ /* #undef HAVE_MEMPCPY */ -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 +/* Define to 1 if you have the `memrchr' function. */ +/* #undef HAVE_MEMRCHR */ /* Define to 1 if you have the `mknod' function. */ #define HAVE_MKNOD 1 @@ -398,12 +432,18 @@ /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define to 1 if you have the `nanotime' function. */ +/* #undef HAVE_NANOTIME */ + /* Define to 1 if you have the header file. */ #define HAVE_NDBM_H 1 /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ +/* Define to 1 if you have the `openat' function. */ +/* #undef HAVE_OPENAT */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_OS_H */ @@ -412,6 +452,15 @@ module, e.g. on systems with shadow passwords or via LDAP */ /* #undef HAVE_PAM */ +/* Define to 1 if getcwd works, except it sometimes fails when it shouldn't, + setting errno to ERANGE, ENAMETOOLONG, or ENOENT. If __GETCWD_PREFIX is not + defined, it doesn't matter whether HAVE_PARTLY_WORKING_GETCWD is defined. + */ +/* #undef HAVE_PARTLY_WORKING_GETCWD */ + +/* Define to 1 if you have the `posix_memalign' function. */ +/* #undef HAVE_POSIX_MEMALIGN */ + /* Define to 1 if the `printf' function supports the %p format for printing pointers. */ #define HAVE_PRINTF_PTR 1 @@ -441,9 +490,6 @@ /* Define to 1 if you have the `regfree' function. */ #define HAVE_REGFREE 1 -/* Define to 1 if you have the `rename' function. */ -#define HAVE_RENAME 1 - /* Define to 1 if you have the `rpmatch' function. */ /* #undef HAVE_RPMATCH */ @@ -482,7 +528,7 @@ /* #undef HAVE_STAT_EMPTY_STRING_BUG */ /* Define to 1 if stdbool.h conforms to C99. */ -/* #undef HAVE_STDBOOL_H */ +#define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -524,6 +570,9 @@ /* Define to 1 if you have the `strstr' function. */ #define HAVE_STRSTR 1 +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 @@ -625,9 +674,6 @@ /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ #define HAVE_UTIME_NULL 1 -/* Define to 1 if you have the `valloc' function. */ -#define HAVE_VALLOC 1 - /* Define to 1 if you have the `vasnprintf' function. */ /* #undef HAVE_VASNPRINTF */ @@ -683,7 +729,10 @@ #define HAVE_ZLIB_H 1 /* Define to 1 if the system has the type `_Bool'. */ -/* #undef HAVE__BOOL */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the `__fpending' function. */ +/* #undef HAVE___FPENDING */ /* Define to 1 if you have the `__secure_getenv' function. */ /* #undef HAVE___SECURE_GETENV */ @@ -715,6 +764,9 @@ /* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ #define MALLOC_0_IS_NONNULL 1 +/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ +#define MAP_ANONYMOUS MAP_ANON + /* By default, CVS stores its modules and other such items in flat text files (MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a system-supplied ndbm database library and use it instead. That may speed @@ -745,6 +797,9 @@ */ #define PAM_SERVICE_NAME "cvs" +/* the number of pending output bytes on stream `fp' */ +#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base + /* Define if you want CVS to be able to serve as a transparent proxy for write operations. Disabling this may produce a slight performance gain on some systems, at the expense of write proxy support. */ @@ -756,6 +811,10 @@ /* Define to force lib/regex.c to use malloc instead of alloca. */ #define REGEX_MALLOC 1 +/* Define if rename does not work for source paths with a trailing slash, like + the one from SunOS 4.1.1_U1. */ +/* #undef RENAME_TRAILING_SLASH_BUG */ + /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -934,10 +993,16 @@ # define __EXTENSIONS__ 1 #endif +/* Define to rpl_ if the getcwd replacement function should be used. */ +#define __GETCWD_PREFIX rpl_ + /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #define __GETOPT_PREFIX rpl_ +/* Define to rpl_ if the openat replacement function should be used. */ +#define __OPENAT_PREFIX rpl_ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -977,6 +1042,9 @@ /* Define to a type if does not define. */ /* #undef mbstate_t */ +/* Define to rpl_mkdir if the replacement function should be used. */ +/* #undef mkdir */ + /* Define to rpl_mkstemp if the replacement function should be used. */ /* #undef mkstemp */ @@ -998,12 +1066,15 @@ /* Define to rpl_realloc if the replacement function should be used. */ /* #undef realloc */ +/* Define to rpl_rename if the replacement function should be used. */ +/* #undef rename */ + /* Define to equivalent of C99 restrict keyword, or to nothing if this is not supported. Do not define if restrict is supported directly. */ #define restrict __restrict /* Define to rpl_select if the replacement function should be used. */ -#define select rpl_select +/* #undef select */ /* Define to empty if the C compiler doesn't support this keyword. */ /* #undef signed */ diff --git a/gnu/usr.bin/cvs/lib/xgethostname.c.patch b/gnu/usr.bin/cvs/lib/xgethostname.c.patch deleted file mode 100644 index 7a94f8cae6..0000000000 --- a/gnu/usr.bin/cvs/lib/xgethostname.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -$DragonFly: src/gnu/usr.bin/cvs/lib/Attic/xgethostname.c.patch,v 1.1 2005/04/18 20:22:42 dillon Exp $ ---- ../../../../contrib/cvs-1.12.11/lib/xgethostname.c 2004-12-18 13:54:14.000000000 -0800 -+++ xgethostname.c 2005-04-18 11:30:43.000000000 -0700 -@@ -69,7 +69,7 @@ - if (! hostname[size_1 - 1]) - break; - } -- else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL) -+ else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL && errno != ENOMEM) - { - int saved_errno = errno; - free (hostname); -- 2.41.0