diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-09 20:32:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-09 20:32:14 +0000 |
| commit | b4d29466958223fb48928e9b4a68e02a29723f1b (patch) | |
| tree | 9ab928bca5a0d055abcab290d86c496fe37478cb /sys-apps/ed/files | |
| parent | Stable on alpha, bug 77025. (Manifest recommit) (diff) | |
| download | gentoo-2-b4d29466958223fb48928e9b4a68e02a29723f1b.tar.gz gentoo-2-b4d29466958223fb48928e9b4a68e02a29723f1b.tar.bz2 gentoo-2-b4d29466958223fb48928e9b4a68e02a29723f1b.zip | |
Push to stable. Only run make the autoconf stuff when cross-compiling #76038.
Diffstat (limited to 'sys-apps/ed/files')
| -rw-r--r-- | sys-apps/ed/files/0.2-mkstemp.patch | 9 | ||||
| -rw-r--r-- | sys-apps/ed/files/0.2-r5-mkstemp.patch | 32 | ||||
| -rw-r--r-- | sys-apps/ed/files/digest-ed-0.2-r4 | 1 |
3 files changed, 8 insertions, 34 deletions
diff --git a/sys-apps/ed/files/0.2-mkstemp.patch b/sys-apps/ed/files/0.2-mkstemp.patch index 6103a2d088dd..4223f85a4fc2 100644 --- a/sys-apps/ed/files/0.2-mkstemp.patch +++ b/sys-apps/ed/files/0.2-mkstemp.patch @@ -1,8 +1,15 @@ +This is based on the following: +=== Submitted By: LFS Book <lfs-book@linuxfromscratch.org> Date: 2003-10-05 Initial Package Version: 0.2 Origin: Slackware Source Description: Use mkstemp instead of mktemp. +=== +However the original patch contained an error. +mkstemp returns a file description, so when fopen ran, the file was opened twice. +The correct change is to use fdopen with mkstemp. +See gentoo bug #73858. diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c --- ed-0.2/buf.c Sat Nov 19 04:37:59 1994 +++ ed-0.2-2/buf.c Tue May 28 18:38:23 2002 @@ -19,7 +26,7 @@ diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c strcpy (sfn, "/tmp/ed.XXXXXX"); - if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL) + sfd = mkstemp(sfn); -+ if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL) ++ if ((sfd == -1) || (sfp = fdopen (sfn, "w+")) == NULL) { fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); sprintf (errmsg, "Cannot open temp file"); diff --git a/sys-apps/ed/files/0.2-r5-mkstemp.patch b/sys-apps/ed/files/0.2-r5-mkstemp.patch deleted file mode 100644 index 4223f85a4fc2..000000000000 --- a/sys-apps/ed/files/0.2-r5-mkstemp.patch +++ /dev/null @@ -1,32 +0,0 @@ -This is based on the following: -=== -Submitted By: LFS Book <lfs-book@linuxfromscratch.org> -Date: 2003-10-05 -Initial Package Version: 0.2 -Origin: Slackware Source -Description: Use mkstemp instead of mktemp. -=== -However the original patch contained an error. -mkstemp returns a file description, so when fopen ran, the file was opened twice. -The correct change is to use fdopen with mkstemp. -See gentoo bug #73858. -diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c ---- ed-0.2/buf.c Sat Nov 19 04:37:59 1994 -+++ ed-0.2-2/buf.c Tue May 28 18:38:23 2002 -@@ -200,13 +200,13 @@ - int - open_sbuf () - { -- char *mktemp (); -- int u; -+ int u, sfd; - - isbinary = newline_added = 0; - u = umask(077); - strcpy (sfn, "/tmp/ed.XXXXXX"); -- if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL) -+ sfd = mkstemp(sfn); -+ if ((sfd == -1) || (sfp = fdopen (sfn, "w+")) == NULL) - { - fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); - sprintf (errmsg, "Cannot open temp file"); diff --git a/sys-apps/ed/files/digest-ed-0.2-r4 b/sys-apps/ed/files/digest-ed-0.2-r4 deleted file mode 100644 index 05d2a7c084db..000000000000 --- a/sys-apps/ed/files/digest-ed-0.2-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz 185913 |