| 1 |
commit: f1b6266f39d0eb515c5377f1352e251aafb67052 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 18 11:57:03 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 19:02:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b6266f |
| 7 |
|
| 8 |
sys-block/open-iscsi: Drop 2.0.873-r1, EAPI5-- |
| 9 |
|
| 10 |
All arches have more up-to-date versions stable. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/643122 |
| 13 |
Bug: https://bugs.gentoo.org/763954 |
| 14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-block/open-iscsi/Manifest | 1 - |
| 18 |
.../files/open-iscsi-2.0.873-Makefiles.patch | 161 --------------------- |
| 19 |
.../files/open-iscsi-2.0.873-memset.patch | 24 --- |
| 20 |
sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 96 ------------ |
| 21 |
4 files changed, 282 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest |
| 24 |
index 51f6539fffc..9d4de0cdd17 100644 |
| 25 |
--- a/sys-block/open-iscsi/Manifest |
| 26 |
+++ b/sys-block/open-iscsi/Manifest |
| 27 |
@@ -1,4 +1,3 @@ |
| 28 |
-DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b |
| 29 |
DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36 |
| 30 |
DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6 SHA512 0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52 |
| 31 |
DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 |
| 32 |
|
| 33 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index db5d6d14ec5..00000000000 |
| 36 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,161 +0,0 @@ |
| 39 |
-diff --git a/Makefile b/Makefile |
| 40 |
-index c5d9700..4dbff18 100644 |
| 41 |
---- a/Makefile |
| 42 |
-+++ b/Makefile |
| 43 |
-@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man |
| 44 |
- etcdir = /etc |
| 45 |
- initddir = $(etcdir)/init.d |
| 46 |
- |
| 47 |
--MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 |
| 48 |
--PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname |
| 49 |
-+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 doc/iscsi-iname.8 |
| 50 |
-+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname usr/iscsistart |
| 51 |
- INSTALL = install |
| 52 |
- ETCFILES = etc/iscsid.conf |
| 53 |
- IFACEFILES = etc/iface.example |
| 54 |
-@@ -84,11 +84,11 @@ install_programs: $(PROGRAMS) |
| 55 |
- # ugh, auto-detection is evil |
| 56 |
- # Gentoo maintains their own init.d stuff |
| 57 |
- install_initd: |
| 58 |
-- if [ -f /etc/debian_version ]; then \ |
| 59 |
-+ if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \ |
| 60 |
- $(MAKE) install_initd_debian ; \ |
| 61 |
-- elif [ -f /etc/redhat-release ]; then \ |
| 62 |
-+ elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \ |
| 63 |
- $(MAKE) install_initd_redhat ; \ |
| 64 |
-- elif [ -f /etc/SuSE-release ]; then \ |
| 65 |
-+ elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \ |
| 66 |
- $(MAKE) install_initd_suse ; \ |
| 67 |
- fi |
| 68 |
- |
| 69 |
-@@ -115,7 +115,7 @@ install_iface: $(IFACEFILES) |
| 70 |
- $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces |
| 71 |
- |
| 72 |
- install_etc: $(ETCFILES) |
| 73 |
-- if [ ! -f /etc/iscsi/iscsid.conf ]; then \ |
| 74 |
-+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \ |
| 75 |
- $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \ |
| 76 |
- $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \ |
| 77 |
- fi |
| 78 |
-@@ -128,11 +128,11 @@ install_kernel: |
| 79 |
- $(MAKE) -C kernel install_kernel |
| 80 |
- |
| 81 |
- install_iname: |
| 82 |
-- if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ |
| 83 |
-- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ |
| 84 |
-+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \ |
| 85 |
-+ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \ |
| 86 |
- echo "***************************************************" ; \ |
| 87 |
-- echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \ |
| 88 |
-- echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \ |
| 89 |
-+ echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \ |
| 90 |
-+ echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \ |
| 91 |
- echo "***************************************************" ; \ |
| 92 |
- fi |
| 93 |
- |
| 94 |
-diff --git a/usr/Makefile b/usr/Makefile |
| 95 |
-index 673b7f1..83507f3 100644 |
| 96 |
---- a/usr/Makefile |
| 97 |
-+++ b/usr/Makefile |
| 98 |
-@@ -54,18 +54,18 @@ all: $(PROGRAMS) |
| 99 |
- |
| 100 |
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ |
| 101 |
- iscsid.o session_mgmt.o discoveryd.o |
| 102 |
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns |
| 103 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns |
| 104 |
- |
| 105 |
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o |
| 106 |
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns |
| 107 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns |
| 108 |
- |
| 109 |
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ |
| 110 |
- iscsistart.o statics.o |
| 111 |
-- $(CC) $(CFLAGS) -static $^ -o $@ |
| 112 |
-+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ |
| 113 |
- clean: |
| 114 |
-- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |
| 115 |
-+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) |
| 116 |
- |
| 117 |
- depend: |
| 118 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
| 119 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
| 120 |
- |
| 121 |
- -include .depend |
| 122 |
-diff --git a/utils/Makefile b/utils/Makefile |
| 123 |
-index 2c7e891..62c49fa 100644 |
| 124 |
---- a/utils/Makefile |
| 125 |
-+++ b/utils/Makefile |
| 126 |
-@@ -1,17 +1,18 @@ |
| 127 |
- # This Makefile will work only with GNU make. |
| 128 |
- |
| 129 |
--CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g |
| 130 |
-+OPTFLAGS ?= -O2 -g |
| 131 |
-+CFLAGS += $(OPTFLAGS) -fno-inline -Wall -Wstrict-prototypes |
| 132 |
- PROGRAMS = iscsi-iname |
| 133 |
- |
| 134 |
- all: $(PROGRAMS) |
| 135 |
- |
| 136 |
- iscsi-iname: md5.o iscsi-iname.o |
| 137 |
-- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ |
| 138 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ |
| 139 |
- |
| 140 |
- clean: |
| 141 |
-- rm -f *.o $(PROGRAMS) .depend |
| 142 |
-+ $(RM) *.o $(PROGRAMS) .depend |
| 143 |
- |
| 144 |
- depend: |
| 145 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
| 146 |
-+ $(GCC) $(CFLAGS) -M `ls *.c` > .depend |
| 147 |
- |
| 148 |
- -include .depend |
| 149 |
-diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile |
| 150 |
-index c72bb7f..a36c2d2 100644 |
| 151 |
---- a/utils/fwparam_ibft/Makefile |
| 152 |
-+++ b/utils/fwparam_ibft/Makefile |
| 153 |
-@@ -26,18 +26,18 @@ OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o |
| 154 |
- OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o |
| 155 |
- CLEANFILES = $(OBJS) *.output *~ |
| 156 |
- |
| 157 |
--OPTFLAGS ?= -O2 -g -fPIC |
| 158 |
-+OPTFLAGS ?= -O2 -g |
| 159 |
- WARNFLAGS ?= -Wall -Wstrict-prototypes |
| 160 |
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../../include -I../../usr -D_GNU_SOURCE |
| 161 |
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fPIC -I../../include -I../../usr -D_GNU_SOURCE |
| 162 |
- |
| 163 |
- all: $(OBJS) |
| 164 |
- |
| 165 |
- clean: |
| 166 |
-- rm -f *.o $(CLEANFILES) .depend |
| 167 |
-+ $(RM) *.o $(CLEANFILES) .depend |
| 168 |
- |
| 169 |
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h |
| 170 |
- |
| 171 |
- depend: |
| 172 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
| 173 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
| 174 |
- |
| 175 |
- -include .depend |
| 176 |
-diff --git a/utils/sysdeps/Makefile b/utils/sysdeps/Makefile |
| 177 |
-index 53c10e5..19cfe19 100644 |
| 178 |
---- a/utils/sysdeps/Makefile |
| 179 |
-+++ b/utils/sysdeps/Makefile |
| 180 |
-@@ -1,15 +1,16 @@ |
| 181 |
- # This Makefile will work only with GNU make. |
| 182 |
- |
| 183 |
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g |
| 184 |
-+OPTFLAGS ?= -O2 -g |
| 185 |
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -fno-inline -Wall -Wstrict-prototypes |
| 186 |
- |
| 187 |
- SYSDEPS_OBJS=sysdeps.o |
| 188 |
- |
| 189 |
- all: $(SYSDEPS_OBJS) |
| 190 |
- |
| 191 |
- clean: |
| 192 |
-- rm -f *.o .depend |
| 193 |
-+ $(RM) *.o .depend |
| 194 |
- |
| 195 |
- depend: |
| 196 |
-- gcc $(CFLAGS) -M `ls *.c` > .depend |
| 197 |
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend |
| 198 |
- |
| 199 |
- -include .depend |
| 200 |
|
| 201 |
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch |
| 202 |
deleted file mode 100644 |
| 203 |
index c56669192f0..00000000000 |
| 204 |
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch |
| 205 |
+++ /dev/null |
| 206 |
@@ -1,24 +0,0 @@ |
| 207 |
-clear the size of the storage, not the size of the pointer |
| 208 |
- |
| 209 |
---- a/usr/md5.c |
| 210 |
-+++ b/usr/md5.c |
| 211 |
-@@ -127,7 +127,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) |
| 212 |
- |
| 213 |
- byteSwap(ctx->buf, 4); |
| 214 |
- memcpy(digest, ctx->buf, 16); |
| 215 |
-- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ |
| 216 |
-+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ |
| 217 |
- } |
| 218 |
- |
| 219 |
- #ifndef ASM_MD5 |
| 220 |
---- a/utils/md5.c |
| 221 |
-+++ b/utils/md5.c |
| 222 |
-@@ -133,7 +133,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx) |
| 223 |
- |
| 224 |
- byteSwap(ctx->buf, 4); |
| 225 |
- memcpy(digest, ctx->buf, 16); |
| 226 |
-- memset(ctx, 0, sizeof (ctx)); /* In case it's sensitive */ |
| 227 |
-+ memset(ctx, 0, sizeof (*ctx)); /* In case it's sensitive */ |
| 228 |
- } |
| 229 |
- |
| 230 |
- #ifndef ASM_MD5 |
| 231 |
|
| 232 |
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild |
| 233 |
deleted file mode 100644 |
| 234 |
index 18707375b85..00000000000 |
| 235 |
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild |
| 236 |
+++ /dev/null |
| 237 |
@@ -1,96 +0,0 @@ |
| 238 |
-# Copyright 1999-2021 Gentoo Authors |
| 239 |
-# Distributed under the terms of the GNU General Public License v2 |
| 240 |
- |
| 241 |
-EAPI=5 |
| 242 |
- |
| 243 |
-inherit versionator linux-info epatch flag-o-matic toolchain-funcs udev |
| 244 |
- |
| 245 |
-MY_P="${PN}-$(replace_version_separator 2 "-")" |
| 246 |
- |
| 247 |
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" |
| 248 |
-HOMEPAGE="http://www.open-iscsi.com/" |
| 249 |
-SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz" |
| 250 |
- |
| 251 |
-LICENSE="GPL-2" |
| 252 |
-SLOT="0" |
| 253 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" |
| 254 |
-IUSE="debug slp" |
| 255 |
- |
| 256 |
-DEPEND="slp? ( net-libs/openslp )" |
| 257 |
-RDEPEND="${DEPEND} |
| 258 |
- sys-fs/lsscsi |
| 259 |
- sys-apps/util-linux" |
| 260 |
- |
| 261 |
-S="${WORKDIR}/${MY_P}" |
| 262 |
- |
| 263 |
-pkg_setup() { |
| 264 |
- linux-info_pkg_setup |
| 265 |
- |
| 266 |
- if kernel_is -lt 2 6 16; then |
| 267 |
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!" |
| 268 |
- fi |
| 269 |
- |
| 270 |
- # Needs to be done, as iscsid currently only starts, when having the iSCSI |
| 271 |
- # support loaded as module. Kernel builtion options don't work. See this for |
| 272 |
- # more information: |
| 273 |
- # https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966 |
| 274 |
- # If there's a new release, check whether this is still valid! |
| 275 |
- CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP" |
| 276 |
- if linux_config_exists; then |
| 277 |
- for module in ${CONFIG_CHECK_MODULES}; do |
| 278 |
- linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
| 279 |
- done |
| 280 |
- fi |
| 281 |
-} |
| 282 |
- |
| 283 |
-src_prepare() { |
| 284 |
- epatch "${FILESDIR}"/${P}-Makefiles.patch |
| 285 |
- epatch "${FILESDIR}"/${P}-memset.patch |
| 286 |
- |
| 287 |
- sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die |
| 288 |
-} |
| 289 |
- |
| 290 |
-src_configure() { |
| 291 |
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI |
| 292 |
- append-lfs-flags |
| 293 |
- |
| 294 |
- cd utils/open-isns || die |
| 295 |
- |
| 296 |
- # SSL (--with-security) is broken |
| 297 |
- econf $(use_with slp) \ |
| 298 |
- --without-security |
| 299 |
-} |
| 300 |
- |
| 301 |
-src_compile() { |
| 302 |
- # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build |
| 303 |
- # is messed up already here, so it's not making it that much worse. |
| 304 |
- KSRC="${KV_DIR}" CFLAGS="" \ |
| 305 |
- emake \ |
| 306 |
- OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 307 |
- AR="$(tc-getAR)" CC="$(tc-getCC)" \ |
| 308 |
- user |
| 309 |
-} |
| 310 |
- |
| 311 |
-src_install() { |
| 312 |
- emake DESTDIR="${ED}" sbindir="/usr/sbin" install |
| 313 |
- |
| 314 |
- dodoc README THANKS |
| 315 |
- |
| 316 |
- docinto test/ |
| 317 |
- dodoc test/* |
| 318 |
- |
| 319 |
- insinto /etc/iscsi |
| 320 |
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example |
| 321 |
- |
| 322 |
- # udev pieces |
| 323 |
- udev_dorules "${FILESDIR}"/99-iscsi.rules |
| 324 |
- exeinto /etc/udev/scripts |
| 325 |
- doexe "${FILESDIR}"/iscsidev.sh |
| 326 |
- |
| 327 |
- newconfd "${FILESDIR}"/iscsid-conf.d iscsid |
| 328 |
- newinitd "${FILESDIR}"/iscsid-init.d iscsid |
| 329 |
- |
| 330 |
- keepdir /var/db/iscsi |
| 331 |
- fperms 700 /var/db/iscsi |
| 332 |
- fperms 600 /etc/iscsi/iscsid.conf |
| 333 |
-} |
Archives