From b9eebc0e1af5cc8c8207d7b11912c1114329067f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 14 Jul 2017 00:42:29 +0000
Subject: [PATCH] core/pacman to 5.0.2-2

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

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 0514cd74c..940a6cc69 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=pacman
 pkgver=5.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -42,7 +42,7 @@ sha256sums=('dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e'
             '47b3583d093a9d5305f52f402f103fc5584c986a0272acbd36acfc96a9f01147'
             'c8610fbae271167c2a1ae0bf69692038eac24f13921cabf925855a8697ea82f9'
             '0c81e6feb426c2def260fe7b0c0586ae191ce3a782d19c119474671f147515c7'
-            '881759c640603e8f2ca5ff7eef83d4a5e2d3482b5d0e1e37d6b17a5533b75e5e')
+            'b5c9c7e09525b1d671f1df96568e06ce966939f8edc788d2753fe1564fd9f64e')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 704d7b4e1..74002915f 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -37,9 +37,9 @@ CHOST="@CHOST@"
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
-CXXFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt"
+CXXFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags