From d9f4f2de86f8823803632e4908dd20c5b625b956 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Wed, 2 May 2018 10:05:56 -0400
Subject: archlinux32-keyring*/: use HTTPS url

---
 core/archlinux32-keyring-transition/PKGBUILD | 4 ++--
 core/archlinux32-keyring/PKGBUILD            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'core')

diff --git a/core/archlinux32-keyring-transition/PKGBUILD b/core/archlinux32-keyring-transition/PKGBUILD
index 83669cc4..44667187 100644
--- a/core/archlinux32-keyring-transition/PKGBUILD
+++ b/core/archlinux32-keyring-transition/PKGBUILD
@@ -5,10 +5,10 @@ pkgver=20170628
 pkgrel=1
 pkgdesc='Arch Linux 32 PGP keyring - transition package'
 arch=('any')
-url='http://archlinux32.org'
+url='https://archlinux32.org'
 license=('GPL')
-install="${pkgname}.install"
 provides=('archlinux32-keyring')
+install="${pkgname}.install"
 source=("https://github.com/archlinux32/$_pkgname/archive/v$pkgver.tar.gz")
 sha512sums=('3c088e02bda95dfa4e72a3afd6e934f8920fb5befaea1080d40cc5594ff77c8bff0f994028b7d371411c35cf4959cc25fc72e07c4d94694872f09be4f3e0d64a')
 
diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD
index 6714b003..c5172ec2 100644
--- a/core/archlinux32-keyring/PKGBUILD
+++ b/core/archlinux32-keyring/PKGBUILD
@@ -4,11 +4,11 @@ pkgver=20180411
 pkgrel=1
 pkgdesc='Arch Linux 32 PGP keyring'
 arch=('any')
-url='http://archlinux32.org'
+url='https://archlinux32.org'
 license=('GPL')
-install="${pkgname}.install"
 conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
+install="${pkgname}.install"
 source=("https://github.com/archlinux32/$pkgname/archive/v$pkgver.tar.gz")
 sha512sums=('ed178d1d3bf8f968d16dadd037673f3dd46996001d6b62aca84ef7ba0197f201dc11db9b545b90f498537b12ce3cef31a72d1fc79f286cbd82408be5f64759b7')
 
-- 
cgit v1.2.3-54-g00ecf


From 2e67e1f81e62612f81cc326f3fb4591b34b76971 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Fri, 4 May 2018 19:47:53 -0400
Subject: archlinux32-keyring: add PGP signatures

---
 core/archlinux32-keyring/PKGBUILD | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD
index c5172ec2..cafd18cd 100644
--- a/core/archlinux32-keyring/PKGBUILD
+++ b/core/archlinux32-keyring/PKGBUILD
@@ -9,8 +9,10 @@ license=('GPL')
 conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
 install="${pkgname}.install"
