From 08fcd7719780746e6288a844b1f622c60c8c2557 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@plugapps.com>
Date: Sat, 11 Feb 2012 16:48:59 -0500
Subject: [PATCH] aur/open-iscsi to 2.0.872-2

---
 aur/open-iscsi/PKGBUILD                     | 41 +++++++++------------
 aur/open-iscsi/open-iscsi-build-error.patch | 11 ------
 2 files changed, 17 insertions(+), 35 deletions(-)
 delete mode 100644 aur/open-iscsi/open-iscsi-build-error.patch

diff --git a/aur/open-iscsi/PKGBUILD b/aur/open-iscsi/PKGBUILD
index f19021eb0..d8001aa2d 100644
--- a/aur/open-iscsi/PKGBUILD
+++ b/aur/open-iscsi/PKGBUILD
@@ -1,14 +1,11 @@
-# Contributor: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
-# Modified: Marco Lima <cipparello@gmail.com>
-
-# No Plugbox changes, straight from AUR
+# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
 
 plugrel=1
 
 pkgname=open-iscsi
-pkgver=2.0.871.3
-_pkgver=2.0-871.3
-pkgrel=1
+pkgver=2.0.872
+_pkgver=2.0-872
+pkgrel=2
 pkgdesc="userland tools"
 arch=('i686' 'x86_64')
 url="http://www.open-iscsi.org"
@@ -16,32 +13,28 @@ license=('GPL')
 depends=('bash')
 install="${pkgname}.install"
 backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi' 'etc/conf.d/open-iscsi')
-source=("http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/${pkgname}-${_pkgver}.tar.gz" \
-        "open-iscsi" "open-iscsi.conf.d" "open-iscsi-build-error.patch")
-#source=("http://www.open-iscsi.org/bits/${pkgname}-${_pkgver}.tar.gz" \
+source=("http://www.open-iscsi.org/bits/${pkgname}-${_pkgver}.tar.gz" \
+        "open-iscsi" "open-iscsi.conf.d")
 options=('docs')
-md5sums=('16474cb7cd5a41aea1b7b0b631ac996d'
-         'b191af2549f7aff89321b54421eab96f'
-         'd6e94c159ddfdeb1ebe69c0760ed1fa6'
-         'cafea1118930cd7d9eb6209706020b6a')
+sha256sums=('37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f'
+            '817791c59d1c271ad5eb78a7609e4fa081cf9414f3d7ac26df897b9327286c23'
+            '289ba27b72a3bd9d251e08b3d61dd3ae2f6ad545e5ffe2edaa2b79638996654c')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${_pkgver}
+  cd ${srcdir}/${pkgname}-${_pkgver}
 
-  patch -Np1 -i ${srcdir}/open-iscsi-build-error.patch
-  
   # include iscsistart program in the package
   sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
-  
+
+  # build breaks if the openslp package is installed
+  sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile 
+
   make user
   make DESTDIR=${pkgdir} install_user
   
-  install -D -m755 ${startdir}/src/open-iscsi ${pkgdir}/etc/rc.d/open-iscsi
-  install -D -m644 ${startdir}/src/open-iscsi.conf.d ${pkgdir}/etc/conf.d/open-iscsi
-  
-  # change permission configuration file
-  # chmod 600 ${startdir}/pkg/etc/iscsi/iscsid.conf
-  install -D -m644 ${startdir}/src/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
+  install -D -m755 ${srcdir}/open-iscsi ${pkgdir}/etc/rc.d/open-iscsi
+  install -D -m644 ${srcdir}/open-iscsi.conf.d ${pkgdir}/etc/conf.d/open-iscsi
+  install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
   
   # copy docs
   mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
diff --git a/aur/open-iscsi/open-iscsi-build-error.patch b/aur/open-iscsi/open-iscsi-build-error.patch
deleted file mode 100644
index 92664145c..000000000
--- a/aur/open-iscsi/open-iscsi-build-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/iscsi_sysfs.c
-+++ b/usr/iscsi_sysfs.c
-@@ -22,6 +22,8 @@
- #include <string.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include "log.h"
- #include "initiator.h"