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

2019-10-21 Thread Bartłomiej Piotrowski via arch-commits 
Date: Tuesday, October 22, 2019 @ 02:03:56
  Author: bpiotrowski
Revision: 365281

5.2.0-1

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

--+
 PKGBUILD |   22 ++
 makepkg.conf |6 +++---
 pacman.conf  |1 -
 3 files changed, 9 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-21 20:21:14 UTC (rev 365280)
+++ PKGBUILD2019-10-22 02:03:56 UTC (rev 365281)
@@ -3,7 +3,7 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.1.3
+pkgver=5.2.0
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
@@ -13,9 +13,8 @@
 depends=('bash' 'glibc' 'libarchive' 'curl'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
-checkdepends=('python2' 'fakechroot')
-optdepends=('perl-locale-gettext: translation support in makepkg-template'
-'xdelta3: delta support in repo-add')
+checkdepends=('python' 'fakechroot')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
 backup=(etc/pacman.conf
 etc/makepkg.conf)
 options=('strip' 'debug')
@@ -24,10 +23,10 @@
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf
 makepkg.conf)
-sha256sums=('10db61a0928d619871340c3f93a677d1541d6c52353c516aec4f8d96e830d4eb'
+sha256sums=('4df564447abba9236e0ad3228b781a95f6375a96693b9ae6558dc144b6ecb440'
 'SKIP'
-'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
-'8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec')
+'3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
+'8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -52,13 +51,4 @@
   install -dm755 "$pkgdir/etc"
   install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
   install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
-
-  # put bash_completion in the right location
-  install -dm755 "$pkgdir/usr/share/bash-completion/completions"
-  mv "$pkgdir/etc/bash_completion.d/pacman" 
"$pkgdir/usr/share/bash-completion/completions"
-  rmdir "$pkgdir/etc/bash_completion.d"
-
-  for f in makepkg pacman-key; do
-ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
-  done
 }

Modified: makepkg.conf
===
--- makepkg.conf2019-10-21 20:21:14 UTC (rev 365280)
+++ makepkg.conf2019-10-22 02:03:56 UTC (rev 365281)
@@ -130,16 +130,16 @@
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -z -q -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
 
 #
 # EXTENSION DEFAULTS
 #
 #
-# WARNING: Do NOT modify these variables unless you know what you are
-#  doing.
-#
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'

Modified: pacman.conf
===
--- pacman.conf 2019-10-21 20:21:14 UTC (rev 365280)
+++ pacman.conf 2019-10-22 02:03:56 UTC (rev 365281)
@@ -19,7 +19,6 @@
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta= 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

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

2019-01-05 Thread Dave Reisner via arch-commits 
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
===
--- PKGBUILD2019-01-05 16:48:41 UTC (rev 343020)
+++ PKGBUILD2019-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 

   'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory 
(pacman) 
@@ -25,7 +27,7 @@
 sha256sums=('ce4eef1585fe64fd1c65c269e263577261edd7535fe2278240103012d74b6ef6'
 'SKIP'
 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
-'650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e')
+'8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec')
 
 build() {
   cd "$pkgname-$pkgver"

Modified: makepkg.conf
===
--- makepkg.conf2019-01-05 16:48:41 UTC (rev 343020)
+++ makepkg.conf2019-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"

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

2017-07-04 Thread Bartłomiej Piotrowski 
Date: Tuesday, July 4, 2017 @ 09:35:34
  Author: bpiotrowski
Revision: 299658

5.0.2-2: enable full RELRO and BIND_NOW

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

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

Modified: PKGBUILD
===
--- PKGBUILD2017-07-04 08:46:47 UTC (rev 299657)
+++ PKGBUILD2017-07-04 09:35:34 UTC (rev 299658)
@@ -5,7 +5,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/;
@@ -30,7 +30,7 @@
 'SKIP'
 'cb76123c15ca9f2a467ebecb72af611f618fcc8431cf8b437d40fa2e61c23590'
 '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
-'56a016d6a5404ab6dd7b8fd39027ef422dd14ad07c768853863a1e03dcc9a3e0')
+'6066d67d818ee36760bf121c76d5019130f7875b3e5ed179b319b810a3a9685b')
 
 
 build() {

Modified: makepkg.conf
===
--- makepkg.conf2017-07-04 08:46:47 UTC (rev 299657)
+++ makepkg.conf2017-07-04 09:35:34 UTC (rev 299658)
@@ -37,9 +37,9 @@
 # -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@ -mtune=generic -O2 -pipe -fstack-protector-strong"
-CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
-fno-plt"
+CXXFLAGS="@CARCHFLAGS@ -mtune=generic -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

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

2015-10-02 Thread Evangelos Foutras 
Date: Friday, October 2, 2015 @ 13:48:18
  Author: foutrelis
Revision: 248253

upgpkg: pacman 4.2.1-4

Remove -fstack-check (FS#46019).

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

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

Modified: PKGBUILD
===
--- PKGBUILD2015-10-02 11:00:18 UTC (rev 248252)
+++ PKGBUILD2015-10-02 11:48:18 UTC (rev 248253)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/;
@@ -30,7 +30,7 @@
  'e8f72afe6f417d11bd36ada042744fe4'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '08beec98ce8c3eca6a980c4a21c0bef0')
+ '4036ccfaed40622a1df74fd464fe0582')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 

 
 

