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

2016-01-29 Thread Allan McRae 
Date: Saturday, January 30, 2016 @ 01:40:01
  Author: allan
Revision: 258691

upgpkg: pacman 5.0.0-1

upstream update

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

+
 PKGBUILD   |   26 +-
 makepkg.conf   |5 +++--
 pacman.conf.i686   |1 +
 pacman.conf.x86_64 |1 +
 4 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-29 18:07:24 UTC (rev 258690)
+++ PKGBUILD2016-01-30 00:40:01 UTC (rev 258691)
@@ -4,14 +4,14 @@
 # Maintainer: Dave Reisner 
 
 pkgname=pacman
-pkgver=4.2.1
-pkgrel=4
+pkgver=5.0.0
+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' 'base-devel')
-depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
+depends=('bash' 'glibc' 'libarchive' 'curl'
  'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
@@ -21,25 +21,17 @@
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-   ensure-matching-database-and-package-version.patch
 pacman.conf.i686
 pacman.conf.x86_64
 makepkg.conf)
-md5sums=('2a596fc8f723e99660c0869a74afcf47'
+md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
  'SKIP'
- 'e8f72afe6f417d11bd36ada042744fe4'
- '2db6c94709bb30cc614a176ecf8badb1'
- 'de74a13618347f08ae4a9637f74471c4'
- '4036ccfaed40622a1df74fd464fe0582')
+ 'bdb40c76225c2fd8874bd34b6a3f6ad7'
+ 'c511ee4c7a86a37e8841440ede89300d'
+ 'f5b59fe5f016eebd9590318530bbd996')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 

 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -p1 -i $srcdir/ensure-matching-database-and-package-version.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
@@ -47,8 +39,8 @@
 --localstatedir=/var --enable-doc \
 --with-scriptlet-shell=/usr/bin/bash \
 --with-ldconfig=/usr/bin/ldconfig
-  make
-  make -C contrib
+  make V=1
+  make -C contrib 
 }
 
 check() {

Modified: makepkg.conf
===
--- makepkg.conf2016-01-29 18:07:24 UTC (rev 258690)
+++ makepkg.conf2016-01-30 00:40:01 UTC (rev 258691)
@@ -73,7 +73,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 
!optipng !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:  Strip symbols from binaries/libraries
@@ -84,9 +84,10 @@
 #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:  Remove files specified by PURGE_TARGETS
 #-- upx:Compress binary executable files using UPX
+#-- optipng:Optimize PNG images with optipng
 #-- 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 !optipng !upx 
!debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)

Modified: pacman.conf.i686
===
--- pacman.conf.i6862016-01-29 18:07:24 UTC (rev 258690)
+++ pacman.conf.i6862016-01-30 00:40:01 UTC (rev 258691)
@@ -14,6 +14,7 @@
 #CacheDir= /var/cache/pacman/pkg/
 #LogFile = /var/log/pacman.log
 #GPGDir  = /etc/pacman.d/gnupg/
+#HookDir = /etc/pacman.d/hooks/
 HoldPkg = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

Modified: pacman.conf.x86_64
===
--- pacman.conf.x86_64  2016-01-29 18:07:24 UTC (rev 258690)
+++ pacman.conf.x86_64  2016-01-30 00:40:01 UTC (rev 258691)
@@ -14,6 +14,7 @@
 #CacheDir= /var/cache/pacman/pkg/
 #LogFile = /var/log/pacman.log
 #GPGDir  = /etc/pacman.d/gnupg/
+#HookDir = /etc/pacman.d/hooks/
 HoldPkg = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

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

2012-06-02 Thread Gaetan Bisson 
Date: Sunday, June 3, 2012 @ 01:22:57
  Author: bisson
Revision: 160647

upgpkg: pacman 4.0.3-2

- enable signature verification in pacman.conf, pacman.conf.x86_64
- add post_install instructions to create and populate keyring
- add dependency on archlinux-keyring

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

+
 PKGBUILD   |8 
 pacman.conf|   23 +--
 pacman.conf.x86_64 |   25 ++---
 pacman.install |   10 ++
 4 files changed, 29 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-03 04:02:31 UTC (rev 160646)
+++ PKGBUILD2012-06-03 05:22:57 UTC (rev 160647)
@@ -5,14 +5,14 @@
 
 pkgname=pacman
 pkgver=4.0.3
-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')
 depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
- 'gpgme' 'pacman-mirrorlist')
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -24,8 +24,8 @@
 makepkg.conf)
 md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
  '1a70392526c8768470da678b31905a6e'
- '4605b3490d4fd1e5c6e20db17da9ded6'
- 'a0edf98ad1845a4c7d902a86638d5d2d'
+ '99734ea46795f466d41c503e9e23b6d4'
+ '556d49489e82b5750cf026d3b18c8f4f'
  '589cd34eb9d5b678455e8289394f523e')
 
 build() {

Modified: pacman.conf
===
--- pacman.conf 2012-06-03 04:02:31 UTC (rev 160646)
+++ pacman.conf 2012-06-03 05:22:57 UTC (rev 160647)
@@ -36,19 +36,14 @@
 CheckSpace
 #VerbosePkgLists
 
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
 #SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
 
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file
@@ -77,11 +72,11 @@
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
@@ -89,7 +84,7 @@
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

Modified: pacman.conf.x86_64
===
--- pacman.conf.x86_64  2012-06-03 04:02:31 UTC (rev 160646)
+++ pacman.conf.x86_64  2012-06-03 05:22:57 UTC (rev 160647)
@@ -36,19 +36,14 @@
 CheckSpace
 #VerbosePkgLists
 
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
 #SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
 
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file
@@ -77,11 +72,11 @@
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist