Date: Monday, December 22, 2014 @ 05:08:00
Author: allan
Revision: 227919
upgpkg: pacman 4.2.0-3
fix typo in makepkg.conf, minor upstream patch update
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
pacman/trunk/pacman-4.2.0-roundup.patch
----------------------------+
PKGBUILD | 8 ++--
makepkg.conf | 8 ++--
pacman-4.2.0-roundup.patch | 72 +++++++++++++++++++++++++++++++++++++++++--
3 files changed, 78 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-22 03:29:32 UTC (rev 227918)
+++ PKGBUILD 2014-12-22 04:08:00 UTC (rev 227919)
@@ -5,7 +5,7 @@
pkgname=pacman
pkgver=4.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/";
@@ -29,14 +29,14 @@
'SKIP'
'2db6c94709bb30cc614a176ecf8badb1'
'de74a13618347f08ae4a9637f74471c4'
- '1172ef3e5fdd0badeef06713a5a35c12'
- '534122433af545f625ad583603c3751a')
+ '0d07f2a750ba20d114c3adc799d371de'
+ 'e98459a565bb4e199695f9c319d7d52d')
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae
<al...@archlinux.org>
prepare() {
cd "$pkgname-$pkgver"
- # v4.2.0..91a56a70
+ # v4.2.0..c8448bb4
patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
}
Modified: makepkg.conf
===================================================================
--- makepkg.conf 2014-12-22 03:29:32 UTC (rev 227918)
+++ makepkg.conf 2014-12-22 04:08:00 UTC (rev 227919)
@@ -21,10 +21,10 @@
#-- The the package required by makepkg to download VCS sources
# Format: 'protocol::package'
-VCSCLIENT=('bzr::bzr'
- 'git::git'
- 'hg::mercurial'
- 'svn::subversion')
+VCSCLIENTS=('bzr::bzr'
+ 'git::git'
+ 'hg::mercurial'
+ 'svn::subversion')
#########################################################################
# ARCHITECTURE, COMPILE FLAGS
Modified: pacman-4.2.0-roundup.patch
===================================================================
--- pacman-4.2.0-roundup.patch 2014-12-22 03:29:32 UTC (rev 227918)
+++ pacman-4.2.0-roundup.patch 2014-12-22 04:08:00 UTC (rev 227919)
@@ -11,11 +11,79 @@
echo
printf "List all packages installed from a given repository\n"
"${myname}"
echo
+diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
+index 712ca60..9ed7ef9 100644
+--- a/etc/makepkg.conf.in
++++ b/etc/makepkg.conf.in
+@@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3
--retry-delay 3 -o %o
+ # /usr/bin/lftpget -c
+ # /usr/bin/wget
+
++#-- The the package required by makepkg to download VCS sources
++# Format: 'protocol::package'
++VCSCLIENTS=('bzr::bzr'
++ 'git::git'
++ 'hg::mercurial'
++ 'svn::subversion')
++
+ #########################################################################
+ # ARCHITECTURE, COMPILE FLAGS
+ #########################################################################
+diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
+index 6e6d944..d9da167 100755
+--- a/scripts/makepkg-template.pl.in
++++ b/scripts/makepkg-template.pl.in
+@@ -70,7 +70,7 @@ sub parse_template_line {
+ foreach my $element (@elements) {
+ my ($key, $val) = ($element =~ /^([a-z0-9]+)=(.*)$/);
+ unless ($key and $val) {
+- die gettext("invalid key/value pair\n%s:%s: %s"),
++ die gettext("invalid key/value pair\n"),
+ "$filename:$linenumber: $line";
+ }
+ $values{$key} = $val;
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 33dff24..23e70cd 100644
+index 33dff24..60276f6 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
-@@ -3435,7 +3435,7 @@ CARCH=${_CARCH:-$CARCH}
+@@ -2896,7 +2896,7 @@ get_vcsclient() {
+ }
+
+ check_vcs_software() {
+- local ret=0
++ local all_sources all_deps deps ret=0
+
+ if (( SOURCEONLY == 1 )); then
+ # we will not download VCS sources
+@@ -2908,7 +2908,17 @@ check_vcs_software() {
+ return $ret
+ fi
+
+- for netfile in ${source[@]}; do
++ # we currently only use global depends/makedepends arrays for --syncdeps
++ for attr in depends makedepends; do
++ pkgbuild_get_attribute "$pkg" "$attr" 1 'deps'
++ all_deps+=("${deps[@]}")
++
++ pkgbuild_get_attribute "$pkg" "${attr}_$CARCH" 1 'deps'
++ all_deps+=("${deps[@]}")
++ done
++
++ get_all_sources_for_arch 'all_sources'
++ for netfile in ${all_sources[@]}; do
+ local proto=$(get_protocol "$netfile")
+
+ case $proto in
+@@ -2921,7 +2931,7 @@ check_vcs_software() {
+ uninstalled="$(set +E; check_deps
$client)" || exit 1
+ # if not installed, check presence in
depends or makedepends
+ if [[ -n "$uninstalled" ]] && (( !
NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
+- if ! in_array "$client"
${depends[@]} ${makedepends[@]}; then
++ if ! in_array "$client"
${alldeps[@]}; then
+ error "$(gettext
"Cannot find the %s package needed to handle %s sources.")" \
+
"$client" "${proto%%+*}"
+ ret=1
+@@ -3435,7 +3445,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\
