Update to 3.2-3

3 files changed, 34 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 205f11a449a6..e16e2a4e10ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libparted
 	pkgdesc = A version with DEBUG defined in its compilation, to provide some necessary functions for other applications.
 	pkgver = 3.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gnu.org/software/parted/parted.html
 	arch = x86_64
 	license = GPL3
@@ -14,10 +14,12 @@ pkgbase = libparted
 	source = https://ftp.gnu.org/gnu/parted/parted-3.2.tar.xz
 	source = https://ftp.gnu.org/gnu/parted/parted-3.2.tar.xz.sig
 	source = parted-735669-fat16-crash-v1.patch
+	source = include.patch
 	validpgpkeys = 1B49F933916A37A3F45A1812015F4DD4A70FB705
 	sha256sums = 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4
 	sha256sums = SKIP
 	sha256sums = 3cbf31765b1653609a4c95687b91e34dd57ad3498d5d02019c966bd46d25d100
+	sha256sums = 789d6ef8fcff389f9f74bd9e377aff9949ab5b317a80bd38cec39510bd40cef6
 
 pkgname = libparted
 
diff --git a/PKGBUILD b/PKGBUILD
index d7296cd0026f..ac8b19870128 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname="parted"
 pkgname="libparted"
 pkgver=3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A version with DEBUG defined in its compilation, to provide some necessary functions for other applications."
 arch=('x86_64')
 url="http://www.gnu.org/software/parted/parted.html"
@@ -17,14 +17,19 @@ depends=('device-mapper' 'libutil-linux')
 makedepends=('pkg-config')
 validpgpkeys=('1B49F933916A37A3F45A1812015F4DD4A70FB705') # Phillip Susi <psusi@ubuntu.com>
 source=("https://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
-        'parted-735669-fat16-crash-v1.patch')
+        'parted-735669-fat16-crash-v1.patch'
+        'include.patch'
+)
 sha256sums=('858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4'
             'SKIP'
-            '3cbf31765b1653609a4c95687b91e34dd57ad3498d5d02019c966bd46d25d100')
+            '3cbf31765b1653609a4c95687b91e34dd57ad3498d5d02019c966bd46d25d100'
+            '789d6ef8fcff389f9f74bd9e377aff9949ab5b317a80bd38cec39510bd40cef6'
+)
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     patch -Np1 -i "${srcdir}/parted-735669-fat16-crash-v1.patch"
+    patch -Np1 -i "${srcdir}/include.patch"
 }
 
 build() {
@@ -40,4 +45,4 @@ package() {
     make DESTDIR="${pkgdir}" install
 }
 
-# vim:set ts=4 sw=2 ft=sh et syn=sh ft=sh:
+# vim:set ts=4 sw=4 ft=sh et syn=sh ft=sh:
diff --git a/include.patch b/include.patch
new file mode 100644
index 000000000000..82ca3e48b7ed
--- /dev/null
+++ b/include.patch
@@ -0,0 +1,22 @@
+From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 24 Mar 2018 17:37:02 +0000
+Subject: linux: Include <sys/sysmacros.h> for major() macro.
+
+Since glibc 2.27 this header is required.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 31b98ab..7e86b51 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -41,6 +41,7 @@
+ #include <sys/utsname.h>        /* for uname() */
+ #include <scsi/scsi.h>
+ #include <assert.h>
++#include <sys/sysmacros.h>
+ #ifdef ENABLE_DEVICE_MAPPER
+ #include <libdevmapper.h>
+ #endif