summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-01-10 17:01:04 +0000
committerMike Frysinger <vapier@gentoo.org>2005-01-10 17:01:04 +0000
commitc79feb067d9ec58dab66ee6463b73d990a27a439 (patch)
tree40edd55194a57733bc03c5a74457c443f34f5478 /sys-apps/ed
parentManifest fix (diff)
downloadhistorical-c79feb067d9ec58dab66ee6463b73d990a27a439.tar.gz
historical-c79feb067d9ec58dab66ee6463b73d990a27a439.tar.bz2
historical-c79feb067d9ec58dab66ee6463b73d990a27a439.zip
Really fix the mktemp patch #77348.
Diffstat (limited to 'sys-apps/ed')
-rw-r--r--sys-apps/ed/ChangeLog8
-rw-r--r--sys-apps/ed/Manifest14
-rw-r--r--sys-apps/ed/ed-0.2-r6.ebuild (renamed from sys-apps/ed/ed-0.2-r5.ebuild)2
-rw-r--r--sys-apps/ed/files/0.2-mkstemp.patch2
-rw-r--r--sys-apps/ed/files/digest-ed-0.2-r6 (renamed from sys-apps/ed/files/digest-ed-0.2-r5)0
5 files changed, 16 insertions, 10 deletions
diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index cf4d15b45d80..66c3c3a39e2b 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/ed
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.22 2005/01/09 20:32:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.23 2005/01/10 17:01:04 vapier Exp $
+
+*ed-0.2-r6 (10 Jan 2005)
+
+ 10 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/0.2-mkstemp.patch,
+ -ed-0.2-r5.ebuild, +ed-0.2-r6.ebuild:
+ Really fix the mktemp patch #77348.
09 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/0.2-mkstemp.patch,
-files/0.2-r5-mkstemp.patch, -ed-0.2-r4.ebuild, ed-0.2-r5.ebuild:
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 5cf0c775aa5d..398ad66be05c 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 f65f890bb8e07a77fa27888e6db32139 ChangeLog 2657
+MD5 9020c94e756e3c51303606f298d03f8e ChangeLog 2837
+MD5 fe11e0ded7a0d23a1974e46851c11442 ed-0.2-r6.ebuild 1535
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 90f4a89ff36d4673f28be667a62f381f ed-0.2-r5.ebuild 1535
-MD5 23a8b5483bac37c6fcd9bbb73efaf502 files/0.2-mkstemp.patch 981
+MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r6 58
+MD5 0c8a87453a1d75e2ff8ed4510b306de0 files/0.2-mkstemp.patch 979
MD5 549e2478edb18002261ae5dd055bcf5b files/0.2-info-dir.patch 373
-MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r5 58
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.9.14 (GNU/Linux)
-iD8DBQFB4ZToroRuSHgZdywRAqsCAJ9VOf8mCFsBvssMRZMycA/LXIiwzQCfRms0
-jADkSQ5/A6u+xEZkxXmRTH0=
-=0nw0
+iD8DBQFB4rTnroRuSHgZdywRAtiqAKCQuO9YKde1/8Klt65yCxq4gnC0agCfSRLS
+czKhhzN5vbQq8F+pRcv9h7o=
+=HAkF
-----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-0.2-r5.ebuild b/sys-apps/ed/ed-0.2-r6.ebuild
index 22b97a586ea6..12cb48724341 100644
--- a/sys-apps/ed/ed-0.2-r5.ebuild
+++ b/sys-apps/ed/ed-0.2-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r5.ebuild,v 1.2 2005/01/09 20:32:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r6.ebuild,v 1.1 2005/01/10 17:01:04 vapier Exp $
inherit eutils toolchain-funcs
diff --git a/sys-apps/ed/files/0.2-mkstemp.patch b/sys-apps/ed/files/0.2-mkstemp.patch
index 4223f85a4fc2..5fe98b81049a 100644
--- a/sys-apps/ed/files/0.2-mkstemp.patch
+++ b/sys-apps/ed/files/0.2-mkstemp.patch
@@ -26,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 = fdopen (sfn, "w+")) == NULL)
++ if ((sfd == -1) || (sfp = fdopen (sfd, "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-r5 b/sys-apps/ed/files/digest-ed-0.2-r6
index 05d2a7c084db..05d2a7c084db 100644
--- a/sys-apps/ed/files/digest-ed-0.2-r5
+++ b/sys-apps/ed/files/digest-ed-0.2-r6