From 0e1e958888ae64e46a9c12ba2a85340eca0aae58 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:03:40 -0400 Subject: [PATCH] bump(app-crypt/rhash): sync with upstream --- .../portage-stable/app-crypt/rhash/Manifest | 2 + .../rhash/files/rhash-1.3.6-no_echon.patch | 54 +++++++++++ .../app-crypt/rhash/files/unquote-cc.patch | 26 +++++ .../app-crypt/rhash/metadata.xml | 16 ++++ .../app-crypt/rhash/rhash-1.3.5.ebuild | 94 +++++++++++++++++++ .../app-crypt/rhash/rhash-1.3.6-r1.ebuild | 77 +++++++++++++++ .../metadata/md5-cache/app-crypt/rhash-1.3.5 | 13 +++ .../md5-cache/app-crypt/rhash-1.3.6-r1 | 13 +++ 8 files changed, 295 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest new file mode 100644 index 0000000000..f3404d7c09 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest @@ -0,0 +1,2 @@ +DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c +DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch new file mode 100644 index 0000000000..9b25b29a89 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch @@ -0,0 +1,54 @@ +From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Mon, 19 Mar 2018 10:47:13 +0100 +Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell + +See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n" +with "printf '%s'". +--- + configure | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index f480f7b..2a7d485 100755 +--- a/configure ++++ b/configure +@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto + INSTALL_LIB_SHARED=auto + INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR" + +-case $(echo -n) in +- -n) # SysV style +- ECHO_N= +- ECHO_C='\c' +- ;; +- *) # BSD style +- ECHO_N='-n ' +- ECHO_C= +- ;; +-esac +- + # display error message and exit + die () { + echo +@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT + + str_concat() + { +- echo ${ECHO_N} $@ ${ECHO_C} ++ printf '%s ' $@ + } + + yn_nonempty() +@@ -246,7 +235,7 @@ yn_nonempty() + # Use this before starting a check + start_check() { + echo "============ Checking for $1 ============" >> "$TMPLOG" +- echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}" ++ printf '%s' "Checking for $1 ... " + res_comment="" + } + +-- +2.16.2 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch new file mode 100644 index 0000000000..77ccc9b2c5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch @@ -0,0 +1,26 @@ +From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sun, 18 Mar 2018 14:23:28 +0000 +Subject: [PATCH] configure: Don't quote $CC when calling it + +It might have additional arguments. +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index f480f7b..8ebb929 100755 +--- a/configure ++++ b/configure +@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then + else + CC_TMP="$CC" + for CC in "$CC_TMP" gcc cc ; do +- if "$CC" -v >/dev/null 2>&1; then ++ if $CC -v >/dev/null 2>&1; then + cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) + if test "$cc_name_tmp" = "gcc"; then + cc_name=$cc_name_tmp +-- +2.16.1 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml new file mode 100644 index 0000000000..a6651d883c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml @@ -0,0 +1,16 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + + rhash + rhash/RHash + https://github.com/rhash/RHash/issues + + + RHash is a console utility for calculation and verification of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru. + + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild new file mode 100644 index 0000000000..dd34f36efb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Console utility and library for computing and verifying file hash sums" +HOMEPAGE="http://rhash.anz.ru/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="debug nls libressl ssl static-libs" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) +)" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/RHash-${PV}" + +src_prepare() { + default + + # Install /etc stuff inside the Prefix + sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die + + if use elibc_Darwin ; then + local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' + local install_name='-install_name $(LIBDIR)/$(SONAME)' + sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \ + -e '/^SOLINK/s/\.so/.dylib/' \ + -e "s:${ver_script}:${install_name}:" \ + librhash/Makefile \ + Makefile || die + fi + + if use elibc_SunOS ; then + # https://sourceware.org/bugzilla/show_bug.cgi?id=12548 + # skip the export.sym for now + sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die + fi + + multilib_copy_sources +} + +multilib_src_compile() { + local ADDCFLAGS=( + $(use debug || echo -DNDEBUG) + $(use nls && echo -DUSE_GETTEXT) + $(use ssl && echo -DOPENSSL_RUNTIME -rdynamic) + ) + + local ADDLDFLAGS=( + $(use ssl && echo -ldl) + ) + + use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD || + use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS && + ADDLDFLAGS+=( $(use nls && echo -lintl) ) + + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ + ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \ + PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \ + build-shared $(use static-libs && echo lib-static) +} + +myemake() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \ + LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}" +} + +multilib_src_install() { + myemake -C librhash install-lib-shared install-so-link + multilib_is_native_abi && myemake install-shared + use static-libs && myemake install-lib-static +} + +multilib_src_install_all() { + myemake -C librhash install-headers + use nls && myemake install-gmo + einstalldocs +} + +multilib_src_test() { + cd tests || die + LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed" +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild new file mode 100644 index 0000000000..24efa67054 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Console utility and library for computing and verifying file hash sums" +HOMEPAGE="http://rhash.anz.ru/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris" +IUSE="debug nls libressl ssl static-libs" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) +)" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/RHash-${PV}" + +PATCHES=( + "${FILESDIR}"/unquote-cc.patch + "${FILESDIR}"/${P}-no_echon.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + set -- \ + ./configure \ + --target="${CHOST}" \ + --cc="$(tc-getCC)" \ + --ar="$(tc-getAR)" \ + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --sysconfdir="${EPREFIX}"/etc \ + --disable-openssl-runtime \ + --disable-static \ + --enable-lib-shared \ + $(use_enable debug) \ + $(use_enable nls gettext) \ + $(use_enable ssl openssl) \ + $(use_enable static-libs lib-static) + + echo "${@}" + "${@}" || die "configure failed" +} + +# We would add compile-gmo to the build targets but install-gmo always +# recompiles unconditionally. :( + +multilib_src_install() { + # -j1 needed due to race condition. + emake DESTDIR="${D}" -j1 \ + install{,-pkg-config} \ + $(use nls && echo install-gmo) \ + $(use kernel_Winnt || echo install-lib-so-link) + + emake DESTDIR="${D}" -j1 \ + -C lib${PN} install-headers +} + +multilib_src_test() { + emake test +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 new file mode 100644 index 0000000000..c8281d8702 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[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(-)?] ) libressl? ( dev-libs/libressl:0=[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(-)?] ) ) nls? ( sys-devel/gettext ) +DESCRIPTION=Console utility and library for computing and verifying file hash sums +EAPI=6 +HOMEPAGE=http://rhash.anz.ru/ +IUSE=debug nls libressl ssl 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 arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[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(-)?] ) libressl? ( dev-libs/libressl:0=[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(-)?] ) ) +SLOT=0 +SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz +_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=4aefbd488aec345d7b4bbc5c784f021d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 new file mode 100644 index 0000000000..8008bb09cb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[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(-)?] ) libressl? ( dev-libs/libressl:0=[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(-)?] ) ) nls? ( sys-devel/gettext ) +DESCRIPTION=Console utility and library for computing and verifying file hash sums +EAPI=6 +HOMEPAGE=http://rhash.anz.ru/ +IUSE=debug nls libressl ssl 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[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(-)?] ) libressl? ( dev-libs/libressl:0=[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(-)?] ) ) +SLOT=0 +SRC_URI=mirror://sourceforge/rhash/rhash-1.3.6-src.tar.gz +_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=5460f3faee7265c62db57c3b52d7e35d