[gentoo-commits] repo/gentoo:master commit in: app-arch/pax/files/, app-arch/pax/

[Aaron Bauman]

commit:     b6d28e6d52b36d20f8703e88ea97e4f697a824ca
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 00:07:20 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 00:07:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d28e6d

app-arch/pax: drop vulnerable wrt bug #537522

 app-arch/pax/Manifest                             |   2 -
 app-arch/pax/files/pax-3.4-fix-fts-includes.patch |  24 ----
 app-arch/pax/files/pax-3.4-sysmacros.patch        |  12 --
 app-arch/pax/files/pax-3.4-x32.patch              | 162 ----------------------
 app-arch/pax/pax-20160306.ebuild                  |  60 --------
 app-arch/pax/pax-3.4.12.16-r1.ebuild              |  40 ------
 app-arch/pax/pax-3.4.12.16.ebuild                 |  38 -----
 7 files changed, 338 deletions(-)

diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index f57780793f9..a31ca15a60e 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,3 +1 @@
-DIST pax-3.4-12.fc16.src.rpm 171016 BLAKE2B 94332a7cd24613c4488c1f00de3bcebeba9a82bc948b3cf83274c5a8d3efb5f687f1363376c40e5dc17a001a2f8c677b49d219a9530ece1710d2f7ddd60a9f44 SHA512 78704cd1b66288acdaa8fdf4ca0a97c12b1e843e024be4d3fac88a6b42049928c6bfe69a72a58a00a9bf755c23e1e8e0b7d30bc72ba08a83830495dd5f6d9be1
-DIST paxmirabilis-20160306.cpio.gz 147448 BLAKE2B b2a9bcfbb6d2007b8a4162b8d010c2a34f7ebc8595a8c20f6b8e973d85421a7f21f24d90b3d0228e5c9921b69dec1ef0ddcd4ee540f95072237255ecf309016d SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce

diff --git a/app-arch/pax/files/pax-3.4-fix-fts-includes.patch b/app-arch/pax/files/pax-3.4-fix-fts-includes.patch
deleted file mode 100644
index 5e4e37eb66a..00000000000
--- a/app-arch/pax/files/pax-3.4-fix-fts-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur pax-3.4-orig/lib/fts.c pax-3.4/lib/fts.c
---- pax-3.4-orig/lib/fts.c	2005-07-29 09:55:25.000000000 +0200
-+++ pax-3.4/lib/fts.c	2014-10-30 21:38:42.404092744 +0100
-@@ -35,7 +35,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <errno.h>
--#include <fts.h>
-+#include "fts.h"
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-diff -ur pax-3.4-orig/src/ftree.c pax-3.4/src/ftree.c
---- pax-3.4-orig/src/ftree.c	2005-07-29 09:46:06.000000000 +0200
-+++ pax-3.4/src/ftree.c	2014-10-30 21:39:14.876093149 +0100
-@@ -46,7 +46,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <stdlib.h>
--#include <fts.h>
-+#include "../lib/fts.h"
- #include "pax.h"
- #include "ftree.h"
- #include "extern.h"

