pcr/libselinux: updated to 2.7

1 files changed, 44 insertions, 36 deletions

diff --git a/pcr/libselinux/PKGBUILD b/pcr/libselinux/PKGBUILD
index 6db0a0641..d974a108a 100644
--- a/pcr/libselinux/PKGBUILD
+++ b/pcr/libselinux/PKGBUILD
@@ -1,18 +1,20 @@
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Maintainer (AUR): Nicolas Iooss <nicolas.iooss@m4x.org>
+# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 # Contributor (AUR): Timothée Ravier <tim@siosm.fr>
-# Contributor (AUR): Nicky726 <Nicky726@gmail.com>
-# Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)
+# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)
 # Contributor (AUR): Zezadas
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+
+# parabola changes and rationale:
+#  - corrected license
 
 pkgname=libselinux
-_reldate=20161014
-pkgver=2.6
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="SELinux library and simple utilities"
 arch=('i686' 'x86_64' 'armv7h')
-url='https://github.com/SELinuxProject/selinux/wiki/Userspace-Packages'
-license=('GPL')
+url='http://userspace.selinuxproject.org'
+license=('GPL2')
 groups=('selinux')
 makedepends=('python2' 'python' 'ruby' 'xz' 'swig')
 depends=('libsepol' 'pcre')
@@ -21,22 +23,10 @@ optdepends=('python2: python2 bindings'
             'ruby: ruby bindings')
 conflicts=("selinux-usr-${pkgname}")
 provides=("selinux-usr-${pkgname}=${pkgver}-${pkgrel}")
-options=(!emptydirs)
-source=("https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${_reldate}/${pkgname}-${pkgver}.tar.gz"
-        "libselinux.tmpfiles"
-        '0001-libselinux-fix-pointer-handling-in-realpath_not_fina.patch'
-        '0002-Revert-libselinux-support-new-python3-functions.patch')
-sha256sums=('4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a'
-            'afe23890fb2e12e6756e5d81bad3c3da33f38a95d072731c0422fbeb0b1fa1fc'
-            '4d7998c5368a6d13f5b730184b4e9ddb28dd42e1576f8daf12676ca468a935b3'
-            '82f598ab5c5d21b8b76e887fea43e5d8549f4e9a4047ba3a4cf1a6980ff22eec')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-
-  patch -Np2 -i '../0001-libselinux-fix-pointer-handling-in-realpath_not_fina.patch'
-  patch -Np2 -i '../0002-Revert-libselinux-support-new-python3-functions.patch'
-}
+source=("https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/${pkgname}-${pkgver}.tar.gz"
+        "libselinux.tmpfiles.d")
+sha256sums=('d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57'
+            'afe23890fb2e12e6756e5d81bad3c3da33f38a95d072731c0422fbeb0b1fa1fc')
 
 build() {
   cd "${pkgname}-${pkgver}"
@@ -46,22 +36,40 @@ build() {
 
   make swigify
   make all
-  make PYTHON=python2 pywrap
-  make PYTHON=python3 pywrap
-  make rubywrap
+  make PYTHON=/usr/bin/python2 pywrap
+  make PYTHON=/usr/bin/python3 pywrap
+  make RUBY=/usr/bin/ruby rubywrap
 }
 
-package(){
+package() {
   cd "${pkgname}-${pkgver}"
 
   export DISABLE_RPM=y
 
-  make DESTDIR="${pkgdir}" USRBINDIR="${pkgdir}"/usr/bin LIBDIR="${pkgdir}"/usr/lib SHLIBDIR="${pkgdir}"/usr/lib install
-  make DESTDIR="${pkgdir}" USRBINDIR="${pkgdir}"/usr/bin LIBDIR="${pkgdir}"/usr/lib SHLIBDIR="${pkgdir}"/usr/lib PYTHON=python2 install-pywrap
-  make DESTDIR="${pkgdir}" USRBINDIR="${pkgdir}"/usr/bin LIBDIR="${pkgdir}"/usr/lib SHLIBDIR="${pkgdir}"/usr/lib PYTHON=python3 install-pywrap
-  make DESTDIR="${pkgdir}" USRBINDIR="${pkgdir}"/usr/bin LIBDIR="${pkgdir}"/usr/lib SHLIBDIR="${pkgdir}"/usr/lib install-rubywrap
-  python2 -m compileall "${pkgdir}/$(python2 -c 'import site; print(site.getsitepackages()[0])')"
-  python3 -m compileall "${pkgdir}/$(python3 -c 'import site; print(site.getsitepackages()[0])')"
+  make DESTDIR="${pkgdir}" \
+    LIBSEPOLA=/usr/lib/libsepol.a \
+    SBINDIR="${pkgdir}/usr/bin" \
+    SHLIBDIR="${pkgdir}/usr/lib" \
+    install
+  make DESTDIR="${pkgdir}" PYTHON=/usr/bin/python2 \
+    LIBSEPOLA=/usr/lib/libsepol.a \
+    SBINDIR="${pkgdir}/usr/bin" \
+    SHLIBDIR="${pkgdir}/usr/lib" \
+    install-pywrap
+  make DESTDIR="${pkgdir}" PYTHON=/usr/bin/python3 \
+    LIBSEPOLA=/usr/lib/libsepol.a \
+    SBINDIR="${pkgdir}/usr/bin" \
+    SHLIBDIR="${pkgdir}/usr/lib" \
+    install-pywrap
+  make DESTDIR="${pkgdir}" RUBY=/usr/bin/ruby \
+    LIBSEPOLA=/usr/lib/libsepol.a \
+    SBINDIR="${pkgdir}/usr/bin" \
+    SHLIBDIR="${pkgdir}/usr/lib" \
+    install-rubywrap
+  /usr/bin/python2 -m compileall "${pkgdir}/$(/usr/bin/python2 -c 'import site; print(site.getsitepackages()[0])')"
+  /usr/bin/python3 -m compileall "${pkgdir}/$(/usr/bin/python3 -c 'import site; print(site.getsitepackages()[0])')"
+
+  install -Dm 0644 "${srcdir}"/libselinux.tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/libselinux.conf
 
-  install -Dm 0644 "${srcdir}"/libselinux.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/libselinux.conf
+  install -Dm 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }