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

[Allan McRae]

    Date: Sunday, December 21, 2014 @ 08:10:07
  Author: allan
Revision: 227857

upgpkg: pacman 4.2.0-2

add needed vcs handlers to makepkg.conf, pull upstream roundup patch

Added:
  pacman/trunk/pacman-4.2.0-roundup.patch
Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf

----------------------------+
 PKGBUILD                   |   15 ++++++++++++---
 makepkg.conf               |   12 +++++++++---
 pacman-4.2.0-roundup.patch |   26 ++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-21 04:39:44 UTC (rev 227856)
+++ PKGBUILD	2014-12-21 07:10:07 UTC (rev 227857)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -23,14 +23,23 @@
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.i686
         pacman.conf.x86_64
-        makepkg.conf)
+        makepkg.conf
+        pacman-4.2.0-roundup.patch)
 md5sums=('184ce14f1f326fede72012cca51bba51'
          'SKIP'
          '2db6c94709bb30cc614a176ecf8badb1'
          'de74a13618347f08ae4a9637f74471c4'
-         '2da6544e387f940588a90cb4b9b914e2')
+         '1172ef3e5fdd0badeef06713a5a35c12'
+         '534122433af545f625ad583603c3751a')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan at archlinux.org>
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  
+  # v4.2.0..91a56a70
+  patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
 

Modified: makepkg.conf
===================================================================
--- makepkg.conf	2014-12-21 04:39:44 UTC (rev 227856)
+++ makepkg.conf	2014-12-21 07:10:07 UTC (rev 227857)
@@ -19,6 +19,13 @@
 # /usr/bin/lftpget -c
 # /usr/bin/wget
 
+#-- The the package required by makepkg to download VCS sources
+#  Format: 'protocol::package'
+VCSCLIENT=('bzr::bzr'
+           'git::git'
+           'hg::mercurial'
+           'svn::subversion')
+
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
@@ -43,10 +50,9 @@
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
-#-- fakeroot: Allow building packages as a non-root user
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
@@ -53,7 +59,7 @@
 #-- check:    Run the check() function if present in the PKGBUILD
 #-- sign:     Generate PGP signature file
 #
-BUILDENV=(fakeroot !distcc color !ccache check !sign)
+BUILDENV=(!distcc color !ccache check !sign)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.

Added: pacman-4.2.0-roundup.patch
===================================================================
--- pacman-4.2.0-roundup.patch	                        (rev 0)
+++ pacman-4.2.0-roundup.patch	2014-12-21 07:10:07 UTC (rev 227857)
@@ -0,0 +1,26 @@
+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/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index 33dff24..23e70cd 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -3435,7 +3435,7 @@ CARCH=${_CARCH:-$CARCH}
+ if (( ! INFAKEROOT )); then
+ 	if (( EUID == 0 )); then
+ 		error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
+-catastrophic damage to your system.")"
++catastrophic damage to your system.")" "makepkg"
+ 		exit 1 # $E_USER_ABORT
+ 	fi
+ else