iproute2-selinux 4.9.0-1 update

2 files changed, 31 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ca5e5e41ff5..275553b4e921 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = iproute2-selinux
 	pkgdesc = IP Routing Utilities with SELinux support
-	pkgver = 4.8.0
+	pkgver = 4.9.0
 	pkgrel = 1
 	url = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = iptables
 	makedepends = linux-atm
 	makedepends = linuxdoc-tools
 	makedepends = texlive-bin
@@ -13,13 +14,13 @@ pkgbase = iproute2-selinux
 	makedepends = texlive-latexextra
 	options = staticlibs
 	options = !makeflags
-	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.8.0.tar.xz
-	source = http://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.8.0.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.9.0.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.9.0.tar.sign
 	source = 0001-make-iproute2-fhs-compliant.patch
 	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
-	sha1sums = eba7c753918ddcf8b3890718391fb795f8dd023b
-	sha1sums = SKIP
-	sha1sums = 1ed328854983b3f9df0a143aa7c77920916a13c1
+	sha256sums = c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4
+	sha256sums = SKIP
+	sha256sums = f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3
 
 pkgname = iproute2-selinux
 	groups = base
@@ -28,7 +29,7 @@ pkgname = iproute2-selinux
 	depends = libselinux
 	optdepends = linux-atm: ATM support
 	provides = iproute
-	provides = iproute2=4.8.0-1
+	provides = iproute2=4.9.0-1
 	conflicts = iproute
 	conflicts = iproute2
 	replaces = iproute
diff --git a/PKGBUILD b/PKGBUILD
index 91843206e4c3..84c87345cbed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,25 @@
 # $Id$
+# Maintainer: Christian Hesse <mail@eworm.de>
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 
 pkgbase=iproute2-selinux
 pkgname=(iproute2-selinux iproute2-selinux-doc)
-pkgver=4.8.0
+pkgver=4.9.0
 pkgrel=1
-pkgdesc="IP Routing Utilities with SELinux support"
+pkgdesc='IP Routing Utilities with SELinux support'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
-makedepends=('linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+makedepends=('iptables' 'linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
 options=('staticlibs' '!makeflags')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
-source=("http://www.kernel.org/pub/linux/utils/net/${pkgbase/-selinux}/${pkgbase/-selinux}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase/-selinux}/${pkgbase/-selinux}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch')
-sha1sums=('eba7c753918ddcf8b3890718391fb795f8dd023b'
-          'SKIP'
-          '1ed328854983b3f9df0a143aa7c77920916a13c1')
+sha256sums=('c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4'
+            'SKIP'
+            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
   cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
@@ -54,26 +55,29 @@ package_iproute2-selinux() {
 
   cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
 
-  # remove sgml and tex files... we have html and pdf in iproute2-doc
-  rm "${pkgdir}/usr/share/doc/iproute2/"*.{sgml,tex}
+  # remove documentation
+  rm -rf "${pkgdir}/usr/share/doc/"
 
   # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
-  install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
-
-  # move binaries
-  cd "${pkgdir}"
-  mv sbin usr/bin
+  install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+  install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
 }
 
 package_iproute2-selinux-doc() {
   pkgdesc='IP Routing Utilities documentation'
 
-  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}/doc"
+  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # documentation is included in default install target... So clean up here.
+  find "${pkgdir}/" ! -type d ! -regex '.*examples.*' -delete
+  find "${pkgdir}/" -empty -delete
+  find "${pkgdir}/" -name '*.sgml' -delete
+  find "${pkgdir}/" -name '*.tex' -delete
 
-  install -d "${pkgdir}/usr/share/doc/iproute2/"
-  install *.html *.pdf "${pkgdir}/usr/share/doc/iproute2/"
+  install -m0644 doc/*.html doc/*.pdf "${pkgdir}/usr/share/doc/iproute2/"
 }