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

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

[Mike Frysinger]

commit:     d20b3532fd462cf2c5e46f02fe71fa03610dc2e6
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 18:54:09 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 18:54:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20b3532

app-arch/pax: fix building w/newer glibc

 app-arch/pax/files/pax-3.4-sysmacros.patch | 12 ++++++++++++
 app-arch/pax/pax-3.4.12.16-r1.ebuild       |  1 +
 app-arch/pax/pax-3.4.12.16.ebuild          |  1 +
 3 files changed, 14 insertions(+)

diff --git a/app-arch/pax/files/pax-3.4-sysmacros.patch b/app-arch/pax/files/pax-3.4-sysmacros.patch
new file mode 100644
index 0000000..3aede97
--- /dev/null
+++ b/app-arch/pax/files/pax-3.4-sysmacros.patch
@@ -0,0 +1,12 @@
+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/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild
index 0e8133f..a14e869 100644
--- a/app-arch/pax/pax-3.4.12.16-r1.ebuild
+++ b/app-arch/pax/pax-3.4.12.16-r1.ebuild
@@ -26,6 +26,7 @@ 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 '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \

diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild
index 973229e..8d485e6 100644
--- a/app-arch/pax/pax-3.4.12.16.ebuild
+++ b/app-arch/pax/pax-3.4.12.16.ebuild
@@ -25,6 +25,7 @@ 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' || die
 	eautoreconf
 }

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

[Jeroen Roovers]

commit:     ac94bbdfb348d04f8e1499288e589939d6766de4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  7 06:43:39 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 06:45:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac94bbdf

app-arch/pax: Version bump.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-arch/pax/Manifest                              |  1 +
 .../pax/files/pax-20160306-glibc-to-linux.patch    |  4 +-
 app-arch/pax/pax-20161104.ebuild                   | 63 ++++++++++++++++++++++
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 7c01e81a31c..f57780793f9 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,2 +1,3 @@
 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-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
index f864729cc4f..eec6624eedc 100644
--- a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
+++ b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
@@ -1,5 +1,5 @@
---- pax/cache.c.old	2016-03-06 08:12:52.000000000 -0600
-+++ pax/cache.c	2016-04-17 13:01:26.461307830 -0500
+--- a/cache.c
++++ b/cache.c
 @@ -195,7 +195,7 @@
  	 * No entry for this uid, we will add it
  	 */

diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
new file mode 100644
index 00000000000..da9f50e30b2
--- /dev/null
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+
+RDEPEND="
+	dev-libs/libbsd
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-20160306-glibc-to-linux.patch"
+)
+S=${WORKDIR}/${PN}
+
+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} \
+		-DPAX_SAFE_PATH=\"/bin:/usr/bin\" \
+		-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
+}