[arch-commits] Commit in mdadm/trunk (PKGBUILD disable-werror.patch)

[Tobias Powalowski]

    Date: Monday, January 10, 2022 @ 16:13:25
  Author: tpowa
Revision: 434143

upgpkg: mdadm 4.2-1: bump to latest version

Added:
  mdadm/trunk/disable-werror.patch
Modified:
  mdadm/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   24 ++++++++----------------
 disable-werror.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-10 15:52:22 UTC (rev 434142)
+++ PKGBUILD	2022-01-10 16:13:25 UTC (rev 434143)
@@ -2,42 +2,34 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=mdadm
-pkgver=4.1
-pkgrel=2
+pkgver=4.2
+pkgrel=1
 pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as Software RAID'
 arch=('x86_64')
 license=('GPL')
 url='https://git.kernel.org/pub/scm/utils/mdadm'
 makedepends=('git')
-depends=('glibc')
+depends=('glibc' 'systemd')
 replaces=('raidtools')
 backup=('etc/mdadm.conf')
 validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen
 source=("git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=${pkgname}-${pkgver}?signed"
-        'mdadm.conf'
+        'disable-werror.patch'
+	'mdadm.conf'
         'mdadm_udev_install')
 sha256sums=('SKIP'
+            '85c98b8fe880bdd365fc0e400af10c2e5d0c439d338e055f66c16162f9282846'
             '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5'
             'b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c')
-
 prepare() {
   cd mdadm
-
-  git cherry-pick -n \
-    a4f7290c20c2ff78328c9db0b18029165cfb05b2 \
-    7039d1f8200b9599b23db5953934fdb43b0442e0 \
-    486720e0c2418e7e2e0a16221f7c42a308622254 \
-    9f4218274cd4a1e1f356a1617f9a1d09960cf255 \
-    761e3bd9f5e3aafa95ad3ae50a637dc67c8774f0 \
-    ccd61ebfd97fde43768497c79e3d361b484b1520 \
-    7d90f7603af6b59e7144cef6617a1e9dd42161bd \
-    6da53c0e2aab200605722795798b1e4f2352cd64
+  patch -Np0 -i ${srcdir}/disable-werror.patch
 }
 
 build() {
   cd mdadm
 
-  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev 
 }
 
 package() {

Added: disable-werror.patch
===================================================================
--- disable-werror.patch	                        (rev 0)
+++ disable-werror.patch	2022-01-10 16:13:25 UTC (rev 434143)
@@ -0,0 +1,11 @@
+--- Makefile.old	2022-01-10 17:07:50.475985407 +0100
++++ Makefile	2022-01-10 17:08:11.599433663 +0100
+@@ -50,7 +50,7 @@
+ CC := $(CROSS_COMPILE)gcc
+ endif
+ CXFLAGS ?= -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
+ endif