- Pacman-dev - lists.archlinux.org

[pacman-dev] DB-Fix for dup Required-By
by Travis Willard 30 Mar '07

30 Mar '07

Hi all, If you're like me and have been installing the pacman3 RC's to help test, you may have been bitten by a bug that caused "Required By" entries in the local pacman DB to become duplicated, resulting in something that may have looked like this: ----------8<----------8<----------8<----------8<----------8< $ pacman -Qi xorg-server Name : xorg-server Version : 1.2.0-3 ...blah blah... Required By : ati-fglrx-utils xorg xorg xorg xorg ----------8<----------8<----------8<----------8<----------8< While harmless, I found this annoying after a while, so I whipped up a script to scan the DB for these discrepancies, collect a list of affected packages, then pacman -S them all to fix it up. I've tested this script a few times on my own system, seems to do the job correctly, though one line is a bit of a hack. ;) As always, "Use at your own risk!", although I think it's perfectly safe to use - the very worst I can imagine that can happen is that you'll reinstall a few packages you didn't need to. -- Travis

2 1

[pacman-dev] Russian translation update
by Владимир Байраковский 30 Mar '07

30 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po with some improvements.

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (util.c)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 00:46:17 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: util.c (1.51 -> 1.52) commit 1d35c4dcc6399023217e41eaa8ff4733b1ad2b0d Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Mar 29 22:44:10 2007 -0500 Report an error on setmntent failure Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> --------+ util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.51 pacman-lib/lib/libalpm/util.c:1.52 --- pacman-lib/lib/libalpm/util.c:1.51 Thu Mar 22 04:22:48 2007 +++ pacman-lib/lib/libalpm/util.c Fri Mar 30 00:46:17 2007 @@ -560,11 +560,13 @@ static long long get_freespace() { struct mntent *mnt; - char *table = MOUNTED; + const char *table = MOUNTED; FILE *fp; long long ret=0; if((fp = setmntent(table, "r")) == NULL) { + _alpm_log(PM_LOG_ERROR, _("cannot read disk space information from %s: %s"), + table, strerror(errno)); return(-1); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:33:19 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.6 -> 1.7) commit 970d2e942eb29bf78fe89895ace4d781970b6e94 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Mar 29 21:30:40 2007 -0500 repo-add leaves .PKGINFO in the current directory * Misuse of 'tar xf', which should be 'tar tf' Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------+ repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.6 pacman-lib/scripts/repo-add:1.7 --- pacman-lib/scripts/repo-add:1.6 Tue Mar 13 11:01:15 2007 +++ pacman-lib/scripts/repo-add Thu Mar 29 23:33:19 2007 @@ -246,7 +246,7 @@ fi else if [ -f "$arg" ]; then - if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then + if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then echo "error: '$arg' is not a package file, skipping" else echo ":: adding package '$arg'"

1 0

[pacman-dev] [patch] makepkg (actually tar) can't extract .tar.Z archives.
by Andrew Fyfe 30 Mar '07

30 Mar '07

Found a bug last night when trying to build rcs, 'tar -xf' doesn't work when trying to extract .tar.Z archives. You need to use 'tar -xzf'. Patch attached. Andrew >From 2d6993d638a46da68c23927e609000764c4b2b0c Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285..92d8ab2 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -809,6 +809,8 @@ else file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*) -- 1.5.0.5

2 1

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:24:10 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.65 -> 1.66) From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ---------+ makepkg | 2 ++ 1 file changed, 2 insertions(+) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.65 pacman-lib/scripts/makepkg:1.66 --- pacman-lib/scripts/makepkg:1.65 Sun Mar 25 13:37:43 2007 +++ pacman-lib/scripts/makepkg Thu Mar 29 23:24:09 2007 @@ -809,6 +809,8 @@ file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*)

1 0

[pacman-dev] handling of provides/conflicts packages
by Scott Horowitz 30 Mar '07

30 Mar '07

So here's the scenario: mplayer is in current, mplayer-svn is in unstable. mplayer-svn provides and conflicts with mplayer. As is typically the case with packages in current, mplayer has no provides or conflicts for packages outside of current/extra (mplayer-svn in this case). If you have mplayer-svn installed and try to install mplayer, you get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] y done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin First off, I think that "done" is probably a bug - mplayer-svn wasn't removed ;-) And secondly, it seems like pacman should be able to handle this swap of mplayer-svn->mplayer even when the mplayer pkgbuild doesn't have the provided/conflicts array set. I mean, if mplayer-svn provides mplayer, doesn't it imply the reverse? I obviously don't understand the technical details, but this behavior seems "broken" to me. Scott

5 6

[pacman-dev] handling of provides/conflicts
by Scott Horowitz 30 Mar '07

30 Mar '07

Scenario: mplayer-svn is in unstable, mplayer is in current. mplayer-svn has provides/conflicts for mplayer, mplayer does not for mplayer-svn (it seems typical that packages in current don't deal with packages outside of current/extra). If I have mplayer-svn installed and try to install mplayer, I get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin (First, two minor problems. The "done" is very confusing - I assume it's from the inter-conflicts statement, but it reads as removing mplayer-svn is done. Also, the "mplayer-svn requires acidrip" should read "acidrip requires mplayer-svn" (sorry yankees26).) But the point is that this behavior seems "broken" to me. Surely if mplayer-svn provides mplayer, you should be able to swap mplayer-svn for mplayer. Scott

3 3

[pacman-dev] Roadmap for 3.1
by Aaron Griffin 29 Mar '07

29 Mar '07

Looks like it's time to move towards a 3.1 release. Dan and I both have a lot of items listed in our TODO lists, though most of them are code changes (doesn't affect the end user much). So I'd like to open the floor up for ideas - what *functional* changes interest you all, as a user of pacman? I'm going to take some input here, and then compose a list of what I'd like to do for the 3.1 release. Keep in mind that, going forward, I'd like to do quick, smaller releases (every 1-2 months would be ideal) so not everything will get done right away. Also, as a side note, we're probably going to be moving to using git for development - making it easier for other users to contribute patches and things like that (still kinda pending on some side projects I'm working on, but I digress). Anyway, let me know. Thanks, Aaron

9 20

[pacman-dev] [patch] Spell check for PKGBUILDs :p (aka check-buildscript)
by Andrew Fyfe 29 Mar '07

29 Mar '07