Modified: makepkg.conf
===
--- makepkg.conf2015-10-02 11:00:18 UTC (rev 248252)
+++ makepkg.conf2015-10-02 11:48:18 UTC (rev 248253)
@@ -37,8 +37,8 @@
 # -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@ -mtune=generic -O2 -pipe -fstack-protector-strong 
-fstack-check"
-CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
-fstack-check"
+CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong"
+CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"

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

2015-08-12 Thread Allan McRae 
Date: Wednesday, August 12, 2015 @ 09:09:12
  Author: allan
Revision: 243200

upgpkg: pacman 4.2.1-3

update cflags (FS#44361, FS#44362)

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

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

Modified: PKGBUILD
===
--- PKGBUILD2015-08-12 05:55:58 UTC (rev 243199)
+++ PKGBUILD2015-08-12 07:09:12 UTC (rev 243200)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -30,7 +30,7 @@
  'e8f72afe6f417d11bd36ada042744fe4'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '03d578816b56852d803cbafac85b9f09')
+ '08beec98ce8c3eca6a980c4a21c0bef0')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
 
 

Modified: makepkg.conf
===
--- makepkg.conf2015-08-12 05:55:58 UTC (rev 243199)
+++ makepkg.conf2015-08-12 07:09:12 UTC (rev 243200)
@@ -37,8 +37,8 @@
 # -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@ -mtune=generic -O2 -pipe -fstack-protector-strong 
--param=ssp-buffer-size=4
-CXXFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
--param=ssp-buffer-size=4
+CFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
-fstack-check
+CXXFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
-fstack-check
 LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS=-j2

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

2014-05-03 Thread Allan McRae 
Date: Sunday, May 4, 2014 @ 04:54:25
  Author: allan
Revision: 211992

upgpkg: pacman 4.1.2-6

Use -fstack-protector-strong

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

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

Modified: PKGBUILD
===
--- PKGBUILD2014-05-03 18:03:26 UTC (rev 211991)
+++ PKGBUILD2014-05-04 02:54:25 UTC (rev 211992)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=5
+pkgrel=6
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -28,7 +28,7 @@
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- 'f4940a8003ebd11e514827a790ef4e7f')
+ '2da6544e387f940588a90cb4b9b914e2')
 
 build() {
   cd $pkgname-$pkgver

Modified: makepkg.conf
===
--- makepkg.conf2014-05-03 18:03:26 UTC (rev 211991)
+++ makepkg.conf2014-05-04 02:54:25 UTC (rev 211992)
@@ -30,8 +30,8 @@
 # -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@ -mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4
-CXXFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4
+CFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
--param=ssp-buffer-size=4
+CXXFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong 
--param=ssp-buffer-size=4
 LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS=-j2

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

2013-10-20 Thread Allan McRae 
Date: Sunday, October 20, 2013 @ 13:13:23
  Author: allan
Revision: 196823

upgpkg: pacman 4.1.2-3

add \!libtool to makepkg.conf

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

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

Modified: PKGBUILD
===
--- PKGBUILD2013-10-20 09:31:59 UTC (rev 196822)
+++ PKGBUILD2013-10-20 11:13:23 UTC (rev 196823)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -28,7 +28,7 @@
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '88817f39676dcb093e9e64d465e40849')
+ 'f4940a8003ebd11e514827a790ef4e7f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Modified: makepkg.conf
===
--- makepkg.conf2013-10-20 09:31:59 UTC (rev 196822)
+++ makepkg.conf2013-10-20 11:13:23 UTC (rev 196823)
@@ -67,7 +67,7 @@
 #   These are default values for the options=() settings
 #
 #
-# Default: OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx 
!debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge 
!upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:  Strip symbols from binaries/libraries
@@ -80,7 +80,7 @@
 #-- upx:Compress binary executable files using UPX
 #-- debug:  Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)

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

2013-10-14 Thread Allan McRae 
Date: Tuesday, October 15, 2013 @ 06:12:42
  Author: allan
Revision: 196538

upgpkg: pacman 4.1.2-2

add \!staticlibs to makepkg.conf, remove install file as none of the checks are 
relevant on systems updated in the last two years

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

+
 PKGBUILD   |5 +--
 makepkg.conf   |4 +-
 pacman.install |   75 ---
 3 files changed, 4 insertions(+), 80 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-15 02:05:11 UTC (rev 196537)
+++ PKGBUILD2013-10-15 04:12:42 UTC (rev 196538)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -19,7 +19,6 @@
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf.i686
@@ -29,7 +28,7 @@
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '5f360e003e95f1a5cbd6e60d937dfd25')
+ '88817f39676dcb093e9e64d465e40849')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Modified: makepkg.conf
===
--- makepkg.conf2013-10-15 02:05:11 UTC (rev 196537)
+++ makepkg.conf2013-10-15 04:12:42 UTC (rev 196538)
@@ -67,7 +67,7 @@
 #   These are default values for the options=() settings
 #
 #
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx 
!debug)
+# Default: OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx 
!debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:  Strip symbols from binaries/libraries
@@ -80,7 +80,7 @@
 #-- upx:Compress binary executable files using UPX
 #-- debug:  Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)

