summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-10-05 12:54:33 +0000
committerMike Frysinger <vapier@gentoo.org>2004-10-05 12:54:33 +0000
commit187cc2ff6580839ee7ecc62d0038602d1f221ad6 (patch)
treecb99e3914e97e666a78bc32d0b269bf3d6985af2 /sys-apps/ed
parentVersion bump #47788 and security #66355. (diff)
downloadhistorical-187cc2ff6580839ee7ecc62d0038602d1f221ad6.tar.gz
historical-187cc2ff6580839ee7ecc62d0038602d1f221ad6.tar.bz2
historical-187cc2ff6580839ee7ecc62d0038602d1f221ad6.zip
Security fix #66400
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-r4.ebuild44
-rw-r--r--sys-apps/ed/files/0.2-info-dir.patch15
-rw-r--r--sys-apps/ed/files/0.2-mkstemp.patch25
-rw-r--r--sys-apps/ed/files/digest-ed-0.2-r41
6 files changed, 101 insertions, 6 deletions
diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index 7ad6fabe2bfe..14c2d560d19e 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/ed
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.11 2004/06/24 22:04:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.12 2004/10/05 12:54:33 vapier Exp $
+
+*ed-0.2-r4 (05 Oct 2004)
+
+ 05 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/0.2-info-dir.patch,
+ +files/0.2-mkstemp.patch, +ed-0.2-r4.ebuild:
+ Security fix #66400.
02 Mar 2004; Brian Jackson <iggy@gentoo.org> ed-0.2-r3.ebuild:
adding initial s390 support
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index d59d1bb296a3..92de77b43bbb 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,16 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 495ef707b930c99de192dc3cb84ffd00 ChangeLog 1273
+MD5 23e6e5f91fcfa5b765c428d3fa1c36fc ChangeLog 1445
MD5 35b8113d7f7e63b36e0b6d1b5f844e8f ed-0.2-r3.ebuild 846
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c1e96c5e2b79729c307bb4e929a87a5f ed-0.2-r4.ebuild 1114
MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r3 58
MD5 549e2478edb18002261ae5dd055bcf5b files/ed-0.2-r2-gentoo.diff 373
MD5 549e2478edb18002261ae5dd055bcf5b files/ed-0.2-r3-gentoo.diff 373
+MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r4 58
+MD5 549e2478edb18002261ae5dd055bcf5b files/0.2-info-dir.patch 373
+MD5 e7e2248f9baa76de3db8210298e0d79e files/0.2-mkstemp.patch 738
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
-iD8DBQFA4EHUHTu7gpaalycRAsYPAKCxbiMVyBoCbYm67fgDWMOiX3iLJACeIs4N
-5jh0CYAY1O+AeMm0ebyBruQ=
-=2nQk
+iD8DBQFBYpmQHTu7gpaalycRAk+aAKCk50EIP5rp2Sfxagq2qYbE8alK5gCfYsvL
+x6XIVAN5A4iW5QONXMISrZg=
+=pNET
-----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-0.2-r4.ebuild b/sys-apps/ed/ed-0.2-r4.ebuild
new file mode 100644
index 000000000000..a5ce3a9a3f8e
--- /dev/null
+++ b/sys-apps/ed/ed-0.2-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r4.ebuild,v 1.1 2004/10/05 12:54:33 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="http://www.gnu.org/software/ed/"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/ed/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+ sys-apps/texinfo"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PV}-info-dir.patch
+ epatch ${FILESDIR}/${PV}-mkstemp.patch
+}
+
+src_compile() {
+ # very old configure script ... econf wont work
+ local myconf="--prefix=/ --host=${CHOST}"
+ [ ! -z "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
+ myconf="${myconf} ${EXTRA_ECONF}"
+ echo "./configure ${myconf}"
+ ./configure ${myconf} || die
+ emake || die
+}
+
+src_install() {
+ chmod 0644 ${S}/ed.info
+ make \
+ prefix=${D}/ \
+ mandir=${D}/usr/share/man/man1 \
+ infodir=${D}/usr/share/info \
+ install || die
+ dodoc ChangeLog NEWS POSIX README THANKS TODO
+}
diff --git a/sys-apps/ed/files/0.2-info-dir.patch b/sys-apps/ed/files/0.2-info-dir.patch
new file mode 100644
index 000000000000..f99b00fd7626
--- /dev/null
+++ b/sys-apps/ed/files/0.2-info-dir.patch
@@ -0,0 +1,15 @@
+diff -r -C2 ed-0.2.orig/ed.texinfo ed-0.2/ed.texinfo
+*** ed-0.2.orig/ed.texinfo Sat Nov 19 07:38:01 1994
+--- ed-0.2/ed.texinfo Fri Aug 3 19:03:33 2001
+***************
+*** 8,11 ****
+--- 8,16 ----
+
+ @ifinfo
++
++ @direntry
++ * ed: (ed). line editor.
++ @end direntry
++
+ This file documents the @code{ed} command, which has the purpose of
+ editing text files.
diff --git a/sys-apps/ed/files/0.2-mkstemp.patch b/sys-apps/ed/files/0.2-mkstemp.patch
new file mode 100644
index 000000000000..6103a2d088dd
--- /dev/null
+++ b/sys-apps/ed/files/0.2-mkstemp.patch
@@ -0,0 +1,25 @@
+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.
+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 = fopen (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
new file mode 100644
index 000000000000..05d2a7c084db
--- /dev/null
+++ b/sys-apps/ed/files/digest-ed-0.2-r4
@@ -0,0 +1 @@
+MD5 ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz 185913