Author: aurel32
Date: 2008-11-03 22:24:44 +0000 (Mon, 03 Nov 2008)
New Revision: 3184
Added:
glibc-package/trunk/debian/patches/any/cvs-rpcgen-makefile.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-rpcgen-makefile.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Replace submitted-rpcgen-makefile.diff by cvs-rpcgen-makefile.diff (accepted
upstream)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-11-03 07:19:39 UTC (rev
3183)
+++ glibc-package/trunk/debian/changelog 2008-11-03 22:24:44 UTC (rev
3184)
@@ -1,9 +1,9 @@
glibc (2.7-16) unstable; urgency=low
- * patches/any/submitted-rpcgen-makefile.diff: new patch to fix fancy
- Makefile filename when using rpcgen -a. Closes: bug#503182.
+ * patches/any/cvs-rpcgen-makefile.diff: new patch from upstream to fix
+ fancy Makefile filename when using rpcgen -a. Closes: bug#503182.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 23 Oct 2008 15:39:04 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 03 Nov 2008 23:00:07 +0100
glibc (2.7-15) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-rpcgen-makefile.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-rpcgen-makefile.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-rpcgen-makefile.diff
2008-11-03 22:24:44 UTC (rev 3184)
@@ -0,0 +1,22 @@
+2008-10-31 Ulrich Drepper <[EMAIL PROTECTED]>
+
+ [BZ #6974]
+ * sunrpc/rpc_main.c (mkfile_output): Properly handle filename
+ without dot. Properly terminate the string with a null byte.
+ Based on a patch by Aurelien Jarno <[EMAIL PROTECTED]>.
+
+--- a/sunrpc/rpc_main.c
++++ b/sunrpc/rpc_main.c
+@@ -995,7 +995,11 @@ mkfile_output (struct commandline *cmd)
+ abort ();
+ temp = rindex (cmd->infile, '.');
+ cp = stpcpy (mkfilename, "Makefile.");
+- strncpy (cp, cmd->infile, (temp - cmd->infile));
++ if (temp != NULL)
++ *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
++ else
++ stpcpy (cp, cmd->infile);
++
+ }
+ else
+ mkfilename = (char *) cmd->outfile;
Deleted: glibc-package/trunk/debian/patches/any/submitted-rpcgen-makefile.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-rpcgen-makefile.diff
2008-11-03 07:19:39 UTC (rev 3183)
+++ glibc-package/trunk/debian/patches/any/submitted-rpcgen-makefile.diff
2008-11-03 22:24:44 UTC (rev 3184)
@@ -1,23 +0,0 @@
-2008-10-23 Aurelien Jarno <[EMAIL PROTECTED]>
-
- * sunrpc/rpc_main.c(mkfile_output): Properly handle filename
- without dot. Properly terminate the string with a null byte.
-
-diff a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -995,7 +995,13 @@ mkfile_output (struct commandline *cmd)
- abort ();
- temp = rindex (cmd->infile, '.');
- cp = stpcpy (mkfilename, "Makefile.");
-- strncpy (cp, cmd->infile, (temp - cmd->infile));
-+ if (temp)
-+ {
-+ strncpy (cp, cmd->infile, (temp - cmd->infile));
-+ cp[temp - cmd->infile] = '\0';
-+ }
-+ else
-+ strcpy (cp, cmd->infile);
- }
- else
- mkfilename = (char *) cmd->outfile;
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-11-03 07:19:39 UTC (rev
3183)
+++ glibc-package/trunk/debian/patches/series 2008-11-03 22:24:44 UTC (rev
3184)
@@ -168,6 +168,7 @@
any/cvs-regex_anchor.diff
any/cvs-sunrpc_rpc_thread.diff
any/cvs-strerror_r.diff
+any/cvs-rpcgen-makefile.diff
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
any/local-bashisms.diff -p0
@@ -225,4 +226,3 @@
#any/submitted-fileops-and-signals.diff
any/local-missing-linux_types.h.diff
any/submitted-user_h.diff -p1
-any/submitted-rpcgen-makefile.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
