gentoo resync : 14.07.2018

6 files changed, 158 insertions, 0 deletions

diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
new file mode 100644
index 000000000000..4e6e015cc9e3
--- /dev/null
+++ b/app-editors/bvi/Manifest
@@ -0,0 +1,7 @@
+AUX bvi-1.3.2-fix-buffer-overflow.patch 622 BLAKE2B 8f081bfea567a7781923b8e95af76495eaaa03c3c2e20450d38c64064467350eeee05668a28ae5bd2ad46f4b0ae013b8c5dba50d0c25be258f1286a46d40f6a9 SHA512 87549381d8c9ef76c4153917faabe2b814dab9ecfb59e9b0cf75be5d02b917fd88266ad5e846982c8d40b80b3304f7efc912bd13f83f48e7a411f663cb10a28d
+AUX bvi-1.3.2-tinfo.patch 1342 BLAKE2B 709237b9c353f8147a5592dae56eb1189fcc67e624f089b4da1c67632eca62109573975d66066b38324fc3fccbc1d317cad01f09986d26d90cd5556c9fbe2e87 SHA512 0ebb9dd499f1959eb760f84a15f2ebeb98b60a576459d05f1280ff48b94ac167d5e5a1dc5877f69198e1fc91e7d3a652a6e4a1fc49fb94395191cbadf07d7cc7
+DIST bvi-1.3.2.src.tar.gz 170444 BLAKE2B 5726fe730b6751a768247581cfd4dce0a40a9ce8e8852c977b62ddd72bd8d8db7b66535a7c711b6837e10d63ee7aca9b5bdb6ba3ea0288d823e684fcabbd79b2 SHA512 eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c
+DIST bvi-1.4.0alpha.src.tar.gz 128821 BLAKE2B b285e9aee5c510205684296afd975fdf4f392d9743561aa8c80c69785eb1b431886fb8664adcb1393b514e77b2e3df562d7c253427364891c36e1c56d4313975 SHA512 75cf0ff27809e2c4213da72b022e012003d6ef272d734d0c18f03d5cb49bc891b4d3d40a9e6bfff226906062fcd3e319a7503d09409fa2023f5ba1d434e66217
+EBUILD bvi-1.3.2-r2.ebuild 1165 BLAKE2B 217ca4311f9982e69b93a95466f6469f19ad2770e5697331f3928eaae731e286401e3e1e42883840f7d602fb3918634dca3feb3b12aa0e2a0d45e6a046b16c4b SHA512 cac249798af37841330e91e49d74d6badb65d8df69aa0512721bd3d47c8961e2c0a940efed31569863767485917d9ce3c42ee888a244a60a229920241b987002
+EBUILD bvi-1.4.0_alpha.ebuild 1058 BLAKE2B fe2efcc9311f8b1945710f5b7c1705f909b8a5eea9b6f29acc65a845a175f3bf17214c32539941318e1bb877066b8cd91c0716d220b865984a14336663eb07a2 SHA512 065cad807372427e57158a12ec5ca095dd7a63a54db8e3a79a607766f79edd05e589b82606261d963eebdac37c3dfb87404bfc4b09106e299d435ef925b3b9cf
+MISC metadata.xml 212 BLAKE2B 0d954f27d3e4eee78d51082e8466a4e81b7ec1963e72b1ee613219df33a75debd7df85cf94226bebaf76f39f37ea84441abc6144dd703db2e9766bd582356e30 SHA512 79e460fd0f3b1b82105557fd8070ecbab50e70ee4c65d5ae289fc31808ef0dd947bfb33483c31b812100ec48864af8551250f739f54ceac2876dee264c4e56c5
diff --git a/app-editors/bvi/bvi-1.3.2-r2.ebuild b/app-editors/bvi/bvi-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..1f7611c79ba0
--- /dev/null
+++ b/app-editors/bvi/bvi-1.3.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit multilib eutils autotools-utils
+
+DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-fix-buffer-overflow.patch"
+		"${FILESDIR}/${P}-tinfo.patch"
+		)
+	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		Makefile.in || die "sed failed in Makefile.in"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(--with-ncurses="${EPREFIX}"/usr)
+	autotools-utils_src_configure
+
+}
+
+src_install() {
+	autotools-utils_src_install
+	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
+	dodoc README CHANGES CREDITS bmore.help
+	dohtml -r html/*
+}
diff --git a/app-editors/bvi/bvi-1.4.0_alpha.ebuild b/app-editors/bvi/bvi-1.4.0_alpha.ebuild
new file mode 100644
index 000000000000..6c63395f9c09
--- /dev/null
+++ b/app-editors/bvi/bvi-1.4.0_alpha.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit multilib eutils versionator
+
+MY_P=$(replace_version_separator 4 '' ${P})
+
+DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bvi/$(replace_version_separator 4 '' ${P}).src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/$MY_P"
+
+src_prepare() {
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		Makefile.in || die "sed failed in Makefile.in"
+
+	epatch_user
+}
+
+src_configure() {
+	econf --with-ncurses="${EPREFIX}"/usr
+
+	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}"/usr/$(get_libdir)/bmore.help
+	dodoc README CHANGES CREDITS bmore.help
+}
diff --git a/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..e3ebaa3d1295
--- /dev/null
+++ b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
@@ -0,0 +1,22 @@
+diff --git a/edit.c b/edit.c
+index 328a0cd..3cf6572 100644
+--- a/edit.c
++++ b/edit.c
+@@ -42,7 +42,7 @@ char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
+ 					"CAN", " EM", "SUB", "ESC", " FS", " GS", " RS", " US",
+ 					"DEL" };
+ char tmpbuf[10];
+-char linbuf[256];
++char linbuf[16384];
+ 
+ static  char    getcbuff[BUFFER];
+ static  char    *getcnext = NULL;
+@@ -492,7 +492,7 @@ printline(mempos, scpos)
+ 			*(string + print_pos) = '.';
+ 	}
+ 	*(string + Anzahl) = '\0';
+-	strcat(linbuf, string);
++	strncat(linbuf, string, sizeof(linbuf) - strlen(linbuf) - 1);
+ 	mvaddstr(scpos, 0, linbuf);
+ }
+ 
diff --git a/app-editors/bvi/files/bvi-1.3.2-tinfo.patch b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
new file mode 100644
index 000000000000..b00c88811507
--- /dev/null
+++ b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.in b/configure.in
+index 68076d8..81da696 100644
+--- a/configure.in
++++ b/configure.in
+@@ -58,17 +58,19 @@ AC_ARG_WITH(ncurses,
+   fi
+ ])
+ 
+-AC_CHECK_HEADER(ncurses.h,
+-    AC_CHECK_LIB(ncurses, initscr,
+-        AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses",
+-        AC_CHECK_LIB(curses, initscr,
+-        AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
+-        AC_MSG_ERROR([bvi requires the curses library]))),
+-    AC_CHECK_HEADER(curses.h,
+-        AC_CHECK_LIB(curses, initscr,
+-		AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
+-		AC_MSG_ERROR([bvi requires the curses library])),
+-		AC_MSG_ERROR([bvi requires the curses library])))
++AC_CHECK_HEADER([ncurses.h],[
++    AC_SEARCH_LIBS([initscr], [ncurses],[
++            AC_DEFINE(HAVE_NCURSES_H)
++	    AC_SEARCH_LIBS([tputs], [tinfo])], [
++        AC_SEARCH_LIBS([initscr], [curses],[
++                AC_DEFINE(HAVE_CURSES_H)
++                AC_SEARCH_LIBS([tputs], [tinfo])],[
++	    AC_MSG_ERROR([bvi requires the curses library])])])],[
++    AC_CHECK_HEADER([curses.h],[
++    	AC_SEARCH_LIBS([initscr], [curses], [
++		AC_DEFINE(HAVE_CURSES_H)],[
++		AC_MSG_ERROR([bvi requires the curses library])])],[
++		AC_MSG_ERROR([bvi requires the curses library])])])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ dnl AC_TYPE_SIZE_T
diff --git a/app-editors/bvi/metadata.xml b/app-editors/bvi/metadata.xml
new file mode 100644
index 000000000000..02e1ad7c6d7e
--- /dev/null
+++ b/app-editors/bvi/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">bvi</remote-id>
+	</upstream>
+</pkgmetadata>