From a7c3d9d6bfdd9ea78a9c8396feaf9c232dc72a27 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Wed, 7 Dec 2005 01:16:30 +0000 Subject: [PATCH] Switch to cvs-1.12.13 --- gnu/usr.bin/cvs/Makefile.inc | 7 +- gnu/usr.bin/cvs/cvs/parseinfo.c.patch | 72 +++++------ gnu/usr.bin/cvs/cvs/root.c.patch | 22 ++-- gnu/usr.bin/cvs/lib/Makefile | 17 +-- gnu/usr.bin/cvs/lib/config.h.proto | 165 ++++++++++++++++++++------ gnu/usr.bin/cvs/lib/save-cwd.c.patch | 20 ++-- 6 files changed, 197 insertions(+), 106 deletions(-) diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc index 07dd314f63..7644cb6b26 100644 --- a/gnu/usr.bin/cvs/Makefile.inc +++ b/gnu/usr.bin/cvs/Makefile.inc @@ -1,9 +1,12 @@ -# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.6 2005/06/13 22:35:54 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/cvs/Makefile.inc,v 1.7 2005/12/07 01:16:30 corecode Exp $ # .if !defined(CVSDIR) -CVSDIR= $(.CURDIR)/../../../../contrib/cvs-1.12.12 +CVSDIR= $(.CURDIR)/../../../../contrib/cvs-1.12 +CVSVERSION= 1.12.13 + +CFLAGS+= -I${.OBJDIR}/../lib -I${CVSDIR}/lib .if exists(${.OBJDIR}/../lib) LIBCVSDIR= ${.OBJDIR}/../lib diff --git a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch index 2834bbce76..8a80d5640f 100644 --- a/gnu/usr.bin/cvs/cvs/parseinfo.c.patch +++ b/gnu/usr.bin/cvs/cvs/parseinfo.c.patch @@ -1,35 +1,28 @@ -$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. - */ --struct config * --parse_config (const char *cvsroot) -+static struct config * -+parse_config_file (const char *cvsroot, const char *config_name, struct config *retval) - { - char *infopath; - FILE *fp_info; -@@ -371,13 +371,13 @@ - size_t line_allocated = 0; +$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.4 2005/12/07 01:16:30 corecode Exp $ +Index: src/parseinfo.c +=================================================================== +RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12/src/parseinfo.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 parseinfo.c +--- src/parseinfo.c 7 Dec 2005 00:15:19 -0000 1.1.1.1 ++++ src/parseinfo.c 7 Dec 2005 01:04:02 -0000 +@@ -384,6 +384,7 @@ size_t len; char *p; -- struct config *retval; + struct config *retval; ++ int rescan = 0; + /* PROCESSING Whether config keys are currently being processed for + * this root. + * PROCESSED Whether any keys have been processed for this root. +@@ -429,6 +430,7 @@ - TRACE (TRACE_FUNCTION, "parse_config (%s)", cvsroot); - -- retval = new_config (); -+ if (retval == NULL) -+ retval = new_config (); - -- infopath = Xasprintf ("%s/%s/%s", cvsroot, CVSROOTADM, CVSROOTADM_CONFIG); -+ infopath = Xasprintf ("%s/%s/%s", cvsroot, CVSROOTADM, config_name); + retval = new_config (); ++again: fp_info = CVS_FOPEN (infopath, "r"); - if (fp_info == NULL) -@@ -464,9 +464,11 @@ + if (!fp_info) + { +@@ -553,9 +555,11 @@ readBool (infopath, "SystemAuth", p, &dummy); } #endif @@ -43,19 +36,16 @@ $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.3 2005/06/13 22: RCS_setincexc (&retval->keywords, p); else if (strcmp (line, "PreservePermissions") == 0) { -@@ -583,3 +585,15 @@ - free (line); +@@ -719,5 +723,12 @@ + if (freeinfopath) free (freeinfopath); + if (buf) free (buf); + ++ if (path == NULL && !rescan++) { ++ infopath = freeinfopath = ++ Xasprintf ("%s/%s/%s", cvsroot, CVSROOTADM, CVSROOTADM_OPTIONS); ++ buf = NULL; ++ goto again; ++ } ++ return retval; } -+ -+struct config * -+parse_config (const char *cvsroot) -+{ -+ struct config *retval; -+ -+ retval = NULL; -+ retval = parse_config_file (cvsroot, CVSROOTADM_CONFIG, retval); -+ retval = parse_config_file (cvsroot, CVSROOTADM_OPTIONS, retval); -+ -+ return retval; -+} diff --git a/gnu/usr.bin/cvs/cvs/root.c.patch b/gnu/usr.bin/cvs/cvs/root.c.patch index 4d65a4b577..73c68b065b 100644 --- a/gnu/usr.bin/cvs/cvs/root.c.patch +++ b/gnu/usr.bin/cvs/cvs/root.c.patch @@ -1,18 +1,18 @@ -$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/root.c.patch,v 1.1 2005/01/25 14:00:18 joerg Exp $ -Index: root.c +$DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/root.c.patch,v 1.2 2005/12/07 01:16:30 corecode Exp $ +Index: src/root.c =================================================================== -RCS file: /home/joerg/wd/repository/dragonflybsd/src/contrib/cvs-1.12.9/src/root.c,v -retrieving revision 1.1 -diff -u -r1.1 root.c ---- root.c 3 Aug 2004 18:08:51 -0000 1.1 -+++ root.c 24 Jan 2005 16:56:08 -0000 -@@ -507,10 +507,14 @@ - #ifdef CLIENT_SUPPORT +RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12/src/root.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 root.c +--- src/root.c 7 Dec 2005 00:15:13 -0000 1.1.1.1 ++++ src/root.c 7 Dec 2005 01:04:02 -0000 +@@ -635,10 +635,14 @@ newroot->isremote = (newroot->method != local_method); + #if defined (CLIENT_SUPPORT) || defined (SERVER_SUPPORT) - if (readonlyfs && newroot->isremote) - error (1, 0, -+ if (newroot->isremote && readonlyfs) { ++ if (readonlyfs && newroot->isremote) { + /* downgrade readonlyfs settings via environment */ + if (readonlyfs < 0) + error (1, 0, @@ -22,4 +22,4 @@ diff -u -r1.1 root.c + } if ((newroot->method != local_method) - #ifdef CLIENT_SUPPORT + && (newroot->method != fork_method) diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index 8b38f1f31d..c99ec50458 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.13 2005/12/03 12:11:44 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/cvs/lib/Makefile,v 1.14 2005/12/07 01:16:30 corecode Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -13,12 +13,9 @@ INTERNALLIB= YES CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H -DIN_LIBINTL YFLAGS= -CLEANFILES+= config.h alloca.h getopt.h +CLEANFILES+= config.h alloca.h getopt.h glob.h CONTRIBDIR= ${CVSDIR}/lib -VERSION!= sed < ${CVSDIR}/configure \ - -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q - CVS_UMASK_DFLT?= 002 CVS_ADMIN_GROUP?= cvsadmin CVS_TMPDIR_DFLT?= /tmp @@ -30,12 +27,15 @@ SRCS= config.h \ xgetcwd.c xgethostname.c xreadlink.c yesno.c \ pagealign_alloc.c getline.c getndelim2.c mktime.c \ getpass.c rpmatch.c vasnprintf.c printf-args.c printf-parse.c \ - asnprintf.c closeout.c quotearg.c memrchr.c + asnprintf.c closeout.c quotearg.c memrchr.c canon-host.c \ + canonicalize.c strcasecmp.c getdelim.c glob.h glob.c \ + cycle-check.c fd-safer.c dup-safer.c mbchar.c strnlen1.c \ + mempcpy.c SRCS+= save-cwd.c.patch xgetcwd.c.patch config.h: config.h.proto - sed -e "s,@VERSION@,${VERSION}-DragonFly,g" \ + sed -e "s,@VERSION@,${CVSVERSION}-DragonFly,g" \ -e "s,@UMASK_DFLT@,${CVS_UMASK_DFLT},g" \ -e "s,@TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \ -e "s,@CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \ @@ -47,4 +47,7 @@ alloca.h: alloca_.h getopt.h: getopt_.h cp ${.ALLSRC} ${.TARGET} +glob.h: glob_.h + cp ${.ALLSRC} ${.TARGET} + .include diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto index 5c4b74418f..94908c8836 100644 --- a/gnu/usr.bin/cvs/lib/config.h.proto +++ b/gnu/usr.bin/cvs/lib/config.h.proto @@ -1,7 +1,12 @@ -/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.8 2005/07/23 20:23:06 joerg Exp $ */ +/* $DragonFly: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.9 2005/12/07 01:16:30 corecode Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ +/* Define this to a NULL terminated list of allowed path prefixes (for + directories) and paths to files the CVS server will allow configuration to + be read from when specified from the command line. */ +#define ALLOW_CONFIG_OVERRIDE "/etc/cvs.conf", "/etc/cvs/", NULL + /* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in the CVS client (default) */ #define AUTH_CLIENT_SUPPORT 1 @@ -95,9 +100,6 @@ message to be appended to the temp file when the editor is started. */ /* #undef FORCE_USE_EDITOR */ -/* Define if gettimeofday clobbers localtime's static buffer. */ -/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER */ - /* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only relevant when using GSSAPI. */ @@ -117,9 +119,15 @@ /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BP_SYM_H */ + /* Define to 1 if you have the `btowc' function. */ #define HAVE_BTOWC 1 +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ /* #undef HAVE_CFLOCALECOPYCURRENT */ @@ -203,10 +211,26 @@ don't. */ #define HAVE_DECL_GETC_UNLOCKED 1 +/* Define to 1 if you have the declaration of `getdelim', and to 0 if you + don't. */ +#define HAVE_DECL_GETDELIM 0 + /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ #define HAVE_DECL_GETENV 1 +/* Define to 1 if you have the declaration of `getline', and to 0 if you + don't. */ +#define HAVE_DECL_GETLINE 0 + +/* Define to 1 if you have the declaration of `getlogin', and to 0 if you + don't. */ +#define HAVE_DECL_GETLOGIN 1 + +/* Define to 1 if you have the declaration of `getlogin_r', and to 0 if you + don't. */ +#define HAVE_DECL_GETLOGIN_R 1 + /* Define to 1 if you have the declaration of `getpass', and to 0 if you don't. */ #define HAVE_DECL_GETPASS 1 @@ -227,6 +251,10 @@ don't. */ #define HAVE_DECL_PUTC_UNLOCKED 1 +/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. + */ +#define HAVE_DECL_STRDUP 1 + /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you don't. */ #define HAVE_DECL_STRERROR_R 1 @@ -260,6 +288,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the `flockfile' function. */ +#define HAVE_FLOCKFILE 1 + /* Define to 1 if you have the `fork' function. */ #define HAVE_FORK 1 @@ -275,6 +306,15 @@ /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 +/* Define to 1 if you have the `funlockfile' function. */ +#define HAVE_FUNLOCKFILE 1 + +/* Define to 1 if you have the `gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + /* Define to 1 if you have the `getdelim' function. */ /* #undef HAVE_GETDELIM */ @@ -287,6 +327,9 @@ /* Define to 1 if you have the `gethostname' function. */ #define HAVE_GETHOSTNAME 1 +/* Define to 1 if you have the `getlogin_r' function. */ +#define HAVE_GETLOGIN_R 1 + /* Define to 1 if you have the header file. */ #define HAVE_GETOPT_H 1 @@ -296,6 +339,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `getpwnam_r' function. */ +/* #undef HAVE_GETPWNAM_R */ + /* Define if you have the getspnam function. */ /* #undef HAVE_GETSPNAM */ @@ -305,6 +351,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + /* Define if you have GSSAPI with Kerberos version 5 available. */ /* #undef HAVE_GSSAPI */ @@ -317,11 +366,8 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_GSSAPI_H */ -/* Define if you have the hstrerror function. */ -#define HAVE_HSTRERROR 1 - /* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ +#define HAVE_ICONV 1 /* Define to 1 if you have the `initgroups' function. */ #define HAVE_INITGROUPS 1 @@ -339,9 +385,18 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_IO_H */ +/* Define to 1 if defines AF_INET. */ +#define HAVE_IPV4 1 + +/* Define to 1 if defines AF_INET6. */ +#define HAVE_IPV6 1 + /* Define to 1 if you have the `isascii' function. */ #define HAVE_ISASCII 1 +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + /* Define to 1 if you have the `iswprint' function. */ #define HAVE_ISWPRINT 1 @@ -354,6 +409,9 @@ /* Define to 1 if you have the `krb_get_err_text' function. */ /* #undef HAVE_KRB_GET_ERR_TEXT */ +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + /* Define to 1 if you have the `krb' library (-lkrb). */ /* #undef HAVE_LIBKRB */ @@ -363,6 +421,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define to 1 if you have the `login' function. */ /* #undef HAVE_LOGIN */ @@ -378,10 +439,6 @@ /* Define if you have the 'long long' type. */ #define HAVE_LONG_LONG 1 -/* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ -/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ - /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ #define HAVE_MALLOC 1 @@ -423,6 +480,12 @@ /* Define to 1 if you have the `memrchr' function. */ /* #undef HAVE_MEMRCHR */ +/* Define to 1 if defines the MIN and MAX macros. */ +/* #undef HAVE_MINMAX_IN_LIMITS_H */ + +/* Define to 1 if defines the MIN and MAX macros. */ +#define HAVE_MINMAX_IN_SYS_PARAM_H 1 + /* Define to 1 if you have the `mknod' function. */ #define HAVE_MKNOD 1 @@ -452,6 +515,9 @@ module, e.g. on systems with shadow passwords or via LDAP */ /* #undef HAVE_PAM */ +/* Define to 1 if pam/pam_appl.h is available */ +/* #undef HAVE_PAM_PAM_APPL_H */ + /* 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. @@ -468,9 +534,6 @@ /* Define to 1 if the system has the type `ptrdiff_t'. */ #define HAVE_PTRDIFF_T 1 -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - /* Define to 1 if you have the `readlink' function. */ #define HAVE_READLINK 1 @@ -490,6 +553,9 @@ /* Define to 1 if you have the `regfree' function. */ #define HAVE_REGFREE 1 +/* Define to 1 if you have the `resolvepath' function. */ +/* #undef HAVE_RESOLVEPATH */ + /* Define to 1 if you have the `rpmatch' function. */ /* #undef HAVE_RPMATCH */ @@ -499,6 +565,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SEARCH_H */ +/* Define to 1 if security/pam_appl.h is available */ +/* #undef HAVE_SECURITY_PAM_APPL_H */ + /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 @@ -511,6 +580,9 @@ /* Define to 1 if you have the `sigblock' function. */ #define HAVE_SIGBLOCK 1 +/* Define to 1 if you have the `siginterrupt' function. */ +#define HAVE_SIGINTERRUPT 1 + /* Define to 1 if you have the `sigprocmask' function. */ #define HAVE_SIGPROCMASK 1 @@ -523,10 +595,6 @@ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -/* #undef HAVE_STAT_EMPTY_STRING_BUG */ - /* Define to 1 if stdbool.h conforms to C99. */ #define HAVE_STDBOOL_H 1 @@ -543,12 +611,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - /* Define if you have strchr (always for CVS). */ #define HAVE_STRCHR 1 +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -567,15 +635,16 @@ /* Define to 1 if you have the `strncasecmp' function. */ #define HAVE_STRNCASECMP 1 -/* 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 +/* Define if there is a member named d_type in the struct describing directory + headers. */ +#define HAVE_STRUCT_DIRENT_D_TYPE 1 + /* Define to 1 if `st_blksize' is member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 @@ -594,6 +663,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_BSDTYPES_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CDEFS_H 1 + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_DIR_H */ @@ -629,6 +701,15 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 +/* Define to 1 if you have the `tcgetattr' function. */ +#define HAVE_TCGETATTR 1 + +/* Define to 1 if you have the `tcsetattr' function. */ +#define HAVE_TCSETATTR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + /* Define to 1 if you have the `timezone' function. */ #define HAVE_TIMEZONE 1 @@ -701,6 +782,12 @@ /* Define if you have the 'wchar_t' type. */ #define HAVE_WCHAR_T 1 +/* Define to 1 if you have the `wcrtomb' function. */ +#define HAVE_WCRTOMB 1 + +/* Define to 1 if you have the `wcscoll' function. */ +#define HAVE_WCSCOLL 1 + /* Define to 1 if you have the `wcslen' function. */ #define HAVE_WCSLEN 1 @@ -732,7 +819,10 @@ #define HAVE__BOOL 1 /* Define to 1 if you have the `__fpending' function. */ -#define HAVE___FPENDING +#define HAVE___FPENDING 1 + +/* Define to 1 if you have the `__fsetlocking' function. */ +/* #undef HAVE___FSETLOCKING */ /* Define to 1 if you have the `__secure_getenv' function. */ /* #undef HAVE___SECURE_GETENV */ @@ -765,7 +855,7 @@ #define MALLOC_0_IS_NONNULL 1 /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ -#define MAP_ANONYMOUS MAP_ANON +#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 @@ -777,7 +867,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "bug-cvs@gnu.org" +#define PACKAGE_BUGREPORT "bug-cvs@nongnu.org" /* Define to the full name of this package. */ #define PACKAGE_NAME "Concurrent Versions System (CVS)" @@ -798,7 +888,7 @@ #define PAM_SERVICE_NAME "cvs" /* the number of pending output bytes on stream `fp' */ -#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base +/* #undef PENDING_OUTPUT_N_BYTES */ /* 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 @@ -811,8 +901,8 @@ /* 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. */ +/* Define if rename does not work for source file names 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'). */ @@ -854,10 +944,6 @@ /* Define to 1 if strerror_r returns char *. */ /* #undef STRERROR_R_CHAR_P */ -/* Define to be the nanoseconds member of struct stat's st_mtim, if it exists. - */ -/* #undef ST_MTIM_NSEC */ - /* Enable support for the pre 1.12.1 *info scripting hook format strings. Disable this option for a smaller executable once your scripting hooks have been updated to use the new *info format strings by passing @@ -980,6 +1066,9 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ /* #undef _POSIX_SOURCE */ +/* Define if you want regoff_t to be at least as wide POSIX requires. */ +#define _REGEX_LARGE_OFFSETS 1 + /* Define to force lib/regex.c to define re_comp et al. */ #define _REGEX_RE_COMP 1 @@ -992,6 +1081,9 @@ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif /* Define to rpl_ if the getcwd replacement function should be used. */ #define __GETCWD_PREFIX rpl_ @@ -1085,6 +1177,9 @@ /* Define as a signed type of the same size as size_t. */ /* #undef ssize_t */ +/* Define to rpl_strcasecmp always. */ +#define strcasecmp rpl_strcasecmp + /* Define to rpl_tzset if the wrapper function should be used. */ /* #undef tzset */ diff --git a/gnu/usr.bin/cvs/lib/save-cwd.c.patch b/gnu/usr.bin/cvs/lib/save-cwd.c.patch index 0aa7d335e3..02bbae88f2 100644 --- a/gnu/usr.bin/cvs/lib/save-cwd.c.patch +++ b/gnu/usr.bin/cvs/lib/save-cwd.c.patch @@ -1,20 +1,20 @@ -$DragonFly: src/gnu/usr.bin/cvs/lib/Attic/save-cwd.c.patch,v 1.1 2005/12/03 12:11:44 corecode Exp $ -Index: save-cwd.c +$DragonFly: src/gnu/usr.bin/cvs/lib/Attic/save-cwd.c.patch,v 1.2 2005/12/07 01:16:30 corecode Exp $ +Index: lib/save-cwd.c =================================================================== -RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12.12/lib/save-cwd.c,v -retrieving revision 1.1 -diff -u -r1.1 save-cwd.c ---- save-cwd.c 21 Apr 2005 06:33:15 -0000 1.1 -+++ save-cwd.c 16 Oct 2005 10:16:48 -0000 -@@ -41,7 +41,6 @@ +RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12/lib/save-cwd.c,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 save-cwd.c +--- lib/save-cwd.c 7 Dec 2005 00:15:28 -0000 1.1.1.1 ++++ lib/save-cwd.c 7 Dec 2005 01:04:02 -0000 +@@ -37,7 +37,6 @@ #include -#include "chdir-long.h" + #include "unistd-safer.h" #include "xgetcwd.h" - /* On systems without the fchdir function (WOE), pretend that open -@@ -105,7 +104,7 @@ +@@ -102,7 +101,7 @@ if (0 <= cwd->desc) return fchdir (cwd->desc); else -- 2.41.0