Merge remote branch 'alpine/master'

18 files changed, 167 insertions, 400 deletions

diff --git a/testing/awstats/APKBUILD b/testing/awstats/APKBUILD
new file mode 100644
index 0000000000..4dddfdd1fe
--- /dev/null
+++ b/testing/awstats/APKBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=awstats
+pkgver=6.95
+pkgrel=0
+pkgdesc="AWStats is short for Advanced Web Statistics."
+url="http://awstats.sourceforge.net/"
+license="GPL-2"
+depends="perl perl-uri"
+subpackages="$pkgname-doc"
+source="http://awstats.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local file
+	cd "$_builddir"
+	for file in tools/* wwwroot/cgi-bin/*; do
+		[ -f "${file}" ] || continue
+		sed -e "s:/usr/local/awstats/wwwroot:/usr/lib/awstats:g" \
+			-i "$file"
+	done
+}
+
+build() {
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+#	logpath="awstats_log"
+#	sed -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
+#	-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|"
+#	-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|"
+#	-e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" 
+#	-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+#	if use ipv6; then
+#	sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+#	fi
+	
+	install -d "$pkgdir"/usr/share/doc/awstats \
+		"$pkgdir"/var/lib/awstats \
+		"$pkgdir"/usr/lib/awstats \
+		"$pkgdir"/usr/bin \
+		"$pkgdir"/etc/awstats
+	# docs
+	cp -a docs tools/xslt "$pkgdir"/usr/share/doc/awstats || return 1
+
+	# cgi-bin
+	cp -a wwwroot/* "$pkgdir"/usr/lib/awstats
+	mv "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf \
+		"$pkgdir"/etc/awstats/
+	ln -s /etc/aswtats/awstats \
+		"$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf
+
+	# tools
+	cp tools/*.pl "$pkgdir"/usr/bin/ || return 1
+	ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/
+}
+md5sums="26a5b19fa9f395e9e7dafed37b795d7f  awstats-6.95.tar.gz"
diff --git a/testing/btrfs-progs/APKBUILD b/testing/btrfs-progs/APKBUILD
new file mode 100644
index 0000000000..62b90460c1
--- /dev/null
+++ b/testing/btrfs-progs/APKBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=btrfs-progs
+pkgver=0.19
+pkgrel=0
+pkgdesc="Tools for the btrfs"
+url="https://btrfs.wiki.kernel.org/"
+license="GPL"
+depends=
+makedepends="util-linux-ng-dev bash"
+install=
+subpackages="$pkgname-doc"
+source="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	make prefix=/usr || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install
+
+	# remove the 2 lines below (and this) if there is no init.d script
+	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+
+md5sums="5854728d080cc76f21a83bdc99b6ddaa  btrfs-progs-0.19.tar.bz2"
diff --git a/testing/cairomm/APKBUILD b/testing/cairomm/APKBUILD
index ad8c64c4a6..9942749e0a 100644
--- a/testing/cairomm/APKBUILD
+++ b/testing/cairomm/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="C++ bindings to Cairo vector graphics library"
 url="http://www.cairographics.org"
 license="LGPL MPL"
 depends=""
-makedepends="cairo-dev libsigc++-dev"
+makedepends="cairo-dev libsigc++-dev perl"
 depends_dev="$makedepends"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz"
diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index 7705d87ce4..f93cfcf588 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=cherokee
 pkgver=0.99.41
-pkgrel=2
+pkgrel=3
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 url="http://www.cherokee-project.com/"
 license="GPL2"
diff --git a/testing/coova-chilli/APKBUILD b/testing/coova-chilli/APKBUILD
index ab84e37318..047c6fbf10 100644
--- a/testing/coova-chilli/APKBUILD
+++ b/testing/coova-chilli/APKBUILD
@@ -4,24 +4,28 @@
 # TODO: fix init.d script
 
 pkgname=coova-chilli
-pkgver=1.0.14
-pkgrel=2
+pkgver=1.2.2
+pkgrel=0
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 license="GPL"
 depends=
 makedepends="perl openssl-dev autoconf automake libtool"
-install= #"coova-chilli.install"
+install= 
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz
-	coova-chilli-ssl.patch
-	"
+	coova-chilli-ssl.patch"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd $_builddir
 	patch -p1 -i ../coova-chilli-ssl.patch || return 1
 	aclocal && autoconf && automake && libtoolize || return 1
+}
 
+build() {
+	cd $_builddir
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -34,9 +38,9 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $_builddir
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="88774ec55f9943d174ea7dd26e85fd8a  coova-chilli-1.0.14.tar.gz
-e4e94b06540c10caa750a590f3ec9ec6  coova-chilli-ssl.patch"
+md5sums="44042e26c3b3c6e64a9a8769328b437d  coova-chilli-1.2.2.tar.gz
+4135e6e19bafdad777b8ca7388ff4101  coova-chilli-ssl.patch"
diff --git a/testing/coova-chilli/coova-chilli-ssl.patch b/testing/coova-chilli/coova-chilli-ssl.patch
index 618b90a60a..1567c96cb3 100644
--- a/testing/coova-chilli/coova-chilli-ssl.patch
+++ b/testing/coova-chilli/coova-chilli-ssl.patch
@@ -1,17 +1,21 @@
-diff -ru a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am	2009-10-15 09:15:00.000000000 +0000
-+++ b/src/Makefile.am	2009-10-15 09:17:20.000000000 +0000
-@@ -20,6 +20,7 @@
- chilli.h options.h util.c garden.c garden.h \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,7 +13,8 @@
+ chilli.h options.h util.c garden.c garden.h ssl.h ssl.c \
  dns.c dns.h session.c session.h limits.h pkt.h pkt.c \
- chksum.c net.h net.c ms_chap.c options.c 
+ chksum.c net.h net.c ms_chap.c options.c statusfile.c \
+-conn.h conn.c 
++conn.h conn.c
 +libchilli_la_LIBADD = $(LIBOPENSSL)
  
- # AM_LDFLAGS = -lchilli
- 
-@@ -32,4 +33,4 @@
- chilli_dog_SOURCES = main-dog.c 
+ AM_CFLAGS = -D_GNU_SOURCE -Wall -fno-builtin -fno-strict-aliasing \
+   -O2 -fomit-frame-pointer -funroll-loops -pipe \
+@@ -33,7 +34,7 @@
  #test_radius_SOURCES = test-radius.c 
+ #test_dhcp_SOURCES = test-dhcp.c 
  
--LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la 
+-LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la ${LIBRT}
 +LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la $(LIBOPENSSL)
+ 
+ if WITH_OPENSSL
+ LDADD += ${LIBSSL}
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
index aee29ffc05..2f8007ee22 100644
--- a/testing/kamailio/APKBUILD
+++ b/testing/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=3.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -51,8 +51,8 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make prefix=/usr \
-		cfg-dir=/etc/kamailio/ \
+	make LOCALBASE=/usr \
+		cfg_target=/etc/kamailio/ \
 		MODS_MYSQL=yes \
 		MODS_PCRE=yes \
 		MODS_PRESENCE=yes \
@@ -64,15 +64,17 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make prefix=/usr \
-		cfg-dir=/etc/kamailio/ \
+	make  LOCALBASE=/usr \
+		cfg_target=/etc/kamailio/ \
 		MODS_MYSQL=yes \
 		MODS_PCRE=yes \
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
 		include_modules="$_modules" \
-		basedir="$pkgdir" install || return 1
+		basedir="$pkgdir" \
+		cfg_prefix="$pkgdir" \
+		install || return 1
 
 	# move default config to -doc package and use our own default config
 
@@ -145,7 +147,7 @@ unixodbc() {
 }
 
 md5sums="dd039e078a77032a423fb15f9685ad31  kamailio-3.0.2_src.tar.gz
-eb665248ee39cf755a247286affc5cbb  kamailio.cfg
+865979ca14a727e99e0de5ca2426603f  kamailio.cfg
 81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
 c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
 3fbaf633ff1620d0d526fc4047c7bed9  kamailio.post-install
diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg
index 9c101a871f..5a45cfdbbf 100644
--- a/testing/kamailio/kamailio.cfg
+++ b/testing/kamailio/kamailio.cfg
@@ -14,7 +14,7 @@ children	=	4
 dns		=	no
 rev_dns		=	no
 
-mpath		= 	"/usr/lib/kamailio/modules/"
+mpath		=	"/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/"
 #--------------------------------------------------------
 # Section 2:  Modules
 #--------------------------------------------------------
diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD
index bac91a5844..0329b63ae2 100644
--- a/testing/libsigc++/APKBUILD
+++ b/testing/libsigc++/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="type-safe Signal Framework for C++"
 url="http://libsigc.sourceforge.net/"
 license="LGPL"
 depends=
-makedepends="m4"
+makedepends="m4 perl"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2"
 
diff --git a/testing/lua-lgob/APKBUILD b/testing/lua-lgob/APKBUILD
new file mode 100644
index 0000000000..17a38eaa3e
--- /dev/null
+++ b/testing/lua-lgob/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lua-lgob
+pkgver=10.05
+pkgrel=0
+pkgdesc="Set of Lua bindings that uses gobject-instrospection"
+url="http://oproj.tuxfamily.org"
+license="LGPL"
+depends="lua"
+makedepends="lua-dev cairo-dev gtk+-dev pango-dev vte-dev gtkspell-dev
+	webkit-dev atk-dev gstreamer-dev gst-plugins-base-dev poppler-gtk-dev
+	gtksourceview-dev"
+subpackages="$pkgname-dev"
+source="http://downloads.tuxfamily.org/oproj/lgob/lgob-$pkgver.tar.bz2"
+
+#    'codegen', 'common', 'gobject', 'loader', 'cairo', 'gdk', 'gtk',
+#    'pango', 'pangocairo', 'vte', 'webkit', 'atk', 'gstreamer', 'gtkspell',
+#    'gtksourceview', 'goocanvas', 'poppler', 'clutter', 'cluttergtk'
+_mods="codegen common gobject loader cairo gdk gtk pango pangocairo vte webkit
+	atk gstreamer gtkspell gtksourceview poppler"
+build() { 
+	cd "$srcdir"/lgob-$pkgver
+}
+
+package() {
+	cd "$srcdir"/lgob-$pkgver
+	for i in $_mods; do
+		cd $i
+		make DESTDIR="$pkgdir"/usr \
+			&& make DESTDIR="$pkgdir"/usr install|| return 1
+		cd ..
+	done
+}
+
+md5sums="ac3eb632d53c8c3d181b317482bacff7  lgob-10.05.tar.bz2"
diff --git a/testing/open-iscsi-grsec/APKBUILD b/testing/open-iscsi-grsec/APKBUILD
deleted file mode 100644
index 1bda4a7f2e..0000000000
--- a/testing/open-iscsi-grsec/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@gmail.com>
-
-_flavor=grsec
-_realname=open-iscsi
-_realver=2.0-871
-# source the kernel version
-if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
-	. ../../main/linux-$_flavor/APKBUILD
-fi
-_kver=$pkgver
-_kernelver=$pkgver-r$pkgrel
-_abi_release=$pkgver-${_flavor}
-_kpkgrel=$pkgrel
-_ksrc=/usr/src/linux-headers-${_abi_release}
-
-_iscsiver=2.0-871
-
-pkgname=${_realname}-${_flavor}
-pkgver=$_kver
-_mypkgrel=0
-pkgrel=$(($_kpkgrel + $_mypkgrel))
-pkgdesc="$_flavor kernel modules for open-iscsi $_iscsiver"
-url="http://www.open-iscsi.org"
-license="GPL-2"
-depends="linux-${_flavor}=${_kernelver}"
-install=
-makedepends="linux-${_flavor}-dev=${_kernelver}"
-subpackages=
-source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz
-	Makefile.kernel.patch
-	CVE-2009-1297.patch
-	open-iscsi-2.0.871-makefile-cleanup.patch"
-
-_builddir="$srcdir/$_realname-$_realver"
-
-prepare() {
-	cd "$_builddir"
-	patch -p0 < ../../CVE-2009-1297.patch || return 1
-	patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
-	patch -p2 < ../../Makefile.kernel.patch || return 1
-}
-
-build() {
-	cd "$_builddir"
-	unset ARCH
-	make KSRC="$_ksrc" kernel || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make KSRC="$_ksrc" DESTDIR="$pkgdir" \
-	 INSTALL_MOD_DIR="extra/drivers/scsi" \
-	 install_kernel
-}
-
-md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
-c5289f800ceebf59319fea284d476cdf  Makefile.kernel.patch
-d1584790b4e12f087e60089880b53d2b  CVE-2009-1297.patch
-734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch"
diff --git a/testing/open-iscsi-grsec/CVE-2009-1297.patch b/testing/open-iscsi-grsec/CVE-2009-1297.patch
deleted file mode 100644
index d1728fff7e..0000000000
--- a/testing/open-iscsi-grsec/CVE-2009-1297.patch
+++ /dev/null
@@ -1,31 +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/testing/open-iscsi-grsec/Makefile.kernel.patch b/testing/open-iscsi-grsec/Makefile.kernel.patch
deleted file mode 100644
index 552e31b47f..0000000000
--- a/testing/open-iscsi-grsec/Makefile.kernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/open-iscsi-2.0-871/kernel/Makefile
-+++ Makefile
-@@ -102,6 +102,8 @@
- 
- linux_2_6_30: $(unpatch_code)
- 
-+linux_2_6_32: $(unpatch_code)
-+
- 
- do_unpatch_code:
- 	echo "Un-patching source code for use with linux-2.6.14 and up ..."
diff --git a/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch b/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch
deleted file mode 100644
index 6ca2a4eaba..0000000000
--- a/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
---- open-iscsi-2.0-871.orig/usr/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/usr/Makefile	2009-11-12 00:58:16.467960344 -0800
-@@ -48,14 +48,14 @@
- all: $(PROGRAMS)
- 
- iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) -static $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
-diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
---- open-iscsi-2.0-871.orig/utils/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/utils/Makefile	2009-11-12 00:58:56.404623435 -0800
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
- 
- iscsi-iname: md5.o iscsi-iname.o
--	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
- 
- clean:
- 	rm -f *.o $(PROGRAMS) .depend
diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD
deleted file mode 100644
index 0f4076e21d..0000000000
--- a/testing/open-iscsi/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@gmail.com>
-pkgname=open-iscsi
-pkgver=2.0.871
-_realver=2.0-871
-pkgrel=2
-pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
-url="http://www.open-iscsi.org"
-license="GPL-2"
-depends=
-makedepends=
-install=""
-subpackages="$pkgname-doc"
-source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz
-	CVE-2009-1297.patch
-	open-iscsi-2.0.871-makefile-cleanup.patch
-	iscsid.initd"
-
-_builddir="$srcdir"/$pkgname-$_realver
-
-prepare() {
-	cd "$_builddir"
-	patch -p0 < ../../CVE-2009-1297.patch || return 1
-	patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1
-}
-
-build() {
-	cd "$_builddir"
-	make user || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install_user
-	mkdir -p $pkgdir/usr/bin
-	mkdir -p $pkgdir/usr/sbin
-	mv $pkgdir/sbin/iscsi-iname $pkgdir/usr/bin
-	mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
-	mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
-	mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
-	install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid
-}
-
-md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
-d1584790b4e12f087e60089880b53d2b  CVE-2009-1297.patch
-734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch
-3e89cb86395756dafebc4f1490f0de10  iscsid.initd"
diff --git a/testing/open-iscsi/CVE-2009-1297.patch b/testing/open-iscsi/CVE-2009-1297.patch
deleted file mode 100644
index d1728fff7e..0000000000
--- a/testing/open-iscsi/CVE-2009-1297.patch
+++ /dev/null
@@ -1,31 +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/testing/open-iscsi/iscsid.initd b/testing/open-iscsi/iscsid.initd
deleted file mode 100644
index 572b0a6ae5..0000000000
--- a/testing/open-iscsi/iscsid.initd
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/sbin/runscript
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
-	after modules
-	use net
-}
-
-checkconfig() {
-	if [ ! -e /etc/conf.d/${SVCNAME} ]; then
-		eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
-		return 1
-	fi
-	if [ ! -e "${CONFIG_FILE}" ]; then
-		eerror "Config file ${CONFIG_FILE} does not exist!"
-		return 1
-	fi
-	if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
-		ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
-		IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
-		IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
-		ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
-		echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
-		eend $?
-	fi
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="${1}"
-	shift
-	modopts="$@"
-	for m in ${modules}
-	do
-		if [ -n "$(find /lib/modules/`uname -r` | grep ${m})" ]
-		then
-			ebegin "${msg} ${m}"
-			modprobe ${modopts} ${m}
-			ret=$?
-			eend ${ret}
-			if [ ${ret} -ne 0 ]; then
-				return ${ret}
-			fi
-		else
-			ebegin "${msg} ${m}: not found"
-			return 1
-		fi
-	done
-	return 0
-}
-
-start() {
-	ebegin "Checking open-iSCSI configuration"
-	checkconfig
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-	ebegin "Loading iSCSI modules"
-	do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend 1
-		return 1
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS}
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eend $?
-		return $?
-	fi
-
-	# Start automatic targets when iscsid is started
-	if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
-		starttargets
-		return $?
-	fi
-	return 0
-}
-	
-stop() {
-	stoptargets
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
-	eend $?
-
-	# ugly, but pid file is not removed by iscsid
-	rm -f $PID_FILE
-	
-	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
-	eend $?
-}
-
-starttargets() {
-        ebegin "Setting up iSCSI targets"
-        /usr/bin/iscsiadm -m node --loginall=automatic
-		ret=$?
-        eend $ret
-		return $ret
-}
-
-stoptargets() {
-        ebegin "Disconnecting iSCSI targets"
-        sync
-        /usr/bin/iscsiadm -m node --logoutall=all
-		ret=$?
-        eend $ret
-		return $ret
-}
-
-restarttargets() {
-        stoptargets
-        starttargets
-}
-
-status() {
-	ebegin "Showing current active iSCSI sessions"
-	/usr/bin/iscsiadm -m session
-}
diff --git a/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch b/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch
deleted file mode 100644
index 6ca2a4eaba..0000000000
--- a/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile
---- open-iscsi-2.0-871.orig/usr/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/usr/Makefile	2009-11-12 00:58:16.467960344 -0800
-@@ -48,14 +48,14 @@
- all: $(PROGRAMS)
- 
- iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- 		iscsistart.o statics.o
--	$(CC) $(CFLAGS) -static $^ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
- 	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
- 
-diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile
---- open-iscsi-2.0-871.orig/utils/Makefile	2009-07-10 20:55:58.000000000 -0700
-+++ open-iscsi-2.0-871/utils/Makefile	2009-11-12 00:58:56.404623435 -0800
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
- 
- iscsi-iname: md5.o iscsi-iname.o
--	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^
- 
- clean:
- 	rm -f *.o $(PROGRAMS) .depend