core/pacman to 3.5.1-1

core/pacman/PKGBUILD

@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 107252 2011-01-22 20:53:38Z dan $
+# $Id: PKGBUILD 116411 2011-03-23 16:23:20Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 # PlugApps: Kevin Mihelich <kevin@plugapps.com>
-#  - Updated steps for ARM and PlugApps
+#  - arch/host/flags for arm
-#  - libarchive >= current as of 7 Mar 2011
+#  - depend on current versions of libarchive, libfetch, xz to fix upgrade issues
-#  - added dep of xz >= current as of 7 Mar 2011
+#  - pacman.conf: architecture=arm, added our aur repo
+#  - makepkg.conf: add --no-check-certificate to http wget, adjusted C/CXX/LDFLAGS
 
 plugrel=1
 
 pkgname=pacman
-pkgver=3.4.3
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('arm')
@@ -25,16 +26,17 @@ options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         makepkg.conf)
-md5sums=('3656a4a05346e28bafa5342879fa278a'
+md5sums=('6e609a6cf0af2a49a0f8b35fc2459131'
-         'dacb1aedacf56fb11e0dea22f7a1d519'
+         '8a202e08a4e9ffe978c6aa6358e1b640'
-         'a267116d3b4fd28daf98416f45739a27')
+         'da2e78190c8677e3df4ed9744bc22e7e')
 
 # 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
 }
 
@@ -45,10 +47,9 @@ package() {
   # install Arch specific stuff
   mkdir -p $pkgdir/etc
   install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-
   mycarch="arm"
   mychost="arm-unknown-linux-gnueabi"
-  myflags="-march=armv5te"
+  myflags="-march=armv5te "
 
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
   # set things correctly in the default conf file

core/pacman/makepkg.conf

@@ -9,7 +9,7 @@
 #-- 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'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
           'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
           'rsync::/usr/bin/rsync -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
@@ -29,8 +29,8 @@ CHOST="@CHOST@"
 #-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@ -O2 -pipe"
+CFLAGS="@CARCHFLAGS@-O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@ -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@-O2 -pipe"
 LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
@@ -39,15 +39,16 @@ LDFLAGS=""
 # 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 @@ BUILDENV=(fakeroot !distcc color !ccache)
 # 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 @@ STRIP_STATIC="--strip-debug"
 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)
 

core/pacman/pacman.conf

@@ -17,7 +17,7 @@ HoldPkg     = pacman glibc
 # 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 = arm
 
@@ -33,6 +33,7 @@ Architecture = arm
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES
@@ -53,6 +54,10 @@ Architecture = arm
 # 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.
+
 [core]
 Include = /etc/pacman.d/mirrorlist
 

core/pacman/pacman.install

@@ -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
+    # one time stuff for md5sum issue with older pacman versions
-	if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
+    if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
-		_resetbackups
+        _resetbackups
-	fi
+    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 ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
-	echo ">>> you are able to remove all NoUpgrade lines of already protected"
+    echo ">>> you are able to remove all NoUpgrade lines of already protected"
-	echo ">>> files from pacman.conf."
+    echo ">>> files from pacman.conf."
-	echo ">>>"
+    echo ">>>"
 
-	# path variables
+    # path variables
     pacconf="/etc/pacman.conf"
     dbpath="/var/lib/pacman/local"