Date: Monday, December 22, 2014 @ 05:13:47 Author: allan Revision: 227922
archrelease: copy trunk to testing-i686, testing-x86_64 Added: pacman/repos/testing-i686/ pacman/repos/testing-i686/PKGBUILD (from rev 227921, pacman/trunk/PKGBUILD) pacman/repos/testing-i686/makepkg.conf (from rev 227921, pacman/trunk/makepkg.conf) pacman/repos/testing-i686/pacman-4.2.0-roundup.patch (from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch) pacman/repos/testing-i686/pacman.conf.i686 (from rev 227921, pacman/trunk/pacman.conf.i686) pacman/repos/testing-i686/pacman.conf.x86_64 (from rev 227921, pacman/trunk/pacman.conf.x86_64) pacman/repos/testing-x86_64/ pacman/repos/testing-x86_64/PKGBUILD (from rev 227921, pacman/trunk/PKGBUILD) pacman/repos/testing-x86_64/makepkg.conf (from rev 227921, pacman/trunk/makepkg.conf) pacman/repos/testing-x86_64/pacman-4.2.0-roundup.patch (from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch) pacman/repos/testing-x86_64/pacman.conf.i686 (from rev 227921, pacman/trunk/pacman.conf.i686) pacman/repos/testing-x86_64/pacman.conf.x86_64 (from rev 227921, pacman/trunk/pacman.conf.x86_64) -------------------------------------------+ testing-i686/PKGBUILD | 98 ++++++++++++++++++ testing-i686/makepkg.conf | 146 ++++++++++++++++++++++++++++ testing-i686/pacman-4.2.0-roundup.patch | 94 ++++++++++++++++++ testing-i686/pacman.conf.i686 | 90 +++++++++++++++++ testing-i686/pacman.conf.x86_64 | 99 ++++++++++++++++++ testing-x86_64/PKGBUILD | 98 ++++++++++++++++++ testing-x86_64/makepkg.conf | 146 ++++++++++++++++++++++++++++ testing-x86_64/pacman-4.2.0-roundup.patch | 94 ++++++++++++++++++ testing-x86_64/pacman.conf.i686 | 90 +++++++++++++++++ testing-x86_64/pacman.conf.x86_64 | 99 ++++++++++++++++++ 10 files changed, 1054 insertions(+) Copied: pacman/repos/testing-i686/PKGBUILD (from rev 227921, pacman/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,98 @@ +# vim: set ts=2 sw=2 et: +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> +# Maintainer: Dave Reisner <dreis...@archlinux.org> + +pkgname=pacman +pkgver=4.2.0 +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' 'base-devel') +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') +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 + makepkg.conf + pacman-4.2.0-roundup.patch) +md5sums=('184ce14f1f326fede72012cca51bba51' + 'SKIP' + '2db6c94709bb30cc614a176ecf8badb1' + 'de74a13618347f08ae4a9637f74471c4' + '0d07f2a750ba20d114c3adc799d371de' + 'e98459a565bb4e199695f9c319d7d52d') +validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <al...@archlinux.org> + +prepare() { + cd "$pkgname-$pkgver" + + # v4.2.0..c8448bb4 + patch -p1 -i $srcdir/pacman-4.2.0-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 + 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-unknown-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/testing-i686/makepkg.conf (from rev 227921, pacman/trunk/makepkg.conf) =================================================================== --- testing-i686/makepkg.conf (rev 0) +++ testing-i686/makepkg.conf 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,146 @@ +# +# /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 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 --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" +#-- 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 !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 +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !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 <j...@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/testing-i686/pacman-4.2.0-roundup.patch (from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch) =================================================================== --- testing-i686/pacman-4.2.0-roundup.patch (rev 0) +++ testing-i686/pacman-4.2.0-roundup.patch 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,94 @@ +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/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..60276f6 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -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\ +-catastrophic damage to your system.")" ++catastrophic damage to your system.")" "makepkg" + exit 1 # $E_USER_ABORT + fi + else Copied: pacman/repos/testing-i686/pacman.conf.i686 (from rev 227921, pacman/trunk/pacman.conf.i686) =================================================================== --- testing-i686/pacman.conf.i686 (rev 0) +++ testing-i686/pacman.conf.i686 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,90 @@ +# +# /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/ +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/testing-i686/pacman.conf.x86_64 (from rev 227921, pacman/trunk/pacman.conf.x86_64) =================================================================== --- testing-i686/pacman.conf.x86_64 (rev 0) +++ testing-i686/pacman.conf.x86_64 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,99 @@ +# +# /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/ +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/testing-x86_64/PKGBUILD (from rev 227921, pacman/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,98 @@ +# vim: set ts=2 sw=2 et: +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> +# Maintainer: Dave Reisner <dreis...@archlinux.org> + +pkgname=pacman +pkgver=4.2.0 +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' 'base-devel') +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') +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 + makepkg.conf + pacman-4.2.0-roundup.patch) +md5sums=('184ce14f1f326fede72012cca51bba51' + 'SKIP' + '2db6c94709bb30cc614a176ecf8badb1' + 'de74a13618347f08ae4a9637f74471c4' + '0d07f2a750ba20d114c3adc799d371de' + 'e98459a565bb4e199695f9c319d7d52d') +validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <al...@archlinux.org> + +prepare() { + cd "$pkgname-$pkgver" + + # v4.2.0..c8448bb4 + patch -p1 -i $srcdir/pacman-4.2.0-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 + 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-unknown-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/testing-x86_64/makepkg.conf (from rev 227921, pacman/trunk/makepkg.conf) =================================================================== --- testing-x86_64/makepkg.conf (rev 0) +++ testing-x86_64/makepkg.conf 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,146 @@ +# +# /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 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 --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" +#-- 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 !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 +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !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 <j...@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/testing-x86_64/pacman-4.2.0-roundup.patch (from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch) =================================================================== --- testing-x86_64/pacman-4.2.0-roundup.patch (rev 0) +++ testing-x86_64/pacman-4.2.0-roundup.patch 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,94 @@ +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/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..60276f6 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -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\ +-catastrophic damage to your system.")" ++catastrophic damage to your system.")" "makepkg" + exit 1 # $E_USER_ABORT + fi + else Copied: pacman/repos/testing-x86_64/pacman.conf.i686 (from rev 227921, pacman/trunk/pacman.conf.i686) =================================================================== --- testing-x86_64/pacman.conf.i686 (rev 0) +++ testing-x86_64/pacman.conf.i686 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,90 @@ +# +# /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/ +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/testing-x86_64/pacman.conf.x86_64 (from rev 227921, pacman/trunk/pacman.conf.x86_64) =================================================================== --- testing-x86_64/pacman.conf.x86_64 (rev 0) +++ testing-x86_64/pacman.conf.x86_64 2014-12-22 04:13:47 UTC (rev 227922) @@ -0,0 +1,99 @@ +# +# /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/ +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