From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 85662fb5be1705406d51b95d74c33b8f147ed7c4
Date: Wed, 10 Jul 2013 14:46:27 +0200 [thread overview]
Message-ID: <20130710124642.21352202C1@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 29855 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 85662fb5be1705406d51b95d74c33b8f147ed7c4 (commit)
via ad30503e87f1a45231bf9b710b60cf701ccdbf7e (commit)
via b019da0d17417c8ce4987b14d710fb8dfe8a392a (commit)
via 3361ab341c1453d2ba1cfb1629d84f77272c4ce0 (commit)
via d84ba2180617969e51a3ccf2066baa60ed0ae7ad (commit)
from 8950e52d017b10ec594986900967e97c1c89d77e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85662fb5be1705406d51b95d74c33b8f147ed7c4
Merge: ad30503 8950e52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 10 12:46:12 2013 +0000
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit ad30503e87f1a45231bf9b710b60cf701ccdbf7e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 10 12:45:21 2013 +0000
iscsi-initiator-util: Update patchset.
Import latest changes from Fedora. Link against kmod
and fix various smaller problems.
commit b019da0d17417c8ce4987b14d710fb8dfe8a392a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 10 12:44:45 2013 +0000
guile: Update to 2.0.9.
commit 3361ab341c1453d2ba1cfb1629d84f77272c4ce0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 10 12:44:18 2013 +0000
gc: New package.
A garbage collector for C and C++.
commit d84ba2180617969e51a3ccf2066baa60ed0ae7ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 10 12:43:18 2013 +0000
libffi: Update to 3.0.13.
Create compat package because of soname bump.
-----------------------------------------------------------------------
Summary of changes:
libffi/libffi.nm => compat-libffi/compat-libffi.nm | 34 +++++---
gc/gc.nm | 67 ++++++++++++++++
guile/guile.nm | 17 ++--
guile/patches/guile-1.8.7-linemarkers.patch | 21 -----
guile/patches/guile-1.8.7-testsuite.patch | 12 ---
iscsi-initiator-utils/iscsi-initiator-utils.nm | 17 ++--
iscsi-initiator-utils/iscsi.tmpfiles | 2 +
...iscsid-add-example-unit-files-for-systemd.patch | 54 +++++++++++++
...emd-service-files-add-iscsi.service-for-s.patch | 93 ++++++++++++++++++++++
.../patches/0053-use-red-hat-for-name.patch | 25 ++++++
.../patches/0054-add-libiscsi.patch | 4 +-
.../patches/0059-iscsiuio-systemd-unit-files.patch | 53 ++++++++++++
.../0060-use-systemctl-to-start-iscsid.patch | 6 +-
...-for-autostart-sessions-if-iscsi-is-not-u.patch | 30 +++++++
...f-setting-uid-gid-and-drop-supplementary-.patch | 68 ++++++++++++++++
...-version-string-to-match-RPM-package-vers.patch | 25 ++++++
libffi/libffi.nm | 5 +-
.../patches/libffi-3.0.13-fix-include-path.patch | 34 ++++++++
18 files changed, 497 insertions(+), 70 deletions(-)
copy libffi/libffi.nm => compat-libffi/compat-libffi.nm (55%)
create mode 100644 gc/gc.nm
delete mode 100644 guile/patches/guile-1.8.7-linemarkers.patch
delete mode 100644 guile/patches/guile-1.8.7-testsuite.patch
create mode 100644 iscsi-initiator-utils/iscsi.tmpfiles
create mode 100644 iscsi-initiator-utils/patches/0009-iscsid-add-example-unit-files-for-systemd.patch
create mode 100644 iscsi-initiator-utils/patches/0034-update-systemd-service-files-add-iscsi.service-for-s.patch
create mode 100644 iscsi-initiator-utils/patches/0053-use-red-hat-for-name.patch
create mode 100644 iscsi-initiator-utils/patches/0059-iscsiuio-systemd-unit-files.patch
create mode 100644 iscsi-initiator-utils/patches/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
create mode 100644 iscsi-initiator-utils/patches/0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
create mode 100644 iscsi-initiator-utils/patches/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
create mode 100644 libffi/patches/libffi-3.0.13-fix-include-path.patch
Difference in files:
diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm
new file mode 100644
index 0000000..6b1df29
--- /dev/null
+++ b/compat-libffi/compat-libffi.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-libffi
+version = 3.0.10
+release = 1
+thisapp = libffi-%{version}
+
+groups = System/Libraries
+url = http://sourceware.org/libffi
+license = BSD
+summary = A portable foreign function interface library.
+
+description
+ This package is for compatability to old versions only, and provides no
+ Development libraries.
+
+ The libffi library provides a portable, high level programming
+ interface to various calling conventions. This allows a programmer to
+ call any function specified by a call interface description at run time.
+end
+
+source_dl = ftp://sourceware.org/pub/libffi/
+
+build
+ install_cmds
+ # Remove all development files, because nothing
+ # should link against this.
+ rm -rvf %{BUILDROOT}%{libdir}/pkgconfig
+ rm -rvf %{BUILDROOT}%{libdir}/libffi-%{version}
+ rm -rvf %{BUILDROOT}%{libdir}/*.so
+ rm -rvf %{BUILDROOT}%{mandir}
+ end
+end
+
+packages
+ package %{name}
+ obsoletes
+ libffi <= %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/gc/gc.nm b/gc/gc.nm
new file mode 100644
index 0000000..686d65e
--- /dev/null
+++ b/gc/gc.nm
@@ -0,0 +1,67 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = gc
+version = %{major_ver}d
+major_ver = 7.2
+release = 1
+
+groups = System/Libraries
+url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+license = BSD
+summary = A garbage collector for C and C++.
+
+description
+ The Boehm-Demers-Weiser conservative garbage collector can be
+ used as a garbage collecting replacement for C malloc or C++ new.
+end
+
+source_dl = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
+
+build
+ requires
+ autoconf
+ automake
+ libtool
+ end
+
+ DIR_APP = %{DIR_SRC}/%{name}-%{major_ver}
+
+ prepare_cmds
+ rm -f libtool libtool.m4
+ autoreconf -vfi
+ end
+
+ configure_options += \
+ --disable-static \
+ --enable-cplusplus \
+ --enable-large-config \
+ --enable-threads=posix \
+ --with-libatomic-ops=no
+
+ if "%{DISTRO_PLATFORM}" == "x86"
+ configure_options += --enable-parallel-mark
+ end
+
+ test
+ make check
+ end
+
+ install_cmds
+ rm -rvf %{BUILDROOT}%{datadir}/gc
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/guile/guile.nm b/guile/guile.nm
index 8c1183d..b666ddd 100644
--- a/guile/guile.nm
+++ b/guile/guile.nm
@@ -4,8 +4,8 @@
###############################################################################
name = guile
-version = 1.8.8
-release = 2
+version = 2.0.9
+release = 1
groups = Development/Tools
url = http://www.gnu.org/software/guile/
@@ -19,12 +19,17 @@ description
as a library during the building of extensible programs.
end
-source_dl =
+source_dl = ftp://ftp.gnu.org/gnu/guile/
build
requires
+ gc-devel
+ gettext-devel
gmp-devel
+ libffi-devel >= 3.0.13
libtool-devel
+ libunistring-devel
+ readline-devel
end
configure_options += \
@@ -36,12 +41,6 @@ build
end
end
-quality-agent
- whitelist_rpath
- /usr/lib
- end
-end
-
packages
package %{name}
diff --git a/guile/patches/guile-1.8.7-linemarkers.patch b/guile/patches/guile-1.8.7-linemarkers.patch
deleted file mode 100644
index 4330c24..0000000
--- a/guile/patches/guile-1.8.7-linemarkers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers guile-1.8.7/libguile/guile-snarf-docs.in
---- guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers 2009-07-04 00:19:00.000000000 +0200
-+++ guile-1.8.7/libguile/guile-snarf-docs.in 2009-11-19 17:58:03.000000000 +0100
-@@ -23,4 +23,4 @@ bindir=`dirname $0`
- ## Let the user override the preprocessor autoconf found.
- test -n "${CPP+set}" || CPP="@CPP@"
-
--${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
-+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
-diff -up guile-1.8.7/libguile/guile-snarf.in.linemarkers guile-1.8.7/libguile/guile-snarf.in
---- guile-1.8.7/libguile/guile-snarf.in.linemarkers 2009-11-19 16:31:46.000000000 +0100
-+++ guile-1.8.7/libguile/guile-snarf.in 2009-11-19 18:10:09.000000000 +0100
-@@ -49,7 +49,7 @@ modern_snarf ()
- ## Apparently, AIX's preprocessor is unhappy if you try to #include an
- ## empty file.
- echo "/* cpp arguments: $@ */" ;
-- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
-+ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
- grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
- }
-
diff --git a/guile/patches/guile-1.8.7-testsuite.patch b/guile/patches/guile-1.8.7-testsuite.patch
deleted file mode 100644
index f4d5269..0000000
--- a/guile/patches/guile-1.8.7-testsuite.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up guile-1.8.7/test-suite/tests/popen.test.testsuite guile-1.8.7/test-suite/tests/popen.test
---- guile-1.8.7/test-suite/tests/popen.test.testsuite 2009-07-04 00:19:00.000000000 +0200
-+++ guile-1.8.7/test-suite/tests/popen.test 2009-07-16 17:09:57.000000000 +0200
-@@ -168,7 +168,7 @@
- (port (with-error-to-port (cdr c2p)
- (lambda ()
- (open-output-pipe
-- "exec 0</dev/null; while true; do echo closed 1>&2; done")))))
-+ "exec 0</dev/null; echo closed 1>&2; sleep 3")))))
- (close-port (cdr c2p)) ;; write side
- (with-epipe
- (lambda ()
diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm
index dbcfe02..6518a17 100644
--- a/iscsi-initiator-utils/iscsi-initiator-utils.nm
+++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -6,7 +6,7 @@
name = iscsi-initiator-utils
rel_ver = 873
version = 6.2.0.%{rel_ver}
-release = 1
+release = 2
groups = System/Daemons
url = http://www.open-iscsi.org/
@@ -26,19 +26,18 @@ source_dl = http://www.open-iscsi.org/bits/
build
requires
+ doxygen
+ kmod-devel
openssl-devel
python-devel
end
build
- cd %{DIR_APP}/utils/open-isns && ./configure --with-security=no
- cd %{DIR_APP}/utils/open-isns && make
- cd %{DIR_APP} && make -C utils/sysdeps
- cd %{DIR_APP} && make -C utils/fwparam_ibft
- cd %{DIR_APP} && make -C usr
- cd %{DIR_APP} && make -C utils
- cd %{DIR_APP} && make -C libiscsi
- cd %{DIR_APP}/libiscsi && python setup.py build
+ make OPTFLAGS="%{CFLAGS} -DUSE_KMOD -lkmod"
+
+ pushd libiscsi
+ python setup.py build
+ popd
end
install
diff --git a/iscsi-initiator-utils/iscsi.tmpfiles b/iscsi-initiator-utils/iscsi.tmpfiles
new file mode 100644
index 0000000..eab4fb2
--- /dev/null
+++ b/iscsi-initiator-utils/iscsi.tmpfiles
@@ -0,0 +1,2 @@
+d /run/lock/iscsi 0700 root root -
+f /run/lock/iscsi/lock 0600 root root -
diff --git a/iscsi-initiator-utils/patches/0009-iscsid-add-example-unit-files-for-systemd.patch b/iscsi-initiator-utils/patches/0009-iscsid-add-example-unit-files-for-systemd.patch
new file mode 100644
index 0000000..28b9b78
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0009-iscsid-add-example-unit-files-for-systemd.patch
@@ -0,0 +1,54 @@
+From c34e0bdcbafdb6f9304e1474d51fe1c789c5dea2 Mon Sep 17 00:00:00 2001
+From: Tomasz Torcz <tomek(a)pipebreaker.pl>
+Date: Wed, 28 Nov 2012 13:37:08 +0100
+Subject: iscsid: add example unit files for systemd
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Those two units, based on the work by Jóhann B. Guðmundsson, exploit
+on-demand socket activation in iscsid.
+---
+ etc/systemd/iscsid.service | 13 +++++++++++++
+ etc/systemd/iscsid.socket | 9 +++++++++
+ 2 files changed, 22 insertions(+)
+ create mode 100644 etc/systemd/iscsid.service
+ create mode 100644 etc/systemd/iscsid.socket
+
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+new file mode 100644
+index 0000000..028e0b3
+--- /dev/null
++++ b/etc/systemd/iscsid.service
+@@ -0,0 +1,13 @@
++[Unit]
++Description=Open-iSCSI
++Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
++After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service
++
++[Service]
++Type=forking
++PIDFile=/var/run/iscsid.pid
++ExecStart=/usr/sbin/iscsid
++ExecStop=/sbin/iscsiadm -k 0 2
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket
+new file mode 100644
+index 0000000..832451d
+--- /dev/null
++++ b/etc/systemd/iscsid.socket
+@@ -0,0 +1,9 @@
++[Unit]
++Description=Open-iSCSI iscsid Socket
++Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
++
++[Socket]
++ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE
++
++[Install]
++WantedBy=sockets.target
+--
+1.7.11.7
+
diff --git a/iscsi-initiator-utils/patches/0034-update-systemd-service-files-add-iscsi.service-for-s.patch b/iscsi-initiator-utils/patches/0034-update-systemd-service-files-add-iscsi.service-for-s.patch
new file mode 100644
index 0000000..966bb9f
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0034-update-systemd-service-files-add-iscsi.service-for-s.patch
@@ -0,0 +1,93 @@
+From 1c3b1d23e0b3f17399ffd4463cafad813b0444d5 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Wed, 19 Dec 2012 15:07:36 -0800
+Subject: update systemd service files, add iscsi.service for starting
+ sessions on boot
+
+Signed-off-by: Chris Leech <cleech(a)redhat.com>
+---
+ etc/systemd/iscsi.service | 19 +++++++++++++++++++
+ etc/systemd/iscsi_mark_root_nodes | 14 ++++++++++++++
+ etc/systemd/iscsid.service | 7 +++++--
+ etc/systemd/iscsid.socket | 2 +-
+ 4 files changed, 39 insertions(+), 3 deletions(-)
+ create mode 100644 etc/systemd/iscsi.service
+ create mode 100755 etc/systemd/iscsi_mark_root_nodes
+
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+new file mode 100644
+index 0000000..bbd52fd
+--- /dev/null
++++ b/etc/systemd/iscsi.service
+@@ -0,0 +1,19 @@
++[Unit]
++Description=Login and scanning of iSCSI devices
++Documentation=man:iscsid(8) man:iscsiadm(8)
++DefaultDependencies=no
++Conflicts=shutdown.target
++After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
++Before=remote-fs-pre.target
++ConditionPathExists=/etc/iscsi/initiatorname.iscsi
++
++[Service]
++Type=oneshot
++RemainAfterExit=true
++ExecStart=/usr/libexec/iscsi_mark_root_nodes
++ExecStart=/sbin/iscsiadm -m node --loginall=automatic
++ExecStop=/bin/sync
++ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
++
++[Install]
++WantedBy=sysinit.target
+diff --git a/etc/systemd/iscsi_mark_root_nodes b/etc/systemd/iscsi_mark_root_nodes
+new file mode 100755
+index 0000000..c68475c
+--- /dev/null
++++ b/etc/systemd/iscsi_mark_root_nodes
+@@ -0,0 +1,14 @@
++#!/bin/bash
++
++ISCSIADM=/sbin/iscsiadm
++SESSION_FILE=/run/initramfs/iscsi.sessions
++
++if [ ! -f $SESSION_FILE ] ; then
++ exit 0
++fi
++
++while read t num i target; do
++ ip=${i%:*}
++ $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
++done < $SESSION_FILE
++
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 028e0b3..653dd08 100644
+--- a/etc/systemd/iscsid.service
++++ b/etc/systemd/iscsid.service
+@@ -1,7 +1,10 @@
+ [Unit]
+ Description=Open-iSCSI
+-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+-After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service
++Documentation=man:iscsid(8) man:iscsiadm(8)
++DefaultDependencies=no
++Conflicts=shutdown.target
++After=network.target iscsiuio.service
++Before=remote-fs-pre.target
+
+ [Service]
+ Type=forking
+diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket
+index 832451d..58a8d12 100644
+--- a/etc/systemd/iscsid.socket
++++ b/etc/systemd/iscsid.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Open-iSCSI iscsid Socket
+-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
++Documentation=man:iscsid(8) man:iscsiadm(8)
+
+ [Socket]
+ ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE
+--
+1.7.11.7
+
diff --git a/iscsi-initiator-utils/patches/0053-use-red-hat-for-name.patch b/iscsi-initiator-utils/patches/0053-use-red-hat-for-name.patch
new file mode 100644
index 0000000..8888200
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0053-use-red-hat-for-name.patch
@@ -0,0 +1,25 @@
+From bf7f9118ab2f1a5302dafa198d3351f6f977b7bd Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Mon, 19 Nov 2012 16:40:04 -0800
+Subject: use red hat for name
+
+---
+ utils/iscsi-iname.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c
+index 6347edc..cb2f6c8 100644
+--- a/utils/iscsi-iname.c
++++ b/utils/iscsi-iname.c
+@@ -73,7 +73,7 @@ main(int argc, char *argv[])
+ exit(0);
+ }
+ } else {
+- prefix = "iqn.2005-03.org.open-iscsi";
++ prefix = "iqn.1994-05.com.redhat";
+ }
+
+ /* try to feed some entropy from the pool to MD5 in order to get
+--
+1.7.11.7
+
diff --git a/iscsi-initiator-utils/patches/0054-add-libiscsi.patch b/iscsi-initiator-utils/patches/0054-add-libiscsi.patch
index 359ef30..44fcf4a 100644
--- a/iscsi-initiator-utils/patches/0054-add-libiscsi.patch
+++ b/iscsi-initiator-utils/patches/0054-add-libiscsi.patch
@@ -118,8 +118,8 @@ index 0000000..317a7ec
+
+$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
+
-+html: libiscsi.h
-+# doxygen libiscsi.doxy
++html: libiscsi.h libiscsi.doxy
++ doxygen libiscsi.doxy
+
+clean:
+ rm -rf *.o common-objs usr-objs fw-objs libuip-objs libiscsi.so* \
diff --git a/iscsi-initiator-utils/patches/0059-iscsiuio-systemd-unit-files.patch b/iscsi-initiator-utils/patches/0059-iscsiuio-systemd-unit-files.patch
new file mode 100644
index 0000000..2d0e213
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0059-iscsiuio-systemd-unit-files.patch
@@ -0,0 +1,53 @@
+From 822b53e6c9ebb0fe7236ebd3b4c73b009100592d Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Tue, 22 Jan 2013 14:27:12 -0800
+Subject: iscsiuio systemd unit files
+
+---
+ etc/systemd/iscsiuio.service | 17 +++++++++++++++++
+ etc/systemd/iscsiuio.socket | 9 +++++++++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 etc/systemd/iscsiuio.service
+ create mode 100644 etc/systemd/iscsiuio.socket
+
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+new file mode 100644
+index 0000000..f0410b7
+--- /dev/null
++++ b/etc/systemd/iscsiuio.service
+@@ -0,0 +1,17 @@
++[Unit]
++Description=iSCSI UserSpace I/O driver
++Documentation=man:iscsiuio(8)
++DefaultDependencies=no
++Conflicts=shutdown.target
++Requires=iscsid.service
++BindTo=iscsid.service
++After=network.target
++Before=remote-fs-pre.target iscsid.service
++
++[Service]
++Type=forking
++PIDFile=/var/run/iscsiuio.pid
++ExecStart=/usr/sbin/iscsiuio
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/etc/systemd/iscsiuio.socket b/etc/systemd/iscsiuio.socket
+new file mode 100644
+index 0000000..d42cedc
+--- /dev/null
++++ b/etc/systemd/iscsiuio.socket
+@@ -0,0 +1,9 @@
++[Unit]
++Description=Open-iSCSI iscsiuio Socket
++Documentation=man:iscsiuio(8)
++
++[Socket]
++ListenStream=@ISCSID_UIP_ABSTRACT_NAMESPACE
++
++[Install]
++WantedBy=sockets.target
+--
+1.7.11.7
+
diff --git a/iscsi-initiator-utils/patches/0060-use-systemctl-to-start-iscsid.patch b/iscsi-initiator-utils/patches/0060-use-systemctl-to-start-iscsid.patch
index dc62c32..81aa2a3 100644
--- a/iscsi-initiator-utils/patches/0060-use-systemctl-to-start-iscsid.patch
+++ b/iscsi-initiator-utils/patches/0060-use-systemctl-to-start-iscsid.patch
@@ -1,7 +1,7 @@
From c3d2b8f3de5b6161845304cf46982d2c5a9918b6 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech(a)redhat.com>
-Date: Tue, 22 Jan 2013 15:04:14 -0800
-Subject: use systemctl to start iscsid
+Date: Thu Feb 21 21:05:39 PST 2013
+Subject: disable iscsid.startup from iscsiadm, prefer systemd socket activation
---
etc/iscsid.conf | 2 +-
@@ -16,7 +16,7 @@ index ac1d231..5851fa5 100644
#
# Default for Fedora and RHEL. (uncomment to activate).
-iscsid.startup = /etc/rc.d/init.d/iscsid force-start
-+iscsid.startup = /bin/systemctl start iscsid.service
++#iscsid.startup = /bin/systemctl start iscsid.service
#
# Default for upstream open-iscsi scripts (uncomment to activate).
# iscsid.startup = /sbin/iscsid
diff --git a/iscsi-initiator-utils/patches/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch b/iscsi-initiator-utils/patches/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
new file mode 100644
index 0000000..684463f
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
@@ -0,0 +1,30 @@
+From ab79bdb20e37216ca969e06d63a952acfd023963 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Tue, 28 May 2013 13:12:27 -0700
+Subject: [PATCH] Don't check for autostart sessions if iscsi is not used (bug
+ #951951)
+
+Change conditional startup in iscsi.service to check for a non-empty
+nodes directory, instead of initiator-name. This fits better with what
+it's doing, as there's no need to scan for autostart node records if
+there are no node records at all.
+---
+ etc/systemd/iscsi.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index bbd52fd..7b4efee 100644
+--- a/etc/systemd/iscsi.service
++++ b/etc/systemd/iscsi.service
+@@ -5,7 +5,7 @@ DefaultDependencies=no
+ Conflicts=shutdown.target
+ After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+ Before=remote-fs-pre.target
+-ConditionPathExists=/etc/iscsi/initiatorname.iscsi
++ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
+
+ [Service]
+ Type=oneshot
+--
+1.8.1.4
+
diff --git a/iscsi-initiator-utils/patches/0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch b/iscsi-initiator-utils/patches/0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
new file mode 100644
index 0000000..cedb4e0
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
@@ -0,0 +1,68 @@
+From 3cac85a3f97d0a22270166f428209f873b58c319 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Tue, 11 Jun 2013 11:25:27 -0700
+Subject: [PATCH] iscsid: fix order of setting uid/gid and drop supplementary
+ groups
+
+If using the user and group ID settings together the existing order of
+calling setuid first will almost always cause the setgid call to fail,
+assuming the new effective user id does not have the CAP_SETGID
+capability. The effective group ID needs to change first.
+
+While we're at it, if iscsid is started as root it should drop any
+inherited supplementary group permissions.
+
+And if anyone is actually using this to try and isolate capabilities,
+they probably care enough to want to known that it is failing. Make
+iscsid startup fail instead of just calling perror.
+
+Signed-off-by: Chris Leech <cleech(a)redhat.com>
+---
+ usr/iscsid.c | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/usr/iscsid.c b/usr/iscsid.c
+index b4bb65b..c0ea6fa 100644
+--- a/usr/iscsid.c
++++ b/usr/iscsid.c
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#include <grp.h>
+ #include <sys/mman.h>
+ #include <sys/utsname.h>
+ #include <sys/types.h>
+@@ -477,11 +478,25 @@ int main(int argc, char *argv[])
+ }
+ }
+
+- if (uid && setuid(uid) < 0)
+- perror("setuid\n");
++ if (gid && setgid(gid) < 0) {
++ log_error("Unable to setgid to %d\n", gid);
++ log_close(log_pid);
++ exit(ISCSI_ERR);
++ }
+
+- if (gid && setgid(gid) < 0)
+- perror("setgid\n");
++ if ((geteuid() == 0) && (getgroups(0, NULL))) {
++ if (setgroups(0, NULL) != 0) {
++ log_error("Unable to drop supplementary group ids\n");
++ log_close(log_pid);
++ exit(ISCSI_ERR);
++ }
++ }
++
++ if (uid && setuid(uid) < 0) {
++ log_error("Unable to setuid to %d\n", uid);
++ log_close(log_pid);
++ exit(ISCSI_ERR);
++ }
+
+ memset(&daemon_config, 0, sizeof (daemon_config));
+ daemon_config.pid_file = pid_file;
+--
+1.8.1.4
+
diff --git a/iscsi-initiator-utils/patches/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/iscsi-initiator-utils/patches/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
new file mode 100644
index 0000000..3c219bc
--- /dev/null
+++ b/iscsi-initiator-utils/patches/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@@ -0,0 +1,25 @@
+From 1483a176fdbb22bbfecf06eea57d1aa200f30561 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech(a)redhat.com>
+Date: Mon, 21 Jan 2013 15:43:36 -0800
+Subject: use Red Hat version string to match RPM package version
+
+---
+ usr/version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/version.h b/usr/version.h
+index a090522..aef0c3d 100644
+--- a/usr/version.h
++++ b/usr/version.h
+@@ -6,7 +6,7 @@
+ * This may not be the same value as the kernel versions because
+ * some other maintainer could merge a patch without going through us
+ */
+-#define ISCSI_VERSION_STR "2.0-873"
++#define ISCSI_VERSION_STR "6.2.0.873-1"
+ #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
+
+ #endif
+--
+1.7.11.7
+
diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index 284af95..db6ba4f 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libffi
-version = 3.0.9
+version = 3.0.13
release = 1
groups = System/Libraries
@@ -18,11 +18,10 @@ description
call any function specified by a call interface description at run time.
end
-source_dl =
+source_dl = ftp://sourceware.org/pub/libffi/
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/patches/libffi-3.0.13-fix-include-path.patch
new file mode 100644
index 0000000..4502333
--- /dev/null
+++ b/libffi/patches/libffi-3.0.13-fix-include-path.patch
@@ -0,0 +1,34 @@
+diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
+--- libffi-3.0.13/include/Makefile.am.fixpath 2013-05-25 22:11:25.983889342 -0400
++++ libffi-3.0.13/include/Makefile.am 2013-05-25 22:12:12.337890037 -0400
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+
+-includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
+--- libffi-3.0.13/include/Makefile.in.fixpath 2013-05-25 22:12:56.259890696 -0400
++++ libffi-3.0.13/include/Makefile.in 2013-05-25 22:13:12.101890934 -0400
+@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+
+diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
+--- libffi-3.0.13/libffi.pc.in.fixpath 2013-05-25 22:14:21.037891968 -0400
++++ libffi-3.0.13/libffi.pc.in 2013-05-25 22:14:31.652892128 -0400
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
++includedir=@includedir@
+
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-07-10 12:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130710124642.21352202C1@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox