From c79feb067d9ec58dab66ee6463b73d990a27a439 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 10 Jan 2005 17:01:04 +0000 Subject: [PATCH] Really fix the mktemp patch #77348. --- sys-apps/ed/ChangeLog | 8 +++++++- sys-apps/ed/Manifest | 14 +++++++------- sys-apps/ed/{ed-0.2-r5.ebuild => ed-0.2-r6.ebuild} | 2 +- sys-apps/ed/files/0.2-mkstemp.patch | 2 +- .../files/{digest-ed-0.2-r5 => digest-ed-0.2-r6} | 0 sys-apps/procps/Manifest | 12 ++++++------ 6 files changed, 22 insertions(+), 16 deletions(-) rename sys-apps/ed/{ed-0.2-r5.ebuild => ed-0.2-r6.ebuild} (93%) rename sys-apps/ed/files/{digest-ed-0.2-r5 => digest-ed-0.2-r6} (100%) 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 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 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 similarity index 93% rename from sys-apps/ed/ed-0.2-r5.ebuild rename to 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 similarity index 100% rename from sys-apps/ed/files/digest-ed-0.2-r5 rename to sys-apps/ed/files/digest-ed-0.2-r6 diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest index 2d7e2681b8b4..f268c7e3999c 100644 --- a/sys-apps/procps/Manifest +++ b/sys-apps/procps/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 fda61149f0506013a51e9c85917318b2 ChangeLog 15286 +MD5 2d963dfa4d89721de95f35d2a08cb18d ChangeLog 15381 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 687bb08f11338030eabaca147372217f procps-3.2.3-r1.ebuild 1492 -MD5 37bbbfd8df596fce9c82112969836184 procps-3.2.4.ebuild 1746 +MD5 6b856567149f55d37df90f85ef76ecf9 procps-3.2.4.ebuild 1747 MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3-r1 64 MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4 64 MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.14 (GNU/Linux) +Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB4aXDroRuSHgZdywRAq9UAJ4zxNlCTw6YjPhZrQjO6I+LHrKbGgCcDVpl -H7jjNBOk/1OpxvDXYGGvCnc= -=NqRU +iD8DBQFB4rVkKRy60XGEcJIRAkVOAJ0QgFUr6ujYWfH8w0rbf9WdAvNVGgCfYnt7 +MnE2lci9t7hIiW/WYjCWGiE= +=b1o5 -----END PGP SIGNATURE----- -- 2.26.2