adding patch for glibc changes

4 files changed, 39 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a9658678c1b..fe60e79b25f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov  9 13:38:16 UTC 2017
+# Sun Aug 12 04:38:48 UTC 2018
 pkgbase = nmtree
 	pkgdesc = NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)
 	pkgver = 20171109
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.netbsd.org/
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,12 @@ pkgbase = nmtree
 	conflicts = mtree
 	conflicts = mtree-git
 	source = license
+	source = maj_min.patch
 	source = license.sig
+	source = maj_min.patch.sig
 	sha512sums = 78f634baef190d4a52187e69344e50ae9544c95bd6243ebb22af727092edbb61c021ec38de1a85e38b08cb046b71bdbf6cc869af2d9a6365cb93c92e342dfe96
+	sha512sums = 57daf0457877c5cfa0c9cddf3840d489e36de449cab417ee6a7197dc71a6fbc818900bbc133042bd4519ffa712b446e7791993e6ff1a67473a4c360ec3e35212
+	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = nmtree
diff --git a/PKGBUILD b/PKGBUILD
index 0df6fdf1a9a2..9bf625bc5235 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 #  This is basically the PKGBUILD he wrote, all credit goes to him. Buy him a beer.
 pkgname=nmtree
 pkgver=20171109
-pkgrel=3
+pkgrel=4
 pkgdesc="NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)"
 arch=( 'i686' 'x86_64' )
 url="https://www.netbsd.org/"
@@ -20,16 +20,21 @@ changelog=
 noextract=()
 # We don't use a source since we use cvs
 source=('license'
-	'license.sig')
+	'maj_min.patch'
+	'license.sig'
+	'maj_min.patch.sig')
 sha512sums=('78f634baef190d4a52187e69344e50ae9544c95bd6243ebb22af727092edbb61c021ec38de1a85e38b08cb046b71bdbf6cc869af2d9a6365cb93c92e342dfe96'
+	    '57daf0457877c5cfa0c9cddf3840d489e36de449cab417ee6a7197dc71a6fbc818900bbc133042bd4519ffa712b446e7791993e6ff1a67473a4c360ec3e35212'
+	    'SKIP'
 	    'SKIP')
 
 _cvsroot=":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"
 _cvsmod="pkgsrc/pkgtools/${_pkgname}/files"
 
-
-build() {
+prepare() {
   cd "${srcdir}"
+
+  # CHECK OUT SOURCE
   msg "Connecting to NetBSD CVS server...."
 
   if [[ -d "${_cvsmod}/CVS" ]]; then
@@ -45,6 +50,15 @@ build() {
 
   rm -rf "${srcdir}/${_cvsmod}-build"
   cp -r "${srcdir}/${_cvsmod}" "${srcdir}/${_cvsmod}-build"
+
+  cd "${srcdir}/${_cvsmod}-build"
+
+  # APPLY PATCHES
+  patch -N < ${srcdir}/maj_min.patch
+
+}
+
+build() {
   cd "${srcdir}/${_cvsmod}-build"
 
   ./configure --prefix=/usr --sbindir=/usr/bin LIBS="-lnbcompat"
diff --git a/maj_min.patch b/maj_min.patch
new file mode 100644
index 000000000000..bf466d81725a
--- /dev/null
+++ b/maj_min.patch
@@ -0,0 +1,15 @@
+--- a/pkgsrc/pkgtools/mtree/files-build/pack_dev.c	2018-08-12 00:20:05.968656198 -0400
++++ b/pkgsrc/pkgtools/mtree/files-build/pack_dev.c	2018-08-12 00:22:26.052941801 -0400
+@@ -57,6 +57,11 @@
+ #if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
++/* Arch AUR packages presume glibc installed.
++   'major' and 'minor' have been moved to
++   sysmacros.h in some recent version of glibc.
++*/
++#include <sys/sysmacros.h>
+ 
+ #if HAVE_LIMITS_H
+ #include <limits.h>
+
diff --git a/maj_min.patch.sig b/maj_min.patch.sig
new file mode 100644
index 000000000000..e54f5957b413
--- /dev/null
+++ b/maj_min.patch.sig