From 79aca0d8e5f975c6002295e204a1266038cc19c5 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 25 Apr 2021 14:13:14 -0500
Subject: pacman-5.2.2-3.parabola1: rebuild

---
 libre/pacman/PKGBUILD        | 31 +++++++++++++++++++++----------
 libre/pacman/makepkg.conf.in |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'libre/pacman')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 533ddd163..dc261b9aa 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,5 +1,4 @@
-# Maintainer (Arch): Dan McGee <dan@archlinux.org>
-# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Arch): 
 # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
@@ -9,7 +8,7 @@
 
 pkgname=pacman
 pkgver=5.2.2
-pkgrel=1
+pkgrel=3
 pkgrel+=.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
@@ -35,6 +34,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         "${arch[@]/#/pacman.conf.}"
         makepkg.conf.in
+        pacman-5.2.2-fix-strip-messing-up-file-attributes.patch::'https://git.archlinux.org/pacman.git/patch/?id=88d054093c1c99a697d95b26bd9aad5bc4d8e170'
         pacman-keyring.service
         pacman-keyring.timer
         0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch)
@@ -43,10 +43,11 @@ source_armv7h=(0001-Sychronize-filesystem.patch
                0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)
 sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'SKIP'
-            '4d5477620ff652b16bca12f149ad79112fcc7d1f2ed8e66248e6e4773a61933c'
-            '989951ad742283c01cb5d05bb76166d1300e737f7ee792e9849937a3ea08e0e5'
-            '759a16419d16aa6c4e5bbbec362f9652c80047398a1e517dbf86ad2dd7186ad9'
-            '23df8ebdc0981f296aa16c13a5f060dcb06f2c048aaa50379c3eef526109a752'
+            'fdc78b55947d41d08d9a0404b4fbb37e409517733ab11cbe336f5aaa24dcfffd'
+            'e5632e1581a4283cf8b93f0d32618fc7a35480c9caaf2d256c95f77645ae4265'
+            'd9bed26a58377b726ebadabd9729008e484f8719632b9c3e76c9320c2fcaa22c'
+            'ee4121a3a94fa0a0709be215e450b3c5b604bc03ffc32be8969d7461526dcc6b'
+            '871fd97b3f13f1718358e4b8e046a56c0262c9042b5e3b5d60835606735798bd'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
             '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8')
@@ -56,6 +57,7 @@ sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041c
 
 prepare() {
   cd "$pkgname-$pkgver"
+  patch -Np1 < ../pacman-5.2.2-fix-strip-messing-up-file-attributes.patch
 
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
@@ -84,17 +86,26 @@ build() {
       i686)
         mycarch="i686"
         mychost="i686-pc-linux-gnu"
-        myflags="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
+        myflags="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+                 -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+                 -Wformat -Werror=format-security \
+                 -fstack-clash-protection -fcf-protection"
         ;;
       x86_64)
         mycarch="x86_64"
         mychost="x86_64-pc-linux-gnu"
-        myflags="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+        myflags="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+                 -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+                 -Wformat -Werror=format-security \
+                 -fstack-clash-protection -fcf-protection"
         ;;
       armv7h)
         mycarch="armv7h"
         mychost="armv7l-unknown-linux-gnueabihf"
-        myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt"
+        myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt -fexceptions \
+                 -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+                 -Wformat -Werror=format-security \
+                 -fstack-clash-protection"
         ;;
     esac
     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
diff --git a/libre/pacman/makepkg.conf.in b/libre/pacman/makepkg.conf.in
index f4ff65a0f..5690b1561 100644
--- a/libre/pacman/makepkg.conf.in
+++ b/libre/pacman/makepkg.conf.in
@@ -36,7 +36,7 @@ CARCH="@CARCH@"
 CHOST="@CHOST@"
 
 #-- Compiler and Linker Flags
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CPPFLAGS=""
 CFLAGS="@CARCHFLAGS@"
 CXXFLAGS="@CARCHFLAGS@"
 LDFLAGS="@LDFLAGS@"
-- 
cgit v1.2.3