[arch-commits] Commit in pacman/trunk (PKGBUILD makepkg.conf)

[Dave Reisner]

    Date: Saturday, January 5, 2019 @ 17:04:42
  Author: dreisner
Revision: 343021

upgpkg: pacman 5.1.2-2

- add xdelta3 to optdepends (FS#43723)
- drop -fstack-protector-strong from makepkg.conf (FS#54736)

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf

--------------+
 PKGBUILD     |   10 ++++++----
 makepkg.conf |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-05 16:48:41 UTC (rev 343020)
+++ PKGBUILD	2019-01-05 17:04:42 UTC (rev 343021)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -14,8 +14,10 @@
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
-optdepends=('perl-locale-gettext: translation support in makepkg-template')
-backup=(etc/pacman.conf etc/makepkg.conf)
+optdepends=('perl-locale-gettext: translation support in makepkg-template'
+            'xdelta3: delta support in repo-add')
+backup=(etc/pacman.conf
+        etc/makepkg.conf)
 options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan at archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
@@ -25,7 +27,7 @@
 sha256sums=('ce4eef1585fe64fd1c65c269e263577261edd7535fe2278240103012d74b6ef6'
             'SKIP'
             'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
-            '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e')
+            '8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec')
 
 build() {
   cd "$pkgname-$pkgver"

Modified: makepkg.conf
===================================================================
--- makepkg.conf	2019-01-05 16:48:41 UTC (rev 343020)
+++ makepkg.conf	2019-01-05 17:04:42 UTC (rev 343021)
@@ -37,8 +37,8 @@
 
 #-- Compiler and Linker Flags
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+CXXFLAGS="-march=x86-64 -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"