June 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] Hi all
by Lanziani Luca 15 Jun '08

15 Jun '08

Hi all, I'm new in pacman-dev, i would like to put a counter in pacman that say how many Kbyte/time left from the end of packages download, something like... gstreamer0.10-base- 227,0K 435,7K/s 00:00:01 [####################] 100% 47110 Kbyte left libgtop-2.22.2-1-i686 109,5K 332,3K/s 00:00:00 [#################] 100% 47000 Kbyte left Very useful when i'm at university and i have only 10 minute, if i don't know how many time pacman need for download all packages, i can't decide if stop it or attend the end. Now i want know the better place to write the code for do that... "I code better than i write in english IMHO :P". I find the function _alpm_downloadfiles_forreal_ .... thanks, Luca

2 1

[pacman-dev] [PATCH] Expand PKGBUILD documentation
by Dan McGee 15 Jun '08

15 Jun '08

Add documentation for $startdir, $srcdir, and $pkgdir variables, as well as general information about the build() function and about custom variables in PKGBUILDs. This addresses FS#10634. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ac39472..f4ddc83 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -30,12 +30,22 @@ distribution of this package. Options and Directives ---------------------- +The following is a list of standard options and directives available for use +in a PKGBUILD. These are all understood and interpreted by makepkg, and most +will be directly transferred to the built package. + +If you need to create any custom variables for use in your build process, it is +recommended to name your custom variables with an '_' (underscore) prefix. +This will prevent any possible name clashes with internal makepkg variables. +For example, to store the base kernel version in a variable, use something +similar to `$_basekernver`. + *pkgname*:: The name of the package. This has be a unix-friendly name as it will be used in the package filename. *pkgver*:: - The version of the software as released from the author (e.g. \'2.7.1'). + The version of the software as released from the author (e.g. '2.7.1'). *pkgrel*:: This is the release number specific to the Arch Linux release. This @@ -205,6 +215,38 @@ Options and Directives of a package changes (or is alphanumeric). +build() Function +---------------- +In addition to the above directives, the build() bash function comprises the +remainder of the PKGBUILD. This is directly sourced and executed by makepkg, so +anything that bash or the system has available is available for use here. Be +sure any exotic commands used are covered by `makedepends`. + +All of the above variables such as `pkgname` and `pkgver` are available for use +in the build function. In addition, makepkg defines three variables for your +use during the build and install process. These three variables are as follows: + +*startdir*:: + This contains the absolute path to the directory where the PKGBUILD was + located, which is usually the output of `$(pwd)` when makepkg is started. + $$startdir$$ was most often used in combination with `/src` or `/pkg` + postfixes, but use of the `srcdir` and `pkgdir` variables is preferred. + +*srcdir*:: + This points to the directory where makepkg extracts or copies all source + files. Although it currently is an alias for `$startdir/src`, this + assumption should not be assumed true for all future revisions of makepkg. + +*pkgdir*:: + This points to the directory where makepkg bundles the installed package + (this directory will become the root directory of your built package). + Although it currently is an alias for `$startdir/pkg`, this assumption + should not be assumed true for all future revisions of makepkg. + +If you create any variables of your own in the build function, it is +recommended to use the bash `local` keyword to scope the variable to inside +the build function. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it -- 1.5.5.3

3 2

[pacman-dev] [PATCH] Combine repo-add and repo-remove into one script
by Dan McGee 14 Jun '08

14 Jun '08

They shared about 75% of their code, so there is no real reason we should maintain them separately. Merge the differences accordingly and add a check based on the basename of the command used to decide what behavior to follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- po/POTFILES.in | 1 - scripts/Makefile.am | 16 ++-- scripts/repo-add.sh.in | 93 ++++++++++++++------ scripts/repo-remove.sh.in | 211 --------------------------------------------- 4 files changed, 76 insertions(+), 245 deletions(-) delete mode 100644 scripts/repo-remove.sh.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 73640f2..10175bf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -16,4 +16,3 @@ src/pacman/util.c scripts/makepkg.sh.in scripts/pacman-optimize.sh.in scripts/repo-add.sh.in -scripts/repo-remove.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e6c051b..283556e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,18 +2,20 @@ AUTOMAKE_OPTIONS = std-options bin_SCRIPTS = \ + $(OURSCRIPTS) \ + repo-remove + +OURSCRIPTS = \ makepkg \ pacman-optimize \ rankmirrors \ - repo-add \ - repo-remove + repo-add EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ rankmirrors.py.in \ - repo-add.sh.in \ - repo-remove.sh.in + repo-add.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -42,7 +44,7 @@ edit = sed \ ## wrong file by accident. # two 'test' lines- make sure we can handle both sh and py type scripts # third 'test' line- make sure one of the two checks succeeded -$(bin_SCRIPTS): Makefile +$(OURSCRIPTS): Makefile rm -f $@ $@.tmp test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true @@ -55,7 +57,7 @@ makepkg: $(srcdir)/makepkg.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in rankmirrors: $(srcdir)/rankmirrors.py.in repo-add: $(srcdir)/repo-add.sh.in -repo-remove: $(srcdir)/repo-remove.sh.in -re-pacman: $(srcdir)/re-pacman.sh.in +repo-remove: $(srcdir)/repo-add.sh.in + ln -s repo-add repo-remove # vim:set ts=2 sw=2 noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 53a7da5..b6772db 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,9 +1,11 @@ #!/bin/bash # # repo-add - add a package to a given repo database file +# repo-remove - remove a package entry from a given repo database file # @configure_input@ # # Copyright (c) 2006-2008 Aaron Griffin <aaron(a)archlinux.org> +# Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org> # # 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 @@ -55,33 +57,41 @@ error() { # print usage instructions usage() { - printf "repo-add (pacman) %s\n\n" "$myver" - printf "$(gettext "Usage: %s [-q] <path-to-db> <package> ...\n\n")" "$0" + printf "repo-add, repo-remove (pacman) %s\n\n" "$myver" + printf "$(gettext "Usage: repo-add [-q] <path-to-db> <package> ...\n")" + printf "$(gettext "Usage: repo-remove [-q] <path-to-db> <packagename> ...\n\n")" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ Multiple packages to add can be specified on the command line.\n\n")" printf "$(gettext "\ -The -q/--quiet flag will force this program to run silently except\n\ +repo-remove will update a package database by removing the package name\n\ +specified on the command line from the given repo database. Multiple\n\ +packages to remove can be specified on the command line.\n\n")" + printf "$(gettext "\ +The -q/--quiet flag to either program will force silent running except\n\ in the case of warnings or errors.\n\n")" echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")" + echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" } version() { - printf "repo-add (pacman) %s\n" "$myver" + printf "repo-add, repo-remove (pacman) %s\n\n" "$myver" printf "$(gettext "\ -Copyright (C) 2006-2008 Aaron Griffin <aaron(a)archlinux.org>.\n\n\ +Copyright (C) 2006-2008 Aaron Griffin <aaron(a)archlinux.org>.\n\ +Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } # test if a file is a repository DB +# arg1 - command name (repo-add, repo-remove) test_repo_db_file () { if [ -f "$REPO_DB_FILE" ]; then if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then return 0 # YES fi - else - return 0 # YES - No database file is also allowed + elif [ "$1" == "repo-add" ]; then + return 0 # YES - No database file is also allowed if we are adding fi return 1 # NO @@ -177,14 +187,8 @@ db_write_entry() return 1 fi - # remove any other package in the DB with same name - local existing - for existing in *; do - if [ "${existing%-*-*}" = "$pkgname" ]; then - msg2 "$(gettext "Removing existing package '%s'...")" "$existing" - rm -rf "$existing" - fi - done + # remove an existing entry if it exists, ignore failures + db_remove_entry "$pkgname" # create package directory mkdir "$pkgname-$pkgver" @@ -251,6 +255,23 @@ db_write_entry() popd 2>&1 >/dev/null } # end db_write_entry +# remove existing entries from the DB +# arg1 - package name +db_remove_entry() { + pushd "$gstmpdir" 2>&1 >/dev/null + + # remove any other package in the DB with same name + local existing + for existing in *; do + if [ "${existing%-*-*}" = "$1" ]; then + msg2 "$(gettext "Removing existing package '%s'...")" "$existing" + rm -rf "$existing" + fi + done + + popd 2>&1 >/dev/null +} # end db_remove_entry + # PROGRAM START # determine whether we have gettext; make it a no-op if we do not @@ -301,10 +322,17 @@ if [ -r ~/.makepkg.conf ]; then fi # main routine -gstmpdir=$(mktemp -d /tmp/repo-add.XXXXXXXXXX) || (\ +gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) +# figure out what program we are +cmd="$(basename $0)" +if [ "$cmd" != "repo-add" -a "$cmd" != "repo-remove" ]; then + error "$(gettext "Invalid command name '%s' specified.")" "$cmd" + exit 1 +fi + success=0 # parse arguments for arg in "$@"; do @@ -316,7 +344,7 @@ for arg in "$@"; do elif [ -z "$REPO_DB_FILE" ]; then # store absolute path to repo DB REPO_DB_FILE=$($realpath "$arg") - if ! test_repo_db_file; then + if ! test_repo_db_file $cmd; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 elif [ -f "$REPO_DB_FILE" ]; then @@ -324,18 +352,28 @@ for arg in "$@"; do bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" fi else - if [ -f "$arg" ]; then - if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then - error "$(gettext "'%s' is not a package file, skipping")" "$arg" + if [ "$cmd" == "repo-add" ]; then + if [ -f "$arg" ]; then + if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then + error "$(gettext "'%s' is not a package file, skipping")" "$arg" + else + msg "$(gettext "Adding package '%s'")" "$arg" + + if db_write_entry "$arg"; then + success=1 + fi + fi else - msg "$(gettext "Adding package '%s'")" "$arg" + error "$(gettext "Package '%s' not found.")" "$arg" + fi + elif [ "$cmd" == "repo-remove" ]; then + msg "$(gettext "Searching for package '%s'...")" "$arg" - if db_write_entry "$arg"; then - success=1 - fi + if db_remove_entry "$arg"; then + success=1 + else + error "$(gettext "Package matching '%s' not found.")" "$arg" fi - else - error "$(gettext "Package '%s' not found.")" "$arg" fi fi done @@ -356,6 +394,9 @@ if [ $success -eq 1 ]; then esac bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * + elif [ "$cmd" == "repo-remove" ]; then + error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE" + rm "$REPO_DB_FILE" fi popd 2>&1 >/dev/null diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in deleted file mode 100644 index a650bcf..0000000 --- a/scripts/repo-remove.sh.in +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/bash -# -# repo-remove - remove a package entry from a given repo database file -# @configure_input@ -# -# Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org> -# -# 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, see <http://www.gnu.org/licenses/>. - -# gettext initialization -export TEXTDOMAIN='pacman' -export TEXTDOMAINDIR='@localedir@' - -myver='@PACKAGE_VERSION@' -confdir='@sysconfdir@' - -QUIET=0 -REPO_DB_FILE="" - -msg() { - [ $QUIET -ne 0 ] && return - local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&1 -} - -msg2() { - [ $QUIET -ne 0 ] && return - local mesg=$1; shift - printf " -> ${mesg}\n" "$@" >&1 -} - -warning() { - local mesg=$1; shift - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 -} - -error() { - local mesg=$1; shift - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 -} - -# print usage instructions -usage() { - printf "$(gettext "repo-remove %s\n\n")" $myver - printf "$(gettext "usage: %s [-q] <path-to-db> <packagename> ...\n\n")" "$0" - printf "$(gettext "\ -repo-remove will update a package database by removing the package name\n\ -specified on the command line from the given repo database. Multiple\n\ -packages to remove can be specified on the command line.\n\n")" - printf "$(gettext "\ -The -q/--quiet flag will force this program to run silently except\n\ -in the case of warnings or errors.\n\n")" - echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" -} - -version() { - printf "repo-remove (pacman) %s\n" "$myver" - printf "$(gettext "\ -Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org>.\n\n\ -This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n")" -} - -# test if a file is a repository DB -test_repo_db_file () { - if [ -f "$REPO_DB_FILE" ]; then - if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then - return 0 # YES - fi - fi - - return 1 # NO -} - -# remove existing entries from the DB -db_remove_entry() { - pushd "$gstmpdir" 2>&1 >/dev/null - - # remove any other package in the DB with same name - local existing - for existing in *; do - if [ "${existing%-*-*}" = "$1" ]; then - msg2 "$(gettext "Removing existing package '%s'...")" "$existing" - rm -rf "$existing" - fi - done - - popd 2>&1 >/dev/null -} # end db_remove_entry - -# PROGRAM START - -# determine whether we have gettext; make it a no-op if we do not -if [ ! $(type -t gettext) ]; then - gettext() { - echo "$@" - } -fi - -# check for help flags -if [ "$1" = "-h" -o "$1" = "--help" ]; then - usage - exit 0 -fi - -# check for version flags -if [ "$1" = "-V" -o "$1" = "--version" ]; then - version - exit 0 -fi - -# check for correct number of args -if [ $# -lt 2 ]; then - usage - exit 1 -fi - -# check for and store the name of a realpath-like program -if [ $(type -t realpath) ]; then - realpath='realpath' -elif [ $(type -t readlink) ]; then - realpath='readlink -f' -else - error "$(gettext "Either realpath or readlink are required by repo-add.")" - exit 1 # $E_MISSING_PROGRAM -fi - -# source system and user makepkg.conf -if [ -r "$confdir/makepkg.conf" ]; then - source "$confdir/makepkg.conf" -else - error "$(gettext "%s not found. Cannot continue.")" "$confdir/makepkg.conf" - exit 1 # $E_CONFIG_ERROR -fi - -if [ -r ~/.makepkg.conf ]; then - source ~/.makepkg.conf -fi - -# main routine -gstmpdir=$(mktemp -d /tmp/repo-remove.XXXXXXXXXX) || (\ - error "$(gettext "Cannot create temp directory for database building.")"; \ - exit 1) - -success=0 -# parse arguments -for arg in "$@"; do - if [ "$arg" == "--quiet" -o "$arg" == "-q" ]; then - QUIET=1 - elif [ -z "$REPO_DB_FILE" ]; then - # store absolute path to repo DB - REPO_DB_FILE=$($realpath "$arg") - if ! test_repo_db_file; then - error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" - exit 1 - elif [ -f "$REPO_DB_FILE" ]; then - msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" - fi - else - msg "$(gettext "Searching for package '%s'...")" "$arg" - - if db_remove_entry "$arg"; then - success=1 - else - error "$(gettext "Package matching '%s' not found.")" "$arg" - fi - fi -done - -# if all operations were a success, re-zip database -if [ $success -eq 1 ]; then - msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" - pushd "$gstmpdir" 2>&1 >/dev/null - - if [ -n "$(ls)" ]; then - [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" - [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" - - case "$DB_COMPRESSION" in - gz) TAR_OPT="z" ;; - bz2) TAR_OPT="j" ;; - *) warning "$(gettext "No compression set.")" ;; - esac - - bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * - else - error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE" - rm "$REPO_DB_FILE" - fi - - popd 2>&1 >/dev/null -else - msg "$(gettext "No packages modified, nothing to do.")" -fi - -# remove the temp directory used to unzip -[ -d "$gstmpdir" ] && rm -rf "$gstmpdir" - -# vim: set ts=2 sw=2 noet: -- 1.5.5.3

