[gentoo-commits] repo/gentoo:master commit in: dev-libs/gnulib/, dev-libs/gnulib/files/

[Fabian Groffen]

commit:     18c165581b6191f01f52b9ded8ab7bf27c73b98f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 07:21:31 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 07:21:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c16558

dev-libs/gnulib: cleanup and remove vulnerable versions, bug #600526

Package-Manager: portage-2.3.0

 dev-libs/gnulib/Manifest                           |   2 -
 .../files/gnulib-2008.07.23-rpl_getopt.patch       |  12 --
 .../files/gnulib-2009.03.03.14.07.45-scandir.patch |  15 ---
 .../gnulib/gnulib-2009.03.03.14.07.45-r1.ebuild    | 134 ---------------------
 dev-libs/gnulib/gnulib-2013.10.28.22.33.52.ebuild  |  46 -------
 dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild  |   4 +-
 dev-libs/gnulib/gnulib-9999-r1.ebuild              |   6 +-
 7 files changed, 4 insertions(+), 215 deletions(-)

diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index f0e41ce..d534c7f 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,3 +1 @@
-DIST gnulib-0.1.tar.gz 5374195 SHA256 ce686e0d2b94fed7b8d37853ab56c9b8feebb29317948f3b87b2b454af2a52d5 SHA512 020e1288dbc4daa839368edce4e3ac2f3b3e9d06d414179ee12abfe1603107f03319601c5d81eb089599b519130942d055d65f5dc7059bbe9be563ceac92e0e3 WHIRLPOOL fb61579df2797d751c107991a8697627d3759544b1951e710b84a06e4ee1a5f732f8ffa7683a3f2490cba93c589a1954a0625be3ab8aae6ff865d2e511ad0eaa
 DIST gnulib-3a0b7b74982f44c735f4cfc2dccf538c3c4ef9e2.tar.gz 6192393 SHA256 1ce07693189d8692a5c8f3e3e9cec23cf51f52f38ac2308a82b2f8011b27937f SHA512 9076d0476aef4a7425fb6db038c2a4657ae1a5619a0ddce07a68a97883924f07635edc59818b532564128fbe23b06b39c98b4c544d4fc670dfc4ebd34e2e52c5 WHIRLPOOL e4bce24d233a0eb0d18c502992c5dc453cfafc9b51553dbc32d0e72cfb9d575b19191f2aa2a7cc2fb906e2111a286bd12a830421b2a4ad2b7cf3a0a94027b4fa
-DIST gnulib-8d2524ce78ca107074727cbd8780c26a203a107c.tar.gz 3687831 SHA256 a220080dda77159b2d30bbed93437b97efeef20c417e255296924d580ce6d309 SHA512 3fd621c487f2089c425ee1d7b36947c91ebd96fe88d5426ada9e908e583bc8bf38c98850b1db7157f4d04def5fb2bec664f0d67d86ee612d4448158b2ad84a6a WHIRLPOOL b332579c148accd9c8da7f8bedd65a7aa0d36b0c4aa89797d170fd1b47cf7d2b069ee3c797bb4fd18935affab34536b2b56ae94a1707db3e98133de2d384f2bc

diff --git a/dev-libs/gnulib/files/gnulib-2008.07.23-rpl_getopt.patch b/dev-libs/gnulib/files/gnulib-2008.07.23-rpl_getopt.patch
deleted file mode 100644
index 2ef427a..00000000
--- a/dev-libs/gnulib/files/gnulib-2008.07.23-rpl_getopt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/getopt.in.h.orig	2008-07-25 13:40:38 +0200
-+++ lib/getopt.in.h	2008-07-25 13:41:25 +0200
-@@ -20,6 +20,9 @@
- 
- #ifndef __need_getopt
- # define _GETOPT_H 1
-+# ifndef __GETOPT_PREFIX
-+#  define __GETOPT_PREFIX rpl_
-+# endif
- #endif
- 
- /* Standalone applications should #define __GETOPT_PREFIX to an

diff --git a/dev-libs/gnulib/files/gnulib-2009.03.03.14.07.45-scandir.patch b/dev-libs/gnulib/files/gnulib-2009.03.03.14.07.45-scandir.patch
deleted file mode 100644
index 67b1274..00000000
--- a/dev-libs/gnulib/files/gnulib-2009.03.03.14.07.45-scandir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/scandir.c
-+++ b/lib/scandir.c
-@@ -18,6 +18,12 @@
- #include <config.h>
-
- #include <dirent.h>
-+#ifndef _D_EXACT_NAMLEN
-+# define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
-+#endif
-+#ifndef _D_ALLOC_NAMLEN
-+# define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
-+#endif
-
- #include <stdlib.h>
- #include <string.h>

diff --git a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45-r1.ebuild b/dev-libs/gnulib/gnulib-2009.03.03.14.07.45-r1.ebuild
deleted file mode 100644
index 0ac165d..00000000
--- a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level"
-HOMEPAGE="https://www.gnu.org/software/gnulib"
-
-# This tar.gz is created on-the-fly when downloaded from
-# http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=${GNULIB_COMMIT_GITID};sf=tgz
-# So to have persistent checksums, we need to download once and cache it.
-#
-# To get a new version, download a "snapshot" from
-# http://git.savannah.gnu.org/gitweb/?p=gnulib.git
-# take the commit-id as GNULIB_COMMIT_GITID
-# and the committer's timestamp (not the author's one), year to second, UTC
-# as the ebuild version.
-#
-# To see what the last commit message for the current version was, use
-# http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=${GNULIB_COMMIT_GITID}
-#
-GNULIB_COMMIT_GITID=8d2524ce78ca107074727cbd8780c26a203a107c
-SRC_URI="https://dev.gentoo.org/~drizzt/distfiles/${PN}-${GNULIB_COMMIT_GITID}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}
-MY_S="${WORKDIR}"/${P}
-
-src_prepare() {
-	local requested_gnulib_modules
-
-	case ${CHOST} in
-		*-freebsd*)
-			requested_gnulib_modules="mathl strndup"
-			;;
-		*-solaris2.8|*-solaris2.9)
-			# Don't remove dirfd!
-			requested_gnulib_modules="alphasort dirfd getopt scandir setenv strcasestr stdint strndup xvasprintf"
-			;;
-		*-solaris2.10|*-solaris2.11)
-			requested_gnulib_modules="dirfd getopt strcasestr strndup xvasprintf"
-			;;
-		*-aix*)
-			requested_gnulib_modules="alphasort dirfd getopt scandir strcasestr strndup xvasprintf"
-			;;
-		*-hpux*)
-			requested_gnulib_modules="atoll dirfd getopt setenv strcasestr strndup xvasprintf"
-			;;
-		*-interix*)
-			requested_gnulib_modules="atoll getopt scandir setenv strcasestr strndup xvasprintf"
-			;;
-		*-irix*)
-			requested_gnulib_modules="getopt strcasestr strndup xvasprintf"
-			;;
-	esac
-
-	epatch "${FILESDIR}"/${PN}-2008.07.23-rpl_getopt.patch
-	epatch "${FILESDIR}"/${P}-scandir.patch
-
-	# Solaris 9 ksh makes gnulib-tool to coredump
-	sed -i "1s:/bin/sh:${EPREFIX}/bin/sh:" gnulib-tool || die "sed failed"
-
-	# Remove the broken pxref
-	sed -i '$d' doc/ld-version-script.texi || die "cannot fix ld-version-script.texi"
-
-	[[ -z "$requested_gnulib_modules" ]] && return
-
-	"${S}"/gnulib-tool --create-testdir --dir="${MY_S}" \
-	${requested_gnulib_modules} || die
-
-	cd "${MY_S}" || die
-
-	# define both libgnu.a and the headers as to-be-installed
-	LANG=C \
-	sed -e '
-		s,noinst_HEADERS,include_HEADERS,;
-		s,noinst_LIBRARIES,lib_LIBRARIES,;
-		s,noinst_LTLIBRARIES,lib_LTLIBRARIES,;
-		s,EXTRA_DIST =$,&\
-EXTRA_HEADERS =,;
-		s,BUILT_SOURCES += \([/a-zA-Z0-9_-][/a-zA-Z0-9_-]*\.h\|\$([_A-Z0-9][_A-Z0-9]*_H)\)$,&\
-include_HEADERS += \1,;
-	' -i gllib/Makefile.am || die "cannot fix gllib/Makefile.am"
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${MY_S}" || return
-	econf --prefix="${EPREFIX}"/usr/$(get_libdir)/${PN}
-}
-
-src_compile() {
-	if use doc; then
-		emake -C doc info html || die "emake failed"
-	fi
-	cd "${MY_S}" || return
-	emake || die "cannot make ${P}"
-}
-
-src_install() {
-	dodoc README ChangeLog
-	if use doc; then
-		dohtml doc/gnulib.html
-		doinfo doc/gnulib.info
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r lib
-	doins -r m4
-	doins -r modules
-	doins -r build-aux
-	doins -r top
-
-	# install the real script
-	exeinto /usr/share/${PN}
-	doexe gnulib-tool
-
-	# create and install the wrapper
-	dosym /usr/share/${PN}/gnulib-tool /usr/bin/gnulib-tool
-
-	cd "${MY_S}" || return
-	emake install DESTDIR="${D}" || die "make install failed"
-}

diff --git a/dev-libs/gnulib/gnulib-2013.10.28.22.33.52.ebuild b/dev-libs/gnulib/gnulib-2013.10.28.22.33.52.ebuild
deleted file mode 100644
index 7afb533..00000000
--- a/dev-libs/gnulib/gnulib-2013.10.28.22.33.52.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-GIT_TAG="0.1"
-
-DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level"
-HOMEPAGE="https://www.gnu.org/software/gnulib"
-SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-S="${WORKDIR}/${PN}-${GIT_TAG}"
-
-src_compile() {
-	if use doc; then
-		emake -C doc info html
-	fi
-}
-
-src_install() {
-	dodoc README ChangeLog
-
-	insinto /usr/share/${PN}
-	doins -r build-aux
-	doins -r doc
-	doins -r lib
-	doins -r m4
-	doins -r modules
-	doins -r tests
-	doins -r top
-
-	# install the real script
-	exeinto /usr/share/${PN}
-	doexe gnulib-tool
-
-	# create and install the wrapper
-	dosym /usr/share/${PN}/gnulib-tool /usr/bin/gnulib-tool
-}

diff --git a/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild b/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
index 94df631..71749f2 100644
--- a/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
+++ b/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 GIT_TAG="3a0b7b74982f44c735f4cfc2dccf538c3c4ef9e2"
 

diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild b/dev-libs/gnulib/gnulib-9999-r1.ebuild
index 960c442..2e9ec7d 100644
--- a/dev-libs/gnulib/gnulib-9999-r1.ebuild
+++ b/dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils git-r3
+inherit git-r3
 
 DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level"
 HOMEPAGE="https://www.gnu.org/software/gnulib"