- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Detect undefined PATH_MAX
by Allan McRae 18 Dec '10

18 Dec '10

POSIX does not require PATH_MAX be defined when there is not actual limit to its value. This affects HURD based systems. Work around this by defining PATH_MAX to 4096 (as on Linux) when this is not defined. Also, clean up inclusions of limits.h Signed-off-by: Allan McRae <allan(a)archlinux.org> --- We do something like: #if !defined(PATH_MAX) #include <limits.h> #endif to only include limits.h when necessary, but given any decent compiler gets rid of unused stuff anyway, I do not think it necessary. acinclude.m4 | 16 ++++++++++++++++ configure.ac | 1 + lib/libalpm/be_sync.c | 1 + lib/libalpm/db.h | 1 - lib/libalpm/dload.c | 1 - lib/libalpm/error.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/sync.c | 1 + lib/libalpm/trans.c | 1 + src/util/cleanupdelta.c | 2 ++ src/util/testdb.c | 2 ++ 11 files changed, 24 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6693da4..7309d73 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -125,3 +125,19 @@ extern int getmntinfo (struct statfs **, int); [Defined as the filesystem stats type ('statvfs' or 'statfs')]) ]) +dnl Checks for PATH_MAX and defines it if not present +AC_DEFUN([PATH_MAX_DEFINED], + [AC_CACHE_CHECK([PATH_MAX defined], path_max_cv_defined, + [AC_EGREP_CPP(yes, [[ +#include <limits.h> +#if defined(PATH_MAX) +yes +#endif +]], + [path_max_cv_defined=yes], + [path_max_cv_defined=no])] + ) + if test $path_max_cv_defined = no; then + AC_DEFINE([PATH_MAX], 4096, [Define if PATH_MAX is undefined by limits.h.]) + fi +]) diff --git a/configure.ac b/configure.ac index 747c8b7..18e8996 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T AC_STRUCT_DIRENT_D_TYPE +PATH_MAX_DEFINED # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b201c00..d5d3a44 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -23,6 +23,7 @@ #include <errno.h> #include <ctype.h> #include <locale.h> +#include <limits.h> /* libarchive */ #include <archive.h> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index ace366d..10aa164 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -23,7 +23,6 @@ #define _ALPM_DB_H #include "alpm.h" -#include <limits.h> #include <time.h> /* libarchive */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1cb24e6..ea7f557 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,7 +29,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 78a7866..d4c296f 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,7 +22,6 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -#include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) #include <sys/syslimits.h> /* PATH_MAX */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 2ea5125..edfb7bd 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include <ctype.h> #include <errno.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2d0a899..7a1e503 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,6 +31,7 @@ #include <stdint.h> /* intmax_t */ #include <unistd.h> #include <time.h> +#include <limits.h> /* libalpm */ #include "sync.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5bc2c91..5c13211 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -31,6 +31,7 @@ #include <sys/stat.h> #include <sys/statvfs.h> #include <errno.h> +#include <limits.h> /* libalpm */ #include "trans.h" diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index c1ef18c..2010282 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util/testdb.c b/src/util/testdb.c index 28f2b2b..f77583a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- 1.7.3.3

1 1

[pacman-dev] [PATCH] makepkg: Add check() function for running test suites
by Allan McRae 15 Dec '10

15 Dec '10

A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf and on an individual package basis using the --nocheck flag. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 3 +++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 27 +++++++++++++++++++++++++-- 7 files changed, 63 insertions(+), 7 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index f5114ab..52aacc5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -16,6 +16,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() provides=() conflicts=() replaces=() @@ -33,6 +34,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package_pkg1() { # options and directives that can be overridden pkgver= diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 71dbc14..98172d8 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -15,6 +15,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() optdepends=() provides=() conflicts=() @@ -29,14 +30,17 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make -k check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 3d3909a..2ccf0b2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -156,6 +156,12 @@ name. The syntax is: `source=('filename::url')`. needed at runtime. Packages in this list follow the same format as depends. +*checkdepends (array)*:: + An array of packages that this package depends on to run its test suite, + but are not needed at runtime. Packages in this list follow the same + format as depends. These dependencies are only considered when the + check() function is present and is to be run by makepkg. + *optdepends (array)*:: An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents @@ -263,10 +269,18 @@ 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. +check() Function +---------------- +An optional check() function can be specified in which a packages test-suite +may be run. This function is run between the build() and package() functions. +The function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. Be sure any exotic commands +used are covered by `checkdepends`. + package() Function ------------------ An optional package() function can be specified in addition to the build() -function. This function is run immediately after the build() function. The +function. This function is run after the build() and check() functions. The function is run in `bash -e` mode, meaning any command that exits with a non-zero status will cause the function to exit. When specified in combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ff0f2b6..0087ddd 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,9 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--nocheck*:: + Do not run the check() function in the PKGBUILD or handle the checkdepends. + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 86ea6a3..2293a8d 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -93,6 +93,11 @@ Options be disabled for individual packages by placing `!ccache` in the PKGBUILD options array. + *check*;; + Run the check() function if present in the PKGBUILD. This can be + disabled for individual packages through the use of makepkg's + `--nocheck` option. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index c795432..81a11b1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -39,15 +39,16 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # 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. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ac10ad3..6707336 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() @@ -145,6 +146,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -805,6 +809,10 @@ run_build() { run_function "build" } +run_check() { + run_function "check" +} + run_package() { local pkgfunc if [[ -z $1 ]]; then @@ -1547,6 +1555,7 @@ usage() { echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --nocheck Do not run the check() function in the '%s'")" "$BUILDSCRIPT" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" @@ -1584,8 +1593,8 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsV" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" -OPT_LONG+=",source,syncdeps,version,config:" +OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1620,6 +1629,7 @@ while true; do -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; @@ -1835,6 +1845,12 @@ fi if declare -f build >/dev/null; then BUILDFUNC=1 fi +if declare -f check >/dev/null; then + # "Hide" check() function if not going to be run + if [[ ! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n" ]]; then + CHECKFUNC=1 + fi +fi if declare -f package >/dev/null; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 ]] && declare -f package_${pkgname} >/dev/null; then @@ -1898,6 +1914,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1948,6 +1965,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + if (( CHECKFUNC )); then + resolve_deps ${checkdepends[@]} || deperr=1 + fi + if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi @@ -2013,6 +2034,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2034,6 +2056,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.3

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-206-g45146dc
by dan＠archlinux.org 15 Dec '10

15 Dec '10

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 45146dccbb94f14fb56df2999131851ff15e46b9 (commit) via ab9c0814d291db840f60073b4e63d58f932e5e64 (commit) via 6605637b5317ad82f2177cc27c5a29450a8a1ef7 (commit) via c7d332a26ad59772de5f37e855858cab97e26bb4 (commit) via 919bb6c9e00820c3930067b5985a246a455bef57 (commit) via c2a73ba989fffb59c1b8ac7edb265a996dfc184d (commit) via dbf59a6b141213b0afc962c71347eb83f8bcab73 (commit) via d1d163c5a3627675e4d063d196ea2b2255507cc8 (commit) via ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via a5e43b16052b5db0de285cb4abfbcd5dff58f7ad (commit) via 580fe21065896a1cc239db72e66107f7997b3039 (commit) via c00e05992e142219c30caf154d62d6166ae28338 (commit) via 94d3d665f0b0b4c934de73580afcb137fea9baa6 (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5f36523af9de20a8c74714da4125bb553b0fae2c (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 45146dccbb94f14fb56df2999131851ff15e46b9 Merge: ab9c081 ba45cb4 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:41:59 2010 -0600 Merge branch 'maint' commit ab9c0814d291db840f60073b4e63d58f932e5e64 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:14:25 2010 -0600 Add a cushion for diskspace checking It is the minimum of 5% of disk capacity or 20 MiB on a per-partition basis. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6605637b5317ad82f2177cc27c5a29450a8a1ef7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 13 15:44:21 2010 +1000 Document PKGEXT and SRCEXT Add some basic documentation for the PKGEXT and SRCEXT options in makepkg.conf. Fixes FS#21302. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c7d332a26ad59772de5f37e855858cab97e26bb4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 17:45:12 2010 -0600 Reorganize fields in package struct Saves a few bytes due to padding (256 -> 248 bytes), especially on x86_64, so we get the overhead of our new hash field right back. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 919bb6c9e00820c3930067b5985a246a455bef57 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:36:02 2010 -0600 Used hashed package name in _alpm_pkg_find This results in huge gains to a lot of our codepaths since this is the most frequent method of random access to packages in a list. The gains are seen in both profiling and real life. $ pacman -Sii zvbi real: 0.41 sec -> 0.32 sec strcmp: 16,669,760 calls -> 473,942 calls _alpm_pkg_find: 52.73% -> 26.31% of time $ pacman -Su (no upgrades found) real: 0.40 sec -> 0.50 sec strcmp: 19,497,226 calls -> 524,097 calls _alpm_pkg_find: 52.36% -> 26.15% of time There is some minor risk with this patch, but most of it should be avoided by falling back to strcmp() if we encounter a package with a '0' hash value (which we should not via any existing code path). We also do a strcmp once hash values match to ensure against hash collisions. The risk left is that a package name is modified once it was originally set, but the hash value is left alone. That would probably result in a lot of other problems anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2a73ba989fffb59c1b8ac7edb265a996dfc184d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:06:31 2010 -0600 When setting package name, set hash value as well Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbf59a6b141213b0afc962c71347eb83f8bcab73 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:56:32 2010 -0600 Add hash_sdbm function This is prepping for the addition of a hash field to each package to greatly speed up the string comparisons we frequently do on package name in _alpm_pkg_find. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d1d163c5a3627675e4d063d196ea2b2255507cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:50:50 2010 -0600 Use _alpm_pkg_find in deps search Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a5e43b16052b5db0de285cb4abfbcd5dff58f7ad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:06:42 2010 -0600 Correctly force load of package reason Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 580fe21065896a1cc239db72e66107f7997b3039 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:00:23 2010 -0600 Abstract has_scriptlet() to package ops struct Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c00e05992e142219c30caf154d62d6166ae28338 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:19:32 2010 -0600 Remove non-public functions from header And rename accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 94d3d665f0b0b4c934de73580afcb137fea9baa6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:16:36 2010 -0600 Mark sync_db_read() as static Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- doc/makepkg.conf.5.txt | 5 +++-- lib/libalpm/be_local.c | 19 +++++++++++++++++-- lib/libalpm/be_package.c | 1 + lib/libalpm/be_sync.c | 12 ++++++++---- lib/libalpm/db.c | 6 +----- lib/libalpm/db.h | 4 ---- lib/libalpm/deps.c | 4 ++-- lib/libalpm/diskspace.c | 11 ++++++++--- lib/libalpm/package.c | 30 +++++++++++++++++------------- lib/libalpm/package.h | 33 +++++++++++++++++---------------- lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 15 files changed, 122 insertions(+), 71 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-21-gba45cb4
by dan＠archlinux.org 15 Dec '10

15 Dec '10

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 ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (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 ba45cb459084a0746e0005345b8c5483834d1ba2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:33 2010 -0600 doc/PKGBUILD: document that functions run in -e mode Caught this noted on the forums, but it is definitely worth a note in the manpage as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5f6995aeb7f0622b63a736208850c9c86f38aad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:24 2010 -0600 Fix manpage wrap not at 80 characters Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f18798d10ab74c79dce3e0b11b5896104299d73 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 23:07:54 2010 -0600 Update news and bump versions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Diskspace checking thought- free space cushion
by Dan McGee 15 Dec '10

15 Dec '10

Code in question is diskspace.c, line ~300: for(i = mount_points; i; i = alpm_list_next(i)) { alpm_mountpoint_t *data = i->data; if(data->used == 1) { _alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, free %ld\n", data->mount_dir, data->max_blocks_needed, (unsigned long)data->fsp.f_bfree); if(data->max_blocks_needed > data->fsp.f_bfree) { abort = 1; } } } This does a strict check of max_blocks_needed > fsp.f_bfree. do we want to cushion this somehow, as having 1 block free could still spell disaster given logging, post-install scripts, etc.? And if so, how much? I don't want to make this something that has loads and loads of configuration- we hardcode max delta ratio at 0.7, for instance. Is 5% of total blocks, capped at something like 10 MB (in 4K blocks that would be 2560 blocks) enough? -Dan

3 4

[pacman-dev] [PATCH 0/4] Package list find performance improvements
by Dan McGee 14 Dec '10

14 Dec '10

This series of patches makes finding a package in our linked list implementation a whole lot faster, if that search is using the standard _alpm_pkg_find, which nearly all are (after the first patch). It does this by adding a hash function to util.c which is nothing too complicated and named after a publicly available algorithm. When packages are created, we fill in this hash value as soon as the pkgname is read. Finally, the _alpm_pkg_find function is rewritten to take advantage of this field, avoiding repeated strcmp() calls and only falling back to that if a hash is not available and to verify the hash value was not some sort of collision. Performance figures and numbers are available in the last patch. This actually speeds up operations by nearly 33%, so this is not a total waste of time to consider. :) Review and questions/comments/concerns welcome! -Dan Dan McGee (4): Use _alpm_pkg_find in deps search Add hash_sdbm function When setting package name, set hash value as well Used hashed package name in _alpm_pkg_find lib/libalpm/be_package.c | 1 + lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 16 ++++++++++++++-- lib/libalpm/package.h | 1 + lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) -- 1.7.3.3

5 8

[pacman-dev] [PATCH] doc/PKGBUILD: document that functions run in -e mode
by Dan McGee 14 Dec '10

14 Dec '10

Caught this noted on the forums, but it is definitely worth a note in the manpage as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. doc/PKGBUILD.5.txt | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fdb868a..8bdb3c6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -235,9 +235,11 @@ name. The syntax is: `source=('filename::url')`. build() Function ---------------- In addition to the above directives, the optional build() bash function usually -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`. +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. The function is run in `bash -e` mode, meaning any command that exits +with a non-zero status will cause the function to exit. 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 @@ -261,10 +263,12 @@ the build function. package() Function ------------------ -An optional package() function can be specified in addition to the build() function. -This function is run immediately after the build() function. When specified in -combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot -usage will be limited to running the packaging stage. An existing build() function +An optional package() function can be specified in addition to the build() +function. This function is run immediately after the build() function. The +function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. When specified in combination +with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage +will be limited to running the packaging stage. An existing build() function will be run as the user calling makepkg. Package Splitting -- 1.7.3.3

1 0

[pacman-dev] Misleading info when epoch is used
by Nagy Gabor 14 Dec '10

14 Dec '10

$ sudo pacman -Su warning: supertuxkart: local (0.6.2a-2) is newer than community (0.7rc1-1) What? First I thought that our vercmp code is buggy, but vercmp binary worked as expected. Then I figured out that my local package has epoch=1, but the epoch is unset on the community package (so this seems to be a packager bug). So the above message is simply misleading (probably this is not the only one). It would be better to switch to a default version printing: "0.6.2a-2 [epoch=1]", or "1#0.6.2a-2" etc. In fact I don't like neither force nor epoch. Epoch is just a version prefix, why don't we let the packager to workaround this (KISS)? We can introduce a new separator (now we have one: '.'), for example '#', and let the packager define his favourite pkgversion (maybe epoch in mind), like "1#0.6.2a-2". Epoch just complicates code and leads to "wtf" imho... NG

7 13

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-191-g5f36523
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 5f36523af9de20a8c74714da4125bb553b0fae2c (commit) via ed367fe96d36fabe4127deab99df98cdb834145a (commit) via 1ff8118212cf566607c61e2f340dc3064c67c2ac (commit) from 13a2847aa14cb7643d50ca82b00180b440e401fe (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 5f36523af9de20a8c74714da4125bb553b0fae2c Author: Bruno Widmann <bruno.widmann(a)gmail.com> Date: Wed Oct 20 08:59:34 2010 +0200 Abort db_populate if dbpath is not set Rather than segfault. Fixes FS#21345. Signed-off-by: Bruno Widmann <bruno.widmann(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed367fe96d36fabe4127deab99df98cdb834145a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 22:42:22 2010 -0600 Update scripts/ .gitignore Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ff8118212cf566607c61e2f340dc3064c67c2ac Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 22:41:02 2010 -0600 Create sync/ DB directory if it does not exist Rather than error out, this is easy enough. Looks quite similar to the code in be_local for creating the local directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 3 +++ lib/libalpm/be_sync.c | 18 ++++++++++++++++++ scripts/.gitignore | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Local database structure change
by Dan McGee 13 Dec '10

13 Dec '10

Everyone, The commits Allan wrote and I just pushed change the local database format. depends no longer exists; everything is now in desc. Provided in the code is a 'pacman-db-upgrade' script to help you guys out if you upgrade, so be sure to run it if running pacman-git. -Dan On Sun, Dec 12, 2010 at 10:03 PM, Dan McGee <dan(a)archlinux.org> wrote: > 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". > > commit d98bacd4ec4289750e740b2dff8c4adaaa7a028a > Author: Allan McRae <allan(a)archlinux.org> > Date: Wed Dec 8 22:16:37 2010 +1000 > > Add script to update pacman database format > > The pacman-db-upgrade script was added to detect old pacman database > formats and upgrade them. > > Currently performs the merging of depends files into desc files in > the local database. > > Signed-off-by: Allan McRae <allan(a)archlinux.org> > Signed-off-by: Dan McGee <dan(a)archlinux.org> > > commit 21833d90e26635fdd2c6af247790a9bf374b4d80 > Author: Allan McRae <allan(a)archlinux.org> > Date: Sat Oct 30 15:35:43 2010 +1000 > > Merge desc and depends files in local db > > Whenever depends is needed from the local db, so is desc. The only > disadvantage to merging them is the additional time taken to read the > depends entries when they are not needed. As depends is in general > relatively small, the additional time taken to read it in will be > negligable. Also, merging these files will speed up local database > access due to less file seeks. > > Signed-off-by: Allan McRae <allan(a)archlinux.org> > Signed-off-by: Dan McGee <dan(a)archlinux.org>

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-188-g13a2847
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 13a2847aa14cb7643d50ca82b00180b440e401fe (commit) via d98bacd4ec4289750e740b2dff8c4adaaa7a028a (commit) via 8f3b485517a401ece348a1c5166d951ec4a8a28f (commit) via 21833d90e26635fdd2c6af247790a9bf374b4d80 (commit) via 209d0643e5fd38f8add70cfb3651012993d861f1 (commit) via b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d (commit) from 3030542d10d4e87997a894a9eb63122cd2426a94 (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 13a2847aa14cb7643d50ca82b00180b440e401fe Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 21:40:24 2010 -0600 pacman-optimize: ensure database directory contains local/ And also default dbpath to the one we may find in pacman.conf. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d98bacd4ec4289750e740b2dff8c4adaaa7a028a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 22:16:37 2010 +1000 Add script to update pacman database format The pacman-db-upgrade script was added to detect old pacman database formats and upgrade them. Currently performs the merging of depends files into desc files in the local database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f3b485517a401ece348a1c5166d951ec4a8a28f Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 16:01:30 2010 +1000 Update pactest suite for change in db structure Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db Whenever depends is needed from the local db, so is desc. The only disadvantage to merging them is the additional time taken to read the depends entries when they are not needed. As depends is in general relatively small, the additional time taken to read it in will be negligable. Also, merging these files will speed up local database access due to less file seeks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 209d0643e5fd38f8add70cfb3651012993d861f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 22:43:55 2008 -0500 Attempt to stop installation when we encounter problems This should hopefully address some of the concerns raised in FS#11639 with regards to continuing after filling the disk up. Add some more checks and passing of error conditions between our functions. When a libarchive warning is encountered, check if it is due to lack of disk space and if so upgrade it to an error condition. A review of other libarchive warnings suggests that these are less critical and can remain as informative warning messages at this stage. Note the presence of errors after extraction of an entire package is complete. If so, we abort the transaction to be on the safe side and keep damage to a minimum. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: make ENOSPC warning into an error] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 12 21:08:39 2008 -0500 Turn libarchive warnings into libalpm warnings Rather than hiding these warnings, show them to the user as they happen. This will prevent things such as hiding full filesystem errors (ENOSPC) from the user as seen in FS#11639. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: adjust warning wording and add gettext calls] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 80 +++++++++++++--------- lib/libalpm/be_local.c | 144 +++++++++++++++------------------------ lib/libalpm/be_package.c | 2 +- lib/libalpm/db.h | 9 +-- lib/libalpm/util.c | 2 +- scripts/Makefile.am | 3 + scripts/pacman-db-upgrade.sh.in | 121 ++++++++++++++++++++++++++++++++ scripts/pacman-optimize.sh.in | 6 +- test/pacman/pmdb.py | 62 +++++------------ test/pacman/pmpkg.py | 4 - 10 files changed, 256 insertions(+), 177 deletions(-) create mode 100644 scripts/pacman-db-upgrade.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-18-g5c8083b
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (commit) via eedf4f4e630f98350090ef2824b0981ffb4b7a4a (commit) via bd08581d2e5c67cc084b7ccb8f67df456bbd9ada (commit) from a91250b7bb718c7e36c9784d51bdcb6e0051c259 (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/be_files.c | 7 ++++--- lib/libalpm/trans.c | 2 +- po/ru.po | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-182-g3030542
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 3030542d10d4e87997a894a9eb63122cd2426a94 (commit) via 9f96c5433a4867cce9dc0c3ff23cb3ba8029be20 (commit) via ef977865a143eb682baf0d4f598c0c6924aeaa1a (commit) via b7015af0fc9325740950223e719f6dec153e264b (commit) via ec136784d4328b4c75f622c08273cf9dc6cac40f (commit) via 24684a616ed46c635a2236873c8168b9153b5bc1 (commit) via e22aa23c8f5adb0fd4b7ccbee480a4906ede0346 (commit) via 3f0d98c124db1547d6595762bd2d125b4350b861 (commit) via e527699dddca41e3af6c1872e851405a4f5212a0 (commit) via 695656d25279342f80c307035721ced6d37ee08b (commit) via f4e9deb6d74614ac427b37513359d91588dd1542 (commit) via adb10c3ab244cc00eb863d5b036fa7bdd76f8152 (commit) via f0051a7678d138ffc88a4c9c6d9add8966abe4f9 (commit) via fc74ef93b6945dfac299433a9418fdd31798f6b6 (commit) via 8e9a69e8f66b9b1a13e01ef0b67a78f2014754fa (commit) via a44c7b8956f1f445d554a742870c72ca7dacaae5 (commit) via 889c260cbf6cf497169ca9b75df121d04140441d (commit) via 579533d1a07808c3e0458d6042d6039e56c38de2 (commit) via 330951200c8a0bb90937e0578510a41220154726 (commit) via 970ffbb4c77bb2121f5aec8391bcc04e3a54986c (commit) via d4bab6f8fcfea7783c260d28c7c598055617b181 (commit) via 622e7fdd4fffcaf28679ba063505fa18755b7ba0 (commit) via 65a96e900d9b3f970fd184986303092e4735de0e (commit) via 6b928fc0bf6a2dc88c413d4bc88c7923d4741bc6 (commit) via 7c06e66c24953a6c8a15e8460be8ed3b1585c469 (commit) via abefa23341caa995cc0d155d30baa7faeb7a6c0e (commit) via 3a9dec104858a64489b004296d009c8222e7f040 (commit) via c78f5fb99ab7551868b3b2b8cd2b56807d457f59 (commit) via d0d8f605d5f3ff8fc306af90ea2a516174354bfc (commit) via d5a7dc67d93f5e530a6b3611f567eff5afe76efb (commit) via 8791ae0fdac16419d25e18acd245a65879807eb8 (commit) via a03daad0734428ded0398c9d71582f90063f3493 (commit) via c2cce1f46a754c04c3623088a9e43922a6c10e2d (commit) via 0e39cf9275c6a6f965e364792527c2704327bd02 (commit) via a35610beba1b12c37ec26ec878d3701dd669db42 (commit) via 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (commit) via eedf4f4e630f98350090ef2824b0981ffb4b7a4a (commit) via bd08581d2e5c67cc084b7ccb8f67df456bbd9ada (commit) via 4fb3cfc48f626f84329c78351d6a8710255a35e3 (commit) via a91250b7bb718c7e36c9784d51bdcb6e0051c259 (commit) via a08638edc8cdacf7840414d82bc687727d7b2363 (commit) via 592211b6dc4b9997a60543309378f1595cf38056 (commit) via d901646f7a2e67d27bcae43f90490299857646fc (commit) from 0f3957ab48f34df8e151ec026dfac0d9d2df5aec (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 3030542d10d4e87997a894a9eb63122cd2426a94 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:38:20 2010 -0600 Make reading from any file possible in sync DB Whether it be "desc", "depends", or "deltas", it really doesn't matter- treat them all the same and have the ability to read any data from any file in that list. This continues the work in a44c7b8956. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f96c5433a4867cce9dc0c3ff23cb3ba8029be20 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 13:51:31 2010 +1000 Explicitly test time difference is greater than zero We are comparing a floating point number so should use an inequality rather than implicitly testing != 0. Prevents warning given by -Wfloat-equal. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef977865a143eb682baf0d4f598c0c6924aeaa1a Author: Allan McRae <allan(a)archlinux.org> Date: Tue Dec 7 17:48:16 2010 +1000 makepkg: perform sanity checks on variables in package functions Check the over-ridden entries for provides, backup, optdepends and options for illegal entries. Partially fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b7015af0fc9325740950223e719f6dec153e264b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:12:27 2010 -0600 diskspace style cleanups and small fixes * Use our normal return() function syntax * Rework a few things to reduce number of casts * Fix void function argument declaration * Add missing gettext _() call * Remove need for seperate malloc() of statvfs/statfs structure * Unify argument order of static functions- mountpoints now always passed first * Count all files that start with '.' in a package against the DB * Rename db to db_local in check_diskspace to clarify some code * Fix some line wrapping to respect 80 characters Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec136784d4328b4c75f622c08273cf9dc6cac40f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:12:26 2010 -0600 Refactor statfs/statvfs type check Turn it into a configure-type typedef, which allows us to reduce the amount of duplicated code and clean up some #ifdef magic in the code itself. Adjust some of the other defined checks to look at the headers available rather than trying to pull in the right ones based on configure checks. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24684a616ed46c635a2236873c8168b9153b5bc1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 17:07:43 2010 +1000 Display progress bar for disk space checking Checking disk space needed for a transaction can take a while so add an informative progress bar. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e22aa23c8f5adb0fd4b7ccbee480a4906ede0346 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:54:30 2010 +1000 Add configuration option to control disk space checking Disk space checking is likely to be an unnecessary bottleneck to people with reasonable partition sizes so add a configuration option to allow it to be disabled/enabled as wanted. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3f0d98c124db1547d6595762bd2d125b4350b861 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:43:45 2010 +1000 Implement disk space checking Pull together the work of the previous commits to implement a check for enough free space before performing an install transaction. Abort if there is not enough free space with an appropriate pm_errno.. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e527699dddca41e3af6c1872e851405a4f5212a0 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:30:33 2010 +1000 Add functions to calculate approximate disk usage by packages Two helper function are added to calculate the disk usage from packages that are either currently installed on the system or from a package archive. Some minor approximations have been made: 1. Size for directories is not considered when removing a package from the filesystem to avoid multiple counting across packages. Also, these are reported to take zero size while installing. 2. Symlinks are reported to contribute zero size towards removal as libarchive reports them to have zero size for install. 3. Package data files (.PKGINFO, .INSTALL, .CHANGELOG) are counted towards usage on dbpath on install, but their size is not counted on package removal. 4. No handling of extra size needed for .pacsave/.pacnew files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 695656d25279342f80c307035721ced6d37ee08b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:24:52 2010 +1000 Add function to match file to mount point For a given file, determine which mount point it is on or will be installed to. Take into account that we might be using an alternative installation root. Add additional helper function added to sort mount point list for easier matching. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f4e9deb6d74614ac427b37513359d91588dd1542 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:15:21 2010 +1000 Add function for listing system mount points Add a mount_point_list() function that attempts to portably obtain a list of system mount points and a struct to hold needed mount point information. Abort the transaction if we are unable to determine the mount points. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit adb10c3ab244cc00eb863d5b036fa7bdd76f8152 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 15:57:39 2010 +1000 Prototype disk space checking functionality Very basic prototyping for adding functionality to check free disk space before performing package installs. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0051a7678d138ffc88a4c9c6d9add8966abe4f9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:13:37 2010 -0600 Remove AC_TYPE_SIGNAL usage This macro is deemed unnecessary by even the autoconf guys, so we really don't need to use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fc74ef93b6945dfac299433a9418fdd31798f6b6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:13:36 2010 -0600 dirent usage cleanup We were including the header in a lot of places it is no longer used. Additionally, use the correct autoconf macro for determining whether d_type is available as a member: HAVE_STRUCT_DIRENT_D_TYPE. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e9a69e8f66b9b1a13e01ef0b67a78f2014754fa Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 7 21:39:55 2010 +1000 Move MAX_DELTA_RATIO definition This is a delta specific definition so it makes more sense to put it in the delta specific header file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a44c7b8956f1f445d554a742870c72ca7dacaae5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 14:50:04 2010 +1000 Combine reading from depends and desc in sync db This will allow us to eventually combine the depends and desc entries within the sync database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 889c260cbf6cf497169ca9b75df121d04140441d Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:38 2010 -0430 makepkg: remove dead code from handle_deps The error message that has been removed never gets to print because, given the same condition, handle_deps throws the same error and then immediately exits makepkg. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 579533d1a07808c3e0458d6042d6039e56c38de2 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:37 2010 -0430 makepkg: do not ignore errors from pacman when checking deps As check_deps is run in a subshell, exit had the same meaning as return. Since the intention is to halt makepkg when pacman throws an error other than 127, the enclosing function has to handle error control instead. Fixes FS#19840 Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 330951200c8a0bb90937e0578510a41220154726 Author: Carlos Diaz <839273(a)gmail.com> Date: Thu Oct 14 12:02:46 2010 -0430 makepkg: use portable escape sequence for terminal escapes The escape string isn't necesarily \033; it's determined by what the particular termcap/info entry for that terminal contains. Bash uses ncurses functions to expand \e to the _correct_ terminal escape. Signed-off-by: Carlos Diaz <839273(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 970ffbb4c77bb2121f5aec8391bcc04e3a54986c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 10:42:41 2010 +1000 Add epoch to PKGBUILD prototypes Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d4bab6f8fcfea7783c260d28c7c598055617b181 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:23:25 2010 -0600 src/util: update .gitignore Add pactree and sort entries. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 622e7fdd4fffcaf28679ba063505fa18755b7ba0 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 18:07:31 2010 +0200 contrib: remove bash pactree This has been rewitten in C which is much much faster. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 65a96e900d9b3f970fd184986303092e4735de0e Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 17:11:14 2010 +0200 pactree: use variables for color and tree output This allows to very easily support non-color and linear mode, by just setting the variables to an empty string, very much like it was done in the bash script. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 6b928fc0bf6a2dc88c413d4bc88c7923d4741bc6 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 15:50:13 2010 +0200 pactree: separate dependency and print logic The deps walking code simply calls print_start, print, print_end, and all the printing logic is handled there. The unresolvable printing is disabled for now because it does not handle linear mode, and the linear and color output will be re-written. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 7c06e66c24953a6c8a15e8460be8ed3b1585c469 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Oct 12 14:46:12 2010 -0400 pactree: rewrite in C Use the bash script in contrib as the basis for a C rewrite using libalpm. The speedup can go from dozens of seconds to less than one second. Colorized output is preserved. The --graph option generates output that graphviz's `dot' utility will understand to draw us a graph. Output is written to stdout and it is left up to the user to pipe the data and determine the output characteristics. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit abefa23341caa995cc0d155d30baa7faeb7a6c0e Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 00:42:04 2010 +0200 alpm/remove.c : respect --dbonly during remove-upgrade When a -Sk or -Uk operation induced a removal of an existing local package, --dbonly was not in effect and the files were all removed. Fixing this behavior was already marked as TODO in database012 pactest ------------ TODO: I honestly think the above should NOT delete the original les, it hould upgrade the DB entry without touching anything on the file stem. E.g. this test should be the same as: pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz ------------ Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> [Dan: small coding style touchup] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a9dec104858a64489b004296d009c8222e7f040 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 10:02:38 2010 +0200 pacman: sort --help output Example with pacman -Uh : $ pacman -Uh options: -b, --dbpath <path> set an alternate database location -d, --nodeps skip dependency checks -f, --force force install, overwrite conflicting files -k, --dbonly only modify database entries, not package files -r, --root <path> set an alternate installation root -v, --verbose be verbose --arch <arch> set an alternate architecture --asdeps install packages as non-explicitly installed --asexplicit install packages as explicitly installed --cachedir <dir> set an alternate package cache location --config <path> set an alternate configuration file --debug display debug messages --ignore <pkg> ignore a package upgrade (can be used more than once) --ignoregroup <grp> ignore a group upgrade (can be used more than once) --logfile <path> set an alternate log file --noconfirm do not ask for any confirmation --noprogressbar do not show a progress bar when downloading files --noscriptlet do not execute the install scriptlet if one exists --print only print the targets instead of performing the operation --print-format <string> specify how the targets should be printed Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> [Dan: small coding style touchups] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c78f5fb99ab7551868b3b2b8cd2b56807d457f59 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 10 18:57:41 2010 +0200 CLI args: update --help and manpage The three parts (help, manpage and code) are now organized in the same way and much easier to compare : - specific options - install/upgrade options for -S and -U - transaction options for -S -R and -U - global options After this re-organization, it was easy to update and sync the three components together. Duplication is also avoided. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d0d8f605d5f3ff8fc306af90ea2a516174354bfc Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 21:47:40 2010 +0200 alpm: don't expose alpm_depcmp Either we expose all low levels function dealing with pmdepend_t (splitdep and depfree come to mind), or we don't. Since none of the tools use depcmp, I chose to remove it. In the future, we might want to expose higher level functions such as alpm_find_satisfier, or just lower level functions like splitdep and depfree together with depcmp. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d5a7dc67d93f5e530a6b3611f567eff5afe76efb Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 21:41:55 2010 +0200 alpm: kill alpm_deptest This has been replaced by the more flexible alpm_find_satisfier function, and alpm_deptest was completely unsused now. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8791ae0fdac16419d25e18acd245a65879807eb8 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 20:27:49 2010 +0200 pacman/deptest: reimplement with alpm_find_satisfier It's very easy to re-implement the -T feature with the more generic alpm_find_satisfier rather then the more specific and less useful alpm_deptest. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a03daad0734428ded0398c9d71582f90063f3493 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 20:13:32 2010 +0200 alpm: add new alpm_find_satisfier function whatprovides and splitdep were removed, so depcmp alone is quite useless now without splitdep, and deptest is not flexible enough. Introduce a new alpm_find_satisfier which is hopefully more flexible, this should make implementation of deptest very easy, and also help alpm tools such as pactree. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2cce1f46a754c04c3623088a9e43922a6c10e2d Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 31 21:39:31 2010 +0100 Fix a few problems reported by clang-analyzer One missing NULL-check and 3 dead assignments. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e39cf9275c6a6f965e364792527c2704327bd02 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:01:14 2010 -0600 Ensure stdin args are correctly terminated And don't require pm_targets to be empty to read from stdin either. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a35610beba1b12c37ec26ec878d3701dd669db42 Merge: 4fb3cfc 5c8083b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 19:53:20 2010 -0600 Merge branch 'maint' Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c commit 4fb3cfc48f626f84329c78351d6a8710255a35e3 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Nov 4 16:05:28 2010 -0400 Support reading package args from stdin Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 + PKGBUILD-split.proto | 1 + PKGBUILD.proto | 1 + acinclude.m4 | 28 +++- configure.ac | 15 +- contrib/Makefile.am | 2 - contrib/PKGBUILD.vim | 9 +- contrib/README | 3 - contrib/pactree.in | 322 ------------------------------- doc/pacman.8.txt | 108 +++++------ doc/pacman.conf.5.txt | 4 + etc/pacman.conf.in | 1 + lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 14 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 3 +- lib/libalpm/be_sync.c | 40 ++--- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 1 - lib/libalpm/delta.h | 3 + lib/libalpm/deps.c | 41 ++--- lib/libalpm/deps.h | 1 + lib/libalpm/diskspace.c | 319 +++++++++++++++++++++++++++++++ lib/libalpm/{log.h => diskspace.h} | 36 +++-- lib/libalpm/dload.c | 2 +- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 14 ++ lib/libalpm/handle.h | 1 + lib/libalpm/remove.c | 5 + lib/libalpm/sync.c | 19 ++- lib/libalpm/trans.c | 2 +- lib/libalpm/util.h | 3 - po/es.po | 40 ++-- po/ru.po | 2 +- po/sv.po | 168 +++++++--------- scripts/makepkg.sh.in | 46 +++-- src/pacman/callback.c | 12 +- src/pacman/deptest.c | 14 +- src/pacman/pacman.c | 312 +++++++++++++++++++----------- src/pacman/util.c | 1 - src/pacman/util.h | 1 + src/util/.gitignore | 15 +- src/util/Makefile.am | 5 +- src/util/pactree.c | 372 ++++++++++++++++++++++++++++++++++++ test/pacman/tests/database012.py | 8 +- 45 files changed, 1261 insertions(+), 746 deletions(-) delete mode 100755 contrib/pactree.in create mode 100644 lib/libalpm/diskspace.c copy lib/libalpm/{log.h => diskspace.h} (55%) create mode 100644 src/util/pactree.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix possible null pointer deref in check_arch
by Dan McGee 11 Dec '10

11 Dec '10

If we have a corrupted database, a package can come through without an arch, causing the code to blow up when making strcmp() calls. It might even be possible with perfectly valid database entries lacking an 'arch =' line. This behavior was seen as at least one of the problems in FS#21668. Ensure pkgarch is not null before doing anything further. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 49fc0f6..02612ec 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -107,7 +107,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) for(i = pkgs; i; i = i->next) { pmpkg_t *pkg = i->data; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) { + if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { char *string; const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgver = alpm_pkg_get_version(pkg); -- 1.7.3.3

1 0

[pacman-dev] Alternative dependencies.
by Xyne 10 Dec '10

10 Dec '10

Hi, Would it be possible to implement support for alternative dependencies, e.g. a package that could use either wget or curl to handle downloads? I'm not asking for this to be implemented. I'm just asking whether there are any technical limitations to such an approach. I know that "provides" can be used to do this, e.g. openjdk6 and jre both provide java-runtime to satisfy that dependency in other packages. The approach is limited though. Using the example above, we couldn't simply add "provides=('download-client')" to both curl and wget because they are not interchangeable. The basic usage case is when an application is capable of detecting any one of a number of different external apps that it can use to satisfy a given dependency. There is currently no way to depend on "at least one" of those. I can imagine a very simple syntax for this too, e.g. "depends=('curl || wget')" so the question is whether the dependency-handling mechanism could be adapted to check for alternatives. If none are found, it could probably use the upcoming "provides" selection dialogue to allow the user to choose the desired dependency. So, would that be possible? Also, would that be acceptable? Again, I'm not asking anyone to do this. I'm just inquiring about the possibility. Regards, Xyne

5 7

[pacman-dev] [PATCH] Add script to update pacman database format
by Allan McRae 08 Dec '10

08 Dec '10

The pacman-db-upgrade script was added to detect old pacman database formats and upgrade them. Currently performs the merging of depends files into desc files in the local database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 7 +++++-- scripts/pacman-db-upgrade.sh.in | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 scripts/pacman-db-upgrade.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 78deb0b..7448691 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -10,14 +10,16 @@ OURSCRIPTS = \ pacman-optimize \ pkgdelta \ rankmirrors \ - repo-add + repo-add \ + pacman-db-upgrade EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ rankmirrors.sh.in \ - repo-add.sh.in + repo-add.sh.in \ + pacman-db-upgrade.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -68,5 +70,6 @@ repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +pacman-db-update: $(srcdir)/pacman-db-update.sh.in # vim:set ts=2 sw=2 noet: diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in new file mode 100644 index 0000000..e28b1d2 --- /dev/null +++ b/scripts/pacman-db-upgrade.sh.in @@ -0,0 +1,34 @@ +#!@BASH_SHELL@ -e +# +# pacman-db-upgrade - upgrade the local pacman db to a newer format +# @configure_input@ +# +# Copyright (c) 2010 Pacman Development Team <pacman-dev(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/>. +# + +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +DBPath="${DBPath:-@localstatedir@/lib/pacman/}/local" + +# pacman-3.4 to 3.5 upgrade - merge depends into desc +if [[ $(find $DBPath -name depends) ]]; then + echo "==> pacman-3.4 database format dectected - upgrading" + for i in $DBPath/*; do + if [[ -f $i/depends ]]; then + cat $i/depends >> $i/desc + rm $i/depends + fi + done +fi -- 1.7.3.3

2 3

[pacman-dev] [PATCH] Use size_t for alpm_list sizes
by Allan McRae 08 Dec '10

08 Dec '10

There is a lot of swtiching between size_t and int for alpm_list sizes in the codebase. Start converting these to all be size_t by adjusting the return type of alpm_list_count and fixing all additional warnings given by -Wconversion that are generated by this change. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 6 +++--- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 4 ++-- lib/libalpm/diskspace.c | 6 +++--- lib/libalpm/remove.c | 6 +++--- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 5 +++-- src/pacman/callback.h | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b0b5a53..31a7928 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -477,7 +477,7 @@ static int extract_single_file(struct archive *archive, return(errors); } -static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, +static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, size_t pkg_count, pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0; @@ -715,7 +715,7 @@ cleanup: int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db) { - int pkg_count, pkg_current; + size_t pkg_count, pkg_current; int skip_ldconfig = 0, ret = 0; alpm_list_t *targ; diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 08d0269..86212a4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -405,7 +405,7 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, void *, int *); /* Transaction Progress callback */ -typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int); +typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); int alpm_trans_get_flags(); alpm_list_t * alpm_trans_get_add(); diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80ba1ee..185295c 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -269,7 +269,7 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a * * @return the resultant list */ -alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn) +alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn) { if (n > 1) { alpm_list_t *left = list; @@ -511,7 +511,7 @@ inline alpm_list_t SYMEXPORT *alpm_list_first(const alpm_list_t *list) * * @return an alpm_list_t node for index `n` */ -alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, int n) +alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, size_t n) { const alpm_list_t *i = list; while(n--) { @@ -574,9 +574,9 @@ void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node) * * @return the number of list items */ -int SYMEXPORT alpm_list_count(const alpm_list_t *list) +size_t SYMEXPORT alpm_list_count(const alpm_list_t *list) { - unsigned int i = 0; + size_t i = 0; const alpm_list_t *lp = list; while(lp) { ++i; diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index bd639f7..19fe548 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -56,7 +56,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data); alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second); alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn); -alpm_list_t *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn); +alpm_list_t *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data); alpm_list_t *alpm_list_remove_str(alpm_list_t *haystack, const char *needle, char **data); alpm_list_t *alpm_list_remove_dupes(const alpm_list_t *list); @@ -67,13 +67,13 @@ alpm_list_t *alpm_list_reverse(alpm_list_t *list); /* item accessors */ alpm_list_t *alpm_list_first(const alpm_list_t *list); -alpm_list_t *alpm_list_nth(const alpm_list_t *list, int n); +alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n); alpm_list_t *alpm_list_next(const alpm_list_t *list); alpm_list_t *alpm_list_last(const alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); /* misc */ -int alpm_list_count(const alpm_list_t *list); +size_t alpm_list_count(const alpm_list_t *list); void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn); void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9dce66d..fec8979 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -422,7 +422,7 @@ int _alpm_local_db_populate(pmdb_t *db) } closedir(dbdir); - db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp); + db->pkgcache = alpm_list_msort(db->pkgcache, (size_t)count, _alpm_pkg_cmp); return(count); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b6c9937..5951f2f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -191,7 +191,7 @@ int _alpm_sync_db_populate(pmdb_t *db) } } - db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp); + db->pkgcache = alpm_list_msort(db->pkgcache, (size_t)count, _alpm_pkg_cmp); archive_read_finish(archive); return(count); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 2b0efa5..e64a00b 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -402,8 +402,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, alpm_list_t *upgrade, alpm_list_t *remove) { alpm_list_t *i, *j, *conflicts = NULL; - int numtargs = alpm_list_count(upgrade); - int current; + size_t numtargs = alpm_list_count(upgrade); + size_t current; ALPM_LOG_FUNC; diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 5ed8e0b..728fd2c 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -243,11 +243,11 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; - int replaces = 0, abort = 0; + size_t replaces = 0, current = 0; + int abort = 0; alpm_list_t *targ; pmpkg_t *pkg; - int numtargs = alpm_list_count(trans->add); - int current = 0; + size_t numtargs = alpm_list_count(trans->add); mount_points = mount_point_list(); if(mount_points == NULL) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 90848dc..fa870c1 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -368,7 +368,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) { pmpkg_t *info; alpm_list_t *targ, *lp; - int pkg_count; + size_t pkg_count; ALPM_LOG_FUNC; @@ -382,7 +382,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) char scriptlet[PATH_MAX]; info = (pmpkg_t*)targ->data; const char *pkgname = NULL; - int targcount = alpm_list_count(targ); + size_t targcount = alpm_list_count(targ); if(handle->trans->state == STATE_INTERRUPTED) { return(0); @@ -413,7 +413,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) } } - int filenum = alpm_list_count(files); + size_t filenum = alpm_list_count(files); alpm_list_t *newfiles; _alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8af32e4..2d0a899 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -801,7 +801,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) { alpm_list_t *i, *j, *files = NULL; alpm_list_t *deltas = NULL; - int replaces = 0; + size_t replaces = 0; int errors = 0; const char *cachedir = NULL; int ret = -1; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c8f604f..ec4a683 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -325,13 +325,14 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, /* callback to handle display of transaction progress */ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, - int howmany, int remain) + size_t howmany, size_t remain) { float timediff; /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; - int tmp, digits, textlen; + int digits, textlen; + size_t tmp; char *opr = NULL; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; diff --git a/src/pacman/callback.h b/src/pacman/callback.h index c56eaa7..09fe8bd 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -33,7 +33,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, /* callback to handle display of transaction progress */ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, - int howmany, int remain); + size_t howmany, size_t remain); /* callback to handle receipt of total download value */ void cb_dl_total(off_t total); -- 1.7.3.3

1 1

[pacman-dev] [PATCH] Explicitly test time difference is greater than zero
by Allan McRae 08 Dec '10

08 Dec '10

We are comparing a floating point number so should use an inequality rather than implicitly testing != 0. Prevents warning given by -Wfloat-equal. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f585b28..c8f604f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -352,7 +352,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, timediff = get_update_timediff(0); } - if(percent > 0 && percent < 100 && !timediff) { + if(percent > 0 && percent < 100 && timediff > 0) { /* only update the progress bar when * a) we first start * b) we end the progress -- 1.7.3.3

1 0

[pacman-dev] [PATCH] makepkg: perform sanity checks on variables in package functions
by Allan McRae 08 Dec '10

08 Dec '10

Check the over-ridden entries for provides, backup, optdepends and options for illegal entries. Partially fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Resubmit of patch: - Added check for valid overridden options as it uses the same technique as the other checks that were added. - Fixed PKGBUILD vs $BUILDFILE usage scripts/makepkg.sh.in | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e321d1..ac10ad3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), +# awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization @@ -1222,21 +1222,27 @@ check_sanity() { fi fi - for i in ${provides[@]}; do + local provides_list + eval $(awk '/^[[:space:]]*provides=/,/)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") + for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi done - for i in "${backup[@]}"; do + local backup_list + eval $(awk '/^[[:space:]]*backup=/,/)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") + for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" return 1 fi done - for i in "${optdepends[@]}"; do + local optdepends_list + eval $(awk '/^[[:space:]]*optdepends=/,/)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" @@ -1257,8 +1263,9 @@ check_sanity() { done local valid_options=1 - local known kopt - for i in ${options[@]}; do + local known kopt options_list + eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/") + for i in ${options_list[@]}; do known=0 # check if option matches a known option or its inverse for kopt in ${packaging_options[@]} ${other_options[@]}; do -- 1.7.3.3

1 0

[pacman-dev] [PATCH] makepkg: perform sanity checks on variables in package functions
by Allan McRae 07 Dec '10

07 Dec '10

Check the over-ridden entries for provides, backup and optdepends for illegal entries. Fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e321d1..d5ccdbf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), +# awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization @@ -1222,21 +1222,27 @@ check_sanity() { fi fi - for i in ${provides[@]}; do + local provides_list + eval $(awk '/^[[:space:]]*provides=/,/)/' PKGBUILD | sed "s/provides=/provides_list+=/") + for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi done - for i in "${backup[@]}"; do + local backup_list + eval $(awk '/^[[:space:]]*backup=/,/)/' PKGBUILD | sed "s/backup=/backup_list+=/") + for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" return 1 fi done - for i in "${optdepends[@]}"; do + local optdepends_list + eval $(awk '/^[[:space:]]*optdepends=/,/)/' PKGBUILD | sed "s/optdepends=/optdepends_list+=/") + for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" -- 1.7.3.3

2 2

[pacman-dev] Changing how repo dbs are updated
by Allan McRae 04 Dec '10

04 Dec '10

Hi, This message is more of a sounding board for me to get the issues surrounding this sorted and point out what I am planning to do. But any comments on this would also be appreciated. Especially #3 below. Issue I see currently and in the future with signed databases: 1) Currently the repo dbs are updated just like downloading a package file. If the update is started and canceled part way though, you get a repo.db.part file which pacman attempts to continue downloading. However, unlike package files, this file is not static content and so we should never continue the download. See https://bugs.archlinux.org/task/15657 . This can be handled by just deleting the repo.db.part file if present, but it might be better just never create .part files in the first place for repo dbs by downloading to a temporary location and moving/deleting based on successful completion. That would mean having a different download function for repo dbs and packages. See #2 for additional reasons to split this... 2) Database signing. Currently the code downloads the database, deletes the old now invalid signature, then downloads the new signature. If the signature is valid, then all is fine. However, if it fails to download or is invalid, pacman issues an error about failing to update the database. The database on your system is now not correctly signed (which is bad given its signature is only checked on update...). I think that the old database and signature should only be overwritten if the new database download is successful _and_ its signature is valid. This requires downloading the database and its signature to a temporary location and then moving the files only once they are confirmed valid. That would require a different download interface for package and database downloads, but that is a good thing as we can get rid of the force crap from the one used for packages. 3) pacman -Syy behavior. Instead of adding a "force" flag to overwrite the old database, would it be better to just delete the old database first? Currently, if you use pacman -Syy and a database download fails, you are left with the old sync database you told pacman to get rid of. Is leaving pacman with no database for that repo a better solution? I'm not sure about #3... But to fix #1 and #2, I think we need to split the download handling for dbs and packages slightly unless someone has a better idea of how to deal with those? Allan

4 7

[pacman-dev] [PATCH] pacman-key: improve usage output
by Allan McRae 25 Nov '10

25 Nov '10

Make the usage output display nicely on 80 character width terminals. Also fix parsing of "-h" and "-v" options and avoid root check when run with no commands. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 7e22aa4..b2bfb23 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -61,20 +61,24 @@ usage() { printf "$(gettext " Default is set in %s")\n" "@sysconfdir@/pacman.conf" echo echo "$(gettext "The available commands are:")" - echo "$(gettext " pacman-key -a | --add [<file>] ... - add the key contained ")" - echo "$(gettext " in <file> (empty for stdin)")" - echo "$(gettext " pacman-key -d | --del <keyid> ... - remove the key <keyid>")" - echo "$(gettext " pacman-key -e | --export <keyid> ... - output the key <keyid>")" - echo "$(gettext " pacman-key -r | --receive <keyserver> <keyid> ... - fetch the keyids from")" - echo "$(gettext " the specified keyserver URL")" - echo "$(gettext " pacman-key -t | --trust <keyid> ... - set the trust level of the given key")" - echo "$(gettext " pacman-key -u | --updatedb - update the trustdb of pacman")" - echo "$(gettext " pacman-key --reload - reloads the keys from the keyring package")" - echo "$(gettext " pacman-key -l | --list - list keys")" - echo "$(gettext " pacman-key -f | --finger [<keyid]> ... - list fingerprint for specified keyids (or for all, if none is specified)")" - echo "$(gettext " pacman-key --adv <params> - use pacman's keyring as target for advanced commands")" - echo "$(gettext " pacman-key -h | --help - displays this message")" - echo "$(gettext " pacman-key -v | --version - displays the current version")" + echo "$(gettext " -a | --add [<file>] ... - add the key contained in <file>")" + echo "$(gettext " (empty for stdin)")" + echo "$(gettext " -d | --del <keyid> ... - remove the key <keyid>")" + echo "$(gettext " -e | --export <keyid> ... - output the key <keyid>")" + echo "$(gettext " -f | --finger [<keyid>] ... - list fingerprint for specified keyids")" + echo "$(gettext " (or for all, if no key is specified)")" + echo "$(gettext " -h | --help - displays this message")" + echo "$(gettext " -l | --list - list keys")" + echo "$(gettext " -r | --receive <keyserver> <keyid> ... - fetch the keyids from the specified")" + echo "$(gettext " keyserver URL")" + echo "$(gettext " -t | --trust <keyid> ... - set the trust level of the given key")" + echo "$(gettext " -u | --updatedb - update the trustdb of pacman")" + echo "$(gettext " -v | --version - displays the current version")" + echo "$(gettext " --adv <params> - use pacman's keyring as target for")" + echo "$(gettext " advanced gpg commands")" + echo "$(gettext " --reload - reloads the keys supplied by your")" + printf "$(gettext " distribution in %s")"'@prefix@/share/pacman' + echo } version() { @@ -214,7 +218,7 @@ if ! type gettext &>/dev/null; then } fi -if [[ $1 != "--version" && $1 != "-v" && $1 != "--help" && $1 != "-h" ]]; then +if [[ $1 != "--version" && $1 != "-v" && $1 != "--help" && $1 != "-h" && $1 != "" ]]; then if type -p gpg >/dev/null 2>&1 = 1; then error "$(gettext "gnupg does not seem to be installed.")" msg2 "$(gettext "pacman-key requires gnupg for most operations.")" @@ -317,10 +321,10 @@ case "${command}" in ${GPG_PACMAN} "$@" || ret=$? exit $ret ;; - --help) + -h | --help) usage ;; - --version) + -v | --version) version exit 0 ;; -- 1.7.3.2

1 0

[pacman-dev] New patchset for package signing
by Denis A. Altoé Falqueto 25 Nov '10

25 Nov '10

So, I changed the code to use gpgme. Here are the patches for your evaluation. By the way, I'm not {angry,upset,crying} :) I really want to see package signing in pacman, but I know that this is a complex issue that will need lots of discussion. Below, follows a little explanation of the general idea of each patch. [PATCH 1/5] pacman-key: keyring management tool The script that helps with management for pacman keyring. It uses gpg, instead of gpg2 and is heavly inpired on apt-key, from debian. It is very straightforward. [PATCH 2/5] Signature verification functions Two functions: one for signatures in memory and another for signatures in files. Signatures of packages are stored in the repository and are copied to memory before verification. The signatures of database files are stored on files, hence the new function. [PATCH 3/5] Verify the signatures of databases and packages The calls for the signature functions. Verification of database updates and package instalations from the repositories. I didn't worry about local instalations, but it doesn't mean they are not there. If it were verified before (as Dan suggests), they are there. :) A point raised by Dan was that the reading of the signature from the repository was too complex. The reaasoning behind it is that signatures grow according to the size of the key used to sign. So, we can't be never sure if some buffer size is really enough. Maybe it is enough now, but in the future it may be not and we'll have a new bug in the bugtracker. My implementation is simple and robust, so it will work with any signature size. [PATCH 4/5] Parameter to select key to sign Just a new parameter to allow the packager to select the key he wants to use. if the key is not specified, his default key will be used. [PATCH 5/5] Document new options related to package signing Just documentation. No imporant comment. As always, comments and suggestions are welcome. -- Denis A. Altoé Falqueto

7 34

[pacman-dev] (Locally) signing a key with pacman-key?
by Allan McRae 24 Nov '10

24 Nov '10

Hi, While playing around with package/database signing, I noticed that I could only validate my packages if I imported my key with pacman-key and then gave it "ultimate" trust. Setting "high" trust allows the signing to be verified but with an unknown trust level. So it seems to me that we always need (at least) one key with ultimate trust in our pacman keyring. I am still confirming my understanding of this on the gpg mailing list so feel free to correct me if I am completely wrong! So, the procedure for someone to use a signed repo would be either: 1) Import the key for a signed repo (which may be used to sign other keys for that repo) and give it "ultimate" trust. While giving ultimate trust to a key that is not yours may be a bit strange, it is only ultimate trust as fas as the pacman keyring goes so may be acceptable... 2) Have your personal key in the pacman keyring with "ultimate" trust. Import the key for the signed repo and locally sign it with your key. If that key is a "master key" that signs other keys used in the signed repo, then we need to give it a trust level (probably full...). I think both methods have their pros and cons. It should be up to the user to decide which they use. The second method has the advantage that you have to explicitly give the key a trust level so importing a key for a repo does not allow that key to be used to install a package adding a bunch of new keys which have been signed by it. It has the disadvantage that you would have to import your secret key into pacman's keyring... If people think the second method is reasonable, it would be good to add an option to pacman-key to allow signing (locally only) of keys. Discuss! Allan

2 4

[pacman-dev] [PATCH] Add SCMs to DLAGENTS
by David Campbell 24 Nov '10

24 Nov '10

Treat source control management programs like they are download agents. Specify what %o and %u mean so that users can meaningfully modify how they want different SCMs to behave. --- etc/makepkg.conf.in | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..6636e17 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,11 +8,18 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' +# Variables: %u = url, %o = filename 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' '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') + 'scp::/usr/bin/scp -C %u %o' + 'darcs::/usr/bin/darcs get --partial --set-scripts-executablei %u' + 'cvs::/usr/bin/cvs -z3 %u co -D $pkgver -f %o' + 'git::/usr/bin/git clone %u %o' + 'svn::/usr/bin/svn co %u --config-dir ./ -r $pkgver %o' + 'bzr::' + 'hg::/usr/bin/hg clone %u %o') # Other common tools: # /usr/bin/snarf -- 1.7.3.1

2 2