I was looking at the commented out code in makepkg to unset all vars in PKGBUILD before including and I think I've cracked it. So I went to test it on arch's main, extra and unstable repo, and there's several PKGBUILDs with miss spelled vars. As a result I've created check-buildscript, this just runs some sanity/spell checks on a PKGBUILD script. People should run it before submitting a PKGBUILD. Andrew >From 1d77fdf087d37ed839c892484df26c471ed79f9a Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 16:24:59 +0100 Subject: [PATCH 1/1] Added check-buildscript check-buildscript does some basic sanity checks on a build script. People should run check-buildscript before they submit a build script. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/Makefile.am | 3 +- scripts/check-buildscript | 261 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 1 deletions(-) create mode 100755 scripts/check-buildscript diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 57baee4..68d9ff6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,6 +4,7 @@ bin_SCRIPTS = \ abs \ + check-buildscript \ gensync \ makepkg \ makeworld \ @@ -15,4 +16,4 @@ bin_SCRIPTS = \ EXTRA_DIST = $(bin_SCRIPTS) -abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: +abs check-buildscript gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: diff --git a/scripts/check-buildscript b/scripts/check-buildscript new file mode 100755 index 0000000..fddd2bf --- /dev/null +++ b/scripts/check-buildscript @@ -0,0 +1,261 @@ +#!/bin/bash +# +# check-buildscript - checks build script for errors. +# +# Copyright (c) 2007 by Andrew Fyfe <andrew(a)neptune-one.net> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# TODO: _PACMAN_VERSION needs to match version of pacman package. +# some autoconf foo is needed. +_PACMAN_VERSION='3.0.0' +_VERSION='1.0' +_BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' + +BUILDSCRIPT='PKGBUILD' + +set -e +trap 'echo -e "\033[1;31mBANG! \033[1;37mThat didnt sound good. \033[1;33m:(\033[1;0m" >&2' ERR + +_DEFAULT_VARS=(pkgname pkgver pkgrel pkgdesc arch url license depends + makedepends provides conflicts replaces backup install + options source noextract md5sums sha1sums groups) + +E_OK=0 +E_UNKNOWN=1 +E_BUILDSCRIPT_ERROR=2 +E_HAS_WARNINGS=4 + +_WARNINGS=0 + +# Source makepkg.conf; fail if it is not found +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + error "/etc/makepkg.conf not found. cannot continue" + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi + +# Source user-specific makepkg.conf overrides +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + +plain() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;37m$1\033[1;0m" >&2 + else + echo " $1" >&2 + fi +} + +msg() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;32m==> \033[1;37m$1\033[1;0m" >&2 + else + echo "==> $1" >&2 + fi +} + +msg2() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;34m-> \033[1;37m$1\033[1;0m" >&2 + else + echo " -> $1" >&2 + fi +} + +warning() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;33m==> WARNING: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> WARNING: $1" >&2 + fi +} + +error() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;31m==> ERROR: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> ERROR: $1" >&2 + fi +} + +in_array() { + local needle=$1 + shift 1 + [ -z "$1" ] && return 1 + for i in $*; do + [ "$i" = "$needle" ] && return 0 + done + return 1 +} + +# check if option is present in BUILDENV +check_buildenv() { + local needle=$(echo $1 | tr [:upper:] [:lower:]) + local i + # use options from makepkg.conf + for i in ${BUILDENV[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" + return + fi + done + echo "unknown" + return +} + +usage () { + cat << EOF +check-buildscript version $_VERSION + +Usage: $0 [options] [build script] + +Options: + -m, --nocolor Disable colourized output messages. + + -h, --help Display this help then exit. + -V, --version Output version information then exit. + +If no build script is specified on the command line then +check-buildscript will check ./$BUILDSCRIPT + +Report bugs to <${_BUG_REPORT_EMAIL}> + +EOF +} + +version () { + echo "check-buildscript $_VERSION" + echo "pacman $_PACMAN_VERSION" +} + +check_hasBuild () { + msg2 "Checking for build() function..." + if ! grep -q ' *build *' $_BUILDSCRIPT; then + error "The build() function was not found." + plain "Please make sure you have a build() function in your build script." + exit $E_BUILDSCRIPT_ERROR + fi +} + +check_varNames () { + msg2 "Checking variable names..." + + local count=$(( \ + $(grep -n 'build *()' "$_BUILDSCRIPT" | cut -d : -f 1) )) + local vars="$(head -n $count "$_BUILDSCRIPT" | \ + grep '^[A-Za-z0-9\-\_]*=.*' | \ + sed 's/^$[A-Za-z0-9\-\_]*$=.*/\1/')" + + [ -z "$vars" ] && return + + local var extra_vars + for var in $vars; do + ! in_array $var ${_DEFAULT_VARS[@]} && extra_vars="$extra_vars $var" + done + + if [ -n "$extra_vars" ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains the following non standard variables:" + + for var in $extra_vars; do + msg2 "$var" + done + + plain "" + plain "Please make sure these aren't misspelled variables." + plain "If they aren't just ignore this warning." + plain "" + fi +} + +check_hasChecksums () { + msg2 "Checking for checksums..." + + if [ "$(source "$_BUILDSCRIPT"; \ + [ -z "$md5sums" -a -z "$sha1sums" ] || \ + [ "$md5sums" = "generate" -a -z "$sha1sums" ]; \ + echo $?)" -eq 0 ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains no checksums for the source files." + plain "Unless this package gets its source from cvs/svn please run" + plain "makepkg -g >>PKGBUILD" + plain "" + fi +} + + +## Begin script... +_OPT_SHORT="mhV" +_OPT_LONG="nocolor,help,version" +_OPT_TEMP="$(getopt -o $_OPT_SHORT --long $_OPT_LONG -n "$0" -- "$@" || true)" +eval set -- "$_OPT_TEMP" +unset _OPT_SHORT _OPT_LONG _OPT_TEMP + +while true; do + case $1 in + -m|--nocolor) USE_COLOR='n';; + + -h|--help) usage; exit $E_OK;; + -V|--version) version; exit $E_OK;; + + --) OPTIND=0; shift; break;; + *) usage; exit $E_UNKNOWN;; + esac +done + +if [ $# -eq 0 ]; then + if [ ! -r "$BUILDSCRIPT" ]; then + usage + exit $E_UNKNOWN + fi + + _FILES=$BUILDSCRIPT +else + _FILES=$* +fi + +for _BUILDSCRIPT in $_FILES; do + if [ ! -r "$_BUILDSCRIPT" ]; then + error "Unable to find $_BUILDSCRIPT" + exit $E_UNKNOWN + fi + + msg "Checking ${_BUILDSCRIPT}..." + + check_hasBuild + check_varNames + check_hasChecksums +done + +plain "" +if [ $_WARNINGS -eq 0 ]; then + msg "Your build script(s) looks ok. \033[1;33m:)" + exit $E_OK +elif [ $_WARNINGS -eq 1 ]; then + warning "There might be a problem. There was 1 warning." + exit $E_HAS_WARNINGS +else + warning "There might be a problem. There were $_WARNINGS warnings." + exit $E_HAS_WARNINGS +fi + +# vim:set ts=4 noet: -- 1.5.0.6

3 4