diff options
Diffstat (limited to 'sys-block')
22 files changed, 416 insertions, 500 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz Binary files differindex 8bd3819ba9b0..0c323928fe2a 100644 --- a/sys-block/Manifest.gz +++ b/sys-block/Manifest.gz diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest index 4d3d22c3532b..11cec49492f1 100644 --- a/sys-block/arcconf/Manifest +++ b/sys-block/arcconf/Manifest @@ -1,5 +1,9 @@ DIST arcconf_v1_2_20618.zip 11920300 BLAKE2B c0ee178216a369ee16a49a97a7a5a8948e10c0dc6b1791ce536f4a23eefb90a9702fb24c1d899916e7d5012ec1e79b0f55bfc3e6e0f9848de2f20b15ccabae2c SHA512 e8415e929cd7a8c8bca33f0de29bdadf3595da911bc3c0984226e02e01e6f4e9c822363dd8aa093efd524eea19f0689784e0300403513a99ead14ac08c487efe DIST arcconf_v1_7_21229.zip 11056748 BLAKE2B d867eb3fe8ddb1e2429b91b33dcfddc4730e1ebc82eca019ad0d2d7fbea92ae421482d0bb62e5a6c28d98b5655ff4a6c8e9f73228d5cb398c1bc23428ecdeb90 SHA512 66a56ea66b8011c1f8f431b25f95050e541311ee415a0d4bdee6ef6416ff499be41d275819694384f66e5a1401b467da82ab15ce7c3fe49e1e013370293cf63a +DIST arcconf_v2_04_22665.zip 35218069 BLAKE2B 77664d219e3262c5302f53924f1182ddc6385b0987072b9c50aaa5591c651766e48d5e5a7ec8c4cf8fab3d8930f322204c3f90d2170fbe041adb69a221fe9667 SHA512 33810ec898935c98c955d869fa443e259761fbd1c329a95a1f85bfca50d25685f6a050eeda535daa81221a922dc094a9ff079080a3969bab826874424dcf85e2 +DIST arcconf_v2_05_22932.zip 58966959 BLAKE2B 7a809e4e3fcbbf915fec399a90064a82ec4fd70526ce3ee51036b55a030e6fdffe2d9e502618456aee68d247e0de2b986ee9f85f15a1f42a366f7498ced9fe8e SHA512 73b30ac06301ab97b42ff86f92a11968b4e4f9fac83bee4cdb57c0096ccdf9bec1adbd1d4b192dcaf5d112b8a5181a52e291df1f5a10e4aa1d25e72070119c96 EBUILD arcconf-1.2.20618.ebuild 1449 BLAKE2B 020bd2d720ac173992c83a40614add9407cac757aa78c5a64760af127d007f43b84579fccd7023473a257d0fc5ad4ca3fa47841f9873b15ad3b9ce9dd47289d0 SHA512 19acdb475bda96c468a3e72d98b26e65eb3694a7959a29d4a092bcfd56ffbe1beba5e2647f7248c4206a3d142c302cea8a16135ff163090e1a7b933e4fdb8616 EBUILD arcconf-1.7.21229.ebuild 1465 BLAKE2B 1c4c9e859d4bc1566a818d6ba4e0a73efd9ec03a25bc9d6d0b31b3256dfc70a9eebb11921dd7a37e06b067e7b901331615fc380f1e35f8a500e4df63ba042c03 SHA512 41f35eb7e2784982326d75fdacfc8b58a7c84291f6a23ab64c9970d6e02183d133c73cf873c3043fe7dedf3b8defa601b5f0fb42f90b5f0d9be35e1f5289e888 +EBUILD arcconf-2.04.22665.ebuild 1693 BLAKE2B ded15eef41fda77a28c865dddb984a32aa667f74272c0ede9e6fb46845b707bbf99141b706eb6762ee456a07c85f067c38c158cb793c7b6e47b0d0dd1770ebe7 SHA512 d72d9b78fb136562bb8f394313ca6229eb338601607eef77af5cfebc8b215b197808eec1de21ebd9ea1de8bc53cab3d8454ee6d107a9f3b95f8ba13e8977d90b +EBUILD arcconf-2.05.22932.ebuild 1693 BLAKE2B ded15eef41fda77a28c865dddb984a32aa667f74272c0ede9e6fb46845b707bbf99141b706eb6762ee456a07c85f067c38c158cb793c7b6e47b0d0dd1770ebe7 SHA512 d72d9b78fb136562bb8f394313ca6229eb338601607eef77af5cfebc8b215b197808eec1de21ebd9ea1de8bc53cab3d8454ee6d107a9f3b95f8ba13e8977d90b MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 diff --git a/sys-block/arcconf/arcconf-2.04.22665.ebuild b/sys-block/arcconf/arcconf-2.04.22665.ebuild new file mode 100644 index 000000000000..2f607e620d68 --- /dev/null +++ b/sys-block/arcconf/arcconf-2.04.22665.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info + +DESCRIPTION="Adaptec RAID Controller Command Line Utility" +HOMEPAGE="http://www.adaptec.com/en-us/downloads/" +SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_v${PV//./_}.zip" + +KEYWORDS="~amd64 ~x86" +LICENSE="Adaptec-EULA" +SLOT="0" + +DEPEND="app-arch/unzip" +RDEPEND="${RDEPEND}" + +RESTRICT="mirror bindist" +# RESTRICT="fetch" + +QA_PRESTRIPPED="/opt/bin/arcconf" + +S="${WORKDIR}" + +# Maintainer notes: +# * When going via the $HOMEPAGE one has to agree to the Adaptec-EULA as +# referenced above. +# * Despite that EULA, one can download the package seemingly without +# restrictions from $SRC_URI. +# * It is therefore assumed that the binary is made available for public +# download. Even more so since the archive does not contain a license +# agreement stating otherwise. + +#pkg_nofetch() { +# einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download" +# einfo "Please visit $HOMEPAGE, choose a controller (for example the Series 7, 7805)" +# einfo "and then navigate to Storage Manager Downloads for the ARCCONF Command Line Utility." +# einfo "And place $A in ${DISTDIR}" +#} + +# Maintainer notes: +# * FreeBSD binaries would be available for FreeBSD 7..9, which ones do we need? + +# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault +pkg_setup() { + if linux-info_get_any_version && linux_config_src_exists ; then + CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN" + check_extra_config + fi +} + +src_install() { + exeinto /opt/bin + + if use amd64; then + doexe linux_x64/cmdline/arcconf + else + doexe linux/cmdline/arcconf + fi +} diff --git a/sys-block/arcconf/arcconf-2.05.22932.ebuild b/sys-block/arcconf/arcconf-2.05.22932.ebuild new file mode 100644 index 000000000000..2f607e620d68 --- /dev/null +++ b/sys-block/arcconf/arcconf-2.05.22932.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info + +DESCRIPTION="Adaptec RAID Controller Command Line Utility" +HOMEPAGE="http://www.adaptec.com/en-us/downloads/" +SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_v${PV//./_}.zip" + +KEYWORDS="~amd64 ~x86" +LICENSE="Adaptec-EULA" +SLOT="0" + +DEPEND="app-arch/unzip" +RDEPEND="${RDEPEND}" + +RESTRICT="mirror bindist" +# RESTRICT="fetch" + +QA_PRESTRIPPED="/opt/bin/arcconf" + +S="${WORKDIR}" + +# Maintainer notes: +# * When going via the $HOMEPAGE one has to agree to the Adaptec-EULA as +# referenced above. +# * Despite that EULA, one can download the package seemingly without +# restrictions from $SRC_URI. +# * It is therefore assumed that the binary is made available for public +# download. Even more so since the archive does not contain a license +# agreement stating otherwise. + +#pkg_nofetch() { +# einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download" +# einfo "Please visit $HOMEPAGE, choose a controller (for example the Series 7, 7805)" +# einfo "and then navigate to Storage Manager Downloads for the ARCCONF Command Line Utility." +# einfo "And place $A in ${DISTDIR}" +#} + +# Maintainer notes: +# * FreeBSD binaries would be available for FreeBSD 7..9, which ones do we need? + +# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault +pkg_setup() { + if linux-info_get_any_version && linux_config_src_exists ; then + CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN" + check_extra_config + fi +} + +src_install() { + exeinto /opt/bin + + if use amd64; then + doexe linux_x64/cmdline/arcconf + else + doexe linux/cmdline/arcconf + fi +} diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 0e55d79c775b..0298bb5be755 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -19,10 +19,13 @@ AUX open-iscsi-2.0.874-include-sysmacros.patch 416 BLAKE2B a1f0f6c336528ba02ea75 AUX open-iscsi-2.0.874-musl-ethtool-compat.patch 2230 BLAKE2B fada90cbf8173364b795be4756805ac0ae45575b785796d6aec9eb6781003974b0d4450e758d42e45778672ba053122b533d8e56bb9c8db1fbf31aa7e8bfe6dc SHA512 09a3b828773e0d7c5d98f8ba8c0683bd1ef5fd83860fafaa75d89cce9e09cebc68bfaea62091aeadeb1d1adfe5318c0af9bfa0a74f2d802568abe1a59b4ebf03 AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213dad21d21cb33c91e8b4763816ce6fccc8f9d8f57d9e7bd246e3417e78da0ce61cade5a29433b2b44d025875cd2199dee2e6353 SHA512 264313bc8de01bcad1db858c0b99ca2c294c22eb1b2693e0445083a895afd0cdc9178ff2dad5de18628a6e61723ad5d2e0c0d4789ce07ccae131f575747aa382 AUX open-iscsi-2.0.875-include-sysmacros.patch 603 BLAKE2B 9c3fcf3bfd0a2ee04c31dd01dbb50680bc9bb434523f0e298d55b762be11f0cd4ef5c7b254466859f755f9e733e8ceaa54795f7dc57518c5136be5ff8001cffe SHA512 686698edc063fbdc47f07dea76ef95e8ae1038eeb3f012f4b6bc098cb0740e9988fc45779e921f4f01ef418d505f194c427308927c67d7af06e03e12b1ae9064 +AUX open-iscsi-2.0.876-Makefiles.patch 1416 BLAKE2B e953a6b5b802feae3068322782f3cd278c878814100fb37bee81400bed76096f08d01575e42d71538ae76086261dccc65104e3df19f3e36e3e660726cdbd3ec5 SHA512 f6038dc8c8d2a31528844f348bc8144616b69bf97f01986a4481b3a81de4bc896204a48c290f8b156d1e85ffd792439251fd52a498d053ed84d21d8b07d1d240 +AUX open-iscsi-2.0.876-musl-fixes.patch 2323 BLAKE2B c69d973bdc48adc1f4f8e5680f8cf108172f708889bb740cd7960f09dd48ee29d6ccdbf6f1ed08579838fc1913cd3c8ee0b9325714e793de5884eb6faea0e161 SHA512 2224465ba4ae0f8eb195a1181304e17285c6501320f1458b6eb9d092a19c08bdedb08e8b88bfc319eb878a18fb1b487842719fa24f69f5885b1ba7845197fe12 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 +DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac SHA512 f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422 EBUILD open-iscsi-2.0.872-r2.ebuild 2987 BLAKE2B 9de1e02c0f2373cdcfb333d8e944f6329dba97fabafbd41ad375519e5c10f9d9d47d58053616caf098b27ec220dc5098a2d0ee39ed33878d1bc89c00e66db280 SHA512 4572c1e2d0cf162d414d3c3771acabaf25f2057d7c25853adf5cc61106a59c86e9d3241690af477ab78023b3af3d1ee5d311ce88a21e7274accc169daf45e41e EBUILD open-iscsi-2.0.872-r3.ebuild 3163 BLAKE2B 37fc57e2fe93d99c8c863092d63fcc372899f519a9001b3fff3d24350e502ba100811f316c841a3d2e0a00250ec65219af6efcd40167bb08c7dda35984f395a5 SHA512 611cad8dca44eba6c5d512bad51b6018e3c6ab9b1a187c96f56957ab047789b53e9f4ec211b5a6fc6d8c08615812a03b95ed98d80505156952236e7a4a67c4c1 EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339 @@ -32,5 +35,6 @@ EBUILD open-iscsi-2.0.873.ebuild 2347 BLAKE2B 1e9a9726dce22fec8219c321fc0e65749a EBUILD open-iscsi-2.0.874-r1.ebuild 3629 BLAKE2B 53330a69aee8fd137f5d09965e86f21deec97f5cd1ba6168b4d50eb47cf13e2d8e2493707110191d3d7c91d38720a5b1666e32bbc0686a9e8f4db09936638d18 SHA512 f9dbe5b16a4580351f424c98dafde5e83e99bda84d2d389b96b34f772a757097195adb183df2030a8b15da752ac449c2588fbb11a4fb9cfb7095a4fa31b7ab00 EBUILD open-iscsi-2.0.874-r2.ebuild 3666 BLAKE2B 05affe10aa1657fbfe9aee479f5ba48c20c2877eb77dae3439bc5588efc12e8851ee03b6884c04fc5a32073ea06643a6ce4e8c0216b492c0e9f762ee2268eb27 SHA512 7104db5ae04c1abc3553cf83ddc027c83d32523a1979fcebaa2c0f4e57b02ef800c88babdb4bdf2930335b79d185bd9269015676d40faf83cca95b1387c8816e EBUILD open-iscsi-2.0.874.ebuild 3164 BLAKE2B 3a001be2ab05943a7614f35e39da4286751cece5e2b7832799211fc1a33c81b437e22ba64269f46a19e38ae80a11993b2e0d5d7d7beb036acf1ce02139cb0b5e SHA512 19219e336d2e289dfa0d2b1e28d8b7d1274f734fd6cd55be1512254412a2688122fc1fe6137d4050cb62160981a358366184c668369212103d28fcdaa1305278 -EBUILD open-iscsi-2.0.875.ebuild 3719 BLAKE2B ec0d258d0ed73095190340d43c1e932e6b4881b2c2fc3ad5b2f34f5dd5ee4f7af4a8794e2213e653776659bba52cd77fbccbe9355239ac4df5924c93c76ae3b5 SHA512 aa7b713bbe5c19a06e5c47be3d311f2614e74f397ac3bbd3b595573d98178baea2e6ab0dd0cebf109bde7e64986af03a4f4ab73883a4882fef2509c0d9e275dc +EBUILD open-iscsi-2.0.875.ebuild 3718 BLAKE2B f14e1c62091837168f1e377d5a3a9b6883ac46df94bc1ba6408ae279dac5619fc8a7c5d735710138c8dab8828b96a295a70a18fd4d8ffb32c23db158240f9afc SHA512 cc8f88e62e7cb7609b58c0535bd1d863efe1f2bf59ac3d5044e80e7d06aaee75c95799a317f458841750d7e5e6c6ef6ce415af1efa2f168771d24e1ea2682f37 +EBUILD open-iscsi-2.0.876.ebuild 3620 BLAKE2B 62aa39170d32cea0f523cf148fa3770fc027b4db72d719996c5621062be9e9f593c95bf3b4a108ae62c13a172a84dc96ffa6587e3e3f51f9635af10abb3a0d6a SHA512 1bb4f8e5e98b93a704242a89e40b692f83dac92497fe018fd87fd635d2a289b7597874fdfa02004b3fd01e2809e45ea514c2a9f86d8ee29c12533bb2638785ff MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch new file mode 100644 index 000000000000..2cfa43622853 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch @@ -0,0 +1,61 @@ +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) + clean: +- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) ++ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ + + clean: +- rm -f *.o $(PROGRAMS) .depend ++ $(RM) *.o $(PROGRAMS) .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/fwparam_ibft/Makefile ++++ b/utils/fwparam_ibft/Makefile +@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr + all: $(OBJS) + + clean: +- rm -f *.o $(CLEANFILES) .depend ++ $(RM) *.o $(CLEANFILES) .depend + + $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +--- a/utils/sysdeps/Makefile ++++ b/utils/sysdeps/Makefile +@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o + all: $(SYSDEPS_OBJS) + + clean: +- rm -f *.o .depend ++ $(RM) *.o .depend + + depend: +- gcc $(CFLAGS) -M `ls *.c` > .depend ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend + + -include .depend +-- +2.16.2 + diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch new file mode 100644 index 000000000000..7bb0c5d6e779 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch @@ -0,0 +1,92 @@ +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,2 +27,3 @@ + #include <errno.h> ++#include <fcntl.h> + #include <dirent.h> +--- a/usr/iscsiadm.c ++++ b/usr/iscsiadm.c +@@ -3269,2 +3269,3 @@ + int do_discover = 0, sub_mode = -1; ++ int argerror = 0; + int portal_type = -1; +@@ -3458,2 +3459,5 @@ + usage(0); ++ case '?': ++ log_error("unrecognized character '%c'", optopt); ++ argerror = 1; + } +@@ -3473,4 +3477,3 @@ + +- if (optopt) { +- log_error("unrecognized character '%c'", optopt); ++ if (argerror) { + rc = ISCSI_ERR_INVAL; +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -358,3 +358,3 @@ + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp); + +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -44,3 +44,3 @@ + #include <linux/sockios.h> +-#include <linux/ethtool.h> ++#include "ethtool-compat.h" + #include <sys/mman.h> +--- /dev/null ++++ b/iscsiuio/src/unix/libs/ethtool-compat.h +@@ -0,0 +1,51 @@ ++/* ++ * ethtool-compat.h: adopted from ++ # ethtool.h: Defines for Linux ethtool. ++ * ++ * Copyright (C) 1998 David S. Miller (davem@redhat.com) ++ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com> ++ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com) ++ * Portions Copyright 2002 Intel (eli.kupermann@intel.com, ++ * christopher.leech@intel.com, ++ * scott.feldman@intel.com) ++ * Portions Copyright (C) Sun Microsystems 2008 ++ */ ++ ++#include <linux/types.h> ++#include <netinet/if_ether.h> ++ ++#define ETHTOOL_FWVERS_LEN 32 ++#define ETHTOOL_BUSINFO_LEN 32 ++#define ETHTOOL_EROMVERS_LEN 32 ++ ++struct ethtool_drvinfo { ++ __u32 cmd; ++ char driver[32]; ++ char version[32]; ++ char fw_version[ETHTOOL_FWVERS_LEN]; ++ char bus_info[ETHTOOL_BUSINFO_LEN]; ++ char erom_version[ETHTOOL_EROMVERS_LEN]; ++ char reserved2[12]; ++ __u32 n_priv_flags; ++ __u32 n_stats; ++ __u32 testinfo_len; ++ __u32 eedump_len; ++ __u32 regdump_len; ++}; ++ ++struct ethtool_tcpip4_spec { ++ __be32 ip4src; ++ __be32 ip4dst; ++ __be16 psrc; ++ __be16 pdst; ++ __u8 tos; ++}; ++ ++struct ethtool_ah_espip4_spec { ++ __be32 ip4src; ++ __be32 ip4dst; ++ __be32 spi; ++ __u8 tos; ++}; ++ ++#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild index 6aca7c297d45..1b690bab83e3 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug infiniband +tcp rdma" DEPEND="sys-block/open-isns:= diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild new file mode 100644 index 000000000000..2f34ac971b3b --- /dev/null +++ b/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev systemd + +DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" +HOMEPAGE="http://www.open-iscsi.com/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug infiniband +tcp rdma" + +DEPEND="sys-block/open-isns:= + infiniband? ( sys-fabric/ofed ) + sys-kernel/linux-headers" +RDEPEND="${DEPEND} + sys-fs/lsscsi + sys-apps/util-linux" +REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.876-musl-fixes.patch" + "${FILESDIR}/${PN}-2.0.876-Makefiles.patch" +) + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is -lt 2 6 16; then + die "Sorry, your kernel must be 2.6.16-rc5 or newer!" + fi + + # Needs to be done, as iscsid currently only starts, when having the iSCSI + # support loaded as module. Kernel builtin options don't work. See this for + # more information: + # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 + # If there's a new release, check whether this is still valid! + TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" + RDMA_MODULES="INFINIBAND_ISER" + INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS" + CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )" + if linux_config_exists; then + if use tcp; then + for module in ${TCP_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use infiniband; then + for module in ${INFINIBAND_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + if use rdma; then + for module in ${RDMA_MODULES}; do + linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$ + done + fi + fi +} + +src_prepare() { + sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die + default + + pushd iscsiuio >/dev/null || die + eautoreconf + popd >/dev/null || die +} + +src_configure() { + use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI + append-lfs-flags +} + +src_compile() { + # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build + # is messed up already here, so it's not making it that much worse. + KSRC="${KV_DIR}" CFLAGS="" \ + emake \ + OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ + AR="$(tc-getAR)" CC="$(tc-getCC)" \ + user +} + +src_install() { + emake DESTDIR="${ED}" sbindir="/usr/sbin" install + # Upstream make is not deterministic, per bug #601514 + rm -f "${ED}"/etc/initiatorname.iscsi + + dodoc README THANKS + + docinto test/ + dodoc test/* + + insinto /etc/iscsi + newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + + newconfd "${FILESDIR}"/iscsid-conf.d iscsid + newinitd "${FILESDIR}"/iscsid-init.d iscsid + + systemd_dounit "${S%/}"/etc/systemd/iscsid.service + + keepdir /var/db/iscsi + fperms 700 /var/db/iscsi + fperms 600 /etc/iscsi/iscsid.conf +} + +pkg_postinst() { + in='/etc/iscsi/initiatorname.iscsi' + if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then + { + cat "${EROOT}${in}.example" + echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" + echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" + } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" + fi +} diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest index 5417431dec8a..4005fa36fc35 100644 --- a/sys-block/open-isns/Manifest +++ b/sys-block/open-isns/Manifest @@ -3,5 +3,5 @@ AUX open-isns-0.97-ossl-1.1.patch 1133 BLAKE2B 0649413cd3a9f8684a0c7a2982d4afdeb DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed EBUILD open-isns-0.97.ebuild 891 BLAKE2B 4fc42c97068e57edc634ea5bcf40f561834d4d56d49f5c7b061cdf1a904271c169b0a63334f1c10d722b1a25a4b160a7b4e8be5c9a3c4224757709f4e4c7fad3 SHA512 098c8d16bbafa1168cf1f233fdfd787b47103b103a065939fb41e447a309f7943e54dde6b45c6569c2cf19508167df4b84c40c0b8f4edbb3bd622cc495c6d0cb -EBUILD open-isns-0.98.ebuild 824 BLAKE2B 016fc327561541a31202ef15b1725e53e3e4c2537ce549cb35bfe525cef7176c5fe7fb5efc45c2648b4ada97e9b099524b3f2b60b0748a56fc273089b6733342 SHA512 c6270de4c06a67b410df215995fe6020cc9dea3f99d82151dac44c7869c443c5a75a2e16ec12f0e04f1f6d40091515b0eb64c4322cc0e7f7d894dd9322b73bce +EBUILD open-isns-0.98.ebuild 823 BLAKE2B 4c85f437382ef3055b2b4cf92c2a9b2836da90bfae65e33264a0ea85881923544ff998cb87780173c460e9fe719f3398c4b3f4847e5db81b0a85862ef7704f95 SHA512 7b757c9fea408cb94be8143bb0679bba0a714186be4034a0bff1c970bfe4d63040a75b9bf42d154c372c03dde688de42723a37ca49c42cfde5424b08b30f8ed1 MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild index a392ec70ea15..d860a3aa21c2 100644 --- a/sys-block/open-isns/open-isns-0.98.ebuild +++ b/sys-block/open-isns/open-isns-0.98.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug slp ssl static" DEPEND=" diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest index da641b59777c..5c4e187e5a55 100644 --- a/sys-block/parted/Manifest +++ b/sys-block/parted/Manifest @@ -1,20 +1,10 @@ -AUX parted-2.4-no-gets.patch 343 BLAKE2B e1eaf9b8524fc6402a756a95e2aa21005941af7ff198a3ec1b219ef5180bebe8a361a12ee1c95992e076ba9c6ca2b1378fdd6da95b66d489ba4669f895243d4d SHA512 9538ad4c6fcc26662395f1cc768c297db0e864b5912346819d71aa85affdede68e96e43d3d5c1249971d921c33595e8980b8298430510924b7bf6f6982dabf5c -AUX parted-2.4-readline.patch 340 BLAKE2B f85e47d803293366b2ec0e4b1350f9367bcdbd02ce4192588727615612cc335e96aa092f95d1969c35264211548b86c1acc16a038536c5b13f9c526c4010b723 SHA512 965a24fd7a9c21b65ce3b55618c127b102a6e0b3783b6ed020d032d3aa572d0323ff845b390e1cb6460ac089f308b7e18b875ada2aebb5e5e8726c4beb7a8da5 -AUX parted-3.1-readline.patch 340 BLAKE2B f6dcce555f655c2e714467e1f3ad48c2f79b24db0394d7a9577194b94b868694c9a51eb9810281eaf6b7eabbc90d7e9061aebdcdf8a41278afe1a6b1224678b5 SHA512 a32774fb51fee399a2d2248415efc3a9ebe948c342f42704b38b23abfa1067845e8dffd606cb24ed5f971ce7ec3e18b707f72c0d00cb20a4d0dc6350dbb12c29 -AUX parted-3.1-zfs.patch 4767 BLAKE2B c1f822901e021d6b1797bb511c7219b3b60f88bc71726a620d17518c1c594dc8d943c806d32a81253b154867d939fc7b8e7d376513951216471a9f5fe6cd792c SHA512 2970595d4d507b5fddc3506430c5fa5f4778c493733879289e1ae6314442a29930b97acf3cdf1b1b0ff26c3c5d3b5bf4b1300a3a4ba35daf2d654a8c0d75863d AUX parted-3.2-devmapper.patch 1972 BLAKE2B 10ceeec3f6af744dad642a9b1b8e8d30a85793415bac68c87463d459e4b1fb321c1d0e9017aa895334f2a2849c436f617581c5b4f3d1d0dbe5d1a97b9f3a278b SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f2b90cbde13475b0749cf580d25dc78b424ecc003a97c4607733b7bde833022c0ba76bdcae0853c8f205fb1fb4c873639ee928 SHA512 31a79f24de58fdbc77b50790372019083375acace66f9a9d3fc93c6ec22988b7198fda13c3790e00518f7a2878de1efb914658f517d275c6ecfd3e507bc4cd15 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468 -DIST parted-2.4.tar.xz 1516412 BLAKE2B fdc489ba9e0636b6f3e67d3863acf88ab3143e60aab2a75765502347e644954014530b7b1ad6dd625e6504abf936d367e65d418ba13379f57b4ba1c386583a23 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 -DIST parted-3.1.tar.xz 1524344 BLAKE2B 51f6cb84fb0a08dc5c9f634e265e4ac7778cde9f5400771af897a8661bf6dcdcfac2b2dec817c7d0f61d3fd5f8408c065754ea756ed59491dff75595d4306a2d SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 DIST parted_3.2-19.debian.tar.xz 87288 BLAKE2B f0cef2978ead9edca3e952849deb36526eea0a050d45ab480b2aa62d02ba0a1750c28e93c28a714df6629f02ccf5a1e4fbb33a6e42b82bf6685c05aeaad1756c SHA512 de3e55545d7d94668eb608c8c31440f550baaf7b664836d199f73f7a8c75bba4ff59b4c06a23459c7d522250d7c03d29fa7f727f7d1a2b1e5a0366e83a2d871a DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22 -EBUILD parted-2.4-r1.ebuild 1276 BLAKE2B 34f0d111529caeffbff7c3468c6b1d379eac58ef299b2c3a3f0b47cd05829028eecc41602aa714e673a4313b6d317979f9c274980272b0618c5b965776be9f6e SHA512 8d9e927273fb73fe4dddafc862b0cd7db994c21f016b367b6ecd083496207adbde9ad75b0a5d1c9a2e73c5f6035bf69dc95d9e73051e6fb7e298a9ae31ce79bb -EBUILD parted-2.4.ebuild 1287 BLAKE2B 51117072f46a58c62180776e3990b9036340c52e373e36d7d68ee9256b0a0617f78f69543a2371694176dc96a01e9f75d328c4fb733c2e6e2624a4ce4e6a9957 SHA512 71e30ebc780d6a2e5f15cdf61dfe600abbe832641a90690e5fe21ff12ea96e479f2c04a0930dcb869aa9b4f720d0efabca6ee88f3da9567f2e7630e0e7bc145a -EBUILD parted-3.1-r1.ebuild 2098 BLAKE2B 4d76bff9d1665e50112a00a8e01a31c8571e8b5efe004001815611d52b775a9f6b8c99bc35893fd524fa6e5625088189ace6395f72637a328b31628ff0bbf36b SHA512 f221964e4983f772915bc1b8ee89627ebcd6cc2e01c019c6dc446f00a2d3f2cbe06875037cee6a926418ac48e29c2fc48f14de45756482139c3c5534c675b434 -EBUILD parted-3.1-r2.ebuild 2065 BLAKE2B 0daa72d53699d46a8468409d02a0568f5340444021c341f7e645aed3cd1a6dfcae0a6c48d7b1d4838382ded81b6f7715e24d2183bb0926bdb3312a4dfd6c964e SHA512 d8e0e54bdc69d0879be4bfb5835b62039037b04f788c10d53c313ffee7265216fbe483d0f55ffc5acdc1f1aeead35ec8f169b046ab4ec8e372bf2914b065b3d5 EBUILD parted-3.2-r1.ebuild 1504 BLAKE2B abac92bef34ac1a73c137feca7b17e2d03e5d878f514d82e428cdd036c59cc6573a361f3edc48082207584acb018d5625e16c76d446fd2cde1bcdeee3fe17c5c SHA512 948e4e0df79ca6fbb587950dcee4ed429ddaedf0a7fe4a669515afd24477a8615c719920b498649646a310b1fccdddd2acdb24bbb107097111a8c8da4a68fc07 EBUILD parted-3.2-r2.ebuild 1514 BLAKE2B d7144fc4a68de8e12059a1dc3a771bb633af41c46dee8cb99b38b480fe90d144dd33f090d383b70b8956abf09b4de8fc5853d44ff74f17e8a883a4f22050152f SHA512 cf2898a4c373c4597cbb99cc511527af7382f548a0b7c8b8f3bc3cd6afea6ab3344cf58c37312d5d5eeacdcb937430f27bf20627aeb9e441950c055f0266eabd EBUILD parted-3.2.ebuild 1316 BLAKE2B 19cb105ba21badec2742d763633b0290ba474208bfb2818215c6551602074f75698e42e5cec75f52a9f90161c89bcdac9c8a5b104cee56ac4182a454d634b385 SHA512 f6836f813e348cc3d8836c22d36f38cb95bcb639e994b2ab61526c961edee9af4a3a72d513ab969ed60445ecc07b234246457d7552a20f1d51836a9b696de3ed diff --git a/sys-block/parted/files/parted-2.4-no-gets.patch b/sys-block/parted/files/parted-2.4-no-gets.patch deleted file mode 100644 index efa6e00b8d45..000000000000 --- a/sys-block/parted/files/parted-2.4-no-gets.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -735,7 +735,6 @@ - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - - diff --git a/sys-block/parted/files/parted-2.4-readline.patch b/sys-block/parted/files/parted-2.4-readline.patch deleted file mode 100644 index 5873ed1e5d43..000000000000 --- a/sys-block/parted/files/parted-2.4-readline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/parted/ui.c -+++ b/parted/ui.c -@@ -1440,7 +1440,7 @@ - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function; - readline_state.in_readline = 0; - } - #endif diff --git a/sys-block/parted/files/parted-3.1-readline.patch b/sys-block/parted/files/parted-3.1-readline.patch deleted file mode 100644 index 936ec00cbefc..000000000000 --- a/sys-block/parted/files/parted-3.1-readline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/parted/ui.c -+++ b/parted/ui.c -@@ -1474,7 +1474,7 @@ - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function; - readline_state.in_readline = 0; - } - #endif diff --git a/sys-block/parted/files/parted-3.1-zfs.patch b/sys-block/parted/files/parted-3.1-zfs.patch deleted file mode 100644 index a87d6d346551..000000000000 --- a/sys-block/parted/files/parted-3.1-zfs.patch +++ /dev/null @@ -1,170 +0,0 @@ -commit 65f838008107a688751dd5a2753c9073e9353daf -Author: root <root@desktop.(none)> -Date: Fri Jun 1 16:26:34 2012 -0400 - - Add ZFS Support - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index 8d48ea1..51b4151 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -49,7 +49,8 @@ libfs_la_SOURCES = \ - xfs/platform_defs.h \ - xfs/xfs.c \ - xfs/xfs_sb.h \ -- xfs/xfs_types.h -+ xfs/xfs_types.h \ -+ zfs/zfs.c - - lib_LTLIBRARIES = libparted-fs-resize.la - -diff --git a/libparted/fs/Makefile.in b/libparted/fs/Makefile.in -index 4335eb1..e3a134b 100644 ---- a/libparted/fs/Makefile.in -+++ b/libparted/fs/Makefile.in -@@ -1112,7 +1112,8 @@ libfs_la_SOURCES = \ - xfs/platform_defs.h \ - xfs/xfs.c \ - xfs/xfs_sb.h \ -- xfs/xfs_types.h -+ xfs/xfs_types.h \ -+ zfs/zfs.c - - lib_LTLIBRARIES = libparted-fs-resize.la - EXTRA_DIST = hfs/DOC hfs/HISTORY hfs/TODO fsresize.sym -diff --git a/libparted/fs/zfs/Makefile.am b/libparted/fs/zfs/Makefile.am -new file mode 100644 -index 0000000..3273c6a ---- /dev/null -+++ b/libparted/fs/zfs/zfs.c -@@ -0,0 +1,81 @@ -+/* -+ libparted - a library for manipulating disk partitions -+ Copyright (C) 2000, 2007, 2009-2010 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see <http://www.gnu.org/licenses/>. -+*/ -+ -+#include <config.h> -+ -+#include <parted/parted.h> -+#include <parted/endian.h> -+ -+#if ENABLE_NLS -+# include <libintl.h> -+# define _(String) dgettext (PACKAGE, String) -+#else -+# define _(String) (String) -+#endif /* ENABLE_NLS */ -+ -+#include <unistd.h> -+ -+#define ZFS_BLOCK_SIZES ((int[2]){512, 0}) -+ -+#define ZFS_SIGNATURE 0x00bab10c -+ -+struct zfs_uberblock -+{ -+ uint64_t signature; -+ uint64_t version; -+}; -+ -+static PedGeometry* -+zfs_probe (PedGeometry* geom) -+{ -+ uint8_t buf[512]; -+ struct zfs_uberblock *uber = (void *) buf; -+ -+ if (!ped_geometry_read (geom, buf, 256, 1)) -+ return 0; -+ -+ if ((le64toh (uber->signature) == ZFS_SIGNATURE -+ || be64toh (uber->signature) == ZFS_SIGNATURE) -+ && uber->version != 0) -+ return ped_geometry_new (geom->dev, geom->start, geom->length); -+ else -+ return NULL; -+} -+ -+static PedFileSystemOps zfs_ops = { -+ probe: zfs_probe, -+}; -+ -+static PedFileSystemType zfs_type = { -+ next: NULL, -+ ops: &zfs_ops, -+ name: "zfs", -+ block_sizes: ZFS_BLOCK_SIZES -+}; -+ -+void -+ped_file_system_zfs_init () -+{ -+ ped_file_system_type_register (&zfs_type); -+} -+ -+void -+ped_file_system_zfs_done () -+{ -+ ped_file_system_type_unregister (&zfs_type); -+} -diff --git a/libparted/libparted.c b/libparted/libparted.c -index a6d86f0..6545989 100644 ---- a/libparted/libparted.c -+++ b/libparted/libparted.c -@@ -109,6 +109,7 @@ extern void ped_file_system_hfs_init (void); - extern void ped_file_system_fat_init (void); - extern void ped_file_system_ext2_init (void); - extern void ped_file_system_nilfs2_init (void); -+extern void ped_file_system_zfs_init (void); - - static void - init_file_system_types () -@@ -124,6 +125,7 @@ init_file_system_types () - ped_file_system_fat_init (); - ped_file_system_ext2_init (); - ped_file_system_nilfs2_init (); -+ ped_file_system_zfs_init (); - } - - extern void ped_disk_aix_done (); -@@ -186,6 +188,7 @@ extern void ped_file_system_reiserfs_done (void); - extern void ped_file_system_ufs_done (void); - extern void ped_file_system_xfs_done (void); - extern void ped_file_system_amiga_done (void); -+extern void ped_file_system_zfs_done (void); - - static void - done_file_system_types () -@@ -201,6 +204,7 @@ done_file_system_types () - ped_file_system_ufs_done (); - ped_file_system_xfs_done (); - ped_file_system_amiga_done (); -+ ped_file_system_zfs_done (); - } - - static void _done() __attribute__ ((destructor)); -diff --git a/scripts/data/abi/baseline_symbols.txt b/scripts/data/abi/baseline_symbols.txt -index 9162f1a..8bb87e6 100644 ---- a/scripts/data/abi/baseline_symbols.txt -+++ b/scripts/data/abi/baseline_symbols.txt -@@ -344,6 +344,8 @@ FUNC:ped_file_system_ufs_done - FUNC:ped_file_system_ufs_init - FUNC:ped_file_system_xfs_done - FUNC:ped_file_system_xfs_init -+FUNC:ped_file_system_zfs_done -+FUNC:ped_file_system_zfs_init - FUNC:ped_geometry_check - FUNC:ped_geometry_destroy - FUNC:ped_geometry_duplicate diff --git a/sys-block/parted/parted-2.4-r1.ebuild b/sys-block/parted/parted-2.4-r1.ebuild deleted file mode 100644 index 2e24db5fe76f..000000000000 --- a/sys-block/parted/parted-2.4-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2:0= - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= ) - selinux? ( sys-libs/libselinux ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-no-gets.patch - "${FILESDIR}"/${P}-readline.patch -) -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-Werror \ - --disable-rpath \ - --disable-silent-rules -} - -src_install() { - default - - prune_libtool_files -} diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild deleted file mode 100644 index eb161766ad3e..000000000000 --- a/sys-block/parted/parted-2.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="+debug device-mapper nls readline selinux static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2:0= - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= ) - selinux? ( sys-libs/libselinux ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-gets.patch - epatch "${FILESDIR}"/${P}-readline.patch -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-Werror \ - --disable-rpath \ - --disable-silent-rules -} - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_install() { - default - prune_libtool_files -} diff --git a/sys-block/parted/parted-3.1-r1.ebuild b/sys-block/parted/parted-3.1-r1.ebuild deleted file mode 100644 index 011ec68857d4..000000000000 --- a/sys-block/parted/parted-3.1-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="+debug device-mapper nls readline selinux static-libs test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.7-r7 - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig - test? ( - >=dev-libs/check-0.9.3 - dev-perl/Digest-CRC - ) -" - -src_prepare() { - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - # there is no configure flag for controlling the dev-libs/check test - sed -i configure.ac \ - -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die - - epatch "${FILESDIR}"/${PN}-3.1-zfs.patch - epatch "${FILESDIR}"/${PN}-3.1-readline.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-rpath \ - --disable-silent-rules -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO - dodoc doc/{API,FAT,USER.jp} - find "${ED}" -name '*.la' -exec rm -f {} + -} diff --git a/sys-block/parted/parted-3.1-r2.ebuild b/sys-block/parted/parted-3.1-r2.ebuild deleted file mode 100644 index 92ce2da8bcbf..000000000000 --- a/sys-block/parted/parted-3.1-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux static-libs test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.7-r7 - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig - test? ( - >=dev-libs/check-0.9.3 - dev-perl/Digest-CRC - ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.1-zfs.patch - "${FILESDIR}"/${PN}-3.1-readline.patch -) -DOCS=( - AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} -) - -src_prepare() { - default - - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - # there is no configure flag for controlling the dev-libs/check test - sed -i configure.ac \ - -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-rpath \ - --disable-silent-rules -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - default - - prune_libtool_files -} diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest index eb66be772016..b1c2c4eef527 100644 --- a/sys-block/targetcli-fb/Manifest +++ b/sys-block/targetcli-fb/Manifest @@ -1,5 +1,5 @@ -DIST targetcli-fb-2.1.44.tar.gz 34278 BLAKE2B 91819135ec20ddbf5d3bb818df6c5b0e753dc6b3f844e6f2750b7b658295416b187e52a6b0590b16f0dcd05133afe53013be6ea4e25435e605e8589fa8c98d84 SHA512 eb744c039357f5c1e6bef1947a9dd42f29dec7306a53d29d32d270515457a78ef6521cf12939fc4ae0075ace3ae8bd857de4855569c740640572cf7815162bab DIST targetcli-fb-2.1.45.tar.gz 32919 BLAKE2B 55b902e438cf379784aa503f72eaee51c17e90f1743fcbc69ec53f06ac4694621a40853f11c16ec11bbf0efe276198592023c908e86d4f529f20560579c3a6b6 SHA512 b9e9e2018b14df5d8fc50a9623d5c5e195088d1062c87629dbc1ab1ca9d53300c76d50a55377bed0d79c1b8dd63224b9423537eb89f63da770661cc5f9294e07 -EBUILD targetcli-fb-2.1.44-r1.ebuild 891 BLAKE2B 73145f32f2c29098aae7c87930125a1123691585fb266adc391de8aad64a5fccd1dd4cfdd0bf8835df767b86710df7aaae99804f01d821774d6a5539dee5bc0a SHA512 55e340f21de24886d2ef9a2a9b9e129f88708da5b4d8f4338f747ca43a788801f6d27875b570de8feed9b235889b946995d6984d6355932889edea462de6d41d +DIST targetcli-fb-2.1.48.tar.gz 33777 BLAKE2B f24661777509a1e125cccaa12ca03eff9564e08bc3b5b3b1798b69a07bd7587b0089bcccbfa6c0166db51ec9f55fa663833e412ecab1614be43bcddf0521b1af SHA512 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420 EBUILD targetcli-fb-2.1.45.ebuild 891 BLAKE2B ad9ebba431aa4ff24c03de06fe49acd8d46b5db68a57857b60f710bc158d3c2acb6ca33982faa11d4122b84c740decfa47b05decd9b111269963e906d090539a SHA512 66d6888ff69a365cbb46c3302e34177b13b1b5eb7a4976aff1e7ac90582b52494cc8b40c8d5ac083af4c08a88ae364b2395027543a6e1805e4162f9d9fe8034c +EBUILD targetcli-fb-2.1.48.ebuild 889 BLAKE2B 45f45e3f299595164c68e86c5e62cf03c56fc4434704f07cd3a00a49ad3b81b33962c0989b628d623ad8c1d6dd386a4169128d6634d2ad4819f31eb6a502ea34 SHA512 6b47037d5035ae47460411bc74f92581a523f0d8cd2459f1710f02a85b4b44e2ee2e97a14a5055baaf601d973ffc0585db9b623eadb2f140f666355aeada7dfa MISC metadata.xml 753 BLAKE2B 95e698cf4414c33f040327e427f8fb554d5f2a6aa48b47629d32cfc4a0228d636ea9c90f12b0d540d1be7a8de9b5c91be5b8188aced8b7bc30faa61ee5f70d9d SHA512 0bbe917fcc75a97f8f1956a734c34ef5abb709c50f1968e9beb83f54d95e3652526a0e651080b9c46cf60806505068b84c7139a91df4db4a7d85797e6b03b6d1 diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.44-r1.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.48.ebuild index 2118968ce48d..525248d50006 100644 --- a/sys-block/targetcli-fb/targetcli-fb-2.1.44-r1.ebuild +++ b/sys-block/targetcli-fb/targetcli-fb-2.1.48.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python2_7 python3_{4,5} ) inherit distutils-r1 versionator @@ -16,16 +16,15 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=dev-python/rtslib-fb-2.1.62[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] !sys-block/targetcli" -S=${WORKDIR}/${PN}-${MY_PV} +S="${WORKDIR}/${PN}-${MY_PV}" src_install() { distutils-r1_src_install |