3 3

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-16-g331891c
by Dan McGee 13 Jun '08

13 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) via 6d737254fcc758b94b7372b51dcf1ea907c53d8e (commit) via 512282ca5415c4c053291ed0ec7819a2787f141d (commit) from 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/de.po | 2 +- po/LINGUAS | 1 + po/fr.po | 4 +- po/tr.po | 1699 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1703 insertions(+), 3 deletions(-) create mode 100644 po/tr.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-205-g7313c85
by Dan McGee 13 Jun '08

13 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 7313c8546ae0a2c38768d665b3f314ee0cf959c4 (commit) via 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) via 6d737254fcc758b94b7372b51dcf1ea907c53d8e (commit) via 0077bfa3a07725db281c55821a459acb84895225 (commit) via 7fc306cd41be8586e2d7fb3cc9595fe3bd58b4c1 (commit) via 1824bc6ee6c67b248c478d3fdd0f1995cb652b6c (commit) via f827c9572e9c8a21d57e58bd61038226e9e0c05e (commit) via 4979157cba9aaf5e9b3488b17b0b50f484614169 (commit) via 0fc538fcdb149141fe25448db5805f2ff790e8fa (commit) via 512282ca5415c4c053291ed0ec7819a2787f141d (commit) via fcac23763b0cd6242a1e126b5063d95d4a46fd09 (commit) via b04d6e751a4359337c84128681a06f436c99197a (commit) via 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) from 5ae02e6ae72b7648318e319eba9ab02f489d858a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7313c8546ae0a2c38768d665b3f314ee0cf959c4 Merge: 0077bfa3a07725db281c55821a459acb84895225 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 12 19:21:06 2008 -0500 Merge branch 'maint' commit 0077bfa3a07725db281c55821a459acb84895225 Author: Juan Pablo González Tognarelli <lord_jotape(a)yahoo.com.ar> Date: Thu Jun 12 19:10:43 2008 -0500 Spanish translation updates Fixes to old translations and new strings for upcoming 3.2 release. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fc306cd41be8586e2d7fb3cc9595fe3bd58b4c1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 12 19:06:14 2008 -0500 Use shell builtin to list files for package inclusion On BSD systems, as super user, the 'ls' command displays all dot files by default, causing these to get included when not intended. If we use the bash glob operator, we can avoid issues with ls on different platforms; however, we need to turn the nullglob shell option on first to ensure we don't have problems in empty directories. Originally-noticed-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1824bc6ee6c67b248c478d3fdd0f1995cb652b6c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 8 17:26:02 2008 -0500 Allow use of GIT_VERSION in documentation dir Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f827c9572e9c8a21d57e58bd61038226e9e0c05e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 2 00:05:50 2008 -0500 makepkg: remove deprecated --usesudo code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4979157cba9aaf5e9b3488b17b0b50f484614169 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sat Jun 7 11:58:21 2008 +1000 makepkg: add --allsource option This supplements the --source option and does nearly the same thing, except downloaded source files are included in the archive as well. The sources are now packages with a pkgname/ prefix. Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fc538fcdb149141fe25448db5805f2ff790e8fa Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 8 13:50:01 2008 -0500 Various updates needed prior to a new release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fcac23763b0cd6242a1e126b5063d95d4a46fd09 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Fri Jun 6 20:17:06 2008 +1000 bacman - regenerate package from system Original work by Carlo "carlocci" Bersani with additions by Xavier Chantry and Allan McRae This script rebuilds an already installed package using metadata stored into the pacman database and system files. Replaces the outdated re-pacman script Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b04d6e751a4359337c84128681a06f436c99197a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 5 14:32:19 2008 -0500 Reformat -Sg output to look like -Qg We used list_display() on -Sg output, which might have been slightly nicer looking but made it much harder to parse in something like a shell script. Reformat it in the 'grpname pkgname' format that -Qg is already using. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/Makefile.am | 2 +- contrib/README | 2 +- contrib/bacman | 282 ++++++++ contrib/re-pacman | 77 -- doc/Makefile.am | 10 +- doc/PKGBUILD-example.txt | 6 +- doc/PKGBUILD.5.txt | 15 +- doc/footer.txt | 11 +- doc/pacman.8.txt | 7 +- doc/pacman.conf.5.txt | 11 +- etc/pacman.conf.in | 2 + lib/libalpm/po/POTFILES.in | 7 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/es.po | 227 +++---- pactest/Makefile.am | 3 +- po/LINGUAS | 1 + po/POTFILES.in | 2 +- po/es.po | 792 ++++++++------------- po/fr.po | 4 +- po/tr.po | 1699 ++++++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 61 ++- src/pacman/pacman.c | 6 +- src/pacman/sync.c | 25 +- 23 files changed, 2480 insertions(+), 774 deletions(-) create mode 100755 contrib/bacman delete mode 100755 contrib/re-pacman create mode 100644 po/tr.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] spanish translation
by Juan Pablo Gonzalez T. 13 Jun '08