diff --git a/app-arch/pax/files/pax-3.4-sysmacros.patch b/app-arch/pax/files/pax-3.4-sysmacros.patch
deleted file mode 100644
index 3aede97ec06..00000000000
--- a/app-arch/pax/files/pax-3.4-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-not all C libs pull in this header via sys/types.h for major()/etc...
-
---- a/src/extern.h
-+++ b/src/extern.h
-@@ -38,6 +38,7 @@
-  */
- 
- #include <sys/cdefs.h>
-+#include <sys/sysmacros.h>
- 
- /*
-  * ar_io.c

diff --git a/app-arch/pax/files/pax-3.4-x32.patch b/app-arch/pax/files/pax-3.4-x32.patch
deleted file mode 100644
index 7ae1a9d914c..00000000000
--- a/app-arch/pax/files/pax-3.4-x32.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-https://sites.google.com/site/x32abi/x32-patches
-
---- pax-3.4/configure.in
-+++ pax-3.4/configure.in
-@@ -33,4 +33,7 @@ dnl Checks for header files.
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- 
-+AC_CHECK_SIZEOF(off_t)
-+AC_CHECK_SIZEOF(long)
-+
- AC_OUTPUT([Makefile lib/Makefile src/Makefile])
---- pax-3.4/src/ar_io.c
-+++ pax-3.4/src/ar_io.c
-@@ -378,7 +378,8 @@ ar_close(void)
- 	 * could have written anything yet.
- 	 */
- 	if (frmt == NULL) {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- 		(void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
- #else
- 		(void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
-@@ -391,7 +392,8 @@ ar_close(void)
- 
- 	if (strcmp(NM_CPIO, argv0) == 0)
- 		(void)fprintf(listf,
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- 		    "%qu blocks\n",
- #else
- 		    "%lu blocks\n",
-@@ -399,7 +401,8 @@ ar_close(void)
- 			(rdcnt ? rdcnt : wrcnt) / 5120);
- 	else if (strcmp(NM_TAR, argv0) != 0)
- 		(void)fprintf(listf,
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- 		    "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
- #else
- 		    "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
---- pax-3.4/src/cpio.c
-+++ pax-3.4/src/cpio.c
-@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
- 	 */
- 	if ((arcn->sb.st_size == 0) ||
- 	    (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- 		paxwarn (1, "Cpio link name length is invalid: %qu",
- 			 arcn->sb.st_size);
- #else
---- pax-3.4/src/gen_subs.c
-+++ pax-3.4/src/gen_subs.c
-@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
-    * print device id's for devices, or sizes for other nodes
-    */
-   if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-     (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
- 		    (unsigned long) MINOR (sbp->st_rdev));
- #else
-@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
- #endif
-   else
-     {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-       (void) fprintf (fp, "%9qu ", sbp->st_size);
- #else
-       (void) fprintf (fp, "%9lu ", sbp->st_size);
-@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len, 
-   return (0);
- }
- 
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- /*
-  * asc_uqd()
-  *	convert hex/octal character string into a u_quad_t. We do not have to
---- pax-3.4/src/options.c
-+++ pax-3.4/src/options.c
-@@ -1545,7 +1545,8 @@ str_offt (char *val)
-   char *expr;
-   off_t num, t;
- 
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-   num = strtoq (val, &expr, 0);
-   if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
- #else
---- pax-3.4/src/tar.c
-+++ pax-3.4/src/tar.c
-@@ -58,7 +58,8 @@
- static unsigned long tar_chksm (char *, int);
- static char *name_split (char *, int);
- static int ul_oct (u_long, char *, int, int);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- static int uqd_oct (u_quad_t, char *, int, int);
- #endif
- 
-@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str, 
-   return (0);
- }
- 
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- /*
-  * uqd_oct()
-  *	convert an u_quad_t to an octal string. one of many oddball field
-@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
- 			       0xfff);
-   arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
-   arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
- #else
-   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
-@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
-        * data follows this file, so set the pad
-        */
-       hd->linkflag = AREGTYPE;
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
- 		   sizeof (hd->size), 1))
- #else
-@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
-    */
-   arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
- 			       0xfff);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
- #else
-   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
-@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
-       else
- 	hd->typeflag = REGTYPE;
-       arcn->pad = TAR_PAD (arcn->sb.st_size);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
- 		   sizeof (hd->size), 3))
- 	{

diff --git a/app-arch/pax/pax-20160306.ebuild b/app-arch/pax/pax-20160306.ebuild
deleted file mode 100644
index 221a2103c1a..00000000000
--- a/app-arch/pax/pax-20160306.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit unpacker toolchain-funcs flag-o-matic
-
-DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="https://www.mirbsd.org/pax.htm"
-SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libbsd
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-	$(unpacker_src_uri_depends)"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}/${P}-glibc-to-linux.patch" )
-
-src_prepare() {
-	# Newer C libraries omit this include from sys/types.h.
-	sed -i '1i#include <sys/sysmacros.h>' extern.h || die
-	default
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	use elibc_musl && append-ldflags "-lfts"
-
-	# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
-	set -- \
-		${CC} ${CPPFLAGS} ${CFLAGS} \
-		-DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
-		-DLONG_OFF_T -DHAVE_LINKAT \
-		$(${PKG_CONFIG} --cflags libbsd-overlay) \
-		-Wall ${LDFLAGS} *.c -o ${PN} \
-		$(${PKG_CONFIG} --libs libbsd-overlay)
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-
-	dosym pax /usr/bin/paxcpio
-	newman cpio.1 paxcpio.1
-
-	dosym pax /usr/bin/paxtar
-	newman tar.1 paxtar.1
-}

diff --git a/app-arch/pax/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild
deleted file mode 100644
index 2b39f887b60..00000000000
--- a/app-arch/pax/pax-3.4.12.16-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils rpm versionator autotools
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${PN}-${MY_PV}"
-RPM_PV=$(get_version_component_range 3)
-FC_PV=$(get_version_component_range 4)
-
-DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
-SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rpm_spec_epatch ../${PN}.spec
-	epatch "${FILESDIR}"/pax-3.4-x32.patch
-	epatch "${FILESDIR}"/pax-3.4-fix-fts-includes.patch
-	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
-	sed -i configure.in \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		-e 's|-Werror||g' \
-		-e '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \
-		|| die
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}

diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild
deleted file mode 100644
index 42fbe159f96..00000000000
--- a/app-arch/pax/pax-3.4.12.16.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils rpm versionator autotools
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${PN}-${MY_PV}"
-RPM_PV=$(get_version_component_range 3)
-FC_PV=$(get_version_component_range 4)
-
-DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
-SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rpm_spec_epatch ../${PN}.spec
-	epatch "${FILESDIR}"/pax-3.4-x32.patch
-	epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
-	sed -i configure.in \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		-e 's|-Werror||g' \
-		|| die
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}