From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- net-libs/libiscsi/Manifest | 5 +++-- .../files/libiscsi-1.18.0-fno-common.patch | 14 +++++++++++++ net-libs/libiscsi/libiscsi-1.18.0.ebuild | 23 +++++++++++++-------- net-libs/libiscsi/libiscsi-9999.ebuild | 24 +++++++++++++--------- 4 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch (limited to 'net-libs/libiscsi') diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest index 3ad8c035df6d..3230aa217c7d 100644 --- a/net-libs/libiscsi/Manifest +++ b/net-libs/libiscsi/Manifest @@ -1,4 +1,5 @@ +AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e -EBUILD libiscsi-1.18.0.ebuild 701 BLAKE2B da88c225c1fd5330dbae0050ca38dc8c24a5b3ee61975cfd309e888e33c254dce64aa4241e892d4c5f15151786f62feb20cddeefbcaf4f14551a868b83a4f3c9 SHA512 4caf6d8ec37771d33c15e69d1c4af83377d67c7b8957d824e0baa3017e1c9652e64acd8105a3920c4c003a536b589d9a0e7a24e69330a01d0ec7edb24ba9d4dc -EBUILD libiscsi-9999.ebuild 639 BLAKE2B 89eb8fb7186b731e920ac69ecdc0ac6ce3cfa9722d61e20f9b1fd5615f47274c303c99ed6e5b5d4f7c9f66aa2ee76f4945d4f5adc960df593f84188766df7063 SHA512 45c93c5fb0cfc20ba74c11777711308075fd9f658f2ba2e99421ea2002a159fd90bd0f9297a6bd0d43fdd0e768ec97fa0d52e7e85053b0b7524d6904592dad48 +EBUILD libiscsi-1.18.0.ebuild 829 BLAKE2B f412c0154a82852ddaa96053c326f976d73dcd3bdd041698de82f94b650516835e9dd4d9ec72c31e66f75b3211750fe70163e681a6f0094a53a4371ca4bd1597 SHA512 f197f360b60fdebffdc0332b4575abcdca1b46e7d89a7854f4b4a0e6f67168e5acb91fbac079c11f40f640ce4e495608dafb1029bbfdeaffb3059efe8561dd29 +EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221 MISC metadata.xml 247 BLAKE2B 3951ab56f9a5dd54a6da332a8f5a7c2b445ec812f8ba6ff6e8957e0ea605c197954b403c8da0d81fc02ee829ccbf807ee8fb929b05ff6d347e67bc22d8023c26 SHA512 8188eee6fd9f0b2bf471e9ceec1bb6459f1ef84ba7ef3dc372747043d3a6db6256dccd4e9e12596a07a04e778576e83fcb56350e59a7e5e09c43ac4dac789af9 diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch new file mode 100644 index 000000000000..e5ce2f7bd493 --- /dev/null +++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/708526 +Taken from: https://github.com/sahlberg/libiscsi/pull/307 +Author: wanghonghao +--- a/include/iser-private.h ++++ b/include/iser-private.h +@@ -159,7 +159,7 @@ struct iser_tx_desc { + struct iser_cm_hdr { + uint8_t flags; + uint8_t rsvd[3]; +-} __packed; ++}; + + struct iser_pdu { + struct iscsi_pdu iscsi_pdu; diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild index 652b0b2953a8..d5f2c942c2dc 100644 --- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild +++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild @@ -1,22 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +fi + DESCRIPTION="iscsi client library and utilities" HOMEPAGE="https://github.com/sahlberg/libiscsi" -SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="GPL-2 LGPL-2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" -IUSE="static-libs" RDEPEND="dev-libs/libgcrypt:0=" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { default eautoreconf @@ -25,11 +32,11 @@ src_prepare() { src_configure() { econf \ --enable-manpages \ - --disable-werror \ - $(use_enable static-libs static) + --disable-static \ + --disable-werror } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild index 6defe3546295..9d1977923e12 100644 --- a/net-libs/libiscsi/libiscsi-9999.ebuild +++ b/net-libs/libiscsi/libiscsi-9999.ebuild @@ -1,19 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools git-r3 +inherit autotools + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +fi DESCRIPTION="iscsi client library and utilities" HOMEPAGE="https://github.com/sahlberg/libiscsi" -SRC_URI="" -EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" SLOT="0" LICENSE="GPL-2 LGPL-2" -KEYWORDS="" -IUSE="static-libs" RDEPEND="dev-libs/libgcrypt:0=" DEPEND="${RDEPEND}" @@ -26,11 +30,11 @@ src_prepare() { src_configure() { econf \ --enable-manpages \ - --disable-werror \ - $(use_enable static-libs static) + --disable-static \ + --disable-werror } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3