[arch-commits] Commit in pacman/repos (12 files)

Pierre Schmitz pierre at archlinux.org
Sat Feb 11 11:50:16 UTC 2017


    Date: Saturday, February 11, 2017 @ 11:50:15
  Author: pierre
Revision: 288658

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pacman/repos/staging-i686/
  pacman/repos/staging-i686/PKGBUILD
    (from rev 288657, pacman/trunk/PKGBUILD)
  pacman/repos/staging-i686/makepkg.conf
    (from rev 288657, pacman/trunk/makepkg.conf)
  pacman/repos/staging-i686/pacman-5.0.1-roundup.patch
    (from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/staging-i686/pacman.conf.i686
    (from rev 288657, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-i686/pacman.conf.x86_64
    (from rev 288657, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/staging-x86_64/
  pacman/repos/staging-x86_64/PKGBUILD
    (from rev 288657, pacman/trunk/PKGBUILD)
  pacman/repos/staging-x86_64/makepkg.conf
    (from rev 288657, pacman/trunk/makepkg.conf)
  pacman/repos/staging-x86_64/pacman-5.0.1-roundup.patch
    (from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/staging-x86_64/pacman.conf.i686
    (from rev 288657, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-x86_64/pacman.conf.x86_64
    (from rev 288657, pacman/trunk/pacman.conf.x86_64)

-------------------------------------------+
 staging-i686/PKGBUILD                     |   99 +++++++++++++++
 staging-i686/makepkg.conf                 |  147 +++++++++++++++++++++++
 staging-i686/pacman-5.0.1-roundup.patch   |  174 ++++++++++++++++++++++++++++
 staging-i686/pacman.conf.i686             |   91 ++++++++++++++
 staging-i686/pacman.conf.x86_64           |  100 ++++++++++++++++
 staging-x86_64/PKGBUILD                   |   99 +++++++++++++++
 staging-x86_64/makepkg.conf               |  147 +++++++++++++++++++++++
 staging-x86_64/pacman-5.0.1-roundup.patch |  174 ++++++++++++++++++++++++++++
 staging-x86_64/pacman.conf.i686           |   91 ++++++++++++++
 staging-x86_64/pacman.conf.x86_64         |  100 ++++++++++++++++
 10 files changed, 1222 insertions(+)

Copied: pacman/repos/staging-i686/PKGBUILD (from rev 288657, pacman/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,99 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=pacman
+pkgver=5.0.1
+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' 'base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+         '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')
+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 <allan at archlinux.org>
+
+
+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"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-doc \
+    --with-scriptlet-shell=/usr/bin/bash \
+    --with-ldconfig=/usr/bin/ldconfig
+  make V=1
+  make -C contrib 
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  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)
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686"
+      ;;
+    x86_64)
+      mycarch="x86_64"
+      mychost="x86_64-pc-linux-gnu"
+      myflags="-march=x86-64"
+      ;;
+  esac
+
+  # set things correctly in the default conf file
+  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"
+
+  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"
+}

Copied: pacman/repos/staging-i686/makepkg.conf (from rev 288657, pacman/trunk/makepkg.conf)
===================================================================
--- staging-i686/makepkg.conf	                        (rev 0)
+++ staging-i686/makepkg.conf	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,147 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+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 --no-motd -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/wget
+
+#-- The package required by makepkg to download VCS sources
+#  Format: 'protocol::package'
+VCSCLIENTS=('bzr::bzr'
+            'git::git'
+            'hg::mercurial'
+            'svn::subversion')
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
+
+#-- Compiler and Linker Flags
+# -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"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
+#
+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.
+#DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# 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
+#-- docs:       Save doc directories specified by DOC_DIRS
+#-- libtool:    Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs:  Leave empty directories in packages
+#-- 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 !optipng !upx !debug)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#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 <john at doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
+
+#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+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
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:

Copied: pacman/repos/staging-i686/pacman-5.0.1-roundup.patch (from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
===================================================================
--- staging-i686/pacman-5.0.1-roundup.patch	                        (rev 0)
+++ staging-i686/pacman-5.0.1-roundup.patch	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,174 @@
+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
++++ b/scripts/libmakepkg/tidy/emptydirs.sh.in
+@@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs')
+ tidy_emptydirs() {
+ 	if check_option "emptydirs" "n"; then
+ 		msg2 "$(gettext "Removing empty directories...")"
+-		find . -depth -type d -exec rmdir '{}' + 2>/dev/null
++		# we are unable to use '-empty' as it is non-POSIX and not support by all find variants
++		find . -depth -type d -exec rmdir '{}' \; 2>/dev/null
+ 	fi
+ }
+diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
+index 675e75d..f9f1c20 100644
+--- a/scripts/libmakepkg/util/util.sh
++++ b/scripts/libmakepkg/util/util.sh
+@@ -46,7 +46,7 @@ is_array() {
+ 	local shellopts=$(shopt -p)
+ 	shopt -s extglob
+ 
+-	if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
++	if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
+ 		ret=0
+ 	fi
+ 
+diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
+index 30d2704..0db0952 100644
+--- a/scripts/pacman-key.sh.in
++++ b/scripts/pacman-key.sh.in
+@@ -483,7 +483,7 @@ verify_sig() {
+ 	local ret=0
+ 	for sig; do
+ 		msg "Checking %s..." "$sig"
+-		if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE)$'; then
++		if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE).*$'; then
+ 			error "$(gettext "The signature identified by %s could not be verified.")" "$sig"
+ 			ret=1
+ 		fi
+diff --git a/src/pacman/check.c b/src/pacman/check.c
+index 0fe74e8..d282cc2 100644
+--- a/src/pacman/check.c
++++ b/src/pacman/check.c
+@@ -254,7 +254,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 	const char *root, *pkgname;
+ 	size_t errors = 0;
+ 	size_t rootlen;
+-	char filepath[PATH_MAX];
+ 	struct archive *mtree;
+ 	struct archive_entry *entry = NULL;
+ 	size_t file_count = 0;
+@@ -267,7 +266,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 		pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, "");
+ 		return 1;
+ 	}
+-	strcpy(filepath, root);
+ 
+ 	pkgname = alpm_pkg_get_name(pkg);
+ 	mtree = alpm_pkg_mtree_open(pkg);
+@@ -282,6 +280,8 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 	while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) {
+ 		struct stat st;
+ 		const char *path = archive_entry_pathname(entry);
++		char filepath[PATH_MAX];
++		int filepath_len;
+ 		mode_t type;
+ 		size_t file_errors = 0;
+ 		int backup = 0;
+@@ -292,31 +292,37 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 			path += 2;
+ 		}
+ 
+-		if(strcmp(path, ".INSTALL") == 0) {
+-			char filename[PATH_MAX];
+-			snprintf(filename, PATH_MAX, "%slocal/%s-%s/install",
+-					alpm_option_get_dbpath(config->handle) + 1,
+-					pkgname, alpm_pkg_get_version(pkg));
+-			archive_entry_set_pathname(entry, filename);
+-			path = archive_entry_pathname(entry);
+-		} else if(strcmp(path, ".CHANGELOG") == 0) {
+-			char filename[PATH_MAX];
+-			snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog",
+-					alpm_option_get_dbpath(config->handle) + 1,
+-					pkgname, alpm_pkg_get_version(pkg));
+-			archive_entry_set_pathname(entry, filename);
+-			path = archive_entry_pathname(entry);
+-		} else if(*path == '.') {
+-			continue;
+-		}
++		if(*path == '.') {
++			const char *dbfile = NULL;
+ 
+-		file_count++;
++			if(strcmp(path, ".INSTALL") == 0) {
++				dbfile = "install";
++			} else if(strcmp(path, ".CHANGELOG") == 0) {
++				dbfile = "changelog";
++			} else {
++				continue;
++			}
+ 
+-		if(rootlen + 1 + strlen(path) > PATH_MAX) {
+-			pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
+-			continue;
++			/* Do not append root directory as alpm_option_get_dbpath is already
++			 * an absoute path */
++			filepath_len = snprintf(filepath, PATH_MAX, "%slocal/%s-%s/%s",
++					alpm_option_get_dbpath(config->handle),
++					pkgname, alpm_pkg_get_version(pkg), dbfile);
++			if(filepath_len >= PATH_MAX) {
++				pm_printf(ALPM_LOG_WARNING, _("path too long: %slocal/%s-%s/%s\n"),
++						alpm_option_get_dbpath(config->handle),
++						pkgname, alpm_pkg_get_version(pkg), dbfile);
++				continue;
++			}
++		} else {
++			filepath_len = snprintf(filepath, PATH_MAX, "%s%s", root, path);
++			if(filepath_len >= PATH_MAX) {
++				pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
++				continue;
++			}
+ 		}
+-		strcpy(filepath + rootlen, path);
++
++		file_count++;
+ 
+ 		exists = check_file_exists(pkgname, filepath, rootlen, &st);
+ 		if(exists == 1) {

Copied: pacman/repos/staging-i686/pacman.conf.i686 (from rev 288657, pacman/trunk/pacman.conf.i686)
===================================================================
--- staging-i686/pacman.conf.i686	                        (rev 0)
+++ staging-i686/pacman.conf.i686	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,91 @@
+#
+# /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
+#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
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# 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    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# 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
+#   - 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
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

Copied: pacman/repos/staging-i686/pacman.conf.x86_64 (from rev 288657, pacman/trunk/pacman.conf.x86_64)
===================================================================
--- staging-i686/pacman.conf.x86_64	                        (rev 0)
+++ staging-i686/pacman.conf.x86_64	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,100 @@
+#
+# /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
+#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
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# 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    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# 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
+#   - 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 repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[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]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

Copied: pacman/repos/staging-x86_64/PKGBUILD (from rev 288657, pacman/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,99 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=pacman
+pkgver=5.0.1
+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' 'base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+         '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')
+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 <allan at archlinux.org>
+
+
+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"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-doc \
+    --with-scriptlet-shell=/usr/bin/bash \
+    --with-ldconfig=/usr/bin/ldconfig
+  make V=1
+  make -C contrib 
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  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)
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686"
+      ;;
+    x86_64)
+      mycarch="x86_64"
+      mychost="x86_64-pc-linux-gnu"
+      myflags="-march=x86-64"
+      ;;
+  esac
+
+  # set things correctly in the default conf file
+  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"
+
+  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"
+}

Copied: pacman/repos/staging-x86_64/makepkg.conf (from rev 288657, pacman/trunk/makepkg.conf)
===================================================================
--- staging-x86_64/makepkg.conf	                        (rev 0)
+++ staging-x86_64/makepkg.conf	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,147 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+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 --no-motd -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/wget
+
+#-- The package required by makepkg to download VCS sources
+#  Format: 'protocol::package'
+VCSCLIENTS=('bzr::bzr'
+            'git::git'
+            'hg::mercurial'
+            'svn::subversion')
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
+
+#-- Compiler and Linker Flags
+# -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"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
+#
+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.
+#DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# 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
+#-- docs:       Save doc directories specified by DOC_DIRS
+#-- libtool:    Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs:  Leave empty directories in packages
+#-- 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 !optipng !upx !debug)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#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 <john at doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
+
+#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+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
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:

Copied: pacman/repos/staging-x86_64/pacman-5.0.1-roundup.patch (from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
===================================================================
--- staging-x86_64/pacman-5.0.1-roundup.patch	                        (rev 0)
+++ staging-x86_64/pacman-5.0.1-roundup.patch	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,174 @@
+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
++++ b/scripts/libmakepkg/tidy/emptydirs.sh.in
+@@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs')
+ tidy_emptydirs() {
+ 	if check_option "emptydirs" "n"; then
+ 		msg2 "$(gettext "Removing empty directories...")"
+-		find . -depth -type d -exec rmdir '{}' + 2>/dev/null
++		# we are unable to use '-empty' as it is non-POSIX and not support by all find variants
++		find . -depth -type d -exec rmdir '{}' \; 2>/dev/null
+ 	fi
+ }
+diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
+index 675e75d..f9f1c20 100644
+--- a/scripts/libmakepkg/util/util.sh
++++ b/scripts/libmakepkg/util/util.sh
+@@ -46,7 +46,7 @@ is_array() {
+ 	local shellopts=$(shopt -p)
+ 	shopt -s extglob
+ 
+-	if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
++	if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
+ 		ret=0
+ 	fi
+ 
+diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
+index 30d2704..0db0952 100644
+--- a/scripts/pacman-key.sh.in
++++ b/scripts/pacman-key.sh.in
+@@ -483,7 +483,7 @@ verify_sig() {
+ 	local ret=0
+ 	for sig; do
+ 		msg "Checking %s..." "$sig"
+-		if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE)$'; then
++		if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE).*$'; then
+ 			error "$(gettext "The signature identified by %s could not be verified.")" "$sig"
+ 			ret=1
+ 		fi
+diff --git a/src/pacman/check.c b/src/pacman/check.c
+index 0fe74e8..d282cc2 100644
+--- a/src/pacman/check.c
++++ b/src/pacman/check.c
+@@ -254,7 +254,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 	const char *root, *pkgname;
+ 	size_t errors = 0;
+ 	size_t rootlen;
+-	char filepath[PATH_MAX];
+ 	struct archive *mtree;
+ 	struct archive_entry *entry = NULL;
+ 	size_t file_count = 0;
+@@ -267,7 +266,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 		pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, "");
+ 		return 1;
+ 	}
+-	strcpy(filepath, root);
+ 
+ 	pkgname = alpm_pkg_get_name(pkg);
+ 	mtree = alpm_pkg_mtree_open(pkg);
+@@ -282,6 +280,8 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 	while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) {
+ 		struct stat st;
+ 		const char *path = archive_entry_pathname(entry);
++		char filepath[PATH_MAX];
++		int filepath_len;
+ 		mode_t type;
+ 		size_t file_errors = 0;
+ 		int backup = 0;
+@@ -292,31 +292,37 @@ int check_pkg_full(alpm_pkg_t *pkg)
+ 			path += 2;
+ 		}
+ 
+-		if(strcmp(path, ".INSTALL") == 0) {
+-			char filename[PATH_MAX];
+-			snprintf(filename, PATH_MAX, "%slocal/%s-%s/install",
+-					alpm_option_get_dbpath(config->handle) + 1,
+-					pkgname, alpm_pkg_get_version(pkg));
+-			archive_entry_set_pathname(entry, filename);
+-			path = archive_entry_pathname(entry);
+-		} else if(strcmp(path, ".CHANGELOG") == 0) {
+-			char filename[PATH_MAX];
+-			snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog",
+-					alpm_option_get_dbpath(config->handle) + 1,
+-					pkgname, alpm_pkg_get_version(pkg));
+-			archive_entry_set_pathname(entry, filename);
+-			path = archive_entry_pathname(entry);
+-		} else if(*path == '.') {
+-			continue;
+-		}
++		if(*path == '.') {
++			const char *dbfile = NULL;
+ 
+-		file_count++;
++			if(strcmp(path, ".INSTALL") == 0) {
++				dbfile = "install";
++			} else if(strcmp(path, ".CHANGELOG") == 0) {
++				dbfile = "changelog";
++			} else {
++				continue;
++			}
+ 
+-		if(rootlen + 1 + strlen(path) > PATH_MAX) {
+-			pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
+-			continue;
++			/* Do not append root directory as alpm_option_get_dbpath is already
++			 * an absoute path */
++			filepath_len = snprintf(filepath, PATH_MAX, "%slocal/%s-%s/%s",
++					alpm_option_get_dbpath(config->handle),
++					pkgname, alpm_pkg_get_version(pkg), dbfile);
++			if(filepath_len >= PATH_MAX) {
++				pm_printf(ALPM_LOG_WARNING, _("path too long: %slocal/%s-%s/%s\n"),
++						alpm_option_get_dbpath(config->handle),
++						pkgname, alpm_pkg_get_version(pkg), dbfile);
++				continue;
++			}
++		} else {
++			filepath_len = snprintf(filepath, PATH_MAX, "%s%s", root, path);
++			if(filepath_len >= PATH_MAX) {
++				pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
++				continue;
++			}
+ 		}
+-		strcpy(filepath + rootlen, path);
++
++		file_count++;
+ 
+ 		exists = check_file_exists(pkgname, filepath, rootlen, &st);
+ 		if(exists == 1) {

Copied: pacman/repos/staging-x86_64/pacman.conf.i686 (from rev 288657, pacman/trunk/pacman.conf.i686)
===================================================================
--- staging-x86_64/pacman.conf.i686	                        (rev 0)
+++ staging-x86_64/pacman.conf.i686	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,91 @@
+#
+# /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
+#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
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# 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    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# 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
+#   - 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
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

Copied: pacman/repos/staging-x86_64/pacman.conf.x86_64 (from rev 288657, pacman/trunk/pacman.conf.x86_64)
===================================================================
--- staging-x86_64/pacman.conf.x86_64	                        (rev 0)
+++ staging-x86_64/pacman.conf.x86_64	2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,100 @@
+#
+# /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
+#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
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# 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    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# 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
+#   - 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 repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[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]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs



More information about the arch-commits mailing list