Date: Wednesday, March 16, 2011 @ 14:36:44 Author: dan Revision: 115075
upgpkg: pacman 3.5.0-1 version bump 3.5.0 Modified: pacman/trunk/PKGBUILD pacman/trunk/makepkg.conf pacman/trunk/pacman.conf pacman/trunk/pacman.conf.x86_64 pacman/trunk/pacman.install --------------------+ PKGBUILD | 15 ++++++++------- makepkg.conf | 9 ++++----- pacman.conf | 3 ++- pacman.conf.x86_64 | 3 ++- pacman.install | 27 ++++++++++++++++++--------- 5 files changed, 34 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-03-16 18:00:13 UTC (rev 115074) +++ PKGBUILD 2011-03-16 18:36:44 UTC (rev 115075) @@ -2,14 +2,14 @@ # Maintainer: Dan McGee <d...@archlinux.org> pkgname=pacman -pkgver=3.4.3 +pkgver=3.5.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' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') +depends=('bash' 'libarchive>=2.8.0' 'libfetch>=2.28' 'pacman-mirrorlist') optdepends=('fakeroot: for makepkg usage as normal user' 'curl: for rankmirrors usage') backup=(etc/pacman.conf etc/makepkg.conf) @@ -19,17 +19,18 @@ pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('3656a4a05346e28bafa5342879fa278a' - 'eda9cbdb47f85fabda2e7e63801e3e16' - '9ba146b4fa7bcb3cc18204b06d1f6157' - '5beebe36bfc1e1f677d5ae12fcff8083') +md5sums=('6cd87230cf77b8a83d1c1f093ea5cc64' + 'e99eb721b6b704f68c5f47468507c102' + '28e6a1f97ed3c47a3961ad00d2a43822' + 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc make } Modified: makepkg.conf =================================================================== --- makepkg.conf 2011-03-16 18:00:13 UTC (rev 115074) +++ makepkg.conf 2011-03-16 18:36:44 UTC (rev 115075) @@ -39,15 +39,16 @@ # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. @@ -61,7 +62,7 @@ # Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages @@ -82,8 +83,6 @@ 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}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,lib32,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) Modified: pacman.conf =================================================================== --- pacman.conf 2011-03-16 18:00:13 UTC (rev 115074) +++ pacman.conf 2011-03-16 18:36:44 UTC (rev 115075) @@ -17,7 +17,7 @@ # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES Modified: pacman.conf.x86_64 =================================================================== --- pacman.conf.x86_64 2011-03-16 18:00:13 UTC (rev 115074) +++ pacman.conf.x86_64 2011-03-16 18:36:44 UTC (rev 115075) @@ -17,7 +17,7 @@ # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES Modified: pacman.install =================================================================== --- pacman.install 2011-03-16 18:00:13 UTC (rev 115074) +++ pacman.install 2011-03-16 18:36:44 UTC (rev 115075) @@ -2,19 +2,28 @@ # arg 1: the new package version # arg 2: the old package version post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi } +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" +} + _resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" - # path variables + # path variables pacconf="/etc/pacman.conf" dbpath="/var/lib/pacman/local"