iproute2-selinux 4.14.1-2 update

2 files changed, 41 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 325278401905..a09445fb5fd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,39 @@
 pkgbase = iproute2-selinux
 	pkgdesc = IP Routing Utilities with SELinux support
-	pkgver = 4.13.0
-	pkgrel = 1
-	url = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
+	pkgver = 4.14.1
+	pkgrel = 2
+	url = https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
 	arch = i686
 	arch = x86_64
 	groups = selinux
 	license = GPL2
-	makedepends = iptables
 	makedepends = linux-atm
-	makedepends = linuxdoc-tools
-	makedepends = texlive-bin
-	makedepends = texlive-core
-	makedepends = texlive-latexextra
-	makedepends = libselinux
-	options = staticlibs
-	options = !makeflags
-	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.13.0.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.13.0.tar.sign
-	source = 0001-make-iproute2-fhs-compliant.patch
-	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
-	sha256sums = 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50
-	sha256sums = SKIP
-	sha256sums = f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3
-
-pkgname = iproute2-selinux
 	depends = glibc
 	depends = iptables
 	depends = libelf
 	depends = libselinux
 	optdepends = linux-atm: ATM support
 	provides = iproute
-	provides = iproute2=4.13.0-1
+	provides = iproute2=4.14.1-2
 	conflicts = iproute
+	conflicts = iproute2-doc
 	conflicts = iproute2
-	replaces = iproute
+	conflicts = iproute2-selinux-doc
+	replaces = iproute2-selinux-doc
+	options = staticlibs
 	backup = etc/iproute2/ematch_map
 	backup = etc/iproute2/rt_dsfield
 	backup = etc/iproute2/rt_protos
 	backup = etc/iproute2/rt_realms
 	backup = etc/iproute2/rt_scopes
 	backup = etc/iproute2/rt_tables
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.14.1.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.14.1.tar.sign
+	source = 0001-make-iproute2-fhs-compliant.patch
+	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
+	sha256sums = d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067
+	sha256sums = SKIP
+	sha256sums = f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3
 
-pkgname = iproute2-selinux-doc
-	pkgdesc = IP Routing Utilities documentation
-	conflicts = iproute2-doc
+pkgname = iproute2-selinux
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b4706c77c75..d06e98adf4f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,38 @@
 # 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.13.0
-pkgrel=1
+pkgname=iproute2-selinux
+pkgver=4.14.1
+pkgrel=2
 pkgdesc='IP Routing Utilities with SELinux support'
 arch=('i686' 'x86_64')
 license=('GPL2')
 groups=('selinux')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
-makedepends=('iptables' 'linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra' 'libselinux')
-options=('staticlibs' '!makeflags')
+url='https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git'
+depends=('glibc' 'iptables' 'libelf' 'libselinux')
+optdepends=('linux-atm: ATM support')
+provides=('iproute' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
+# Upstream commit b2fd7a0e6efa7b85a041b5cb9ea6fc1a6a798fd3 removed old documentation.
+# Add conflict and replace to get rid of the package. TODO: Remove anytime soon.
+conflicts=('iproute' 'iproute2-doc' "${pkgname/-selinux}" 'iproute2-selinux-doc')
+replaces=('iproute2-selinux-doc')
+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')
+makedepends=('linux-atm')
+options=('staticlibs')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
-source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase/-selinux}/${pkgbase/-selinux}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/net/${pkgname/-selinux}/${pkgname/-selinux}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch')
-sha256sums=('9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50'
+sha256sums=('d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067'
             'SKIP'
             'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
-  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
+  cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
 
   # set correct fhs structure
   patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
@@ -34,51 +46,19 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
+  cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
 
   ./configure --with-selinux
   make
-
-  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}/doc/"
-
-  make html pdf
 }
 
-package_iproute2-selinux() {
-  depends=('glibc' 'iptables' 'libelf' 'libselinux')
-  optdepends=('linux-atm: ATM support')
-  provides=('iproute' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
-  conflicts=('iproute' "${pkgname/-selinux}")
-  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')
-
-  cd "${srcdir}/${pkgbase/-selinux}-${pkgver}"
+package() {
+  cd "${srcdir}/${pkgname/-selinux}-${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 -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'
-  conflicts=("${pkgname/-selinux}")
-
-  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 -m0644 doc/*.html doc/*.pdf "${pkgdir}/usr/share/doc/iproute2/"
-}
-