upgpkg: make-3.81 3.81-2

- Fix glibc build issues.
- Upstream sources is validated securely.
- Tests are available, upon manual editing of the PKGBUILD.

3 files changed, 46 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 815cce1f76ba..9b550ad741f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
 pkgbase = make-3.81
 	pkgdesc = GNU make utility to maintain groups of programs (3.81 version)
 	pkgver = 3.81
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnu.org/software/make
-	install = make-3.81.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	checkdepends = procps-ng
 	depends = glibc
-	depends = sh
-	source = ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz
-	md5sums = a4e9494ac6dc3f6b0c5ff75c5d52abba
+	source = https://ftpmirror.gnu.org/make/make-3.81.tar.gz
+	source = https://ftpmirror.gnu.org/make/make-3.81.tar.gz.sig
+	source = https://raw.githubusercontent.com/InuSasha/LibreELEC.tv/master/packages/devel/make/patches/make-glibc_alloc_fix.patch
+	source = perl-use_safe_inclusion.patch::https://git.savannah.gnu.org/cgit/make.git/patch/?id=d9d4e06084a4c7da480bd49a3487aadf6ba77b54
+	validpgpkeys = 3D2554F0A15338AB9AF1BB9D96B047156338B6D4
+	sha256sums = 16b77de9f013bcd536b7bc1efbe314223aedfe250f9063e33cbb4dfd347215a2
+	sha256sums = SKIP
+	sha256sums = 7145e958d5209c3de5a40fe77f71141363dadfbbe7a206826d7b7d7c09c8f98f
+	sha256sums = 94368caa194cbdccc0a0c9ad31c515fe5b7a02bc66e2d01be4327335f60cbe33
 
 pkgname = make-3.81
 
diff --git a/PKGBUILD b/PKGBUILD
index aadb76165822..0a379e1b5d16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,50 @@
 # $Id$
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Giovanni 'ItachiSan' Santini <giovannisantini93@yahoo.it>
+# Previous maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make-3.81
 pkgver=3.81
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs (3.81 version)"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
 license=('GPL')
-depends=('glibc' 'sh')
-install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/make/${pkgname}.tar.gz)
-md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba')
+depends=('glibc')
+checkdepends=('procps-ng')
+source=(
+    https://ftpmirror.gnu.org/make/${pkgname}.tar.gz{,.sig}
+    # Fixing builds on newer toolchains, thanks to BangL
+    https://raw.githubusercontent.com/InuSasha/LibreELEC.tv/master/packages/devel/make/patches/make-glibc_alloc_fix.patch
+    # Fix unsafe Perl imports, see: https://bugs.archlinux.org/task/55127
+    perl-use_safe_inclusion.patch::https://git.savannah.gnu.org/cgit/make.git/patch/?id=d9d4e06084a4c7da480bd49a3487aadf6ba77b54
+)
+validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4') # Paul Smith
+sha256sums=('16b77de9f013bcd536b7bc1efbe314223aedfe250f9063e33cbb4dfd347215a2'
+            'SKIP'
+            '7145e958d5209c3de5a40fe77f71141363dadfbbe7a206826d7b7d7c09c8f98f'
+            '94368caa194cbdccc0a0c9ad31c515fe5b7a02bc66e2d01be4327335f60cbe33')
+
+prepare() {
+    cd ${srcdir}/${pkgname}
+    patch -Np1 -i $srcdir/make-glibc_alloc_fix.patch
+    patch -Np1 -i $srcdir/perl-use_safe_inclusion.patch
+}
 
 build() {
-  cd ${srcdir}/${pkgname}
-  ./configure --prefix=/usr --program-suffix=-$pkgver
-  make
+    cd ${srcdir}/${pkgname}
+    ./configure --prefix=/usr --program-suffix=-$pkgver
+    make
 }
 
+# Optional: decomment it to have tests running
+#check() {
+#    cd ${srcdir}/${pkgname}
+#    make -k check
+#}
+
 package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir} install-exec
+    cd ${srcdir}/${pkgname}
+    # Just install the binaries, so that it can live along-side with the normal make
+    make DESTDIR=${pkgdir} install-exec
 }
diff --git a/make-3.81.install b/make-3.81.install
deleted file mode 100644
index 0c2da13c35f0..000000000000
--- a/make-3.81.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(make.info make.info-1 make.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}