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

2020-04-30 Thread Allan McRae via arch-commits 
Date: Thursday, April 30, 2020 @ 10:23:07
  Author: allan
Revision: 381920

upgpkg: pacman 5.2.1-5: reproducible builds build

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-30 09:39:16 UTC (rev 381919)
+++ PKGBUILD2020-04-30 10:23:07 UTC (rev 381920)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;

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

2020-01-09 Thread David Runge via arch-commits 
Date: Friday, January 10, 2020 @ 01:17:37
  Author: dvzrv
Revision: 373112

upgpkg: pacman 5.2.1-3: Adding pacman back to base-devel group (it's required 
for archbuild).

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-09 23:27:53 UTC (rev 373111)
+++ PKGBUILD2020-01-10 01:17:37 UTC (rev 373112)
@@ -4,11 +4,12 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
 license=('GPL')
+groups=('base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')

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

2020-01-07 Thread Levente Polyak via arch-commits 
Date: Tuesday, January 7, 2020 @ 23:10:13
  Author: anthraxx
Revision: 372798

upgpkg: pacman 5.2.1-2: rebuild against file 5.38 (libseccomp)

pacman 5.2.1 support detecting file versions to disable sandbox
when processing files, therefore we can enable libseccomp in file
again.

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-07 23:09:11 UTC (rev 372797)
+++ PKGBUILD2020-01-07 23:10:13 UTC (rev 372798)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
@@ -21,13 +21,20 @@
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae 

   'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory 
(pacman) 
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+
pacman-5.2.1-fix-pactest-package-tar-format.patch::https://git.archlinux.org/pacman.git/patch/?id=b9faf652735c603d1bdf849a570185eb721f11c1
 pacman.conf
 makepkg.conf)
 sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
 'SKIP'
+'d268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1'
 '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
 '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 < ../pacman-5.2.1-fix-pactest-package-tar-format.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"

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

2019-11-13 Thread Christian Hesse via arch-commits 
Date: Wednesday, November 13, 2019 @ 12:22:42
  Author: eworm
Revision: 368102

base group removal

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 12:21:14 UTC (rev 368101)
+++ PKGBUILD2019-11-13 12:22:42 UTC (rev 368102)
@@ -9,7 +9,6 @@
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
 license=('GPL')
-groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')

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

2019-10-31 Thread Allan McRae via arch-commits 
Date: Friday, November 1, 2019 @ 04:12:05
  Author: allan
Revision: 366311

upgpkg: pacman 5.2.1-1

upstream update

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-01 00:41:32 UTC (rev 366310)
+++ PKGBUILD2019-11-01 04:12:05 UTC (rev 366311)
@@ -3,8 +3,8 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.2.1
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
@@ -24,7 +24,7 @@
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf
 makepkg.conf)
-sha256sums=('4df564447abba9236e0ad3228b781a95f6375a96693b9ae6558dc144b6ecb440'
+sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
 'SKIP'
 '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
 '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')

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

2019-10-21 Thread Bartłomiej Piotrowski via arch-commits 
Date: Tuesday, October 22, 2019 @ 02:09:23
  Author: bpiotrowski
Revision: 365288

5.2.0-2: add libprovides

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-22 02:09:09 UTC (rev 365287)
+++ PKGBUILD2019-10-22 02:09:23 UTC (rev 365288)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
@@ -15,6 +15,7 @@
 makedepends=('asciidoc')
 checkdepends=('python' 'fakechroot')
 optdepends=('perl-locale-gettext: translation support in makepkg-template')
+provides=('libalpm.so')
 backup=(etc/pacman.conf
 etc/makepkg.conf)
 options=('strip' 'debug')

[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)

2019-02-28 Thread Allan McRae via arch-commits 
Date: Friday, March 1, 2019 @ 01:41:31
  Author: allan
Revision: 346962

upstream update

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 00:20:55 UTC (rev 346961)
+++ PKGBUILD2019-03-01 01:41:31 UTC (rev 346962)
@@ -3,8 +3,8 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.1.2
-pkgrel=2
+pkgver=5.1.3
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/;
@@ -24,7 +24,7 @@
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf
 makepkg.conf)
-sha256sums=('ce4eef1585fe64fd1c65c269e263577261edd7535fe2278240103012d74b6ef6'
+sha256sums=('10db61a0928d619871340c3f93a677d1541d6c52353c516aec4f8d96e830d4eb'
 'SKIP'
 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
 '8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec')

[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)

2018-12-27 Thread Bartłomiej Piotrowski via arch-commits 
Date: Thursday, December 27, 2018 @ 13:22:19
  Author: bpiotrowski
Revision: 342754

5.1.2-1

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-27 10:13:36 UTC (rev 342753)
+++ PKGBUILD2018-12-27 13:22:19 UTC (rev 342754)
@@ -3,7 +3,7 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.1.1
+pkgver=5.1.2
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
@@ -22,7 +22,7 @@
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf
 makepkg.conf)
-sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
+sha256sums=('ce4eef1585fe64fd1c65c269e263577261edd7535fe2278240103012d74b6ef6'
 'SKIP'
 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
 '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e')

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

2018-07-26 Thread Allan McRae via arch-commits 
Date: Friday, July 27, 2018 @ 03:38:30
  Author: allan
Revision: 329572

upgpkg: pacman 5.1.1-1

upstream update

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

-+
 PKGBUILD|   21 +
 pacman.conf |2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-27 01:56:09 UTC (rev 329571)
+++ PKGBUILD2018-07-27 03:38:30 UTC (rev 329572)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.1.0
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="http://www.archlinux.org/pacman/;
@@ -15,30 +15,19 @@
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
-optdpepends=('perl-locale-gettext: translation support in makepkg-template')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae 

   'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory 
(pacman) 
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch
-0002-makepkg-Don-t-use-parameterless-return.patch
 pacman.conf
 makepkg.conf)
-sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3'
+sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
 'SKIP'
-'9b2304141582a421e812c76760a74f360a3cbd780472cbb60cf023a34d6fcb3d'
-'2a31d4db5f6e19e0148d4892de14317514f2b2dfb5369c7972a641ca8be89e5a'
-'95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
+'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
 '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  # Fix install_packages failure exit code, required by makechrootpkg
-  patch -Np1 -i 
../0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch
-  patch -Np1 -i ../0002-makepkg-Don-t-use-parameterless-return.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 

Modified: pacman.conf
===
--- pacman.conf 2018-07-27 01:56:09 UTC (rev 329571)
+++ pacman.conf 2018-07-27 03:38:30 UTC (rev 329572)
@@ -16,7 +16,7 @@
 #GPGDir  = /etc/pacman.d/gnupg/
 #HookDir = /etc/pacman.d/hooks/
 HoldPkg = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#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

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

2018-06-01 Thread Bartłomiej Piotrowski via arch-commits 
Date: Friday, June 1, 2018 @ 08:39:50
  Author: bpiotrowski
Revision: 325489

Add perl-locale-gettext to optdepends

It is needed for translations in makepkg-template (FS#58398).

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-01 08:34:57 UTC (rev 325488)
+++ PKGBUILD2018-06-01 08:39:50 UTC (rev 325489)
@@ -15,6 +15,7 @@
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
+optdpepends=('perl-locale-gettext: translation support in makepkg-template')
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae

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

2018-05-27 Thread Allan McRae via arch-commits 
Date: Monday, May 28, 2018 @ 01:27:48
  Author: allan
Revision: 325055

remove pacman-contrib provides etc

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 ---
 1 file changed, 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-28 01:22:55 UTC (rev 325054)
+++ PKGBUILD2018-05-28 01:27:48 UTC (rev 325055)
@@ -15,9 +15,6 @@
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae

[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 pacman-5.0.1-roundup.patch)

2017-06-13 Thread Christian Hesse 
Date: Tuesday, June 13, 2017 @ 12:12:26
  Author: eworm
Revision: 298723

upgpkg: pacman 5.0.2-1

new upstream release

Modified:
  pacman/trunk/PKGBUILD
Deleted:
  pacman/trunk/pacman-5.0.1-roundup.patch

+
 PKGBUILD   |   26 ++
 pacman-5.0.1-roundup.patch |  174 ---
 2 files changed, 9 insertions(+), 191 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-13 12:03:16 UTC (rev 298722)
+++ PKGBUILD2017-06-13 12:12:26 UTC (rev 298723)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.0.1
-pkgrel=5
+pkgver=5.0.2
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/;
@@ -20,27 +20,19 @@
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae 

+  'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory 
(pacman) 
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-pacman-5.0.1-roundup.patch
 pacman.conf.i686
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('377a2664d6007d72d6d8a126add83bcf'
- 'SKIP'
- '1a6573187531068d38cb4478cd20368c'
- 'bdb40c76225c2fd8874bd34b6a3f6ad7'
- 'c511ee4c7a86a37e8841440ede89300d'
- 'f5b59fe5f016eebd9590318530bbd996')
-validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 

+sha256sums=('dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e'
+'SKIP'
+'cb76123c15ca9f2a467ebecb72af611f618fcc8431cf8b437d40fa2e61c23590'
+'95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
+'56a016d6a5404ab6dd7b8fd39027ef422dd14ad07c768853863a1e03dcc9a3e0')
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  
-  # v5.0.1..pacman-5.0.1..c2f97580
-  patch -p1 -i $srcdir/pacman-5.0.1-roundup.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 

Deleted: pacman-5.0.1-roundup.patch
===
--- pacman-5.0.1-roundup.patch  2017-06-13 12:03:16 UTC (rev 298722)
+++ pacman-5.0.1-roundup.patch  2017-06-13 12:12:26 UTC (rev 298723)
@@ -1,174 +0,0 @@
-diff --git a/NEWS b/NEWS
-index 07aa028..b7298bf 100644
 a/NEWS
-+++ b/NEWS
-@@ -1,5 +1,22 @@
- VERSION DESCRIPTION
- -
-+5.0.1 - fix alignment issues with wide character locales (FS#47980)
-+  - fix removal of .pacnew files (FS#47993)
-+  - fix triggering of Install hooks (FS#47996)
-+  - fix handling of stdin scripts called by pacman
-+  - hook activity is logged
-+  - documentataion updates for alpm-hooks (FS#48080)
-+  - makepkg:
-+- increase robustness of variable array checks
-+- makepkg -g does not perform current architecture checks
-+- do not run prepare() with --noextract
-+- all directories in the packaging directory are cleared
-+  before each build
-+- fix translations issues (FS#48057, FS#48298)
-+  - repo-add:
-+- fix checking for non-existent database
-+  - contrib:
-+- zsh_completion: updated makepkg options
- 5.0.0 - pacman can run hooks pre- and post-transaction. See the
- alpm-hooks(5) man page for details and an example hook 
(FS#2985)
-   - pacman can now sync and read .files databases (-Fy) and do 
basic
-diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
-index e410481..4b4a22c 100644
 a/doc/PKGBUILD.5.txt
-+++ b/doc/PKGBUILD.5.txt
-@@ -52,10 +52,10 @@ similar to `$_basekernver`.
- +
- The `pkgver` variable can be automatically updated by providing a `pkgver()`
- function in the PKGBUILD that outputs the new package version.
--This is run after downloading and extracting the sources so it can use those
--files in determining the new `pkgver`.
--This is most useful when used with sources from version control systems (see
--below).
-+This is run after downloading and extracting the sources and running the
-+`prepare()` function (if present), so it can use those files in determining 
the
-+new `pkgver`.  This is most useful when used with sources from version control
-+systems (see below).
- 
- *pkgrel*::
-   This is the release number specific to the Arch Linux release. This
-diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in 
b/scripts/libmakepkg/tidy/emptydirs.sh.in
-index 32b8d8c..85ab39d 100644
 a/scripts/libmakepkg/tidy/emptydirs.sh.in
-+++

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

2017-02-11 Thread Pierre Schmitz 
Date: Saturday, February 11, 2017 @ 11:49:58
  Author: pierre
Revision: 288657

upgpkg: pacman 5.0.1-5

OpenSSL 1,1 rebuild

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-11 11:46:59 UTC (rev 288656)
+++ PKGBUILD2017-02-11 11:49:58 UTC (rev 288657)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=5.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/;

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

2016-05-02 Thread Allan McRae 
Date: Monday, May 2, 2016 @ 15:04:32
  Author: allan
Revision: 266765

upgpkg: pacman 5.0.1-3

gcc enforces using 'pc' over 'unknown' in the host triplet

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-02 12:37:47 UTC (rev 266764)
+++ PKGBUILD2016-05-02 13:04:32 UTC (rev 266765)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=5.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/;
@@ -13,7 +13,6 @@
 groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
 provides=('pacman-contrib')
 conflicts=('pacman-contrib')
@@ -73,7 +72,7 @@
   ;;
 x86_64)
   mycarch="x86_64"
-  mychost="x86_64-unknown-linux-gnu"
+  mychost="x86_64-pc-linux-gnu"
   myflags="-march=x86-64"
   ;;
   esac

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

2016-02-22 Thread Allan McRae 
Date: Tuesday, February 23, 2016 @ 05:23:19
  Author: allan
Revision: 260170

upgpkg: pacman 5.0.1-1

upstream update

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-23 02:36:25 UTC (rev 260169)
+++ PKGBUILD2016-02-23 04:23:19 UTC (rev 260170)
@@ -4,7 +4,7 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=5.0.0
+pkgver=5.0.1
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
 pacman.conf.i686
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
+md5sums=('377a2664d6007d72d6d8a126add83bcf'
  'SKIP'
  'bdb40c76225c2fd8874bd34b6a3f6ad7'
  'c511ee4c7a86a37e8841440ede89300d'

[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 pacman-4.2.0-roundup.patch)

2015-02-19 Thread Allan McRae 
Date: Friday, February 20, 2015 @ 02:59:29
  Author: allan
Revision: 231682

upgpkg: pacman 4.2.1-1

upstream update

Modified:
  pacman/trunk/PKGBUILD
Deleted:
  pacman/trunk/pacman-4.2.0-roundup.patch

+
 PKGBUILD   |   21 --
 pacman-4.2.0-roundup.patch |  342 ---
 2 files changed, 5 insertions(+), 358 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-19 19:43:49 UTC (rev 231681)
+++ PKGBUILD2015-02-20 01:59:29 UTC (rev 231682)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner dreis...@archlinux.org
 
 pkgname=pacman
-pkgver=4.2.0
-pkgrel=6
+pkgver=4.2.1
+pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -23,25 +23,14 @@
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf.i686
 pacman.conf.x86_64
-makepkg.conf
-pacman-4.2.0-roundup.patch)
-md5sums=('184ce14f1f326fede72012cca51bba51'
+makepkg.conf)
+md5sums=('2a596fc8f723e99660c0869a74afcf47'
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '03d578816b56852d803cbafac85b9f09'
- 'abe3baaf610d9cc42b4e3748c936bbce')
+ '03d578816b56852d803cbafac85b9f09')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
 
-prepare() {
-  cd $pkgname-$pkgver
-  
-  # v4.2.0-13-gacc639a
-  patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
-  
-  # fix bad translation mistake - corrected in transifex
-  sed -i 's#pacman-db-update#pacman-db-upgrade#' src/pacman/po/nl.po
-}
 
 build() {
   cd $pkgname-$pkgver

Deleted: pacman-4.2.0-roundup.patch
===
--- pacman-4.2.0-roundup.patch  2015-02-19 19:43:49 UTC (rev 231681)
+++ pacman-4.2.0-roundup.patch  2015-02-20 01:59:29 UTC (rev 231682)
@@ -1,342 +0,0 @@
-diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in
-index 6a68d4d..1690583 100644
 a/contrib/paccache.sh.in
-+++ b/contrib/paccache.sh.in
-@@ -256,6 +256,8 @@ while :; do
-   delete=1 ;;
-   -u|--uninstalled)
-   IFS=$'\n' read -r -d '' -a ign  (pacman -Qq)
-+  # pacman -Qq may exit with an error, thus making ign an 
empty array
-+  (( ${#ign[@]} )) || die 'failed to retrieve the list of 
installed packages'
-   blacklist+=(${ign[@]})
-   unset ign ;;
-   -V|--version)
-diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in
-index 1c10b32..f4fd540 100644
 a/contrib/paclist.sh.in
-+++ b/contrib/paclist.sh.in
-@@ -31,7 +31,7 @@ if ! type gettext /dev/null; then
- fi
- 
- usage() {
--  printf %s (pacman) v%s\n ${myname} myver
-+  printf %s (pacman) v%s\n ${myname} ${myver}
-   echo
-   printf List all packages installed from a given repository\n 
${myname}
-   echo
-diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in
-index b0d2d69..7b92efe 100644
 a/contrib/updpkgsums.sh.in
-+++ b/contrib/updpkgsums.sh.in
-@@ -82,9 +82,6 @@ fi
- export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XX)
- newbuildfile=$(mktemp --tmpdir updpkgsums.XX)
- 
--# In case the eventual replacement fails, we don't want to leave behind
--# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement
--# succeeds.
- trap rm -rf '$BUILDDIR' '$newbuildfile' EXIT
- newsums=$(makepkg -g -p $buildfile) || die 'Failed to generate new 
checksums'
- awk -v newsums=$newsums '
-@@ -100,8 +97,9 @@ awk -v newsums=$newsums '
-   END { if (!w) print newsums }
- ' $buildfile  $newbuildfile || die 'Failed to write new PKGBUILD'
- 
--# Replace the original buildfile.
--if ! mv -- $newbuildfile $buildfile; then
-+# Rewrite the original buildfile. Use cat instead of mv/cp to preserve
-+# permissions implicitly.
-+if ! cat -- $newbuildfile $buildfile; then
-   die Failed to update %s. The file has not been modified. $buildfile
- fi
- 
-diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
-index 7fa91ff..c95c41d 100644
 a/doc/PKGBUILD.5.txt
-+++ b/doc/PKGBUILD.5.txt
-@@ -216,7 +216,7 @@ underscore and the architecture name e.g., 
'checkdepends_x86_64=()'.
-   and are not utilized by pacman during dependency resolution. The format
-   for specifying optdepends is:
- 
--  optdepends=('fakeroot: for makepkg usage as normal user')
-+  optdepends=('python: for library bindings')
- +
- Additional architecture-specific optdepends can be added by appending an
- underscore and the architecture name e.g., 'optdepends_x86_64=()'.
-@@ -336,10 +336,9 @@ files into the packaging directory, with optional 
`prepare()`, `build()`, and
- *package() Function*::
-   The `package()`

[arch-commits] Commit in pacman/trunk (PKGBUILD pacman-4.2.0-roundup.patch)

2015-01-11 Thread Allan McRae 
Date: Monday, January 12, 2015 @ 06:54:31
  Author: allan
Revision: 228934

upgpkg: pacman 4.2.0-6

pull from upstream maint branch

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman-4.2.0-roundup.patch

+
 PKGBUILD   |   10 ++-
 pacman-4.2.0-roundup.patch |  131 +--
 2 files changed, 122 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-12 04:24:32 UTC (rev 228933)
+++ PKGBUILD2015-01-12 05:54:31 UTC (rev 228934)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -13,6 +13,7 @@
 groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive=3.1.2' 'curl=7.39.0'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
 provides=('pacman-contrib')
 conflicts=('pacman-contrib')
@@ -28,8 +29,8 @@
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
- '0d07f2a750ba20d114c3adc799d371de'
- '8b8e478e3b6f785f6fb0029f792cea38')
+ '03d578816b56852d803cbafac85b9f09'
+ 'abe3baaf610d9cc42b4e3748c936bbce')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
 
 prepare() {
@@ -37,6 +38,9 @@
   
   # v4.2.0-13-gacc639a
   patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
+  
+  # fix bad translation mistake - corrected in transifex
+  sed -i 's#pacman-db-update#pacman-db-upgrade#' src/pacman/po/nl.po
 }
 
 build() {

Modified: pacman-4.2.0-roundup.patch
===
--- pacman-4.2.0-roundup.patch  2015-01-12 04:24:32 UTC (rev 228933)
+++ pacman-4.2.0-roundup.patch  2015-01-12 05:54:31 UTC (rev 228934)
@@ -1,3 +1,16 @@
+diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in
+index 6a68d4d..1690583 100644
+--- a/contrib/paccache.sh.in
 b/contrib/paccache.sh.in
+@@ -256,6 +256,8 @@ while :; do
+   delete=1 ;;
+   -u|--uninstalled)
+   IFS=$'\n' read -r -d '' -a ign  (pacman -Qq)
++  # pacman -Qq may exit with an error, thus making ign an 
empty array
++  (( ${#ign[@]} )) || die 'failed to retrieve the list of 
installed packages'
+   blacklist+=(${ign[@]})
+   unset ign ;;
+   -V|--version)
 diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in
 index 1c10b32..f4fd540 100644
 --- a/contrib/paclist.sh.in
@@ -11,8 +24,61 @@
echo
printf List all packages installed from a given repository\n 
${myname}
echo
+diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in
+index b0d2d69..7b92efe 100644
+--- a/contrib/updpkgsums.sh.in
 b/contrib/updpkgsums.sh.in
+@@ -82,9 +82,6 @@ fi
+ export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XX)
+ newbuildfile=$(mktemp --tmpdir updpkgsums.XX)
+ 
+-# In case the eventual replacement fails, we don't want to leave behind
+-# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement
+-# succeeds.
+ trap rm -rf '$BUILDDIR' '$newbuildfile' EXIT
+ newsums=$(makepkg -g -p $buildfile) || die 'Failed to generate new 
checksums'
+ awk -v newsums=$newsums '
+@@ -100,8 +97,9 @@ awk -v newsums=$newsums '
+   END { if (!w) print newsums }
+ ' $buildfile  $newbuildfile || die 'Failed to write new PKGBUILD'
+ 
+-# Replace the original buildfile.
+-if ! mv -- $newbuildfile $buildfile; then
++# Rewrite the original buildfile. Use cat instead of mv/cp to preserve
++# permissions implicitly.
++if ! cat -- $newbuildfile $buildfile; then
+   die Failed to update %s. The file has not been modified. $buildfile
+ fi
+ 
+diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
+index 7fa91ff..c95c41d 100644
+--- a/doc/PKGBUILD.5.txt
 b/doc/PKGBUILD.5.txt
+@@ -216,7 +216,7 @@ underscore and the architecture name e.g., 
'checkdepends_x86_64=()'.
+   and are not utilized by pacman during dependency resolution. The format
+   for specifying optdepends is:
+ 
+-  optdepends=('fakeroot: for makepkg usage as normal user')
++  optdepends=('python: for library bindings')
+ +
+ Additional architecture-specific optdepends can be added by appending an
+ underscore and the architecture name e.g., 'optdepends_x86_64=()'.
+@@ -336,10 +336,9 @@ files into the packaging directory, with optional 
`prepare()`, `build()`, and
+ *package() Function*::
+   The `package()` function is used to install files into the directory 
that
+   will become the root directory of the built package and is run after all
+-  the optional functions listed below. When specified in combination with
+-

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

2015-01-02 Thread Allan McRae 
Date: Friday, January 2, 2015 @ 12:36:35
  Author: allan
Revision: 228340

remove outdated optdepends

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-02 06:25:12 UTC (rev 228339)
+++ PKGBUILD2015-01-02 11:36:35 UTC (rev 228340)
@@ -14,7 +14,6 @@
 depends=('bash' 'glibc' 'libarchive=3.1.2' 'curl=7.39.0'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 checkdepends=('python2' 'fakechroot')
-optdepends=('fakeroot: for makepkg usage as normal user')
 provides=('pacman-contrib')
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')

[arch-commits] Commit in pacman/trunk (PKGBUILD pacman-4.2.0-roundup.patch)

2014-12-28 Thread Allan McRae 
Date: Sunday, December 28, 2014 @ 10:07:13
  Author: allan
Revision: 228108

upgpkg: pacman 4.2.0-5

acutally update the patch...

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman-4.2.0-roundup.patch

+
 PKGBUILD   |4 -
 pacman-4.2.0-roundup.patch |  161 +--
 2 files changed, 157 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-28 03:39:45 UTC (rev 228107)
+++ PKGBUILD2014-12-28 09:07:13 UTC (rev 228108)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -30,7 +30,7 @@
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'
  '0d07f2a750ba20d114c3adc799d371de'
- 'e98459a565bb4e199695f9c319d7d52d')
+ '8b8e478e3b6f785f6fb0029f792cea38')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
 
 prepare() {

Modified: pacman-4.2.0-roundup.patch
===
--- pacman-4.2.0-roundup.patch  2014-12-28 03:39:45 UTC (rev 228107)
+++ pacman-4.2.0-roundup.patch  2014-12-28 09:07:13 UTC (rev 228108)
@@ -29,6 +29,32 @@
  #
  # ARCHITECTURE, COMPILE FLAGS
  #
+diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
+index d232bcc..9af5e84 100644
+--- a/lib/libalpm/log.c
 b/lib/libalpm/log.c
+@@ -52,7 +52,7 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const 
char *prefix,
+   int fd;
+   do {
+   fd = open(handle-logfile, O_WRONLY | O_APPEND | 
O_CREAT | O_CLOEXEC,
+-  );
++  0644);
+   } while(fd == -1  errno == EINTR);
+   if(fd = 0) {
+   handle-logstream = fdopen(fd, a);
+diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
+index e2997f6..d9ed3d3 100644
+--- a/lib/libalpm/package.c
 b/lib/libalpm/package.c
+@@ -574,7 +574,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr)
+   newpkg-installdate = pkg-installdate;
+   STRDUP(newpkg-packager, pkg-packager, goto cleanup);
+   STRDUP(newpkg-md5sum, pkg-md5sum, goto cleanup);
+-  STRDUP(newpkg-sha256sum, pkg-md5sum, goto cleanup);
++  STRDUP(newpkg-sha256sum, pkg-sha256sum, goto cleanup);
+   STRDUP(newpkg-arch, pkg-arch, goto cleanup);
+   newpkg-size = pkg-size;
+   newpkg-isize = pkg-isize;
 diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
 index 6e6d944..d9da167 100755
 --- a/scripts/makepkg-template.pl.in
@@ -43,12 +69,94 @@
}
$values{$key} = $val;
 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 33dff24..60276f6 100644
+index 33dff24..18b2822 100644
 --- a/scripts/makepkg.sh.in
 +++ b/scripts/makepkg.sh.in
-@@ -2896,7 +2896,7 @@ get_vcsclient() {
+@@ -1317,47 +1317,41 @@ verify_integrity_sums() {
+   fi
  }
  
+-have_sources() {
+-  local a
+-
+-  (( ${#source[*]} ))  return 0
++check_checksums() {
++  local integ a
++  declare -A correlation
++  (( SKIPCHECKSUMS ))  return 0
+ 
++  # Initialize a map which we'll use to verify that every source array 
has at
++  # least some kind of checksum array associated with it.
++  (( ${#source[*]} ))  correlation['source']=1
+   case $1 in
+   all)
+   for a in ${arch[@]}; do
+-  array_build _ source_$a  return 0
++  array_build _ source_$a  
correlation[source_$a]=1
+   done
+   ;;
+   *)
+-  array_build _ source_$CARCH  return 0
++  array_build _ source_$CARCH  
correlation[source_$CARCH]=1
+   ;;
+   esac
+ 
+-  return 1
+-}
+-
+-check_checksums() {
+-  (( SKIPCHECKSUMS ))  return 0
+-  have_sources $1 || return 0
+-
+-  local correlation=0
+-  local integ a
+   for integ in ${known_hash_algos[@]}; do
+-  verify_integrity_sums $integ  correlation=1
++  verify_integrity_sums $integ  unset correlation[source]
+ 
+   case $1 in
+   all)
+   for a in ${arch[@]}; do
+-  verify_integrity_sums $integ $a  
correlation=1
++  verify_integrity_sums $integ $a  
unset correlation[source_$a]
+   done
+   ;;
+   *)
+-

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

2014-12-27 Thread Allan McRae 
Date: Sunday, December 28, 2014 @ 04:17:12
  Author: allan
Revision: 228102

upgpkg: pacman 4.2.0-4

new upstream snapshot

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-28 00:19:11 UTC (rev 228101)
+++ PKGBUILD2014-12-28 03:17:12 UTC (rev 228102)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -36,7 +36,7 @@
 prepare() {
   cd $pkgname-$pkgver
   
-  # v4.2.0..c8448bb4
+  # v4.2.0-13-gacc639a
   patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
 }

[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)

2014-01-03 Thread Dave Reisner 
Date: Friday, January 3, 2014 @ 18:32:40
  Author: dreisner
Revision: 203077

be pedantic about quoting

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |   33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-03 12:12:14 UTC (rev 203076)
+++ PKGBUILD2014-01-03 17:32:40 UTC (rev 203077)
@@ -31,7 +31,7 @@
  'f4940a8003ebd11e514827a790ef4e7f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
 --localstatedir=/var --enable-doc \
@@ -46,16 +46,17 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  make DESTDIR=$pkgdir -C contrib install
+  cd $pkgname-$pkgver
 
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
   # install Arch specific stuff
-  install -dm755 $pkgdir/etc
-  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
-  
-  case $CARCH in
-i686)
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
+  case $CARCH in
+i686)
   mycarch=i686
   mychost=i686-pc-linux-gnu
   myflags=-march=i686
@@ -66,18 +67,18 @@
   myflags=-march=x86-64
   ;;
   esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+
   # set things correctly in the default conf file
-  sed -i $pkgdir/etc/makepkg.conf \
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc
+  sed -i $pkgdir/etc/makepkg.conf \
 -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 -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

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

2013-12-24 Thread Dave Reisner 
Date: Tuesday, December 24, 2013 @ 22:35:48
  Author: dreisner
Revision: 202690

upgpkg: pacman 4.1.2-5

- install PKGBUILD.vim (FS#37036)
- add debug package (hosted elsewhere)

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-24 21:00:55 UTC (rev 202689)
+++ PKGBUILD2013-12-24 21:35:48 UTC (rev 202690)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=4
+pkgrel=5
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -19,6 +19,7 @@
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf.i686
 pacman.conf.x86_64
@@ -81,4 +82,6 @@
   for f in makepkg pacman-key; do
 ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
   done
+
+  install -Dm644 contrib/PKGBUILD.vim 
$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim
 }

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

2013-10-21 Thread Allan McRae 
Date: Monday, October 21, 2013 @ 16:05:24
  Author: allan
Revision: 197027

upgpkg: pacman 4.1.2-4

remove static libraries

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 13:56:19 UTC (rev 197026)
+++ PKGBUILD2013-10-21 14:05:24 UTC (rev 197027)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=3
+pkgrel=4
 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)
-options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf.i686
 pacman.conf.x86_64

[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)

2013-06-17 Thread Allan McRae 
Date: Tuesday, June 18, 2013 @ 06:04:38
  Author: allan
Revision: 188692

upgpkg: pacman 4.1.2-1

upstream update

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-18 03:41:11 UTC (rev 188691)
+++ PKGBUILD2013-06-18 04:04:38 UTC (rev 188692)
@@ -4,7 +4,7 @@
 # Maintainer: Dave Reisner dreis...@archlinux.org
 
 pkgname=pacman
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@
 pacman.conf.i686
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('72a1688ff73c1c0b79d8f87b3793d446'
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
  'SKIP'
  '2db6c94709bb30cc614a176ecf8badb1'
  'de74a13618347f08ae4a9637f74471c4'

[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)

2013-02-28 Thread Dave Reisner 
Date: Thursday, February 28, 2013 @ 18:05:39
  Author: dreisner
Revision: 178901

upgpkg: pacman 4.0.3-7

bump libarchive version requirement

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 16:29:22 UTC (rev 178900)
+++ PKGBUILD2013-02-28 17:05:39 UTC (rev 178901)
@@ -5,13 +5,13 @@
 
 pkgname=pacman
 pkgver=4.0.3
-pkgrel=6
+pkgrel=7
 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.0.2' 'curl=7.19.4'
+depends=('bash' 'glibc=2.15' 'libarchive=3.1.2' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 optdepends=('fakeroot: for makepkg usage as normal user')

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

2013-02-27 Thread Dave Reisner 
Date: Wednesday, February 27, 2013 @ 22:54:22
  Author: dreisner
Revision: 178868

upgpkg: pacman 4.0.3-6

rebuild for libarchive soname bump

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-27 21:51:44 UTC (rev 178867)
+++ PKGBUILD2013-02-27 21:54:22 UTC (rev 178868)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;

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

2013-01-01 Thread Allan McRae 
Date: Tuesday, January 1, 2013 @ 06:55:10
  Author: allan
Revision: 174003

add to base-devel

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-01 11:53:35 UTC (rev 174002)
+++ PKGBUILD2013-01-01 11:55:10 UTC (rev 174003)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
-groups=('base')
+groups=('base' 'base-devel')
 depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')

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

2012-11-17 Thread Allan McRae 
Date: Saturday, November 17, 2012 @ 20:57:51
  Author: allan
Revision: 171482

upgpkg: pacman 4.0.3-5

you need to do more than just add a patch to the source array...

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-18 00:39:38 UTC (rev 171481)
+++ PKGBUILD2012-11-18 01:57:51 UTC (rev 171482)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -39,6 +39,7 @@
 
   patch -p1 -i 
$srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
   patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+  patch -p1 -i 
$srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
 --localstatedir=/var --enable-doc

[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)

2012-04-07 Thread Dave Reisner 
Date: Saturday, April 7, 2012 @ 12:38:18
  Author: dreisner
Revision: 155848

upgpkg: pacman 4.0.3-1

- move completion to /usr/share/bash-completion/completions
  - adds symlinks for makepkg and pacman-key

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-07 16:18:57 UTC (rev 155847)
+++ PKGBUILD2012-04-07 16:38:18 UTC (rev 155848)
@@ -1,10 +1,10 @@
 # vim: set ts=2 sw=2 et:
 # $Id$
 # Maintainer: Dan McGee d...@archlinux.org
-# Maintainer: Dave Reisner d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
 
 pkgname=pacman
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('289ba4a19a16393096e065cec1cb9b0a'
- '575140dce3ea597d91b6d081aa3f6a00'
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
  '4605b3490d4fd1e5c6e20db17da9ded6'
  'a0edf98ad1845a4c7d902a86638d5d2d'
  'db051afbd12993b7743ccd4d58668499')
@@ -68,8 +68,10 @@
 -e s|@CARCHFLAGS[@]|$myflags|g
 
   # install completion files
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+  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
 }

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

2012-02-11 Thread Dave Reisner 
Date: Saturday, February 11, 2012 @ 16:39:32
  Author: dreisner
Revision: 149917

upgpkg: pacman 4.0.2-1

- add check() function
- add source tarball .sig

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-11 20:22:35 UTC (rev 149916)
+++ PKGBUILD2012-02-11 21:39:32 UTC (rev 149917)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner d...@archlinux.org
 
 pkgname=pacman
-pkgver=4.0.1
-pkgrel=4
+pkgver=4.0.2
+pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -18,11 +18,12 @@
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('76bd88eff8cd94bc9899faa091822dc1'
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+ '575140dce3ea597d91b6d081aa3f6a00'
  '4605b3490d4fd1e5c6e20db17da9ded6'
  'a0edf98ad1845a4c7d902a86638d5d2d'
  'db051afbd12993b7743ccd4d58668499')
@@ -38,6 +39,10 @@
   make
 }
 
+check() {
+  make -C $pkgname-$pkgver check
+}
+
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install

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

2012-01-13 Thread Dave Reisner 
Date: Friday, January 13, 2012 @ 11:47:02
  Author: dreisner
Revision: 146568

upgpkg: pacman 4.0.1-4

- disable sig checking by default

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-13 16:46:12 UTC (rev 146567)
+++ PKGBUILD2012-01-13 16:47:02 UTC (rev 146568)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -13,6 +13,7 @@
 groups=('base')
 depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
+makedepends=('asciidoc')
 optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
@@ -22,8 +23,8 @@
 pacman.conf.x86_64
 makepkg.conf)
 md5sums=('76bd88eff8cd94bc9899faa091822dc1'
- '4ebee5e1da37a6afdf06c1bc55efbf92'
- '3e3342bd4abda20bb758595c1cbfb014'
+ '4605b3490d4fd1e5c6e20db17da9ded6'
+ 'a0edf98ad1845a4c7d902a86638d5d2d'
  'db051afbd12993b7743ccd4d58668499')
 
 # keep an upgrade path for older installations

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

2012-01-02 Thread Dave Reisner 
Date: Monday, January 2, 2012 @ 14:33:46
  Author: dreisner
Revision: 145832

upgpkg: pacman 4.0.1-2

- rebuild for libarchive soname bump

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-02 19:21:38 UTC (rev 145831)
+++ PKGBUILD2012-01-02 19:33:46 UTC (rev 145832)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;

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

2012-01-02 Thread Dave Reisner 
Date: Monday, January 2, 2012 @ 14:39:43
  Author: dreisner
Revision: 145836

upgpkg: pacman 4.0.1-3

- fix glibc/libarchive versioning in depends

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-02 19:34:59 UTC (rev 145835)
+++ PKGBUILD2012-01-02 19:39:43 UTC (rev 145836)
@@ -5,13 +5,13 @@
 
 pkgname=pacman
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
+depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)

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

2011-11-20 Thread Dan McGee 
Date: Sunday, November 20, 2011 @ 22:56:58
  Author: dan
Revision: 143023

upgpkg: pacman 4.0.1-1

maint release 4.0.1

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

+
 PKGBUILD   |   10 +-
 pacman.conf|1 +
 pacman.conf.x86_64 |1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 02:26:42 UTC (rev 143022)
+++ PKGBUILD2011-11-21 03:56:58 UTC (rev 143023)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner d...@archlinux.org
 
 pkgname=pacman
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.0.1
+pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -21,9 +21,9 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('8c97f4804d2a0847956c45888b0ea517'
- 'ae4abf6df12483d26b39529ab27c0837'
- '99d8fae7a3c761e3ebad800f6a216e83'
+md5sums=('76bd88eff8cd94bc9899faa091822dc1'
+ '4ebee5e1da37a6afdf06c1bc55efbf92'
+ '3e3342bd4abda20bb758595c1cbfb014'
  'db051afbd12993b7743ccd4d58668499')
 
 # keep an upgrade path for older installations

Modified: pacman.conf
===
--- pacman.conf 2011-11-21 02:26:42 UTC (rev 143022)
+++ pacman.conf 2011-11-21 03:56:58 UTC (rev 143023)
@@ -74,6 +74,7 @@
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]

Modified: pacman.conf.x86_64
===
--- pacman.conf.x86_64  2011-11-21 02:26:42 UTC (rev 143022)
+++ pacman.conf.x86_64  2011-11-21 03:56:58 UTC (rev 143023)
@@ -74,6 +74,7 @@
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+#SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]

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

2011-10-21 Thread Dan McGee 
Date: Friday, October 21, 2011 @ 10:35:28
  Author: dan
Revision: 141012

Fix FS#26543, curl in deps twice

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 10:45:03 UTC (rev 141011)
+++ PKGBUILD2011-10-21 14:35:28 UTC (rev 141012)
@@ -1,3 +1,4 @@
+# vim: set ts=2 sw=2 et:
 # $Id$
 # Maintainer: Dan McGee d...@archlinux.org
 # Maintainer: Dave Reisner d...@archlinux.org
@@ -12,8 +13,7 @@
 groups=('base')
 depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-'curl: for rankmirrors usage')
+optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
@@ -70,5 +70,3 @@
   mkdir -p $pkgdir/usr/share/zsh/site-functions/
   install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
 }
-
-# vim: set ts=2 sw=2 et:

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

2011-10-13 Thread Dan McGee 
Date: Thursday, October 13, 2011 @ 13:52:30
  Author: dan
Revision: 140413

upgpkg: pacman 4.0.0-1

4.0.0-1 initial [testing] release

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 17:40:33 UTC (rev 140412)
+++ PKGBUILD2011-10-13 17:52:30 UTC (rev 140413)
@@ -10,7 +10,7 @@
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl'
+depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
  'gpgme' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'curl: for rankmirrors usage')
@@ -33,7 +33,7 @@
   cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc --enable-debug
+--localstatedir=/var --enable-doc
   make
 }

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

