iproute2: update to 4.9.0

1 files changed, 53 insertions, 34 deletions

diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD
index 4a6bcc0..566c75b 100644
--- a/abs/core/iproute2/PKGBUILD
+++ b/abs/core/iproute2/PKGBUILD
@@ -1,41 +1,32 @@
 # $Id$
+# Maintainer: Christian Hesse <mail@eworm.de>
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
-pkgname=iproute2
-pkgver=4.1.1
+pkgbase=iproute2
+#pkgname=(iproute2 iproute2-doc)
+pkgname=(iproute2)
+pkgver=4.9.0
 pkgrel=1
-pkgdesc="IP Routing Utilities"
+pkgdesc='IP Routing Utilities'
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'iptables')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-groups=('base')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
+#makedepends=('iptables' 'linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+makedepends=('iptables' 'linux-atm')
 options=('staticlibs' '!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
-	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
-source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
-        iproute2-fhs.patch
-        unwanted-link-help.patch)
-sha1sums=('750c17e720b43041c23fed7b8cf0118c0e841036'
-          'SKIP'
-          '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935'
-          '3b1335f4025f657f388fbf4e5a740871e3129c2a')
+source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase}/${pkgbase}-${pkgver}.tar."{xz,sign}
+        '0001-make-iproute2-fhs-compliant.patch')
+sha256sums=('c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4'
+            'SKIP'
+            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # set correct fhs structure
-  patch -Np1 -i "${srcdir}/iproute2-fhs.patch"
-
-  # allow operations on links called "h", "he", "hel", "help"
-  patch -Np1 -i "${srcdir}/unwanted-link-help.patch"
+  patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
 
   # do not treat warnings as errors
   sed -i 's/-Werror//' Makefile
@@ -43,23 +34,51 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure
   make
+
+#  cd "${srcdir}/${pkgbase}-${pkgver}/doc/"
+
+#  make html pdf
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_iproute2() {
+  depends=('glibc' 'iptables')
+  optdepends=('linux-atm: ATM support')
+  groups=('base')
+  provides=('iproute')
+  conflicts=('iproute')
+  replaces=('iproute')
+  backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+    'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 
-  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
+
+  # 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"
+  install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+  install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+}
+
+package_iproute2-doc() {
+  pkgdesc='IP Routing Utilities documentation'
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # move binaries
-  cd "${pkgdir}"
-  mv sbin usr/bin
+  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 -m0644 doc/*.html doc/*.pdf "${pkgdir}/usr/share/doc/iproute2/"
 }
+