[arch-commits] Commit in pacman/trunk (PKGBUILD makepkg.conf pacman.install)
Allan McRae
allan at nymeria.archlinux.org
Tue Oct 15 04:12:42 UTC 2013
Date: Tuesday, October 15, 2013 @ 06:12:42
Author: allan
Revision: 196538
upgpkg: pacman 4.1.2-2
add \!staticlibs to makepkg.conf, remove install file as none of the checks are relevant on systems updated in the last two years
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
Deleted:
pacman/trunk/pacman.install
----------------+
PKGBUILD | 5 +--
makepkg.conf | 4 +-
pacman.install | 75 -------------------------------------------------------
3 files changed, 4 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-15 02:05:11 UTC (rev 196537)
+++ PKGBUILD 2013-10-15 04:12:42 UTC (rev 196538)
@@ -5,7 +5,7 @@
pkgname=pacman
pkgver=4.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
@@ -19,7 +19,6 @@
conflicts=('pacman-contrib')
replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf.i686
@@ -29,7 +28,7 @@
'SKIP'
'2db6c94709bb30cc614a176ecf8badb1'
'de74a13618347f08ae4a9637f74471c4'
- '5f360e003e95f1a5cbd6e60d937dfd25')
+ '88817f39676dcb093e9e64d465e40849')
build() {
cd $srcdir/$pkgname-$pkgver
Modified: makepkg.conf
===================================================================
--- makepkg.conf 2013-10-15 02:05:11 UTC (rev 196537)
+++ makepkg.conf 2013-10-15 04:12:42 UTC (rev 196538)
@@ -67,7 +67,7 @@
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+# 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
@@ -80,7 +80,7 @@
#-- 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)
+OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
Deleted: pacman.install
===================================================================
--- pacman.install 2013-10-15 02:05:11 UTC (rev 196537)
+++ pacman.install 2013-10-15 04:12:42 UTC (rev 196538)
@@ -1,75 +0,0 @@
-#!/bin/sh
-# 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.5.0)" -lt 0 ]; then
- _warnupgrade
- fi
- if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
- _check_pubring
- fi
-}
-
-post_install() {
- _check_pubring
-}
-
-_check_pubring() {
- echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`"
- echo " >>> to import the data required by pacman for package verification."
- echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
-}
-
-_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 ">>>"
-
- # path variables
- pacconf="/etc/pacman.conf"
- dbpath="/var/lib/pacman/local"
-
- # get a list of NoUpgrade files from the user's pacman.conf
- echo ">>> Retrieving pacman.conf NoUpgrade list..."
- config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
- # add the standard list of files, even if they are already above
- config="$config \
- etc/passwd etc/group etc/shadow etc/sudoers \
- etc/fstab etc/raidtab etc/ld.so.conf \
- etc/rc.conf etc/rc.local \
- etc/modprobe.conf etc/modules.conf \
- etc/lilo.conf boot/grub/menu.lst"
-
- # blank md5sum for use in sed expression
- zeroes='00000000000000000000000000000000'
-
- for file in $config; do
- echo ">>> -> finding owner of /$file..."
- line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
- # if file is owned by a package, go find its incorrectly stored sum
- if [ ! -z "$line" ]; then
- # get the name and version of the package owning file
- name=$(echo $line | awk '{print $5}')
- version=$(echo $line | awk '{print $6}')
- # set the path to the backup array holding the md5sum
- path="$dbpath/$name-$version/files"
- # run a sed on the path to reset the line containing $file
- # NOTE: literal tab characters in sed expression after $file
- echo ">>> -> resetting sum of /$file..."
- sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path
- else
- echo ">>> -> $file is unowned."
- fi
- done
-}
More information about the arch-commits
mailing list