2011-10-13 Thread Dan McGee 
Date: Thursday, October 13, 2011 @ 14:11:31
  Author: dan
Revision: 140415

upgpkg: pacman 4.0.0-2

4.0.0-2 add install message for pacman-key init

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman.install

+
 PKGBUILD   |2 +-
 pacman.install |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 17:54:15 UTC (rev 140414)
+++ PKGBUILD2011-10-13 18:11:31 UTC (rev 140415)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;

Modified: pacman.install
===
--- pacman.install  2011-10-13 17:54:15 UTC (rev 140414)
+++ pacman.install  2011-10-13 18:11:31 UTC (rev 140415)
@@ -9,8 +9,19 @@
 if [ $(vercmp $2 3.5.0) -lt 0 ]; then
 _warnupgrade
 fi
+_check_pubring
 }
 
+post_install() {
+_check_pubring
+}
+
+_check_pubring() {
+if [ ! -f etc/pacman.d/gnupg/pubring.gpg ]; then
+echo   Run \`pacman-key --init\` to set up your pacman keyring.
+fi
+}
+
 _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.

[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)

2011-08-11 Thread Dave Reisner 
Date: Thursday, August 11, 2011 @ 15:58:54
  Author: dreisner
Revision: 135272

upgpkg: pacman 3.5.4-3
explicitly version against glibc=2.14

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-11 18:40:14 UTC (rev 135271)
+++ PKGBUILD2011-08-11 19:58:54 UTC (rev 135272)
@@ -3,13 +3,13 @@
 
 pkgname=pacman
 pkgver=3.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.8.4' 'libfetch=2.28' 'pacman-mirrorlist')
+depends=('bash' 'glibc=2.14' 'libarchive=2.8.4' 'libfetch=2.28' 
'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'curl: for rankmirrors usage')
 backup=(etc/pacman.conf etc/makepkg.conf)

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

2011-08-09 Thread Dave Reisner 
Date: Tuesday, August 9, 2011 @ 20:44:33
  Author: dreisner
Revision: 135058

upgpkg: pacman 3.5.4-1
maint release 3.5.4

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-10 00:39:47 UTC (rev 135057)
+++ PKGBUILD2011-08-10 00:44:33 UTC (rev 135058)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.5.3
+pkgver=3.5.4
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
+md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
  'e99eb721b6b704f68c5f47468507c102'
  'f8b939d9b2beb79a0436961a2d707d7c'
  'a8684989d3dfad5a6e1bcf95af3e571b')
@@ -69,7 +69,3 @@
 }
 
 # vim: set ts=2 sw=2 et:
-md5sums=('c36c18ed4d8ec69c0ecb4f9684266901'
- 'e99eb721b6b704f68c5f47468507c102'
- 'f8b939d9b2beb79a0436961a2d707d7c'
- 'a8684989d3dfad5a6e1bcf95af3e571b')

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

2011-04-18 Thread Dan McGee 
Date: Monday, April 18, 2011 @ 12:49:22
  Author: dan
Revision: 120035

3.5.2 rebuild, update x86_64 config for FS#23650

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

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

Modified: PKGBUILD
===
--- PKGBUILD2011-04-18 14:49:05 UTC (rev 120034)
+++ PKGBUILD2011-04-18 16:49:22 UTC (rev 120035)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -19,9 +19,9 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('6e609a6cf0af2a49a0f8b35fc2459131'
+md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
  'e99eb721b6b704f68c5f47468507c102'
- '28e6a1f97ed3c47a3961ad00d2a43822'
+ 'f8b939d9b2beb79a0436961a2d707d7c'
  'a8684989d3dfad5a6e1bcf95af3e571b')
 
 # keep an upgrade path for older installations

Modified: pacman.conf.x86_64
===
--- pacman.conf.x86_64  2011-04-18 14:49:05 UTC (rev 120034)
+++ pacman.conf.x86_64  2011-04-18 16:49:22 UTC (rev 120035)
@@ -74,7 +74,11 @@
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repository here.
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 #[multilib]
 #Include = /etc/pacman.d/mirrorlist

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

2011-03-23 Thread Dan McGee 
Date: Wednesday, March 23, 2011 @ 12:23:20
  Author: dan
Revision: 116411

upgpkg: pacman 3.5.1-1
verbump 3.5.1

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-23 12:05:43 UTC (rev 116410)
+++ PKGBUILD2011-03-23 16:23:20 UTC (rev 116411)
@@ -2,14 +2,14 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.5.0
+pkgver=3.5.1
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.8.0' 'libfetch=2.28' 'pacman-mirrorlist')
+depends=('bash' 'libarchive=2.8.4' 'libfetch=2.28' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'curl: for rankmirrors usage')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -19,7 +19,7 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('6cd87230cf77b8a83d1c1f093ea5cc64'
+md5sums=('6e609a6cf0af2a49a0f8b35fc2459131'
  'e99eb721b6b704f68c5f47468507c102'
  '28e6a1f97ed3c47a3961ad00d2a43822'
  'a8684989d3dfad5a6e1bcf95af3e571b')

[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)

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

2010-12-29 Thread Dan McGee 
Date: Wednesday, December 29, 2010 @ 20:16:24
  Author: dan
Revision: 104147

upgpkg: pacman 3.4.2-1
verbump 3.4.2

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-29 21:43:21 UTC (rev 104146)
+++ PKGBUILD2010-12-30 01:16:24 UTC (rev 104147)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=pacman
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 pacman.conf
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
+md5sums=('de9198368bdf669c108763c37d793063'
  'eda9cbdb47f85fabda2e7e63801e3e16'
  '9ba146b4fa7bcb3cc18204b06d1f6157'
  'aef317285c7d16ac495b0e53deeb948d')
@@ -30,37 +30,31 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
-  make || return 1
+  make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  make DESTDIR=$pkgdir install
 
   # install Arch specific stuff
   mkdir -p $pkgdir/etc
   case $CARCH in
 i686)
   install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-  ;;
-x86_64)
-  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-  ;;
-  esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  # set things correctly in the default conf file
-  case $CARCH in
-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 
   ;;
   esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
   sed -i $pkgdir/etc/makepkg.conf \
 -e s|@car...@]|$mycarch|g \
 -e s|@cho...@]|$mychost|g \

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

2010-08-26 Thread Thomas Bächler 
Date: Thursday, August 26, 2010 @ 09:25:57
  Author: thomas
Revision: 88931

Add a separate configuration file for x86_64 that has multilib included, but 
commented out.

Added:
  pacman/trunk/pacman.conf.x86_64
(from rev 88927, pacman/trunk/pacman.conf)
Modified:
  pacman/trunk/PKGBUILD

+
 PKGBUILD   |   16 +++--
 pacman.conf.x86_64 |   84 +++
 2 files changed, 97 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-26 13:25:42 UTC (rev 88930)
+++ PKGBUILD2010-08-26 13:25:57 UTC (rev 88931)
@@ -17,14 +17,17 @@
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
 pacman.conf
+pacman.conf.x86_64
 makepkg.conf
 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch)
 md5sums=('50ad71be1faaad84842c576e239d1bb5'
- '80f5bb2a606553512d0db857f78d9ac2'
+ 'eda9cbdb47f85fabda2e7e63801e3e16'
+ '9ba146b4fa7bcb3cc18204b06d1f6157'
  'aef317285c7d16ac495b0e53deeb948d'
  'f8c4a3cc7702a7a70d177659441495c5')
 sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3'
-'97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838'
+'cc5b197d50739ecd5e757b95d19ba5936782f8b588260e3ec063f2ae383ff6a1'
+'816655f858cf5d4950a284ed6ca5fc52ab3abc81f6618d3a8b3644f4f2d03242'
 '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418'
 '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44')
 
@@ -44,7 +47,14 @@
 
   # install Arch specific stuff
   mkdir -p $pkgdir/etc
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  ;;
+x86_64)
+  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+  ;;
+  esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
   # set things correctly in the default conf file
   case $CARCH in

Copied: pacman/trunk/pacman.conf.x86_64 (from rev 88927, 
pacman/trunk/pacman.conf)
===
--- pacman.conf.x86_64  (rev 0)
+++ pacman.conf.x86_64  2010-08-26 13:25:57 UTC (rev 88931)
@@ -0,0 +1,84 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir = /
+#DBPath  = /var/lib/pacman/
+#CacheDir= /var/cache/pacman/pkg/
+#LogFile = /var/log/pacman.log
+HoldPkg = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u  %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+# have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#   [repo-name]
+#   Server = ServerName
+#   Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repository here.
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

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

2010-04-07 Thread Pierre Schmitz 
Date: Wednesday, April 7, 2010 @ 10:54:54
  Author: pierre
Revision: 76068

add versioned deps to get libfetch/libarchive with openssl-1; warn the user to 
reupdate the system

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman.install

+
 PKGBUILD   |4 ++--
 pacman.install |4 
 2 files changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-07 12:21:07 UTC (rev 76067)
+++ PKGBUILD2010-04-07 14:54:54 UTC (rev 76068)
@@ -4,13 +4,13 @@
 
 pkgname=pacman
 pkgver=3.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.7.1' 'libfetch=2.25' 'pacman-mirrorlist')
+depends=('bash' 'libarchive=2.8.3-3' 'libfetch=2.30-3' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'python: for rankmirrors script usage')
 backup=(etc/pacman.conf etc/makepkg.conf)

Modified: pacman.install
===
--- pacman.install  2010-04-07 12:21:07 UTC (rev 76067)
+++ pacman.install  2010-04-07 14:54:54 UTC (rev 76068)
@@ -6,6 +6,10 @@
if [ $(vercmp $2 3.0.2) -lt 0 ]; then
_resetbackups
fi
+
+   if [ $(vercmp $2 3.3.3-4) -le 0 ]; then
+   echo ' Make sure to run pacman -Su again after pacman has 
updated itself!'
+   fi
 }
 
 _resetbackups() {

[arch-commits] Commit in pacman/trunk (PKGBUILD pacman.install vercmp.patch)

2010-04-07 Thread Pierre Schmitz 
Date: Wednesday, April 7, 2010 @ 13:17:03
  Author: pierre
Revision: 76084

revert versiond deps; instead: avoid using libalpm in vercmp

Added:
  pacman/trunk/vercmp.patch
Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman.install

+
 PKGBUILD   |   11 ++-
 pacman.install |4 -
 vercmp.patch   |  191 +++
 3 files changed, 198 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-07 17:10:46 UTC (rev 76083)
+++ PKGBUILD2010-04-07 17:17:03 UTC (rev 76084)
@@ -10,7 +10,7 @@
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.8.3-3' 'libfetch=2.30-3' 'pacman-mirrorlist')
+depends=('bash' 'libarchive=2.7.1' 'libfetch=2.25' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'python: for rankmirrors script usage')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -18,17 +18,20 @@
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
 pacman.conf
-makepkg.conf)
+makepkg.conf
+vercmp.patch)
 md5sums=('a8cef73d68e2a4c3a46fb46c33210719'
  'abe70dabacee7036368c7afeb686eb10'
- '4d2f2f2ac74cba7bd2d336db9135ab16')
+ '4d2f2f2ac74cba7bd2d336db9135ab16'
+ '84129116c61c8a7cad03a5ae5d80aee5')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  
+  # avoid linking vercmp against libalpm as this might be broken during a 
transaction
+  patch -p0 -i $srcdir/vercmp.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
 }

Modified: pacman.install
===
--- pacman.install  2010-04-07 17:10:46 UTC (rev 76083)
+++ pacman.install  2010-04-07 17:17:03 UTC (rev 76084)
@@ -6,10 +6,6 @@
if [ $(vercmp $2 3.0.2) -lt 0 ]; then
_resetbackups
fi
-
-   if [ $(vercmp $2 3.3.3-4) -le 0 ]; then
-   echo ' Make sure to run pacman -Su again after pacman has 
updated itself!'
-   fi
 }
 
 _resetbackups() {

Added: vercmp.patch
===
--- vercmp.patch(rev 0)
+++ vercmp.patch2010-04-07 17:17:03 UTC (rev 76084)
@@ -0,0 +1,191 @@
+--- src/util/vercmp.c  2009-09-30 03:38:22.0 +0200
 src/util/vercmp.c  2010-04-07 18:49:13.659173306 +0200
+@@ -18,17 +18,184 @@
+  *  along with this program.  If not, see http://www.gnu.org/licenses/.
+  */
+ 
+-#include config.h
+-
+ #include stdio.h /* printf */
++#include stdlib.h /* malloc/free */
+ #include string.h /* strncpy */
+ 
+-#include alpm.h
+-
+ #define BASENAME vercmp
+ 
+ #define MAX_LEN 255
+ 
++/** Compare two version strings and determine which one is 'newer'.
++ * Returns a value comparable to the way strcmp works. Returns 1
++ * if a is newer than b, 0 if a and b are the same version, or -1
++ * if b is newer than a.
++ *
++ * This function has been adopted from the rpmvercmp function located
++ * at lib/rpmvercmp.c, and was most recently updated against rpm
++ * version 4.4.2.3. Small modifications have been made to make it more
++ * consistent with the libalpm coding style.
++ *
++ * Keep in mind that the pkgrel is only compared if it is available
++ * on both versions handed to this function. For example, comparing
++ * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield
++ * -1 as expected. This is mainly for supporting versioned dependencies
++ * that do not include the pkgrel.
++ */
++static int alpm_pkg_vercmp(const char *a, const char *b)
++{
++  char oldch1, oldch2;
++  char *str1, *str2;
++  char *ptr1, *ptr2;
++  char *one, *two;
++  int rc;
++  int isnum;
++  int ret = 0;
++
++  /* libalpm added code. ensure our strings are not null */
++  if(!a) {
++  if(!b) return(0);
++  return(-1);
++  }
++  if(!b) return(1);
++
++  /* easy comparison to see if versions are identical */
++  if(strcmp(a, b) == 0) return(0);
++
++  str1 = strdup(a);
++  str2 = strdup(b);
++
++  one = str1;
++  two = str2;
++
++  /* loop through each version segment of str1 and str2 and compare them 
*/
++  while(*one  *two) {
++  while(*one  !isalnum((int)*one)) one++;
++  while(*two  !isalnum((int)*two)) two++;
++
++  /* If we ran to the end of either, we are finished with the 
loop */
++  if(!(*one  *two)) break;
++
++  ptr1 = one;
++  ptr2 = two;
++
++  /* grab first completely alpha or completely numeric segment */
++  /* leave one and two pointing to the start of the alpha or 
numeric */
++  /*

[arch-commits] Commit in pacman/trunk (PKGBUILD completion.patch)

2010-04-07 Thread Pierre Schmitz 
Date: Wednesday, April 7, 2010 @ 14:42:35
  Author: pierre
Revision: 76102

fix completion for xz compresseed packages

Added:
  pacman/trunk/completion.patch
Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |8 --
 completion.patch |   68 +
 2 files changed, 74 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-07 18:11:16 UTC (rev 76101)
+++ PKGBUILD2010-04-07 18:42:35 UTC (rev 76102)
@@ -19,11 +19,13 @@
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
 pacman.conf
 makepkg.conf
-vercmp.patch)
+vercmp.patch
+completion.patch)
 md5sums=('a8cef73d68e2a4c3a46fb46c33210719'
  'abe70dabacee7036368c7afeb686eb10'
  '4d2f2f2ac74cba7bd2d336db9135ab16'
- '84129116c61c8a7cad03a5ae5d80aee5')
+ '84129116c61c8a7cad03a5ae5d80aee5'
+ '7eddda58bf55809e6bde14b446e41a15')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -32,6 +34,8 @@
   cd $srcdir/$pkgname-$pkgver
   # avoid linking vercmp against libalpm as this might be broken during a 
transaction
   patch -p0 -i $srcdir/vercmp.patch || return 1
+  # fix completion for .pkg.tar.xz pacakges (included in next upstream release)
+  patch -p1 -i $srcdir/completion.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
 }

Added: completion.patch
===
--- completion.patch(rev 0)
+++ completion.patch2010-04-07 18:42:35 UTC (rev 76102)
@@ -0,0 +1,68 @@
+From d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 Mon Sep 17 00:00:00 2001
+From: Pierre Schmitz pie...@archlinux.de
+Date: Thu, 18 Feb 2010 04:18:10 +
+Subject: contrib/*_completion: match *.pkg.tar.*
+
+Signed-off-by: Pierre Schmitz pie...@archlinux.de
+Signed-off-by: Dan McGee d...@archlinux.org
+---
+diff --git a/contrib/bash_completion b/contrib/bash_completion
+index 62e5bc9..a231eb6 100644
+--- a/contrib/bash_completion
 b/contrib/bash_completion
+@@ -321,7 +321,7 @@ _pacman ()
+ case ${op} in
+   U)
+ COMPREPLY=( $( compgen -d -- $cur ) \
+-$( compgen -f -X '!*.pkg.tar.gz' -- $cur ) )
++$( compgen -f -X '!*.pkg.tar.*' -- $cur ) )
+ return 0
+ ;;
+   h|V)
+@@ -336,7 +336,7 @@ _pacman ()
+   $( compgen -f -- $cur ) )
+ elif _instring $mod p; then
+   COMPREPLY=( $( compgen -d -- $cur ) \
+-  $( compgen -f -X '!*.pkg.tar.gz' -- $cur ) )
++  $( compgen -f -X '!*.pkg.tar.*' -- $cur ) )
+ elif _instring $mod u; then
+   COMPREPLY=''
+   return 0
+diff --git a/contrib/zsh_completion b/contrib/zsh_completion
+index 2f43d9b..01b3c44 100644
+--- a/contrib/zsh_completion
 b/contrib/zsh_completion
+@@ -32,7 +32,7 @@ _pacman_opts_common=(
+ _pacman_opts_pkgfile=(
+   '-d[Skip dependency checks]'
+   '-f[Overwrite conflicting files]'
+-  '*:package file:_files -g *.pkg.tar.gz(.)'
++  '*:package file:_files -g *.pkg.tar.*(.)'
+ )
+ 
+ # options for passing to _arguments: subactions for --query command
+@@ -120,7 +120,7 @@ _pacman_action_query() {
+   _arguments -s : \
+   $_pacman_opts_comm...@] \
+   $_pacman_opts_query_modifie...@] \
+-  '*:package file:_files -g *.pkg.tar.gz'
++  '*:package file:_files -g *.pkg.tar.*'
+   ;;
+   query_group)
+   _arguments -s : \
+@@ -295,11 +295,11 @@ _pacman() {
+   $_pacman_opts_query_modifie...@] \
+   '*:package file:_files'
+   ;;
+-  -Q*p*) # file *.pkg.tar.gz
++  -Q*p*) # file *.pkg.tar.*
+   _arguments -s : \
+   $_pacman_opts_comm...@] \
+   $_pacman_opts_query_modifie...@] \
+-  '*:package file:_files -g *.pkg.tar.gz'
++  '*:package file:_files -g *.pkg.tar.*'
+   ;;
+   -Q*)  _pacman_action_query;;
+   -R*)  _pacman_action_remove   ;;
+--
+cgit v0.8.3.1-3-ga650

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

2010-03-31 Thread Pierre Schmitz 
Date: Wednesday, March 31, 2010 @ 21:36:02
  Author: pierre
Revision: 75175

upgpkg: pacman 3.3.3-2
openssl/heimdal rebuild

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 01:35:35 UTC (rev 75174)
+++ PKGBUILD2010-04-01 01:36:02 UTC (rev 75175)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=3.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
@@ -21,7 +21,7 @@
 makepkg.conf)
 md5sums=('a8cef73d68e2a4c3a46fb46c33210719'
  'abe70dabacee7036368c7afeb686eb10'
- '52c7bc651b107d73f9902755b7594458')
+ '4d2f2f2ac74cba7bd2d336db9135ab16')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'

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

2010-03-31 Thread Allan McRae 
Date: Wednesday, March 31, 2010 @ 23:45:09
  Author: allan
Revision: 75238

upgpkg: pacman 3.3.3-3
version dep libfetch and libarchive for openssl rebuild

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 03:39:51 UTC (rev 75237)
+++ PKGBUILD2010-04-01 03:45:09 UTC (rev 75238)
@@ -4,13 +4,13 @@
 
 pkgname=pacman
 pkgver=3.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.7.1' 'libfetch=2.25' 'pacman-mirrorlist')
+depends=('bash' 'libarchive=2.8.3-2' 'libfetch=2.30-2' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'python: for rankmirrors script usage')
 backup=(etc/pacman.conf etc/makepkg.conf)

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

2010-03-31 Thread Allan McRae 
Date: Thursday, April 1, 2010 @ 00:00:30
  Author: allan
Revision: 75243

upgpkg: pacman 3.3.3-4
revert version dep libfetch and libarchive - it is better this way...

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 03:47:38 UTC (rev 75242)
+++ PKGBUILD2010-04-01 04:00:30 UTC (rev 75243)
@@ -4,13 +4,13 @@
 
 pkgname=pacman
 pkgver=3.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc=A library-based package manager with dependency support
 arch=('i686' 'x86_64')
 url=http://www.archlinux.org/pacman/;
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive=2.8.3-2' 'libfetch=2.30-2' 'pacman-mirrorlist')
+depends=('bash' 'libarchive=2.7.1' 'libfetch=2.25' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
 'python: for rankmirrors script usage')
 backup=(etc/pacman.conf etc/makepkg.conf)

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

2010-02-21 Thread Pierre Schmitz 
Date: Sunday, February 21, 2010 @ 21:25:18
  Author: pierre
Revision: 69711

keep .pkg.tar.gz for a while

Modified:
  pacman/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-22 02:24:53 UTC (rev 69710)
+++ PKGBUILD2010-02-22 02:25:18 UTC (rev 69711)
@@ -23,6 +23,9 @@
  'abe70dabacee7036368c7afeb686eb10'
  '52c7bc651b107d73f9902755b7594458')
 
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
 build() {
   cd $srcdir/$pkgname-$pkgver