From 7935e6ea41264fcda0067b7b54905798ed73c151 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 8 Jan 2019 22:06:29 +0100
Subject: core/archlinux32-keyring: new version

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

(limited to 'core')

diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD
index d7b1add7..c831e66e 100644
--- a/core/archlinux32-keyring/PKGBUILD
+++ b/core/archlinux32-keyring/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Erich Eckner <deep42thought@archlinux32.org>
 pkgname=archlinux32-keyring
-pkgver=20180603
+pkgver=20190108
 pkgrel=1
 pkgdesc='Arch Linux 32 PGP keyring'
 arch=('any')
@@ -11,7 +11,7 @@ conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
 source=("https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig})
 sha512sums=(
-  '74f92707d259657d21ddd4606c391f7efb358e14851fee980ac95418685b3a6098794400bbf46f681d010463ff186655885de6a9943ed51e1d6e7bbe31191f24'
+  '8332d4634c543106eb0baeafedb3304bb4d43430a62260a551dbd76849fb2271d00dc0d6dfc73c2e276a0e9cc51f07e2ddf74c780f6dc4b135d2ab193afa520d'
   'SKIP'
 )
 validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
-- 
cgit v1.2.3-54-g00ecf


From bdf7bc10b3d82910abfc0a91803d493299efb2d3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 10 Jan 2019 09:46:27 +0100
Subject: core/pacman: upstream dropped "-fstack-protector-strong" from
 makepkg.conf - we do so, too

---
 core/pacman/PKGBUILD     | 6 +++---
 core/pacman/makepkg.conf | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 86372fc6..ce92903a 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,4 +1,4 @@
-# upstream git revision: e06c0338abc7919fe18a2070704bcd498344b29e
+# upstream git revision: 2519f7ad3a9ad47ee6bb997d53a2266ca34fdd52
 
 depends+=(archlinux32-keyring)
 
@@ -7,8 +7,8 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb' ]; then
     sha256sums[${i}]='d75bbbe42d290c4f22a95e6ac86d4723dc6d0c08228d14c3dcbae9dc5d2514e5'
   fi
-  if [ "${sha256sums[${i}]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
-    sha256sums[${i}]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
+  if [ "${sha256sums[${i}]}" = '8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec' ]; then
+    sha256sums[${i}]='730b6d399dc03ea0ea505fde9387b3fd14475a0e5421e53be30b6b2f946b974f'
   fi
 done
 
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index b1f1c25d..0b49df35 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -37,8 +37,8 @@ CHOST="i686-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
-- 
cgit v1.2.3-54-g00ecf


From a764a71ef21d7bd0ef34b808871b6fe6ed4a322a Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Thu, 10 Jan 2019 09:05:56 -0500
Subject: upgpkg: archlinux32-keyring-transition 20190108-1

upstream release
---
 core/archlinux32-keyring-transition/PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/archlinux32-keyring-transition/PKGBUILD b/core/archlinux32-keyring-transition/PKGBUILD
index 2293f4cb..2f064115 100644
--- a/core/archlinux32-keyring-transition/PKGBUILD
+++ b/core/archlinux32-keyring-transition/PKGBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
 # Maintainer: Erich Eckner <deep42thought@archlinux32.org>
 pkgname=archlinux32-keyring-transition
 _pkgname=${pkgname%-*}
-pkgver=20180603
+pkgver=20190108
 pkgrel=1
 pkgdesc='Arch Linux 32 PGP keyring - transition package'
 arch=('any')
@@ -10,7 +11,7 @@ license=('GPL')
 provides=('archlinux32-keyring')
 install="${pkgname}.install"
 source=("https://sources.archlinux32.org/sources/${_pkgname}-v${pkgver}.tar.gz"{,.sig})
-sha512sums=('74f92707d259657d21ddd4606c391f7efb358e14851fee980ac95418685b3a6098794400bbf46f681d010463ff186655885de6a9943ed51e1d6e7bbe31191f24'
+sha512sums=('8332d4634c543106eb0baeafedb3304bb4d43430a62260a551dbd76849fb2271d00dc0d6dfc73c2e276a0e9cc51f07e2ddf74c780f6dc4b135d2ab193afa520d'
             'SKIP')
 validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A') # Erich Eckner (replaces 0xC6A88E21) <erich@eckner.net>
 
-- 
cgit v1.2.3-54-g00ecf