Deleted: pacman.install
===
--- pacman.install  2013-10-15 02:05:11 UTC (rev 196537)
+++ pacman.install  2013-10-15 04:12:42 UTC (rev 196538)
@@ -1,75 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-# one time stuff for md5sum issue with older pacman versions
-if [ $(vercmp $2 3.0.2) -lt 0 ]; then
-_resetbackups
-fi
-if [ $(vercmp $2 3.5.0) -lt 0 ]; then
-_warnupgrade
-fi
-if [ ! -f etc/pacman.d/gnupg/pubring.gpg ] || [ $(vercmp $2 4.0.3-2) 
-lt 0 ]; then
-_check_pubring
-fi
-}
-
-post_install() {
-_check_pubring
-}
-
-_check_pubring() {
-echo   Run  \`pacman-key --init; pacman-key --populate archlinux\`
-echo   to import the data required by pacman for package verification.
-echo   See: 
https://www.archlinux.org/news/having-pacman-verify-packages;
-}
-
-_warnupgrade() {
-echo  The pacman database format has changed as of pacman 3.5.0.
-echo  You will need to run \`pacman-db-upgrade\` as root.
-echo 
-}
-
-_resetbackups() {
-echo  Performing one-time reset of NoUpgrade md5sums. After this reset
-echo  you are able to remove all NoUpgrade lines of already protected
-echo  files from pacman.conf.
-echo 
-
-# path variables
-pacconf=/etc/pacman.conf
-dbpath=/var/lib/pacman/local
-
-# get a list of NoUpgrade files from the user's pacman.conf
-echo  Retrieving pacman.conf NoUpgrade list...
-config=$(grep ^NoUpgrade $pacconf | cut -d'=' -f2)
-# add the standard list of files, even if they are already above
-config=$config \
-etc/passwd etc/group etc/shadow etc/sudoers \
-etc/fstab etc/raidtab etc/ld.so.conf \
-etc/rc.conf etc/rc.local \
-etc/modprobe.conf etc/modules.conf \
-etc/lilo.conf boot/grub/menu.lst
-
-# blank md5sum for use in sed expression
-zeroes=''
-
-for file in $config; do
-echo  - finding owner of /$file...
-line=$(LC_ALL=C LANG=C pacman -Qo /$file 2/dev/null)
-# if file is owned by a package, go find its incorrectly stored sum
-if [ ! -z $line ]; then
-# get the name and version of the package owning file
-name=$(echo $line | awk '{print $5}')
-version=$(echo $line | awk '{print $6}')
-# set the path to the backup

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

2013-05-06 Thread Allan McRae 
Date: Tuesday, May 7, 2013 @ 05:37:44
  Author: allan
Revision: 184462

upgpkg: pacman 4.1.1-1

upstream update, add LOGDEST to makepkg.conf

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

--+
 PKGBUILD |   10 +-
 makepkg.conf |2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-06 22:30:55 UTC (rev 184461)
+++ PKGBUILD2013-05-07 03:37:44 UTC (rev 184462)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner dreis...@archlinux.org
 
 pkgname=pacman
-pkgver=4.1.0
-pkgrel=2
+pkgver=4.1.1
+pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -25,11 +25,11 @@
 pacman.conf.i686
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
- '4959b8d00056398195f4e549e7bdd346'
+md5sums=('72a1688ff73c1c0b79d8f87b3793d446'
+ 'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '883292a326d2b3e0d9e7c3ec576263f5')
+ '5f360e003e95f1a5cbd6e60d937dfd25')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Modified: makepkg.conf
===
--- makepkg.conf2013-05-06 22:30:55 UTC (rev 184461)
+++ makepkg.conf2013-05-07 03:37:44 UTC (rev 184462)
@@ -109,6 +109,8 @@
 #SRCDEST=/home/sources
 #-- Source packages: specify a fixed directory where all src packages will be 
placed
 #SRCPKGDEST=/home/srcpackages
+#-- Log files: specify a fixed directory where all log files will be placed
+#LOGDEST=/home/makepkglogs
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER=John Doe j...@doe.com
 #-- Specify a key to use for package signing

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

2013-04-04 Thread Allan McRae 
Date: Thursday, April 4, 2013 @ 14:29:36
  Author: allan
Revision: 181841

upgpkg: pacman 4.1.0-2

configure using paths outside /bin and /sbin for later /usr move, install 
contrib files, uncomment DEBUG flags, completely sync makepkg.conf

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

--+
 PKGBUILD |   35 +--
 makepkg.conf |9 +
 2 files changed, 26 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-04 08:37:20 UTC (rev 181840)
+++ PKGBUILD2013-04-04 12:29:36 UTC (rev 181841)
@@ -5,17 +5,19 @@
 
 pkgname=pacman
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('bash' 'glibc=2.15' 'libarchive=3.1.2' 'curl=7.19.4'
+depends=('bash=4.2.042-2' 'glibc=2.17-2' 'libarchive=3.1.2' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc')
-checkdepends=('fakechroot')
+checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
@@ -27,13 +29,15 @@
  '4959b8d00056398195f4e549e7bdd346'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '2ea6f0a5badef735ec7d30a372f5e9c6')
+ '883292a326d2b3e0d9e7c3ec576263f5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
   make
   make -C contrib
 }
@@ -45,18 +49,19 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
 
   # install Arch specific stuff
-  mkdir -p $pkgdir/etc
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  
   case $CARCH in
-i686)
-  install -m644 $srcdir/pacman.conf.i686 $pkgdir/etc/pacman.conf
+i686)
   mycarch=i686
   mychost=i686-pc-linux-gnu
   myflags=-march=i686
   ;;
 x86_64)
-  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
   mycarch=x86_64
   mychost=x86_64-unknown-linux-gnu
   myflags=-march=x86-64
@@ -68,12 +73,14 @@
 -e s|@CARCH[@]|$mycarch|g \
 -e s|@CHOST[@]|$mychost|g \
 -e s|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+  mv ${pkgdir}/etc/bash_completion.d/pacman \
+${pkgdir}/usr/share/bash-completion/completions
+  rmdir ${pkgdir}/etc/bash_completion.d
 
-  # install completion files
-  install -Dm644 contrib/bash_completion 
$pkgdir/usr/share/bash-completion/completions/pacman
   for f in makepkg pacman-key; do
 ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
   done
-
-  install -Dm644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
 }

Modified: makepkg.conf
===
--- makepkg.conf2013-04-04 08:37:20 UTC (rev 181840)
+++ makepkg.conf2013-04-04 12:29:36 UTC (rev 181841)
@@ -11,7 +11,7 @@
 DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o 
%u'
   'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
   'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-  'rsync::/usr/bin/rsync -z %u %o'
+  'rsync::/usr/bin/rsync --no-motd -z %u %o'
   'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
@@ -36,8 +36,8 @@
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS=-j2
 #-- Debugging flags
-#DEBUG_CFLAGS=-g -fvar-tracking-assignments
-#DEBUG_CXXFLAGS=-g -fvar-tracking-assignments
+DEBUG_CFLAGS=-g -fvar-tracking-assignments
+DEBUG_CXXFLAGS=-g -fvar-tracking-assignments
 
 #
 # BUILD ENVIRONMENT
@@ -121,9 +121,10 @@
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
 
-
 #
 # EXTENSION DEFAULTS
 #

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

2012-04-23 Thread Allan McRae 
Date: Tuesday, April 24, 2012 @ 00:46:50
  Author: allan
Revision: 157116

remove --hash-style=gnu from LDFLAGS as this is default in our gcc-4.7 package, 
move whitespace from PKGBUILD to makepkg.conf

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

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-24 00:17:32 UTC (rev 157115)
+++ PKGBUILD2012-04-24 04:46:50 UTC (rev 157116)
@@ -26,7 +26,7 @@
  '1a70392526c8768470da678b31905a6e'
  '4605b3490d4fd1e5c6e20db17da9ded6'
  'a0edf98ad1845a4c7d902a86638d5d2d'
- 'db051afbd12993b7743ccd4d58668499')
+ '589cd34eb9d5b678455e8289394f523e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -51,13 +51,13 @@
   install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
   mycarch=i686
   mychost=i686-pc-linux-gnu
-  myflags=-march=i686 
+  myflags=-march=i686
   ;;
 x86_64)
   install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
   mycarch=x86_64
   mychost=x86_64-unknown-linux-gnu
-  myflags=-march=x86-64 
+  myflags=-march=x86-64
   ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/

Modified: makepkg.conf
===
--- makepkg.conf2012-04-24 00:17:32 UTC (rev 157115)
+++ makepkg.conf2012-04-24 04:46:50 UTC (rev 157116)
@@ -29,9 +29,9 @@
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
-CXXFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
-LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu
+CFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+CXXFLAGS=@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS=-j2

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

2011-08-14 Thread Allan McRae 
Date: Sunday, August 14, 2011 @ 05:13:40
  Author: allan
Revision: 135469

upgpkg: pacman 3.5.4-4

adjust CFLAGS/LDFLAGS for additional security and some more optimization (fixes 
FS#18864)

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

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-14 07:32:48 UTC (rev 135468)
+++ PKGBUILD2011-08-14 09:13:40 UTC (rev 135469)
@@ -3,7 +3,7 @@
 
 pkgname=pacman
 pkgver=3.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -23,7 +23,7 @@
 md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
  'e99eb721b6b704f68c5f47468507c102'
  'f8b939d9b2beb79a0436961a2d707d7c'
- 'a8684989d3dfad5a6e1bcf95af3e571b'
+ 'c034b061c86b3f26a9646cf8efc7ff11'
  '749a4ddc6d8418d8d031f1c9b4e09d6f')
 
 # keep an upgrade path for older installations

Modified: makepkg.conf
===
--- makepkg.conf2011-08-14 07:32:48 UTC (rev 135468)
+++ makepkg.conf2011-08-14 09:13:40 UTC (rev 135469)
@@ -29,9 +29,9 @@
 #-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe
-CXXFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe
-LDFLAGS=-Wl,--hash-style=gnu -Wl,--as-needed
+CFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+CXXFLAGS=@CARCHFLAGS@-mtune=generic -O2 -pipe -fstack-protector 
--param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS=-j2

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

2011-01-22 Thread Dan McGee 
Date: Saturday, January 22, 2011 @ 15:53:38
  Author: dan
Revision: 107252

upgpkg: pacman 3.4.3-1
verbump 3.4.3

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

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

Modified: PKGBUILD
===
--- PKGBUILD2011-01-22 20:45:52 UTC (rev 107251)
+++ PKGBUILD2011-01-22 20:53:38 UTC (rev 107252)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -19,10 +19,10 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('de9198368bdf669c108763c37d793063'
+md5sums=('3656a4a05346e28bafa5342879fa278a'
  'eda9cbdb47f85fabda2e7e63801e3e16'
  '9ba146b4fa7bcb3cc18204b06d1f6157'
- 'aef317285c7d16ac495b0e53deeb948d')
+ '5beebe36bfc1e1f677d5ae12fcff8083')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'

Modified: makepkg.conf
===
--- makepkg.conf2011-01-22 20:45:52 UTC (rev 107251)
+++ makepkg.conf2011-01-22 20:53:38 UTC (rev 107252)
@@ -83,7 +83,7 @@
 #-- Doc directories to remove (if !docs is specified)
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} 
opt/*/{bin,lib,sbin})
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,lib32,sbin,local/{bin,lib,sbin}} 
opt/*/{bin,lib,sbin})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)