* [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/, app-arch/xar/files/
@ 2018-05-20 12:20 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2018-05-20 12:20 UTC (permalink / raw
To: gentoo-commits
commit: e79d7f6da1496a32d3a9842550f48fa58b95f45a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 12:20:27 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 20 12:20:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79d7f6d
app-arch/xar: Remove 1.5.2-r1
Uses deprecated EAPI 4 and overshadowed by 1.8-r1.
Package-Manager: Portage-2.3.38, Repoman-2.3.9
app-arch/xar/Manifest | 1 -
.../files/xar-1.5.2-automagic_acl_and_bzip2.patch | 46 ----------------------
app-arch/xar/files/xar-1.5.2-respect_ldflags.patch | 21 ----------
app-arch/xar/xar-1.5.2-r1.ebuild | 35 ----------------
4 files changed, 103 deletions(-)
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 187e6e6db35..204e1c36a4c 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,3 +1,2 @@
-DIST xar-1.5.2.tar.gz 137973 BLAKE2B 1bd478134f9de23094cbf6b6c6d15100629ebb3359c39b39eb6a2bfad80fefc74282655ecd2c32ef0140f3d69f5a75c13665c0a5015dc3e278f99bab3c1a9ade SHA512 975861324ee31805eb107f51f2f6c43029b25601d4c1daa2dfee49ec7e25351e94798de9fb5c011b90d93dd6a3bbd3fe15c97ab0fc32f0b36b3000dd48cbf46b
DIST xar-1.6.1.tar.gz 180771 BLAKE2B efc15995941b7240486a02cad736981e4881dac8a576cb3188be1bb54aefbb612f374d82af56e1af27301d6d8f00698ad601f8ad4b0ae100107bbcd84cb203e8 SHA512 6ddf83130519006c4d8fe699cdf5a6e5e41b293f3411d4744bf3425fda21556ef54b95e46f60c13f9276070ccda94c8d95a543f1fda4cbd9e3087ab9b5d0b00b
DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
diff --git a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
deleted file mode 100644
index 54ad8f72531..00000000000
--- a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur xar-1.5.2.orig/configure.ac xar-1.5.2/configure.ac
---- xar-1.5.2.orig/configure.ac 2007-12-29 20:49:57.000000000 +0200
-+++ xar-1.5.2/configure.ac 2008-05-19 17:07:23.000000000 +0300
-@@ -181,8 +181,13 @@
- )
- AC_SUBST([enable_autogen])
-
-+AC_ARG_ENABLE(acl, AC_HELP_STRING([--disable-acl], [disable support for libacl (default=autodetect)]), [ enable_acl=$enableval ], [ enable_acl=yes ])
-+
-+if test "x$enable_acl" = "xyes"; then
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
-+fi
-+
- AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
- AC_CHECK_FUNCS(lgetxattr)
- AC_CHECK_FUNCS(lsetxattr)
-@@ -251,7 +256,9 @@
- AC_ERROR(can not detect the size of your system's dev_t type)
- fi
-
--AC_CHECK_LIB(acl, acl_get_file)
-+if test "x$enable_acl" = "xyes"; then
-+ AC_CHECK_LIB(acl, acl_get_file)
-+fi
-
- dnl Check for paths
- AC_PREFIX_DEFAULT(/usr/local)
-@@ -342,9 +349,14 @@
- dnl
- dnl Configure libbz2.
- dnl
--have_libbz2="1"
--AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
--AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
-+AC_ARG_ENABLE(bzip2, AC_HELP_STRING([--disable-bzip2], [disable support for libbz2 (default=autodetect)]), [ enable_bzip2=$enableval ], [ enable_bzip2=yes ])
-+
-+if test "x$enable_bzip2" = "xyes"; then
-+ have_libbz2="1"
-+ AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"])
-+ AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"])
-+fi
-+
- if test "x${have_libbz2}" = "x1" ; then
- AC_DEFINE([HAVE_LIBBZ2])
- fi
diff --git a/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch b/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch
deleted file mode 100644
index 1ac090d9486..00000000000
--- a/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur xar-1.5.2.orig/lib/Makefile.inc.in xar-1.5.2/lib/Makefile.inc.in
---- xar-1.5.2.orig/lib/Makefile.inc.in 2007-12-29 20:49:57.000000000 +0200
-+++ xar-1.5.2/lib/Makefile.inc.in 2010-04-07 01:18:59.027890429 +0300
-@@ -134,7 +134,7 @@
- $(LIBRXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o)
- @mkdir -p $(@D)
- ifeq (elf, @abi@)
-- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@
-+ $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
- endif
- ifeq (macho, @abi@)
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @abs_objroot@$(LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@
-@@ -150,7 +150,7 @@
- $(LIBXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o)
- @mkdir -p $(@D)
- ifeq (elf, @abi@)
-- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@
-+ $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
- endif
- ifeq (macho, @abi@)
- $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@
diff --git a/app-arch/xar/xar-1.5.2-r1.ebuild b/app-arch/xar/xar-1.5.2-r1.ebuild
deleted file mode 100644
index 4f493f664b6..00000000000
--- a/app-arch/xar/xar-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools base eutils
-
-DESCRIPTION="An easily extensible archive format"
-HOMEPAGE="https://github.com/mackyle/xar"
-SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="acl +bzip2"
-
-DEPEND="dev-libs/openssl
- dev-libs/libxml2
- sys-libs/zlib
- acl? ( sys-apps/acl )
- bzip2? ( app-arch/bzip2 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( TODO )
-PATCHES=( "${FILESDIR}/${P}-automagic_acl_and_bzip2.patch"
- "${FILESDIR}/${P}-respect_ldflags.patch" )
-
-src_prepare() {
- base_src_prepare
- eautoconf
-}
-
-src_configure() {
- econf $(use_enable acl) $(use_enable bzip2)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/, app-arch/xar/files/
@ 2022-07-16 19:35 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2022-07-16 19:35 UTC (permalink / raw
To: gentoo-commits
commit: f61a854bf04077812644f5a7d1b1ef508bb43d70
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 19:34:13 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 19:35:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61a854b
app-arch/xar-1.8.0.0.487.100.1: version bump, security fix #820641
xar version from macOS 12.3 and up
Bug: https://bugs.gentoo.org/820641
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-arch/xar/Manifest | 1 +
.../xar/files/xar-1.8.0.0.487-non-darwin.patch | 12 +++
.../xar-1.8.0.0.487-variable-sized-object.patch | 18 +++++
app-arch/xar/xar-1.8.0.0.487.100.1.ebuild | 88 ++++++++++++++++++++++
4 files changed, 119 insertions(+)
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 73ada38ef97f..441896afc4b7 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,3 +1,4 @@
DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10
+DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6
diff --git a/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch b/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch
new file mode 100644
index 000000000000..c350f69f4ca0
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch
@@ -0,0 +1,12 @@
+don't do availability stuff on non-Darwin
+
+--- a/include/xar.h.in
++++ b/include/xar.h.in
+@@ -52,6 +52,7 @@
+ #import <os/availability.h>
+ #else
+ #define API_DEPRECATED(...)
++#define API_AVAILABLE(...)
+ #endif
+
+ #pragma pack(4)
diff --git a/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch b/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch
new file mode 100644
index 000000000000..8779c1129cd7
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch
@@ -0,0 +1,18 @@
+GCC doesn't like this:
+
+filetree.c:744:9: error: variable-sized object may not be initialized
+
+Since there's nothing changing at runtime at all, just make the compiler
+see it's always going to be 1.
+
+--- a/lib/filetree.c
++++ b/lib/filetree.c
+@@ -740,7 +740,7 @@
+ size_t fspath1_size = 0, fspath2_size = 0;
+ size_t ns1_size = 0, ns2_size = 0;
+ const struct __xar_file_t * child1 = NULL, * child2 = NULL;
+- const uint keys_to_ignore_count = 1;
++#define keys_to_ignore_count 1
+ char * keys_to_ignore[keys_to_ignore_count] = { "id" }; // ID is allowed ot mismatch
+
+ // If the two pointers match, call it the same.
diff --git a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
new file mode 100644
index 000000000000..7e4e0547d540
--- /dev/null
+++ b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal multilib
+
+APPLE_PV=$(ver_cut 5-) # 487: macOS 12.3 and up
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://github.com/apple-oss-distributions/xar/tree/xar-${APPLE_PV}"
+SRC_URI="https://github.com/apple-oss-distributions/xar/archive/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+ elibc_musl? ( sys-libs/fts-standalone )
+ kernel_linux? ( virtual/acl )
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+ app-arch/bzip2[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-ext2.patch
+ "${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+ "${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+ "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+ "${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch
+ "${FILESDIR}"/${PN}-1.8.0.0.487-non-darwin.patch
+ "${FILESDIR}"/${PN}-1.8.0.0.487-variable-sized-object.patch
+)
+
+S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+ default
+
+ # make lib headers available (without installing first?)
+ cd "${S}"/include || die
+ mv ../lib/*.h . || die
+
+ # strip RPATH pointing to ED
+ cd "${S}"/src || die
+ sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+ # avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+ # file, this doesn't happen outside portage, but it does from the
+ # ebuild env, causing the install phase to re-compile xar.o and link
+ # the executable
+ echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+ # drop Darwin specific reliance on CommonCrypto Framework, for it
+ # depends on what version of Darwin we're on, and it is much simpler
+ # to just use openessl instead, which we maintain and control
+ cd "${S}" || die
+ sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+ include/archive.h \
+ lib/hash.c \
+ || die
+
+ # fix branding somewhat
+ sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+ use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
+ append-cflags -Wno-unused-result # allow to see real problems
+ ECONF_SOURCE=${S} \
+ econf --disable-static
+ # botched check, fix it up
+ if use kernel_SunOS ; then
+ sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+ fi
+ # allow xar/xar.h to be found
+ (cd include && ln -s . xar)
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-16 19:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-20 12:20 [gentoo-commits] repo/gentoo:master commit in: app-arch/xar/, app-arch/xar/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2022-07-16 19:35 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox