[arch-commits] Commit in pacman/trunk (PKGBUILD mirrorlist pacman.conf pacman.install)

[Dan McGee]

    Date: Wednesday, July 30, 2008 @ 21:27:44
  Author: dan
Revision: 7358

upgpkg: pacman 3.2.0-1

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/mirrorlist
  pacman/trunk/pacman.conf
  pacman/trunk/pacman.install

----------------+
 PKGBUILD       |   10 +++++-----
 mirrorlist     |    1 +
 pacman.conf    |   25 ++++++++++++++++++-------
 pacman.install |   49 -------------------------------------------------
 4 files changed, 24 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-31 01:08:35 UTC (rev 7357)
+++ PKGBUILD	2008-07-31 01:27:44 UTC (rev 7358)
@@ -3,23 +3,23 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pacman
-pkgver=3.1.4
+pkgver=3.2.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=('gcc-libs' 'bash' 'libarchive>=2.4.17' 'libdownload>=1.3')
+depends=('gcc-libs' 'bash' 'libarchive>=2.5.5' 'libdownload>=1.3')
 backup=(etc/pacman.conf etc/makepkg.conf etc/pacman.d/mirrorlist)
 install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         mirrorlist)
-md5sums=('dfba385a6675db39938c8cc7581c6325'
-         'a960bb221183782e44886555d2dc54a6'
-         '3d2f5efe2e85f551c6732a6e0e5f77f8')
+md5sums=('f56238a6ba29d2252bb0976f5420b88e'
+         'bf489fb0437ee27f6cf6dcd0fb55731f'
+         'ea21911b8d9e7e79e040daa337e08946')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver

Modified: mirrorlist
===================================================================
--- mirrorlist	2008-07-31 01:08:35 UTC (rev 7357)
+++ mirrorlist	2008-07-31 01:27:44 UTC (rev 7358)
@@ -14,6 +14,7 @@
 Server = http://holmes.umflint.edu/archlinux/$repo/os/@carch@
 Server = http://mirror.neotuli.net/arch/$repo/os/@carch@
 Server = http://mirror.rit.edu/archlinux/$repo/os/@carch@
+Server = http://mirror.umoss.org/archlinux/$repo/os/@carch@
 # - Canada
 Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@carch 
 

Modified: pacman.conf
===================================================================
--- pacman.conf	2008-07-31 01:08:35 UTC (rev 7357)
+++ pacman.conf	2008-07-31 01:27:44 UTC (rev 7358)
@@ -1,7 +1,7 @@
 #
 # /etc/pacman.conf
 #
-# See the pacman manpage for option directives
+# See the pacman.conf(5) manpage for option and repository directives
 
 #
 # GENERAL OPTIONS
@@ -14,8 +14,24 @@
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 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
 
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#NoPassiveFtp
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file
@@ -23,6 +39,7 @@
 #   - 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
 #
 # Repository entries are of the format:
 #       [repo-name]
@@ -51,12 +68,6 @@
 # Add your preferred servers here, they will be used first
 Include = /etc/pacman.d/mirrorlist
 
-# Unstable is disabled by default.  To enable, uncomment the following
-# two lines.  You can add preferred servers immediately after the header,
-# and they will be used before the default mirrors.
-#[unstable]
-#Include = /etc/pacman.d/mirrorlist
-
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

Modified: pacman.install
===================================================================
--- pacman.install	2008-07-31 01:08:35 UTC (rev 7357)
+++ pacman.install	2008-07-31 01:27:44 UTC (rev 7358)
@@ -1,28 +1,12 @@
 # arg 1:  the new package version
-post_install() {
-  _rankmirrors
-}
-
-# 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
-	if [ "$(vercmp $2 3.1.0)" -lt 0 ]; then
-		_upgrade310
-	fi
 }
 
-_rankmirrors() {
-  echo ">>> Use of the rankmirrors script on /etc/pacman.d/mirrorfile file is"
-  echo ">>> highly recommended. Python is required, and read rankmirrors --help"
-  echo ">>> for details. In addition, mirrors are now listed by country, so"
-  echo ">>> move those that are geographically close to you to the top and"
-  echo ">>> remove the others BEFORE running rankmirrors."
-}
-
 _resetbackups() {
 	echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
 	echo ">>> you are able to remove all NoUpgrade lines of already protected"
@@ -67,39 +51,6 @@
     done
 }
 
-# TODO not used yet, we'll use it in later pacman upgrades
-_cleanrequiredby() {
-    dbpath="/var/lib/pacman/local"
-    echo ">>> Cleaning out unnecessary requiredby entries from DB."
-    echo ">>> -> making local DB backup at /tmp/pacmanDB.tgz..."
-    bsdtar -czf /tmp/pacmanDB.tgz "$dbpath"
-    echo ">>> -> removing entries..."
-    grep -Rl REQUIREDBY /var/lib/pacman/local | xargs sed -i '/^%REQUIREDBY%/,/^$/ d'
-    echo ">>> -> done."
-}
-
-_upgrade310() {
-	# makepkg.conf syntax changed in 3.1
-	echo ">>> The makepkg.conf syntax has changed, please note the new format"
-	echo ">>> when merging the pacnew file with your old configuration."
-	echo ">>>"
-	# pacman.conf syntax changed in 3.1
-	echo ">>> The pacman.conf default file has changed. Please update your"
-	echo ">>> config to use the single mirrorlist, and any additional files"
-	echo ">>> in /etc/pacman.d/ (core, extra, etc.) can be deleted."
-	echo ">>>"
-	# sync DB location changed in 3.1
-	echo ">>> The location of sync DBs has moved from /var/lib/pacman/ to"
-	echo ">>> /var/lib/pacman/sync/ for several reasons. To delete older"
-	echo ">>> DBs, please run pacman -Sc and follow the instructions."
-	echo ">>> You will also have to run pacman -Sy to refresh the sync DBs."
-	echo ">>>"
-	# abs is no longer included
-	echo ">>> abs is no longer included; please install the 'abs' package"
-	echo ">>> to use abs. You may need to edit abs.conf to re-enable repos."
-
-}
-
 op=$1
 shift
 $op $*