[arch-commits] Commit in partimage/trunk (PKGBUILD partimage-build-fix.patch)

Antonio Rojas arojas at archlinux.org
Sat May 30 20:23:09 UTC 2020


    Date: Saturday, May 30, 2020 @ 20:23:09
  Author: arojas
Revision: 637515

BUILDINFO rebuild

Added:
  partimage/trunk/partimage-build-fix.patch
Modified:
  partimage/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    5 ++++-
 partimage-build-fix.patch |   13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 20:18:37 UTC (rev 637514)
+++ PKGBUILD	2020-05-30 20:23:09 UTC (rev 637515)
@@ -6,7 +6,7 @@
 
 pkgname=partimage
 pkgver=0.6.9
-pkgrel=12
+pkgrel=13
 pkgdesc='Partition Image saves partitions in many formats to an image file.'
 arch=('x86_64')
 url='https://www.partimage.org/'
@@ -16,6 +16,7 @@
 source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'partimage-0.6.9-zlib-1.2.6.patch'
         'use-SSLv3-by-default.patch'
+        'partimage-build-fix.patch'
         'partimaged-gencrt'
         'partimaged.service'
         'partimage.sysusers')
@@ -22,6 +23,7 @@
 md5sums=('1bc046fd915c5debbafc85729464e513'
          '202c4334766041d98c5f67c9d62c3063'
          '77c33f779186cd25e7c6543348ca5009'
+         'c84a2b59ecf9e554806b11ed1735ef72'
          '2316b116227b07efb48266e660ca1ba1'
          '5f8dae511cdfbf097409a45e9642a372'
          'b0773e9d666e06301c2dcbec80ff25ac')
@@ -31,6 +33,7 @@
 
   patch -Np1 -i ../partimage-0.6.9-zlib-1.2.6.patch
   patch -Np1 -i ../use-SSLv3-by-default.patch
+  patch -p1 -i ../partimage-build-fix.patch # Fix build with recent glibc
 
   sed -e 's/CRYPTO_lock/X509_new/g' -i configure
 }

Added: partimage-build-fix.patch
===================================================================
--- partimage-build-fix.patch	                        (rev 0)
+++ partimage-build-fix.patch	2020-05-30 20:23:09 UTC (rev 637515)
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/580290
+
+--- a/src/client/misc.h
++++ b/src/client/misc.h
+@@ -36,7 +36,7 @@ struct COptions;
+ #endif
+ 
+ #ifndef makedev
+-  #define makedev(maj,min) (((maj) << 8) | min))
++  #define makedev(maj,min) (((maj) << 8) | (min))
+ #endif
+ 
+ // =======================================================


More information about the arch-commits mailing list