SOURCES: cvs-debian-64bit-crash.patch, cvs-debian-check-method-cra...
arekm
arekm at pld-linux.org
Thu Nov 8 00:57:59 CET 2007
Author: arekm Date: Wed Nov 7 23:57:59 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to apply correctly
---- Files affected:
SOURCES:
cvs-debian-64bit-crash.patch (1.1 -> 1.2) , cvs-debian-check-method-crash.patch (1.1 -> 1.2) , cvs-debian-cvsbug.patch (1.1 -> 1.2) , cvs-debian-cvspass.patch (1.1 -> 1.2) , cvs-debian-cvsrc.patch (1.1 -> 1.2) , cvs-debian-date-format.patch (1.1 -> 1.2) , cvs-debian-dsa-ext-pwd.patch (1.1 -> 1.2) , cvs-debian-ext-exp.patch (1.1 -> 1.2) , cvs-debian-extra-tags.patch (1.1 -> 1.2) , cvs-debian-flag-conflicted-copies.patch (1.1 -> 1.2) , cvs-debian-homedir.patch (1.1 -> 1.2) , cvs-debian-import-n-X.patch (1.1 -> 1.2) , cvs-debian-info.patch (1.1 -> 1.2) , cvs-debian-keyword-alnum.patch (1.1 -> 1.2) , cvs-debian-l-opt.patch (1.1 -> 1.2) , cvs-debian-newlines-commit-template.patch (1.1 -> 1.2) , cvs-debian-normalize-roots.patch (1.1 -> 1.2) , cvs-debian-pam.patch (1.1 -> 1.2) , cvs-debian-parseopts.patch (1.1 -> 1.2) , cvs-debian-perms.patch (1.1 -> 1.2) , cvs-debian-rcs2log-sort.patch (1.1 -> 1.2) , cvs-debian-repouid.patch (1.1 -> 1.2) , cvs-debian-rsc2log.patch (1.1 -> 1.2) ,
cvs-debian-R-warning.patch (1.1 -> 1.2) , cvs-debian-server-wrapper.patch (1.1 -> 1.2) , cvs-debian-sparc.patch (1.1 -> 1.2) , cvs-debian-zlib-read-compressed.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/cvs-debian-64bit-crash.patch
diff -u SOURCES/cvs-debian-64bit-crash.patch:1.1 SOURCES/cvs-debian-64bit-crash.patch:1.2
--- SOURCES/cvs-debian-64bit-crash.patch:1.1 Tue Nov 6 08:40:29 2007
+++ SOURCES/cvs-debian-64bit-crash.patch Thu Nov 8 00:57:52 2007
@@ -1,18 +1,15 @@
---- cvs-1.12.13.orig/debian/patches/66_64bit_crashfix
-+++ cvs-1.12.13/debian/patches/66_64bit_crashfix
-@@ -0,0 +1,15 @@
-+# Fix a 64-bit crash in the entries_time() function and another bug in
-+# the diff code. Thanks to Gabor Gombas for the patch. Closes:
-+# #329127.
-+diff -ruN cvs-1.12.13-old/diff/util.c cvs-1.12.13/diff/util.c
-+--- cvs-1.12.13-old/diff/util.c 2003-02-03 03:52:38.000000000 +0800
-++++ cvs-1.12.13/diff/util.c 2006-02-26 21:32:22.000000000 +0800
-+@@ -235,7 +235,7 @@
-+ close (pipes[0]);
-+ }
-+
-+- execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, 0);
-++ execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, NULL);
-+ pfatal_with_name (PR_PROGRAM);
-+ }
-+ else
+# Fix a 64-bit crash in the entries_time() function and another bug in
+# the diff code. Thanks to Gabor Gombas for the patch. Closes:
+# #329127.
+diff -ruN cvs-1.12.13-old/diff/util.c cvs-1.12.13/diff/util.c
+--- cvs-1.12.13-old/diff/util.c 2003-02-03 03:52:38.000000000 +0800
++++ cvs-1.12.13/diff/util.c 2006-02-26 21:32:22.000000000 +0800
+@@ -235,7 +235,7 @@
+ close (pipes[0]);
+ }
+
+- execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, 0);
++ execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, NULL);
+ pfatal_with_name (PR_PROGRAM);
+ }
+ else
================================================================
Index: SOURCES/cvs-debian-check-method-crash.patch
diff -u SOURCES/cvs-debian-check-method-crash.patch:1.1 SOURCES/cvs-debian-check-method-crash.patch:1.2
--- SOURCES/cvs-debian-check-method-crash.patch:1.1 Tue Nov 6 08:40:29 2007
+++ SOURCES/cvs-debian-check-method-crash.patch Thu Nov 8 00:57:53 2007
@@ -1,24 +1,21 @@
---- cvs-1.12.13.orig/debian/patches/11_check_method_crash
-+++ cvs-1.12.13/debian/patches/11_check_method_crash
-@@ -0,0 +1,21 @@
-+#
-+# Do a basic sanity check on the method in the CVSROOT - don't crash
-+# if one is not specified! Bug#274020
-+#
-+# Patch from Steve McIntyre <steve at einval.com>
-+diff -ruN cvs-1.12.13-old/src/root.c cvs-1.12.13/src/root.c
-+--- cvs-1.12.13-old/src/root.c 2005-09-25 08:38:29.000000000 +0800
-++++ cvs-1.12.13/src/root.c 2006-02-26 17:48:32.000000000 +0800
-+@@ -535,6 +535,12 @@
-+ method = "";
-+ #endif /* defined (CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
-+
-++ if (NULL == method)
-++ {
-++ error (0, 0, "Missing method in CVSROOT.");
-++ goto error_exit;
-++ }
-++
-+ /* Now we have an access method -- see if it's valid. */
-+
-+ if (!strcasecmp (method, "local"))
+#
+# Do a basic sanity check on the method in the CVSROOT - don't crash
+# if one is not specified! Bug#274020
+#
+# Patch from Steve McIntyre <steve at einval.com>
+diff -ruN cvs-1.12.13-old/src/root.c cvs-1.12.13/src/root.c
+--- cvs-1.12.13-old/src/root.c 2005-09-25 08:38:29.000000000 +0800
++++ cvs-1.12.13/src/root.c 2006-02-26 17:48:32.000000000 +0800
+@@ -535,6 +535,12 @@
+ method = "";
+ #endif /* defined (CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
+
++ if (NULL == method)
++ {
++ error (0, 0, "Missing method in CVSROOT.");
++ goto error_exit;
++ }
++
+ /* Now we have an access method -- see if it's valid. */
+
+ if (!strcasecmp (method, "local"))
================================================================
Index: SOURCES/cvs-debian-cvsbug.patch
diff -u SOURCES/cvs-debian-cvsbug.patch:1.1 SOURCES/cvs-debian-cvsbug.patch:1.2
--- SOURCES/cvs-debian-cvsbug.patch:1.1 Tue Nov 6 08:40:30 2007
+++ SOURCES/cvs-debian-cvsbug.patch Thu Nov 8 00:57:53 2007
@@ -1,25 +1,22 @@
---- cvs-1.12.13.orig/debian/patches/71_cvsbug_tmpfix
-+++ cvs-1.12.13/debian/patches/71_cvsbug_tmpfix
-@@ -0,0 +1,22 @@
-+# Patch for a tmp race in cvsbug (in the source package; we don't ship
-+# the script as part of the package). Closes: #325106
-+diff -ruN cvs-1.12.13-old/src/cvsbug.in cvs-1.12.13/src/cvsbug.in
-+--- cvs-1.12.13-old/src/cvsbug.in 2003-02-26 05:31:33.000000000 +0800
-++++ cvs-1.12.13/src/cvsbug.in 2006-02-26 22:07:08.000000000 +0800
-+@@ -109,14 +109,14 @@
-+ /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
-+ cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-+ ORIGINATOR="`cat $TEMP`"
-+- rm -f $TEMP
-++ > $TEMP
-+ fi
-+ fi
-+
-+ if [ "$ORIGINATOR" = "" ]; then
-+ grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-+ ORIGINATOR="`cat $TEMP`"
-+- rm -f $TEMP
-++ > $TEMP
-+ fi
-+
-+ if [ -n "$ORGANIZATION" ]; then
+# Patch for a tmp race in cvsbug (in the source package; we don't ship
+# the script as part of the package). Closes: #325106
+diff -ruN cvs-1.12.13-old/src/cvsbug.in cvs-1.12.13/src/cvsbug.in
+--- cvs-1.12.13-old/src/cvsbug.in 2003-02-26 05:31:33.000000000 +0800
++++ cvs-1.12.13/src/cvsbug.in 2006-02-26 22:07:08.000000000 +0800
+@@ -109,14 +109,14 @@
+ /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
+ cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+ ORIGINATOR="`cat $TEMP`"
+- rm -f $TEMP
++ > $TEMP
+ fi
+ fi
+
+ if [ "$ORIGINATOR" = "" ]; then
+ grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+ ORIGINATOR="`cat $TEMP`"
+- rm -f $TEMP
++ > $TEMP
+ fi
+
+ if [ -n "$ORGANIZATION" ]; then
================================================================
Index: SOURCES/cvs-debian-cvspass.patch
diff -u SOURCES/cvs-debian-cvspass.patch:1.1 SOURCES/cvs-debian-cvspass.patch:1.2
--- SOURCES/cvs-debian-cvspass.patch:1.1 Tue Nov 6 08:40:30 2007
+++ SOURCES/cvs-debian-cvspass.patch Thu Nov 8 00:57:53 2007
@@ -1,22 +1,19 @@
---- cvs-1.12.13.orig/debian/patches/65_login_cvspass_message
-+++ cvs-1.12.13/debian/patches/65_login_cvspass_message
-@@ -0,0 +1,19 @@
-+# Print a clearer message if ~/.cvspass does not exist when cvs login is
-+# called. Closes: #168163.
-+#
-+# Patch by Steve McIntyre <steve at einval.com>
-+diff -ruN cvs-1.12.13-old/src/login.c cvs-1.12.13/src/login.c
-+--- cvs-1.12.13-old/src/login.c 2005-05-14 05:47:28.000000000 +0800
-++++ cvs-1.12.13/src/login.c 2006-02-26 21:31:17.000000000 +0800
-+@@ -309,7 +309,10 @@
-+ fp = CVS_FOPEN (passfile, "r");
-+ if (fp == NULL)
-+ {
-+- error (0, errno, "warning: failed to open %s for reading", passfile);
-++ if (errno == ENOENT)
-++ error (0, 0, "CVS password file %s does not exist - creating a new file", passfile);
-++ else
-++ error (0, errno, "warning: failed to open %s for reading", passfile);
-+ goto process;
-+ }
-+
+# Print a clearer message if ~/.cvspass does not exist when cvs login is
+# called. Closes: #168163.
+#
+# Patch by Steve McIntyre <steve at einval.com>
+diff -ruN cvs-1.12.13-old/src/login.c cvs-1.12.13/src/login.c
+--- cvs-1.12.13-old/src/login.c 2005-05-14 05:47:28.000000000 +0800
++++ cvs-1.12.13/src/login.c 2006-02-26 21:31:17.000000000 +0800
+@@ -309,7 +309,10 @@
+ fp = CVS_FOPEN (passfile, "r");
+ if (fp == NULL)
+ {
+- error (0, errno, "warning: failed to open %s for reading", passfile);
++ if (errno == ENOENT)
++ error (0, 0, "CVS password file %s does not exist - creating a new file", passfile);
++ else
++ error (0, errno, "warning: failed to open %s for reading", passfile);
+ goto process;
+ }
+
================================================================
Index: SOURCES/cvs-debian-cvsrc.patch
diff -u SOURCES/cvs-debian-cvsrc.patch:1.1 SOURCES/cvs-debian-cvsrc.patch:1.2
--- SOURCES/cvs-debian-cvsrc.patch:1.1 Tue Nov 6 08:40:30 2007
+++ SOURCES/cvs-debian-cvsrc.patch Thu Nov 8 00:57:53 2007
@@ -1,40 +1,37 @@
---- cvs-1.12.13.orig/debian/patches/62_cvsrc_whitespace
-+++ cvs-1.12.13/debian/patches/62_cvsrc_whitespace
-@@ -0,0 +1,37 @@
-+# Ignore leading whitespace in .cvsrc files. Closes: #212415. Thanks
-+# to James R. Van Zandt for the patch.
-+diff -ruN cvs-1.12.13-old/src/cvsrc.c cvs-1.12.13/src/cvsrc.c
-+--- cvs-1.12.13-old/src/cvsrc.c 2005-03-16 23:52:14.000000000 +0800
-++++ cvs-1.12.13/src/cvsrc.c 2006-02-26 18:25:18.000000000 +0800
-+@@ -41,6 +41,7 @@
-+ size_t line_chars_allocated;
-+
-+ char *optstart;
-++ int white_len;
-+
-+ int command_len;
-+ int found = 0;
-+@@ -96,9 +97,12 @@
-+ if (line[0] == '#')
-+ continue;
-+
-++ for (white_len=0; isspace(line[white_len]); white_len++)
-++ ;
-++
-+ /* stop if we match the current command */
-+- if (!strncmp (line, cmdname, command_len)
-+- && isspace ((unsigned char) *(line + command_len)))
-++ if (!strncmp (line + white_len, cmdname, command_len)
-++ && isspace ((unsigned char) *(line + white_len + command_len)))
-+ {
-+ found = 1;
-+ break;
-+@@ -120,7 +124,7 @@
-+ if (found)
-+ {
-+ /* skip over command in the options line */
-+- for (optstart = strtok (line + command_len, "\t \n");
-++ for (optstart = strtok (line + white_len + command_len, "\t \n");
-+ optstart;
-+ optstart = strtok (NULL, "\t \n"))
-+ {
+# Ignore leading whitespace in .cvsrc files. Closes: #212415. Thanks
+# to James R. Van Zandt for the patch.
+diff -ruN cvs-1.12.13-old/src/cvsrc.c cvs-1.12.13/src/cvsrc.c
+--- cvs-1.12.13-old/src/cvsrc.c 2005-03-16 23:52:14.000000000 +0800
++++ cvs-1.12.13/src/cvsrc.c 2006-02-26 18:25:18.000000000 +0800
+@@ -41,6 +41,7 @@
+ size_t line_chars_allocated;
+
+ char *optstart;
++ int white_len;
+
+ int command_len;
+ int found = 0;
+@@ -96,9 +97,12 @@
+ if (line[0] == '#')
+ continue;
+
++ for (white_len=0; isspace(line[white_len]); white_len++)
++ ;
++
+ /* stop if we match the current command */
+- if (!strncmp (line, cmdname, command_len)
+- && isspace ((unsigned char) *(line + command_len)))
++ if (!strncmp (line + white_len, cmdname, command_len)
++ && isspace ((unsigned char) *(line + white_len + command_len)))
+ {
+ found = 1;
+ break;
+@@ -120,7 +124,7 @@
+ if (found)
+ {
+ /* skip over command in the options line */
+- for (optstart = strtok (line + command_len, "\t \n");
++ for (optstart = strtok (line + white_len + command_len, "\t \n");
+ optstart;
+ optstart = strtok (NULL, "\t \n"))
+ {
================================================================
Index: SOURCES/cvs-debian-date-format.patch
diff -u SOURCES/cvs-debian-date-format.patch:1.1 SOURCES/cvs-debian-date-format.patch:1.2
--- SOURCES/cvs-debian-date-format.patch:1.1 Tue Nov 6 08:40:30 2007
+++ SOURCES/cvs-debian-date-format.patch Thu Nov 8 00:57:53 2007
@@ -1,154 +1,151 @@
---- cvs-1.12.13.orig/debian/patches/67_date_format_option
-+++ cvs-1.12.13/debian/patches/67_date_format_option
-@@ -0,0 +1,151 @@
-+#
-+# Add an extra option to set the DateFormat used in log output.
-+#
-+# Patch by Steve McIntyre <steve at einval.com>
-+diff -ruN cvs-1.12.13-old/doc/cvs.texinfo cvs-1.12.13/doc/cvs.texinfo
-+--- cvs-1.12.13-old/doc/cvs.texinfo 2005-09-23 10:02:53.000000000 +0800
-++++ cvs-1.12.13/doc/cvs.texinfo 2006-02-26 23:03:05.000000000 +0800
-+@@ -14840,9 +14840,17 @@
-+ group to using @code{cvs admin} to change the default keyword
-+ substitution mode, lock revisions, unlock revisions, and
-+ replace the log message, use @samp{UserAdminOptions=klum}.
-+- at end table
-+-
-+
-++ at cindex DateFormat, in CVSROOT/config
-++ at item DateFormat=@var{value}
-++Control the output format of dates from cvs. cvs version 1.12.x
-++changed the default format to use ``iso8601'' dates, which are
-++better for many reasons. However, old scripts/programs written to
-++parse the output of various cvs commands (especially cvs log) may
-++not cope with the change in date format (e.g. gcvs). The default
-++value of DateFormat will be ``iso8601'', but if you need temporary
-++backwards-compatibility set DateFormat=old.
-++ at end table
-+
-+ @c ---------------------------------------------------------------------
-+ @node Environment variables
-+diff -ruN cvs-1.12.13-old/src/log.c cvs-1.12.13/src/log.c
-+--- cvs-1.12.13-old/src/log.c 2005-03-22 21:19:57.000000000 +0800
-++++ cvs-1.12.13/src/log.c 2006-02-26 23:03:05.000000000 +0800
-+@@ -1607,8 +1607,12 @@
-+ &sec);
-+ if (year < 1900)
-+ year += 1900;
-+- sprintf (buf, "%04d-%02d-%02d %02d:%02d:%02d +0000", year, mon, mday,
-+- hour, min, sec);
-++ if ('-' == datesep)
-++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d +0000", year, datesep,
-++ mon, datesep, mday, hour, min, sec);
-++ else
-++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d", year, datesep,
-++ mon, datesep, mday, hour, min, sec);
-+ cvs_output_tagged ("date", buf);
-+
-+ cvs_output_tagged ("text", "; author: ");
-+diff -ruN cvs-1.12.13-old/src/main.c cvs-1.12.13/src/main.c
-+--- cvs-1.12.13-old/src/main.c 2006-02-26 23:03:04.000000000 +0800
-++++ cvs-1.12.13/src/main.c 2006-02-26 23:10:12.000000000 +0800
-+@@ -1371,9 +1371,19 @@
-+ static char buf[sizeof ("yyyy-mm-dd HH:MM:SS -HHMM")];
-+ /* Convert to a time in the local time zone. */
-+ struct tm ltm = *(localtime (&unixtime));
-+-
-+- if (!my_strftime (buf, sizeof (buf), "%Y-%m-%d %H:%M:%S %z", <m, 0, 0))
-+- return NULL;
-++ char *format = NULL;
-++
-++ switch (datesep)
-++ {
-++ case '/':
-++ format = "%Y/%m/%d %H:%M:%S";
-++ break;
-++ default:
-++ format = "%Y-%m-%d %H:%M:%S %z";
-++ break;
-++ }
-++ if (my_strftime (buf, sizeof (buf), format, <m, 0, 0) == 0)
-++ return NULL;
-+
-+ return xstrdup (buf);
-+ }
-+@@ -1388,9 +1398,19 @@
-+ static char buf[sizeof ("yyyy-mm-dd HH:MM:SS -HHMM")];
-+ /* Convert to a time in the local time zone. */
-+ struct tm ltm = *(gmtime (&unixtime));
-+-
-+- if (!my_strftime (buf, sizeof (buf), "%Y-%m-%d %H:%M:%S %z", <m, 0, 0))
-+- return NULL;
-++ char *format = NULL;
-++
-++ switch (datesep)
-++ {
-++ case '/':
-++ format = "%Y/%m/%d %H:%M:%S";
-++ break;
-++ default:
-++ format = "%Y-%m-%d %H:%M:%S %z";
-++ break;
-++ }
-++ if (my_strftime (buf, sizeof (buf), format, <m, 0, 0) == 0)
-++ return NULL;
-+
-+ return xstrdup (buf);
-+ }
-+diff -ruN cvs-1.12.13-old/src/parseinfo.c cvs-1.12.13/src/parseinfo.c
-+--- cvs-1.12.13-old/src/parseinfo.c 2005-09-06 12:40:37.000000000 +0800
-++++ cvs-1.12.13/src/parseinfo.c 2006-02-26 23:03:05.000000000 +0800
-+@@ -626,6 +626,19 @@
-+ retval->logHistory = xstrdup (p);
-+ }
-+ }
-++ /* grab FreeBSD date format idea */
-++ else if (strcmp (line, "DateFormat") == 0)
-++ {
-++ if (strcmp (p, "old") == 0)
-++ {
-++ datesep = '/';
-++ }
-++ else if (strcmp (p, "iso8601") == 0)
-++ {
-++ datesep = '-';
-++ }
-++ }
-++ /* end grabbing */
-+ else if (strcmp (line, "RereadLogAfterVerify") == 0)
-+ {
-+ if (!strcasecmp (p, "never"))
-+diff -ruN cvs-1.12.13-old/src/rcs.c cvs-1.12.13/src/rcs.c
-+--- cvs-1.12.13-old/src/rcs.c 2006-02-26 23:03:04.000000000 +0800
-++++ cvs-1.12.13/src/rcs.c 2006-02-26 23:03:05.000000000 +0800
-+@@ -33,6 +33,8 @@
-+ # endif
-+ #endif
-+
-++int datesep = '-';
-++
-+ /* The RCS -k options, and a set of enums that must match the array.
-+ These come first so that we can use enum kflag in function
-+ prototypes. */
-+@@ -3537,8 +3539,8 @@
-+ &sec);
-+ if (year < 1900)
-+ year += 1900;
-+- sprintf (buf, "%04d/%02d/%02d %02d:%02d:%02d", year, mon, mday,
-+- hour, min, sec);
-++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d", year, datesep, mon,
-++ datesep, mday, hour, min, sec);
-+ return xstrdup (buf);
-+ }
-+
-+diff -ruN cvs-1.12.13-old/src/rcs.h cvs-1.12.13/src/rcs.h
-+--- cvs-1.12.13-old/src/rcs.h 2005-03-18 06:36:24.000000000 +0800
-++++ cvs-1.12.13/src/rcs.h 2006-02-26 23:03:05.000000000 +0800
-+@@ -254,6 +254,7 @@
-+ void RCS_setlocalid (const char *, unsigned int, void **, const char *arg);
-+ char *make_file_label (const char *, const char *, RCSNode *);
-+
-++extern int datesep;
-+ extern bool preserve_perms;
-+
-+ /* From import.c. */
+#
+# Add an extra option to set the DateFormat used in log output.
+#
+# Patch by Steve McIntyre <steve at einval.com>
+diff -ruN cvs-1.12.13-old/doc/cvs.texinfo cvs-1.12.13/doc/cvs.texinfo
+--- cvs-1.12.13-old/doc/cvs.texinfo 2005-09-23 10:02:53.000000000 +0800
++++ cvs-1.12.13/doc/cvs.texinfo 2006-02-26 23:03:05.000000000 +0800
+@@ -14840,9 +14840,17 @@
+ group to using @code{cvs admin} to change the default keyword
+ substitution mode, lock revisions, unlock revisions, and
+ replace the log message, use @samp{UserAdminOptions=klum}.
+- at end table
+-
+
++ at cindex DateFormat, in CVSROOT/config
++ at item DateFormat=@var{value}
++Control the output format of dates from cvs. cvs version 1.12.x
++changed the default format to use ``iso8601'' dates, which are
++better for many reasons. However, old scripts/programs written to
++parse the output of various cvs commands (especially cvs log) may
++not cope with the change in date format (e.g. gcvs). The default
++value of DateFormat will be ``iso8601'', but if you need temporary
++backwards-compatibility set DateFormat=old.
++ at end table
+
+ @c ---------------------------------------------------------------------
+ @node Environment variables
+diff -ruN cvs-1.12.13-old/src/log.c cvs-1.12.13/src/log.c
+--- cvs-1.12.13-old/src/log.c 2005-03-22 21:19:57.000000000 +0800
++++ cvs-1.12.13/src/log.c 2006-02-26 23:03:05.000000000 +0800
+@@ -1607,8 +1607,12 @@
+ &sec);
+ if (year < 1900)
+ year += 1900;
+- sprintf (buf, "%04d-%02d-%02d %02d:%02d:%02d +0000", year, mon, mday,
+- hour, min, sec);
++ if ('-' == datesep)
++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d +0000", year, datesep,
++ mon, datesep, mday, hour, min, sec);
++ else
++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d", year, datesep,
++ mon, datesep, mday, hour, min, sec);
+ cvs_output_tagged ("date", buf);
+
+ cvs_output_tagged ("text", "; author: ");
+diff -ruN cvs-1.12.13-old/src/main.c cvs-1.12.13/src/main.c
+--- cvs-1.12.13-old/src/main.c 2006-02-26 23:03:04.000000000 +0800
++++ cvs-1.12.13/src/main.c 2006-02-26 23:10:12.000000000 +0800
+@@ -1371,9 +1371,19 @@
+ static char buf[sizeof ("yyyy-mm-dd HH:MM:SS -HHMM")];
+ /* Convert to a time in the local time zone. */
+ struct tm ltm = *(localtime (&unixtime));
+-
+- if (!my_strftime (buf, sizeof (buf), "%Y-%m-%d %H:%M:%S %z", <m, 0, 0))
+- return NULL;
++ char *format = NULL;
++
++ switch (datesep)
++ {
++ case '/':
++ format = "%Y/%m/%d %H:%M:%S";
++ break;
++ default:
++ format = "%Y-%m-%d %H:%M:%S %z";
++ break;
++ }
++ if (my_strftime (buf, sizeof (buf), format, <m, 0, 0) == 0)
++ return NULL;
+
+ return xstrdup (buf);
+ }
+@@ -1388,9 +1398,19 @@
+ static char buf[sizeof ("yyyy-mm-dd HH:MM:SS -HHMM")];
+ /* Convert to a time in the local time zone. */
+ struct tm ltm = *(gmtime (&unixtime));
+-
+- if (!my_strftime (buf, sizeof (buf), "%Y-%m-%d %H:%M:%S %z", <m, 0, 0))
+- return NULL;
++ char *format = NULL;
++
++ switch (datesep)
++ {
++ case '/':
++ format = "%Y/%m/%d %H:%M:%S";
++ break;
++ default:
++ format = "%Y-%m-%d %H:%M:%S %z";
++ break;
++ }
++ if (my_strftime (buf, sizeof (buf), format, <m, 0, 0) == 0)
++ return NULL;
+
+ return xstrdup (buf);
+ }
+diff -ruN cvs-1.12.13-old/src/parseinfo.c cvs-1.12.13/src/parseinfo.c
+--- cvs-1.12.13-old/src/parseinfo.c 2005-09-06 12:40:37.000000000 +0800
++++ cvs-1.12.13/src/parseinfo.c 2006-02-26 23:03:05.000000000 +0800
+@@ -626,6 +626,19 @@
+ retval->logHistory = xstrdup (p);
+ }
+ }
++ /* grab FreeBSD date format idea */
++ else if (strcmp (line, "DateFormat") == 0)
++ {
++ if (strcmp (p, "old") == 0)
++ {
++ datesep = '/';
++ }
++ else if (strcmp (p, "iso8601") == 0)
++ {
++ datesep = '-';
++ }
++ }
++ /* end grabbing */
+ else if (strcmp (line, "RereadLogAfterVerify") == 0)
+ {
+ if (!strcasecmp (p, "never"))
+diff -ruN cvs-1.12.13-old/src/rcs.c cvs-1.12.13/src/rcs.c
+--- cvs-1.12.13-old/src/rcs.c 2006-02-26 23:03:04.000000000 +0800
++++ cvs-1.12.13/src/rcs.c 2006-02-26 23:03:05.000000000 +0800
+@@ -33,6 +33,8 @@
+ # endif
+ #endif
+
++int datesep = '-';
++
+ /* The RCS -k options, and a set of enums that must match the array.
+ These come first so that we can use enum kflag in function
+ prototypes. */
+@@ -3537,8 +3539,8 @@
+ &sec);
+ if (year < 1900)
+ year += 1900;
+- sprintf (buf, "%04d/%02d/%02d %02d:%02d:%02d", year, mon, mday,
+- hour, min, sec);
++ sprintf (buf, "%04d%c%02d%c%02d %02d:%02d:%02d", year, datesep, mon,
++ datesep, mday, hour, min, sec);
+ return xstrdup (buf);
+ }
+
+diff -ruN cvs-1.12.13-old/src/rcs.h cvs-1.12.13/src/rcs.h
+--- cvs-1.12.13-old/src/rcs.h 2005-03-18 06:36:24.000000000 +0800
++++ cvs-1.12.13/src/rcs.h 2006-02-26 23:03:05.000000000 +0800
+@@ -254,6 +254,7 @@
+ void RCS_setlocalid (const char *, unsigned int, void **, const char *arg);
+ char *make_file_label (const char *, const char *, RCSNode *);
+
++extern int datesep;
+ extern bool preserve_perms;
+
+ /* From import.c. */
================================================================
Index: SOURCES/cvs-debian-dsa-ext-pwd.patch
diff -u SOURCES/cvs-debian-dsa-ext-pwd.patch:1.1 SOURCES/cvs-debian-dsa-ext-pwd.patch:1.2
--- SOURCES/cvs-debian-dsa-ext-pwd.patch:1.1 Tue Nov 6 08:40:30 2007
+++ SOURCES/cvs-debian-dsa-ext-pwd.patch Thu Nov 8 00:57:53 2007
@@ -1,391 +1,388 @@
---- cvs-1.12.13.orig/debian/patches/68_DSA_external_passwd_file
-+++ cvs-1.12.13/debian/patches/68_DSA_external_passwd_file
-@@ -0,0 +1,388 @@
-+# Add support for overriding lookups in CVSROOT/passwd
-+# Specify --password-file <file> on the pserver command line to use it
-+# Initial patch from the Debian DSA team, adapted by Steve McIntyre.
-+# See README.Debian for more details.
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-64bit-crash.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-check-method-crash.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-cvsbug.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-cvspass.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-cvsrc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-date-format.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-dsa-ext-pwd.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-ext-exp.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-extra-tags.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-flag-conflicted-copies.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-homedir.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-import-n-X.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-info.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-keyword-alnum.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-l-opt.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-newlines-commit-template.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-normalize-roots.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-pam.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-parseopts.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-perms.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-rcs2log-sort.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-repouid.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-rsc2log.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-R-warning.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-server-wrapper.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-sparc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cvs-debian-zlib-read-compressed.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list