packages: cvs-nserver/cvs-nserver-getline.patch (NEW) - fix conflict with n...
baggins
baggins at pld-linux.org
Sat Jul 4 00:37:00 CEST 2009
Author: baggins Date: Fri Jul 3 22:37:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix conflict with new glibc
---- Files affected:
packages/cvs-nserver:
cvs-nserver-getline.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cvs-nserver/cvs-nserver-getline.patch
diff -u /dev/null packages/cvs-nserver/cvs-nserver-getline.patch:1.1
--- /dev/null Sat Jul 4 00:37:00 2009
+++ packages/cvs-nserver/cvs-nserver-getline.patch Sat Jul 4 00:36:55 2009
@@ -0,0 +1,389 @@
+diff -ur cvs-nserver-1.11.1.52/lib/getline.c cvs-nserver-1.11.1.52-getline/lib/getline.c
+--- cvs-nserver-1.11.1.52/lib/getline.c 2000-12-01 00:50:43.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/lib/getline.c 2009-07-04 00:33:52.556620165 +0200
+@@ -154,7 +154,7 @@
+ }
+
+ int
+-getline (lineptr, n, stream)
++cvs_getline (lineptr, n, stream)
+ char **lineptr;
+ size_t *n;
+ FILE *stream;
+@@ -163,7 +163,7 @@
+ }
+
+ int
+-getline_safe (lineptr, n, stream, limit)
++cvs_getline_safe (lineptr, n, stream, limit)
+ char **lineptr;
+ size_t *n;
+ FILE *stream;
+diff -ur cvs-nserver-1.11.1.52/lib/getline.h cvs-nserver-1.11.1.52-getline/lib/getline.h
+--- cvs-nserver-1.11.1.52/lib/getline.h 2000-12-01 00:50:43.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/lib/getline.h 2009-07-04 00:32:03.262674181 +0200
+@@ -12,9 +12,9 @@
+ #define GETLINE_NO_LIMIT -1
+
+ int
+- getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++ cvs_getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+ int
+- getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
++ cvs_getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+ int limit));
+ int
+ getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+diff -ur cvs-nserver-1.11.1.52/src/client.c cvs-nserver-1.11.1.52-getline/src/client.c
+--- cvs-nserver-1.11.1.52/src/client.c 2009-07-04 00:34:22.252366910 +0200
++++ cvs-nserver-1.11.1.52-getline/src/client.c 2009-07-04 00:33:52.496617548 +0200
+@@ -5007,7 +5007,7 @@
+ char *p;
+
+ fp = open_file (CVSADM_NOTIFY, "r");
+- if (getline (&line, &line_len, fp) < 0)
++ if (cvs_getline (&line, &line_len, fp) < 0)
+ {
+ if (feof (fp))
+ error (0, 0, "cannot read %s: end of file", CVSADM_NOTIFY);
+@@ -5028,7 +5028,7 @@
+ line + 1);
+ }
+
+- if (getline (&line, &line_len, fp) < 0)
++ if (cvs_getline (&line, &line_len, fp) < 0)
+ {
+ if (feof (fp))
+ {
+diff -ur cvs-nserver-1.11.1.52/src/commit.c cvs-nserver-1.11.1.52-getline/src/commit.c
+--- cvs-nserver-1.11.1.52/src/commit.c 2009-07-04 00:34:22.222367462 +0200
++++ cvs-nserver-1.11.1.52-getline/src/commit.c 2009-07-04 00:33:52.449617374 +0200
+@@ -1488,7 +1488,7 @@
+
+ line = NULL;
+ line_chars_allocated = 0;
+- line_length = getline (&line, &line_chars_allocated, fp);
++ line_length = cvs_getline (&line, &line_chars_allocated, fp);
+ if (line_length > 0)
+ {
+ /* Remove any trailing newline. */
+diff -ur cvs-nserver-1.11.1.52/src/cvspasswd.c cvs-nserver-1.11.1.52-getline/src/cvspasswd.c
+--- cvs-nserver-1.11.1.52/src/cvspasswd.c 2001-09-08 19:26:57.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/cvspasswd.c 2009-07-04 00:33:52.400617520 +0200
+@@ -176,7 +176,7 @@
+
+ /* first check user and/or password */
+
+- while (getline (&passwd_line, &passwd_line_allocated, CVSPASSWD) != -1)
++ while (cvs_getline (&passwd_line, &passwd_line_allocated, CVSPASSWD) != -1)
+ {
+ assert(strlen(passwd_line) > 0);
+ passwd_line[strlen(passwd_line) - 1] = '\0';
+diff -ur cvs-nserver-1.11.1.52/src/cvspasswd-file.c cvs-nserver-1.11.1.52-getline/src/cvspasswd-file.c
+--- cvs-nserver-1.11.1.52/src/cvspasswd-file.c 2009-07-04 00:34:22.254366550 +0200
++++ cvs-nserver-1.11.1.52-getline/src/cvspasswd-file.c 2009-07-04 00:33:52.497617308 +0200
+@@ -65,7 +65,7 @@
+ char *passwd_line = NULL;
+ size_t passwd_line_allocated = 0;
+
+- while (getline(&passwd_line, &passwd_line_allocated, cvspasswd) != -1)
++ while (cvs_getline(&passwd_line, &passwd_line_allocated, cvspasswd) != -1)
+ {
+ char *field_user, *field_password;
+
+diff -ur cvs-nserver-1.11.1.52/src/cvsrc.c cvs-nserver-1.11.1.52-getline/src/cvsrc.c
+--- cvs-nserver-1.11.1.52/src/cvsrc.c 2009-07-04 00:34:22.178367490 +0200
++++ cvs-nserver-1.11.1.52-getline/src/cvsrc.c 2009-07-04 00:33:52.409619722 +0200
+@@ -116,7 +116,7 @@
+ line_chars_allocated = 0;
+ command_len = strlen (cmdname);
+ cvsrcfile = open_file (homeinit, "r");
+- while ((line_length = getline (&line, &line_chars_allocated, cvsrcfile))
++ while ((line_length = cvs_getline (&line, &line_chars_allocated, cvsrcfile))
+ >= 0)
+ {
+ /* skip over comment lines */
+diff -ur cvs-nserver-1.11.1.52/src/edit.c cvs-nserver-1.11.1.52-getline/src/edit.c
+--- cvs-nserver-1.11.1.52/src/edit.c 2001-09-24 00:13:09.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/edit.c 2009-07-04 00:33:52.311617374 +0200
+@@ -178,7 +178,7 @@
+ return 0;
+ }
+
+- while (getline (&line, &line_len, fp) > 0)
++ while (cvs_getline (&line, &line_len, fp) > 0)
+ {
+ notif_type = line[0];
+ if (notif_type == '\0')
+@@ -891,7 +891,7 @@
+ error (0, errno, "cannot read %s", usersname);
+ if (fp != NULL)
+ {
+- while (getline (&line, &line_len, fp) >= 0)
++ while (cvs_getline (&line, &line_len, fp) >= 0)
+ {
+ if (strncmp (line, p, len) == 0
+ && line[len] == ':')
+@@ -995,7 +995,7 @@
+ error (0, errno, "cannot open %s", CVSADM_NOTIFY);
+ return;
+ }
+- while (getline (&line, &line_len, fp) > 0)
++ while (cvs_getline (&line, &line_len, fp) > 0)
+ {
+ int notif_type;
+ char *filename;
+diff -ur cvs-nserver-1.11.1.52/src/entries.c cvs-nserver-1.11.1.52-getline/src/entries.c
+--- cvs-nserver-1.11.1.52/src/entries.c 2001-05-19 14:05:04.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/entries.c 2009-07-04 00:33:52.316617855 +0200
+@@ -302,7 +302,7 @@
+ line_chars_allocated = 0;
+
+ ent = NULL;
+- while ((line_length = getline (&line, &line_chars_allocated, fpin)) > 0)
++ while ((line_length = cvs_getline (&line, &line_chars_allocated, fpin)) > 0)
+ {
+ l = line;
+
+@@ -737,7 +737,7 @@
+ line = NULL;
+ line_chars_allocated = 0;
+
+- if ((line_length = getline (&line, &line_chars_allocated, fp)) > 0)
++ if ((line_length = cvs_getline (&line, &line_chars_allocated, fp)) > 0)
+ {
+ /* Remove any trailing newline. */
+ if (line[line_length - 1] == '\n')
+@@ -1070,7 +1070,7 @@
+
+ if (fp != NULL)
+ {
+- while (getline (&line, &line_allocated, fp) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp) >= 0)
+ {
+ char *linefile;
+ char *p;
+diff -ur cvs-nserver-1.11.1.52/src/fileattr.c cvs-nserver-1.11.1.52-getline/src/fileattr.c
+--- cvs-nserver-1.11.1.52/src/fileattr.c 2000-12-01 00:50:46.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/src/fileattr.c 2009-07-04 00:33:52.320617816 +0200
+@@ -100,7 +100,7 @@
+ attrlist = getlist ();
+ while (1) {
+ int nread;
+- nread = getline (&line, &line_len, fp);
++ nread = cvs_getline (&line, &line_len, fp);
+ if (nread < 0)
+ break;
+ /* Remove trailing newline. */
+diff -ur cvs-nserver-1.11.1.52/src/ignore.c cvs-nserver-1.11.1.52-getline/src/ignore.c
+--- cvs-nserver-1.11.1.52/src/ignore.c 2001-05-26 14:43:51.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/ignore.c 2009-07-04 00:33:52.327617418 +0200
+@@ -164,7 +164,7 @@
+ error (0, errno, "cannot open %s", file);
+ return;
+ }
+- while (getline (&line, &line_allocated, fp) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp) >= 0)
+ ign_add (line, hold);
+ if (ferror (fp))
+ error (0, errno, "cannot read %s", file);
+diff -ur cvs-nserver-1.11.1.52/src/login.c cvs-nserver-1.11.1.52-getline/src/login.c
+--- cvs-nserver-1.11.1.52/src/login.c 2009-07-04 00:34:22.178367490 +0200
++++ cvs-nserver-1.11.1.52-getline/src/login.c 2009-07-04 00:33:52.411617563 +0200
+@@ -363,7 +363,7 @@
+
+ /* Check each line to see if we have this entry already. */
+ line = 0;
+- while ((line_length = getline (&linebuf, &linebuf_len, fp)) >= 0)
++ while ((line_length = cvs_getline (&linebuf, &linebuf_len, fp)) >= 0)
+ {
+ line++;
+ password = password_entry_parseline(cvsroot_canonical, 1, line, linebuf);
+@@ -432,7 +432,7 @@
+ error (1, errno, "unable to open temp file %s", tmp_name);
+
+ line = 0;
+- while ((line_length = getline (&linebuf, &linebuf_len, fp)) >= 0)
++ while ((line_length = cvs_getline (&linebuf, &linebuf_len, fp)) >= 0)
+ {
+ line++;
+ if (line < found_at
+diff -ur cvs-nserver-1.11.1.52/src/logmsg.c cvs-nserver-1.11.1.52-getline/src/logmsg.c
+--- cvs-nserver-1.11.1.52/src/logmsg.c 2001-09-23 13:29:21.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/logmsg.c 2009-07-04 00:33:52.344617823 +0200
+@@ -321,7 +321,7 @@
+ size_t offset = 0;
+ while (1)
+ {
+- line_length = getline (&line, &line_chars_allocated, fp);
++ line_length = cvs_getline (&line, &line_chars_allocated, fp);
+ if (line_length == -1)
+ {
+ if (ferror (fp))
+@@ -350,7 +350,7 @@
+ (void) printf ("a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs\n");
+ (void) printf ("Action: (continue) ");
+ (void) fflush (stdout);
+- line_length = getline (&line, &line_chars_allocated, stdin);
++ line_length = cvs_getline (&line, &line_chars_allocated, stdin);
+ if (line_length < 0)
+ {
+ error (0, errno, "cannot read from stdin");
+@@ -491,7 +491,7 @@
+ char *line = NULL;
+ size_t line_chars_allocated = 0;
+
+- while (getline (&line, &line_chars_allocated, tfp) >= 0)
++ while (cvs_getline (&line, &line_chars_allocated, tfp) >= 0)
+ (void) fputs (line, fp);
+ if (ferror (tfp))
+ error (0, errno, "warning: cannot read %s", template);
+diff -ur cvs-nserver-1.11.1.52/src/mkmodules.c cvs-nserver-1.11.1.52-getline/src/mkmodules.c
+--- cvs-nserver-1.11.1.52/src/mkmodules.c 2001-06-16 21:14:10.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/mkmodules.c 2009-07-04 00:33:52.350617465 +0200
+@@ -451,7 +451,7 @@
+ *
+ * comment lines begin with '#'
+ */
+- while (getline (&line, &line_allocated, fp) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp) >= 0)
+ {
+ /* skip lines starting with # */
+ if (line[0] == '#')
+diff -ur cvs-nserver-1.11.1.52/src/parseinfo.c cvs-nserver-1.11.1.52-getline/src/parseinfo.c
+--- cvs-nserver-1.11.1.52/src/parseinfo.c 2001-11-20 22:26:06.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/src/parseinfo.c 2009-07-04 00:33:52.353617386 +0200
+@@ -72,7 +72,7 @@
+
+ /* search the info file for lines that match */
+ callback_done = line_number = 0;
+- while (getline (&line, &line_allocated, fp_info) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp_info) >= 0)
+ {
+ line_number++;
+
+@@ -261,7 +261,7 @@
+ return 0;
+ }
+
+- while (getline (&line, &line_allocated, fp_info) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp_info) >= 0)
+ {
+ /* Skip comments. */
+ if (line[0] == '#')
+diff -ur cvs-nserver-1.11.1.52/src/patch.c cvs-nserver-1.11.1.52-getline/src/patch.c
+--- cvs-nserver-1.11.1.52/src/patch.c 2001-11-20 22:29:17.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/src/patch.c 2009-07-04 00:33:52.357619467 +0200
+@@ -613,8 +613,8 @@
+ cvs_output ("\n", 1);
+
+ fp = open_file (tmpfile3, "r");
+- if (getline (&line1, &line1_chars_allocated, fp) < 0 ||
+- getline (&line2, &line2_chars_allocated, fp) < 0)
++ if (cvs_getline (&line1, &line1_chars_allocated, fp) < 0 ||
++ cvs_getline (&line2, &line2_chars_allocated, fp) < 0)
+ {
+ if (feof (fp))
+ error (0, 0, "\
+@@ -719,7 +719,7 @@
+
+ /* spew the rest of the diff out */
+ while ((line_length
+- = getline (&line1, &line1_chars_allocated, fp))
++ = cvs_getline (&line1, &line1_chars_allocated, fp))
+ >= 0)
+ cvs_output (line1, 0);
+ if (line_length < 0 && !feof (fp))
+diff -ur cvs-nserver-1.11.1.52/src/release.c cvs-nserver-1.11.1.52-getline/src/release.c
+--- cvs-nserver-1.11.1.52/src/release.c 2001-10-13 17:21:56.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/release.c 2009-07-04 00:33:52.366617869 +0200
+@@ -188,7 +188,7 @@
+
+ c = 0;
+
+- while ((line_length = getline (&line, &line_allocated, fp)) >= 0)
++ while ((line_length = cvs_getline (&line, &line_allocated, fp)) >= 0)
+ {
+ if (strchr ("MARCZ", *line))
+ c++;
+diff -ur cvs-nserver-1.11.1.52/src/repos.c cvs-nserver-1.11.1.52-getline/src/repos.c
+--- cvs-nserver-1.11.1.52/src/repos.c 2001-09-23 00:28:58.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/repos.c 2009-07-04 00:33:52.368618270 +0200
+@@ -91,7 +91,7 @@
+ error (1, save_errno, "cannot open %s", tmp);
+ }
+
+- if (getline (&repos, &repos_allocated, fpin) < 0)
++ if (cvs_getline (&repos, &repos_allocated, fpin) < 0)
+ {
+ /* FIXME: should be checking for end of file separately. */
+ error (0, 0, "in directory %s:", xupdate_dir);
+diff -ur cvs-nserver-1.11.1.52/src/root.c cvs-nserver-1.11.1.52-getline/src/root.c
+--- cvs-nserver-1.11.1.52/src/root.c 2001-11-20 21:22:15.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/src/root.c 2009-07-04 00:33:52.370617391 +0200
+@@ -75,7 +75,7 @@
+ */
+ fpin = open_file (tmp, "r");
+
+- if (getline (&root, &root_allocated, fpin) < 0)
++ if (cvs_getline (&root, &root_allocated, fpin) < 0)
+ {
+ /* FIXME: should be checking for end of file separately; errno
+ is not set in that case. */
+diff -ur cvs-nserver-1.11.1.52/src/server.c cvs-nserver-1.11.1.52-getline/src/server.c
+--- cvs-nserver-1.11.1.52/src/server.c 2009-07-04 00:34:22.248367469 +0200
++++ cvs-nserver-1.11.1.52-getline/src/server.c 2009-07-04 00:33:52.480617263 +0200
+@@ -2582,7 +2582,7 @@
+ }
+ else /* successfully opened readers file */
+ {
+- while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
++ while ((num_red = cvs_getline (&linebuf, &linebuf_len, fp)) >= 0)
+ {
+ /* Hmmm, is it worth importing my own readline
+ library into CVS? It takes care of chopping
+@@ -2643,7 +2643,7 @@
+ }
+
+ found_it = 0;
+- while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
++ while ((num_red = cvs_getline (&linebuf, &linebuf_len, fp)) >= 0)
+ {
+ /* Chop newline by hand, for strcmp()'s sake. */
+ if (linebuf[num_red - 1] == '\n')
+diff -ur cvs-nserver-1.11.1.52/src/subr.c cvs-nserver-1.11.1.52-getline/src/subr.c
+--- cvs-nserver-1.11.1.52/src/subr.c 2001-09-08 19:26:21.000000000 +0200
++++ cvs-nserver-1.11.1.52-getline/src/subr.c 2009-07-04 00:33:52.377617913 +0200
+@@ -610,7 +610,7 @@
+ fp = CVS_FOPEN (finfo->file, "r");
+ if (fp == NULL)
+ error (1, errno, "cannot open %s", finfo->fullname);
+- while (getline (&line, &line_allocated, fp) > 0)
++ while (cvs_getline (&line, &line_allocated, fp) > 0)
+ {
+ if (strncmp (line, RCS_MERGE_PAT_1, sizeof RCS_MERGE_PAT_1 - 1) == 0 ||
+ strncmp (line, RCS_MERGE_PAT_2, sizeof RCS_MERGE_PAT_2 - 1) == 0 ||
+diff -ur cvs-nserver-1.11.1.52/src/update.c cvs-nserver-1.11.1.52-getline/src/update.c
+--- cvs-nserver-1.11.1.52/src/update.c 2002-03-10 03:25:35.000000000 +0100
++++ cvs-nserver-1.11.1.52-getline/src/update.c 2009-07-04 00:33:52.391617677 +0200
+@@ -1115,7 +1115,7 @@
+ size_t line_allocated = 0;
+
+ repository = Name_Repository ((char *) NULL, update_dir);
+- if (getline (&line, &line_allocated, fp) >= 0)
++ if (cvs_getline (&line, &line_allocated, fp) >= 0)
+ {
+ if ((cp = strrchr (line, '\n')) != NULL)
+ *cp = '\0';
+diff -ur cvs-nserver-1.11.1.52/src/wrapper.c cvs-nserver-1.11.1.52-getline/src/wrapper.c
+--- cvs-nserver-1.11.1.52/src/wrapper.c 2009-07-04 00:34:22.244367428 +0200
++++ cvs-nserver-1.11.1.52-getline/src/wrapper.c 2009-07-04 00:33:52.460617417 +0200
+@@ -300,7 +300,7 @@
+ error (0, errno, "cannot open %s", file);
+ return;
+ }
+- while (getline (&line, &line_allocated, fp) >= 0)
++ while (cvs_getline (&line, &line_allocated, fp) >= 0)
+ wrap_add (line, temp);
+ if (line)
+ free (line);
================================================================
More information about the pld-cvs-commit
mailing list