Merge pull request #3623 from dm0-/glsa

Fix GLSA

sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/Manifest

@@ -1 +1 @@
-DIST libmspack-0.4alpha.tar.gz 597036 SHA256 b7958983f60cbec40d48ef87520210f9d8e2672a57a5ce0a2187b3d4fb2f5c68 SHA512 cf6a1a7c2e84879021509897b10b6956ff2bb81f75416b376e9e8f8264f60ce04abf03eec1075f85d23a3c19cdac88f1d780fec7ee8916b2c4d86587a10604bc WHIRLPOOL b7a3b6548c27bae486b22b0f02071c04f728ce836ab9beb11548417a359553d0cb2bb16cd65c85ddc8097ea1244cc001a5fbf11602c124b60941be59810f4a70
+DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a

sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch

@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac  | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/libmspack/configure.ac b/libmspack/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T

sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.4_alpha.ebuild

@@ -1,23 +0,0 @@
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="http://www.cabextract.org.uk/libmspack/"
-SRC_URI="http://www.cabextract.org.uk/libmspack/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--prefix=/usr/share/oem \
-		$(use_enable static-libs static)
-}

sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild

@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+else
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+fi
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--prefix=/usr/share/oem \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}

sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/metadata.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<use>
+		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
+	</use>
 </pkgmetadata>

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.4_alpha

@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=A library for Microsoft compression formats
-EAPI=5
-HOMEPAGE=http://www.cabextract.org.uk/libmspack/
-IUSE=static-libs
-KEYWORDS=amd64 arm64
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz
-_md5_=5003e340a6182589e7ec9a5b79463831

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1

@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for Microsoft compression formats
+EAPI=7
+HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.9.1alpha.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9c5af6879c11beeae38d6645d137178f