-source=("https://github.com/archlinux32/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('ed178d1d3bf8f968d16dadd037673f3dd46996001d6b62aca84ef7ba0197f201dc11db9b545b90f498537b12ce3cef31a72d1fc79f286cbd82408be5f64759b7')
+source=("https://github.com/archlinux32/${pkgname}/releases/download/v${pkgver}/${pkgname}-v${pkgver}.tar.xz"{,.sig})
+sha512sums=('e1bb190ea3895ecff789eeb25b35758704d2528f46cf2861c7cd89250eca9396e22d9be2bf42dd3fda2dba0c858216eca51d93d7a5ce7e84691a3965fa9aa63e'
+            'SKIP')
+validpgpkeys=('5FDCA472AB93292BC678FD59255A76DB9A12601A') # Erich Eckner (just to sign arch packages) <arch@eckner.net>
 
 package() {
     cd "${srcdir}/${pkgname}-"* # ${pkgver}"
-- 
cgit v1.2.3-54-g00ecf


From 394abce7ee40eb9d1211ceb3a951eb9a350b399e Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Fri, 4 May 2018 19:48:03 -0400
Subject: upgpkg: archlinux32-keyring-transition 20180411-1

Sign with my upstream maintainer key
add PGP signatures
---
 core/archlinux32-keyring-transition/PKGBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/archlinux32-keyring-transition/PKGBUILD b/core/archlinux32-keyring-transition/PKGBUILD
index 44667187..4af997de 100644
--- a/core/archlinux32-keyring-transition/PKGBUILD
+++ b/core/archlinux32-keyring-transition/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Erich Eckner <deep42thought@archlinux32.org>
 pkgname=archlinux32-keyring-transition
 _pkgname=${pkgname%-*}
-pkgver=20170628
+pkgver=20180411
 pkgrel=1
 pkgdesc='Arch Linux 32 PGP keyring - transition package'
 arch=('any')
@@ -9,8 +9,10 @@ url='https://archlinux32.org'
 license=('GPL')
 provides=('archlinux32-keyring')
 install="${pkgname}.install"
-source=("https://github.com/archlinux32/$_pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('3c088e02bda95dfa4e72a3afd6e934f8920fb5befaea1080d40cc5594ff77c8bff0f994028b7d371411c35cf4959cc25fc72e07c4d94694872f09be4f3e0d64a')
+source=("https://github.com/archlinux32/${_pkgname}/releases/download/v${pkgver}/${_pkgname}-v${pkgver}.tar.xz"{,.sig})
+sha512sums=('e1bb190ea3895ecff789eeb25b35758704d2528f46cf2861c7cd89250eca9396e22d9be2bf42dd3fda2dba0c858216eca51d93d7a5ce7e84691a3965fa9aa63e'
+            'SKIP')
+validpgpkeys=('5FDCA472AB93292BC678FD59255A76DB9A12601A') # Erich Eckner (just to sign arch packages) <arch@eckner.net>
 
 package() {
     cd "${srcdir}/${_pkgname}-"* # ${pkgver}"
-- 
cgit v1.2.3-54-g00ecf


From 67670fe8b3d916cc6756f9c0940aa1504bc7fd15 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 6 May 2018 01:40:40 -0400
Subject: archlinux32-keyring*/: line 18: cd: too many arguments

This happens when you don't guard the cd wildcard with trailing / and
suddenly start naming the download something which cooperates with a
shared $SRCDEST.

The solution is to not use wildcards...
---
 core/archlinux32-keyring-transition/PKGBUILD | 2 +-
 core/archlinux32-keyring/PKGBUILD            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/archlinux32-keyring-transition/PKGBUILD b/core/archlinux32-keyring-transition/PKGBUILD
index 4af997de..bb306a55 100644
--- a/core/archlinux32-keyring-transition/PKGBUILD
+++ b/core/archlinux32-keyring-transition/PKGBUILD
@@ -15,6 +15,6 @@ sha512sums=('e1bb190ea3895ecff789eeb25b35758704d2528f46cf2861c7cd89250eca9396e22
 validpgpkeys=('5FDCA472AB93292BC678FD59255A76DB9A12601A') # Erich Eckner (just to sign arch packages) <arch@eckner.net>
 
 package() {
-    cd "${srcdir}/${_pkgname}-"* # ${pkgver}"
+    cd "${srcdir}/${_pkgname}-v${pkgver}"
     make PREFIX=/usr DESTDIR=${pkgdir} install
 }
diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD
index cafd18cd..82cc55a3 100644
--- a/core/archlinux32-keyring/PKGBUILD
+++ b/core/archlinux32-keyring/PKGBUILD
@@ -15,6 +15,6 @@ sha512sums=('e1bb190ea3895ecff789eeb25b35758704d2528f46cf2861c7cd89250eca9396e22
 validpgpkeys=('5FDCA472AB93292BC678FD59255A76DB9A12601A') # Erich Eckner (just to sign arch packages) <arch@eckner.net>
 
 package() {
-    cd "${srcdir}/${pkgname}-"* # ${pkgver}"
+    cd "${srcdir}/${pkgname}-v${pkgver}"
     make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-- 
cgit v1.2.3-54-g00ecf