Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93a35dbbd29904205877b10151ad3b88761c5a5e
commit 93a35dbbd29904205877b10151ad3b88761c5a5e Author: James Buren <[email protected]> Date: Mon Jul 30 09:42:59 2012 -0500 iscsi-2.0_873-1-x86_64 * convert to systemd schema * remove old patches * version bump diff --git a/source/network-extra/iscsi/CVE-2009-1297.diff b/source/network-extra/iscsi/CVE-2009-1297.diff deleted file mode 100644 index cb9dc55..0000000 --- a/source/network-extra/iscsi/CVE-2009-1297.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100 -+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100 -@@ -104,24 +104,22 @@ - - connected=0 - discovered=0 -- df=/tmp/discovered.$$ - - dbg "starting discovery to $ip" -- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df} -- while read portal target -+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})" -+ echo "${disc}" | while read portal target - do - portal=${portal%,*} - select_transport -- done < ${df} -+ done - -- discovered=$(cat ${df} | wc -l) -+ discovered=$(echo "${disc}" | wc -l) - if [ ${discovered} = 0 ]; then - echo "failed to discover targets at ${ip}" - exit 2 - else - echo "discovered ${discovered} targets at ${ip}" - fi -- /bin/rm -f ${df} - } - - try_login() - diff --git a/source/network-extra/iscsi/FrugalBuild b/source/network-extra/iscsi/FrugalBuild index 460dd03..0f6199a 100644 --- a/source/network-extra/iscsi/FrugalBuild +++ b/source/network-extra/iscsi/FrugalBuild @@ -3,25 +3,27 @@ pkgname=iscsi _F_archive_name="open-iscsi" -pkgver=2.0_871 +pkgver=2.0_873 pkgrel=1 pkgdesc="Open-iSCSI project is a high performance, transport independent" url="http://www.open-iscsi.org"; #don't build modules provides by kernel now source=(http://www.open-iscsi.org/bits/$_F_archive_name-${pkgver/_/-}.tar.gz \ - noModules.diff CVE-2009-1297.diff initiatorname.iscsi rc.iscsid iscsid) + initiatorname.iscsi rc.iscsid iscsid iscsid.service) up2date="Flasttar http://www.open-iscsi.org/bits/"; depends=('glibc') groups=('network-extra') archs=('i686' 'x86_64') -sha1sums=('968baf16d4094fb9842bc04b0fe8109103356252' \ - '8ca923fff93623dff5bb9b3548034699f5f7483e' \ - 'b71c3fd3096b1654ab250445b7f660176bf7704d' \ +sha1sums=('d72c00d5bad16a2d8c77811441b50ac527af57d9' \ '7adb8bb034125184c7210d12c6c562069539545a' \ '2d8e99f24ec87b923a76af06404567f7cfeb33a5' \ - '024b307d3a881c2bc07a6e2e599cdd65abe868ba') + '39125cc84c75f9ada1e1a8ed0d412b384ead6d63' \ + 'e35565aed06ce39126bd39dbb87eb474d7505865') _F_cd_path=$_F_archive_name-${pkgver/_/-} backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi' 'etc/sysconfig/iscsid') +_F_sysvinit_units=(iscsid) +_F_systemd_units=(iscsid=) +Finclude systemd build() { Fbuild @@ -31,6 +33,8 @@ build() { Fcp initiatorname.iscsi etc/iscsi/ Fcp iscsid etc/sysconfig/ Frcd2 iscsid + Ffile /lib/systemd/system/iscsid.service + Fgenscriptlet } # optimization OK diff --git a/source/network-extra/iscsi/iscsid b/source/network-extra/iscsi/iscsid index 850f675..768396a 100644 --- a/source/network-extra/iscsi/iscsid +++ b/source/network-extra/iscsi/iscsid @@ -1,14 +1,4 @@ # /etc/sysconfig/iscsid -# config file to use -CONFIG_FILE=/etc/iscsi/iscsid.conf - -# you need to specify an initiatorname in the file -INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi - # options to pass to iscsid -OPTS="-i ${INITIATORNAME_FILE}" - -# Start automatic targets when iscsid is started -AUTOSTARTTARGETS="yes" - +OPTS="" diff --git a/source/network-extra/iscsi/iscsid.service b/source/network-extra/iscsi/iscsid.service new file mode 100644 index 0000000..9274670 --- /dev/null +++ b/source/network-extra/iscsi/iscsid.service @@ -0,0 +1,13 @@ +[Unit] +Description=ISCSI Initiator Daemon +After=network.target + +[Service] +EnvironmentFile=/etc/sysconfig/iscsid +ExecStart=/sbin/iscsid $OPTS +ExecStartPost=/sbin/iscsiadm -m node --loginall=automatic +ExecStop=/sbin/iscsiadm -m node --logoutall=all +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/source/network-extra/iscsi/noModules.diff b/source/network-extra/iscsi/noModules.diff deleted file mode 100644 index ff1bef3..0000000 --- a/source/network-extra/iscsi/noModules.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- src/Makefile 2009-12-28 20:28:44.000000000 +0000 -+++ src/Makefile 2009-12-28 20:30:00.000000000 +0000 -@@ -24,7 +24,7 @@ - # using '$(MAKE)' instead of just 'make' allows make to run in parallel - # over multiple makefile. - --all: user kernel -+all: user - - user: ; - $(MAKE) -C utils/sysdeps -@@ -40,16 +40,6 @@ - @echo - @echo "Read README file for detailed information." - --kernel: force -- $(MAKE) -C kernel -- @echo "Kernel Compilation complete Output file" -- @echo "----------------------------------- ----------------" -- @echo "Built iSCSI Open Interface module: kernel/scsi_transport_iscsi.ko" -- @echo "Built iSCSI library module: kernel/libiscsi.ko" -- @echo "Built iSCSI over TCP library module: kernel/libiscsi_tcp.ko" -- @echo "Built iSCSI over TCP kernel module: kernel/iscsi_tcp.ko" -- --force: ; - - clean: - $(MAKE) -C utils/sysdeps clean -@@ -63,9 +53,9 @@ - # note that make may still execute the blocks in parallel - .NOTPARALLEL: install_user install_programs install_initd \ - install_initd_suse install_initd_redhat install_initd_debian \ -- install_etc install_iface install_doc install_kernel install_iname -+ install_etc install_iface install_doc install_iname - --install: install_kernel install_programs install_doc install_etc \ -+install: install_programs install_doc install_etc \ - install_initd install_iname install_iface - - install_user: install_programs install_doc install_etc \ -@@ -118,8 +108,6 @@ - $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - $(INSTALL) -m 644 $^ $(DESTDIR)$(mandir)/man8 - --install_kernel: -- $(MAKE) -C kernel install_kernel - - install_iname: - if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
