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
commit24272449307293c38a2bcb599517f716e45daebe (patch)
treeda799c61c593871b3d00241b0c66520cdbc63685 /sys-apps/ed
parentManifest fix (Manifest recommit) (diff)
downloadgentoo-2-24272449307293c38a2bcb599517f716e45daebe.tar.gz
gentoo-2-24272449307293c38a2bcb599517f716e45daebe.tar.bz2
gentoo-2-24272449307293c38a2bcb599517f716e45daebe.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/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
4 files changed, 9 insertions, 3 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/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