Date: Thursday, October 13, 2011 @ 13:40:33 Author: dan Revision: 140412
Initial stab at 4.0 update Modified: pacman/trunk/PKGBUILD pacman/trunk/makepkg.conf pacman/trunk/pacman.conf pacman/trunk/pacman.conf.x86_64 Deleted: pacman/trunk/0001-makepkg-fix-removing-symbolic-link.patch -----------------------------------------------+ 0001-makepkg-fix-removing-symbolic-link.patch | 32 ------------------------ PKGBUILD | 24 ++++++++---------- makepkg.conf | 25 ++++++++++++------ pacman.conf | 21 ++++++++++++--- pacman.conf.x86_64 | 21 ++++++++++++--- 5 files changed, 61 insertions(+), 62 deletions(-) Deleted: 0001-makepkg-fix-removing-symbolic-link.patch =================================================================== --- 0001-makepkg-fix-removing-symbolic-link.patch 2011-10-13 03:56:02 UTC (rev 140411) +++ 0001-makepkg-fix-removing-symbolic-link.patch 2011-10-13 17:40:33 UTC (rev 140412) @@ -1,32 +0,0 @@ -From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001 -From: Allan McRae <al...@archlinux.org> -Date: Tue, 28 Jun 2011 22:47:35 +1000 -Subject: [PATCH] makepkg: fix removing symbolic link - -The path was not being stripped from $file before prefixing with -$srcdir resulting in the attempted removal of a very weird -filename. - -Signed-off-by: Allan McRae <al...@archlinux.org> -Signed-off-by: Dan McGee <d...@archlinux.org> -(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c) ---- - scripts/makepkg.sh.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 3ace945..b0b0882 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -509,7 +509,7 @@ download_sources() { - local file=$(get_filepath "$netfile" || true) - if [[ -n "$file" ]]; then - msg2 "$(gettext "Found %s")" "${file##*/}" -- rm -f "$srcdir/$file" -+ rm -f "$srcdir/${file##*/}" - ln -s "$file" "$srcdir/" - continue - fi --- -1.7.6 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-13 03:56:02 UTC (rev 140411) +++ PKGBUILD 2011-10-13 17:40:33 UTC (rev 140412) @@ -1,15 +1,17 @@ # $Id$ # Maintainer: Dan McGee <d...@archlinux.org> +# Maintainer: Dave Reisner <d...@archlinux.org> pkgname=pacman -pkgver=3.5.4 -pkgrel=4 +pkgver=4.0.0 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') -depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'curl' + 'gpgme' 'pacman-mirrorlist') optdepends=('fakeroot: for makepkg usage as normal user' 'curl: for rankmirrors usage') backup=(etc/pacman.conf etc/makepkg.conf) @@ -18,13 +20,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 - makepkg.conf - 0001-makepkg-fix-removing-symbolic-link.patch) -md5sums=('2dd3a85d55ee3dd89abd349aa837447c' - 'e99eb721b6b704f68c5f47468507c102' - 'f8b939d9b2beb79a0436961a2d707d7c' - 'c034b061c86b3f26a9646cf8efc7ff11' - '749a4ddc6d8418d8d031f1c9b4e09d6f') + makepkg.conf) +md5sums=('8c97f4804d2a0847956c45888b0ea517' + 'ae4abf6df12483d26b39529ab27c0837' + '99d8fae7a3c761e3ebad800f6a216e83' + 'db051afbd12993b7743ccd4d58668499') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -32,10 +32,8 @@ build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 < "$srcdir/0001-makepkg-fix-removing-symbolic-link.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc + --localstatedir=/var --enable-doc --enable-debug make } Modified: makepkg.conf =================================================================== --- makepkg.conf 2011-10-13 03:56:02 UTC (rev 140411) +++ makepkg.conf 2011-10-13 17:40:33 UTC (rev 140412) @@ -8,16 +8,16 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' +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 -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: # /usr/bin/snarf # /usr/bin/lftpget -c -# /usr/bin/curl +# /usr/bin/wget ######################################################################### # ARCHITECTURE, COMPILE FLAGS @@ -26,7 +26,7 @@ CARCH="@CARCH@" CHOST="@CHOST@" -#-- Exclusive: will only run on @CARCH@ +#-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" @@ -39,7 +39,7 @@ # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user @@ -47,19 +47,23 @@ #-- 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=(fakeroot !distcc color !ccache check) +BUILDENV=(fakeroot !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 emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -68,8 +72,9 @@ #-- 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 # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -100,6 +105,8 @@ #SRCPKGDEST=/home/srcpackages #-- 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="" ######################################################################### # EXTENSION DEFAULTS Modified: pacman.conf =================================================================== --- pacman.conf 2011-10-13 03:56:02 UTC (rev 140411) +++ pacman.conf 2011-10-13 17:40:33 UTC (rev 140412) @@ -13,11 +13,12 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -28,13 +29,24 @@ #NoUpgrade = #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload -#CheckSpace +CheckSpace +#VerbosePkgLists +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll + # # REPOSITORIES # - can be defined here or included from another file @@ -76,5 +88,6 @@ # 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 Modified: pacman.conf.x86_64 =================================================================== --- pacman.conf.x86_64 2011-10-13 03:56:02 UTC (rev 140411) +++ pacman.conf.x86_64 2011-10-13 17:40:33 UTC (rev 140412) @@ -13,11 +13,12 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -28,13 +29,24 @@ #NoUpgrade = #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload -#CheckSpace +CheckSpace +#VerbosePkgLists +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll + # # REPOSITORIES # - can be defined here or included from another file @@ -85,5 +97,6 @@ # 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