update to 7.1.6.2

Split package into -server and -dkms

tslclient-dkms doesn't build properly due to kernel incompat, but
package is still generated properly (dkms build happens at install)

Use the .service files from the distrobution & modify runpath on the
binaries so they can locate their libraries.

4 files changed, 77 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56faa8eebd69..2b9c259f1e74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
-# Generated by mksrcinfo v8
-# Thu Jan 28 20:15:35 UTC 2016
 pkgbase = tsmclient
 	pkgdesc = IBM Tivoli Storage Manager Client
-	pkgver = 7.1.4
+	pkgver = 7.1.6.2
 	pkgrel = 1
 	url = http://www-03.ibm.com/software/products/en/tivostormana/
 	arch = x86_64
 	license = proprietary
-	makedepends = rpmextract
+	makedepends = libarchive
+	makedepends = patchelf
 	optdepends = jre8-openjdk: support for dsmj java gui
 	options = !strip
-	source = ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v714/7.1.4.0-TIV-TSMBAC-LinuxX86.tar
-	source = dsmcad.service
-	sha1sums = acecc4cc3fbe0f3d5cf9bd2cd9339534214b091d
-	sha1sums = d4702d06339da46e998980e0d145e1f3e92f30aa
+	source = ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v716/7.1.6.2-TIV-TSMBAC-LinuxX86.tar
+	source = dkms.conf
+	sha1sums = db47fa69b96a20da08d29e55738e71158277adc7
+	sha1sums = ad89fff3d6096ba25d973e7e27ee3ce10e2fe57f
 
-pkgname = tsmclient
+pkgname = tsmclient-service
+
+pkgname = tsmclient-dkms
+	arch = any
+	depends = dkms
 
diff --git a/.gitignore b/.gitignore
index 4552cbc6889a..69465f16e944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 pkg
 src
 *.log
+*
diff --git a/PKGBUILD b/PKGBUILD
index 3945d39332c2..8f9893a52513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Grey Christoforo <first name [at] last name [dot] net>
 # Contributer: Stefan Seemayer <stefan@seemayer.de>
-pkgname=tsmclient
-pkgver=7.1.4
+pkgbase=tsmclient
+pkgname=(tsmclient-service tsmclient-dkms)
+pkgver=7.1.6.2
 pkgrel=1
 pkgdesc="IBM Tivoli Storage Manager Client"
 arch=('x86_64')
 url="http://www-03.ibm.com/software/products/en/tivostormana/"
 license=('proprietary')
 depends=()
-makedepends=(rpmextract)
+makedepends=(libarchive patchelf)
 checkdepends=()
 optdepends=('jre8-openjdk: support for dsmj java gui')
 provides=()
@@ -16,21 +17,37 @@ conflicts=()
 install=
 options=(!strip)
 
-source=(ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v${pkgver//.}/${pkgver}.0-TIV-TSMBAC-LinuxX86.tar
-	dsmcad.service)
+# For 7.1.6.2:
+# 7
+_ver_major="${pkgver%%.*}"
+# 7.1.6
+_ver_3="${pkgver%.*}"
+# 716
+_ver_3_nd="${_ver_3//.}"
+# 7.1
+_ver_2="${_ver_3%.*}"
+# 1
+_ver_minor="${_ver_2#*.}"
+source=(ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v${_ver_major}r${_ver_minor}/Linux/LinuxX86/BA/v${_ver_3_nd}/${pkgver}-TIV-TSMBAC-LinuxX86.tar
+	dkms.conf)
 
-sha1sums=('acecc4cc3fbe0f3d5cf9bd2cd9339534214b091d'
-          'd4702d06339da46e998980e0d145e1f3e92f30aa')
+sha1sums=('db47fa69b96a20da08d29e55738e71158277adc7'
+          'ad89fff3d6096ba25d973e7e27ee3ce10e2fe57f')
 
 prepare() {
 	cd "$srcdir/"
 	for rpmfile in *.rpm; do
+		case "$rpmfile" in
+			TIVsm-filepath-*) continue ;;
+		esac
 		echo "Extracting '$rpmfile'"
-		rpmextract.sh $rpmfile
+		bsdtar -xf $rpmfile
 	done
+
+	bsdtar -xf TIVsm-filepath-source.tar.gz
 }
 
-package() {
+package_tsmclient-service() {
 	cd "$srcdir/"
 
 	#cp -r "$srcdir/etc" "$pkgdir/"
@@ -40,8 +57,35 @@ package() {
 
 	ln -s "/opt/tivoli/tsm/client/lang/EN_US" "$pkgdir/opt/tivoli/tsm/client/ba/bin/EN_US"
 
-	install -Dm 644 "$srcdir/dsmcad.service" "$pkgdir/usr/lib/systemd/system/dsmcad.service"
+	for serv in "$srcdir"/opt/tivoli/tsm/client/ba/bin/*.service; do
+		install -d "$pkgdir"/usr/lib/systemd/system
+		install -m 644 "$serv" "$pkgdir"/usr/lib/systemd/system
+	done
+
+	# Permissions even for owner are locked down, fix what we need for now.
+	chmod u+rw -R "$pkgdir"/opt/tivoli/tsm/client/ba
+
+	# GSK stuff is in wierd places, tweak rpath to allow it
+	# TODO: consider relocating these somewhere else
+	for bin in "$pkgdir"/opt/tivoli/tsm/client/ba/bin/{dsmadmc,dsmagent,dsmc,dsmcad,dsmenc,dsmswitch,dsmtca,dsmtrace,tsmjbbd}; do
+		echo "Patch rpath of $bin"
+		patchelf --set-rpath '/usr/local/ibm/gsk8_64/lib64:/opt/tivoli/tsm/client/api/bin64'  "$bin"
+	done
+}
+
+package_tsmclient-dkms() {
+	arch=('any')
+	depends=('dkms')
+
+	cd "$srcdir"/jbb_gpl
+
+	install -d -m 0755 "${pkgdir}"/usr/src/${pkgbase}-${pkgver}
+	install -D -m 0644 "${srcdir}"/dkms.conf "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/dkms.conf
+	install -m0644 Makefile *.c *.h "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/
 
-	# Install ld.so.conf.d file so that shared libraries can be found
-	#install -Dm 644 "$srcdir/tsmclient.conf" "$pkgdir/etc/ld.so.conf.d/tsmclient.conf"
+	sed \
+		-e "s/@PKGBASE@/${pkgbase}/" \
+		-e "s/@PKGVER@/${pkgver}/" \
+		-i "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/dkms.conf
 }
+		
diff --git a/dkms.conf b/dkms.conf
new file mode 100644
index 000000000000..e2e33332e12b
--- /dev/null
+++ b/dkms.conf
@@ -0,0 +1,8 @@
+PACKAGE_NAME=@PKGBASE@
+PACKAGE_VERSION=@PKGVER@
+
+MAKE[0]="make RELNUM=@PKGVER@"
+
+BUILT_MODULE_NAME="filepath"
+DEST_MODULE_LOCATION="/kernel"
+AUTOINSTALL=yes