13 Jun '08

i know that the string freeze is not declared yet. but now i have time to do the translation job. also i did a few fixes to the old ones texts. this files are bassed on a git sync of today (june 12) greetings! -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Juan Pablo González Tognarelli | http://lacasadeljota.blogspot.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2 1

[pacman-dev] Dependency resolution in package management systems
by Xavier 12 Jun '08

12 Jun '08

I wanted to have an overview of pisi, which seems to be an interesting package manager in python (for the Pardus linux distrib), and I felt on a small paper formalizing how the dependency resolution is done. http://www.pardus.org.tr/eng/projects/pisi/index.html http://svn.pardus.org.tr/uludag/trunk/pisi/doc/dependency.pdf I found it interesting so wanted to share it with others ;) There are also many neat features : http://www.pardus.org.tr/eng/projects/pisi/PiSi.html

1 0

[pacman-dev] [PATCH] Make sure dot files don't get included in package
by Sebastian Nowicki 12 Jun '08

12 Jun '08

On BSD systems, as a super user, `ls` displays all dot files by default. On most BSD systems -I can be used to suppress this behavior, but this argument is not available on Mac OSX. Instead, grep is used to filter out all dot files. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cb55dea..f4acd50 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -849,7 +849,7 @@ create_package() { local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" - if ! bsdtar -czf "$pkg_file" $comp_files $(ls); then + if ! bsdtar -czf "$pkg_file" $comp_files $(ls | grep -v '^\.'); then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi -- 1.5.5.1

4 6

[pacman-dev] [PATCH] Fix warning messages when syncing installed package
by Allan McRae 11 Jun '08

11 Jun '08

The patch fixes the warning messages when syncing a package where the local version is newer that the db version. Also, all messages are suppressed when using --print-uris and messages about upgrading or reinstalling are suppressed when using --downloadonly Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/sync.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3dc54d0..f10e1b3 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -333,19 +333,40 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { - if(_alpm_pkg_compare_versions(local, spkg) == 0) { - /* spkg is NOT an upgrade */ + int cmp = alpm_pkg_vercmp(alpm_pkg_get_version(spkg), alpm_pkg_get_version(local)); + + if(cmp == -1) { + /* local is newer than spkg */ + _alpm_db_read(spkg->origin_data.db, spkg, INFRQ_DESC); + if(spkg->force) { + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"), + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); + } + } else { + /* we are downgrading */ + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + pmdb_t *db = spkg->origin_data.db; + _alpm_log(PM_LOG_WARNING, _("%s-%s is newer than in %s -- downgrading\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local), + alpm_db_get_name(db)); + } + } + } else if(cmp == 0) { + /* spkg has same version as local */ if(trans->flags & PM_TRANS_FLAG_NEEDED) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + } return(0); } else { - if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), alpm_pkg_get_name(local), alpm_pkg_get_version(local)); } } - } + } /* else cmp == 1 - spkg is newer than local */ } /* add the package to the transaction */ -- 1.5.5.3

3 11

[pacman-dev] [PATCH] Move geninteg block in makepkg before error checking
by Allan McRae 10 Jun '08

10 Jun '08

This pactch moves the generating of integrity checks to before any error checking takes place in the PKGBUILD file. This allows integrity generation to complete when unrelated errors exist in a PKGBUILD file and allows the removal of multiple checks of the GENINTEG variable that would otherwise be needed. In addition a minor fix is made to a comment Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..38b22a5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1187,8 +1187,7 @@ while true; do done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then - # The extra '--' is here to prevent gettext from thinking --holdver is - # an option + # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi @@ -1288,6 +1287,14 @@ fi source "$BUILDSCRIPT" +if [ "$GENINTEG" = "1" ]; then + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + generate_checksums + exit 0 # $E_OK +fi + # check for no-no's in the build script if [ -z "$pkgname" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" @@ -1340,7 +1347,7 @@ devel_check devel_update if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then + -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package @@ -1386,11 +1393,11 @@ if [ "$SOURCEONLY" = "1" ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then +if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then if [ "$NODEPS" = "1" ]; then warning "$(gettext "Skipping dependency checks.")" fi - # skip printing a warning message for the others: geninteg, nobuild, repkg + # skip printing a warning message for the others: nobuild, repkg elif [ $(type -p pacman) ]; then unset pkgdeps # Set by resolve_deps() and used by remove_deps() deperr=0 @@ -1416,12 +1423,6 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$GENINTEG" = "1" ]; then - download_sources - generate_checksums - exit 0 # $E_OK -fi - if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" -- 1.5.5.1

4 5