From f562948c546528878127308189c46fbee42e86f6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 Mar 2018 23:31:00 +0000
Subject: dialog: update to 1.3_20171209

---
 abs/core/dialog/PKGBUILD        | 35 ++++++++++++++++++++++-------------
 abs/extra/crda/PKGBUILD         | 30 ++++++++++++++----------------
 abs/extra/crda/__changelog      |  2 +-
 abs/extra/crda/keysUnused.patch | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 abs/extra/crda/keysUnused.patch

diff --git a/abs/core/dialog/PKGBUILD b/abs/core/dialog/PKGBUILD
index d615e05..1f4e0b5 100644
--- a/abs/core/dialog/PKGBUILD
+++ b/abs/core/dialog/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: PKGBUILD 163201 2012-07-09 14:42:05Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.1_20120706
+pkgver=1.3_20171209
 pkgrel=1
+epoch=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
-arch=('i686' 'x86_64')
-url="http://invisible-island.net/dialog/"
+arch=('x86_64')
+url="https://invisible-island.net/dialog/"
 license=('LGPL2.1')
-depends=('ncurses')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84')
+depends=('sh' 'ncurses')
+provides=('libdialog.so')
+source=(https://invisible-mirror.net/archives/$pkgname/$pkgname-${pkgver/_/-}.tgz)
+sha256sums=('20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6')
 
 build() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --with-ncursesw --enable-nls
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-nls \
+    --with-libtool \
+    --with-ncursesw
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  make DESTDIR="${pkgdir}" install install-lib
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  make DESTDIR="$pkgdir" install-full
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/crda/PKGBUILD b/abs/extra/crda/PKGBUILD
index 53fe499..a64528b 100644
--- a/abs/extra/crda/PKGBUILD
+++ b/abs/extra/crda/PKGBUILD
@@ -2,35 +2,27 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=crda
-pkgver=3.13
+pkgver=3.18
 pkgrel=1
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
 depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw')
-makedepends=('python-m2crypto')
+makedepends=('python2-m2crypto')
 install=crda.install
-source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar.xz
+source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar{.xz,.sign}
         set-wireless-regdom
-        0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
-        0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
         0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
-        0001-Makefile-Don-t-run-ldconfig.patch)
-sha256sums=('2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59'
-            '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3'
-            '8920b5988eb1befe13f88ce5c0dbbf30c294796d613681a2b0925f6f8534c51b'
-            'ced0a372b06ffd64f90be77d7267c9d8cc10413bc017c3154b7208dbf69be3cb'
-            '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520'
-            'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663')
-
+        0001-Makefile-Don-t-run-ldconfig.patch
+        keysUnused.patch)
+validpgpkeys=('E4053F8D0E7C4B9A0A20AB27DC553250F8FE7407') #Luis R. Rodriguez
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  patch -p1 -i "${srcdir}"/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
-  patch -p1 -i "${srcdir}"/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
   patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
   patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch
+  patch -p1 -i "${srcdir}"/keysUnused.patch
 }
 
 build() {
@@ -51,3 +43,9 @@ package() {
   
   install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
 }
+md5sums=('0431fef3067bf503dfb464069f06163a'
+         'SKIP'
+         '65c93f2ff2eb1b29d9e9fa102ae2dd45'
+         '0fac1d7753cc60866709c6d82f8a6fb2'
+         '63c1829bba4e1d97336bb59cda80f330'
+         '63434b3e5fa28bb574cc78e169740d1f')
diff --git a/abs/extra/crda/__changelog b/abs/extra/crda/__changelog
index 2c7ba65..8096b92 100644
--- a/abs/extra/crda/__changelog
+++ b/abs/extra/crda/__changelog
@@ -1 +1 @@
-PKGBUILD: change dep python2-m2crypto to python-m2crypto
+PKGBUILD: add keysUnused.patch
diff --git a/abs/extra/crda/keysUnused.patch b/abs/extra/crda/keysUnused.patch
new file mode 100644
index 0000000..ca4f09d
--- /dev/null
+++ b/abs/extra/crda/keysUnused.patch
@@ -0,0 +1,34 @@
+From 067d961a344b4a2b2c374cfba5a632f0652971e2 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Mon, 4 Dec 2017 21:52:39 +0100
+Subject: =?UTF-8?q?crda:=20Fix=20error:=20`keys=E2=80=99=20defined=20but?=
+ =?UTF-8?q?=20not=20used?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix error: ‘keys’ defined but not used [-Werror=unused-const-variable=]
+by informing GCC keys is unused.
+
+Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
+Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
+---
+ utils/key2pub.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 3e84cd2..9bb04cd 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -115,7 +115,7 @@ struct key_params {
+ 	.n = _n, .len_n = sizeof(_n),	\
+ }
+ 
+-static const struct key_params keys[] = {
++static const struct key_params __attribute__ ((unused)) keys[] = {
+ ''')
+     for n in xrange(n + 1):
+         output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
+-- 
+cgit v1.1
+
-- 
cgit v0.12

