- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: allow empty source arrays
by Andrew Gregory 18 Oct '13

18 Oct '13

Necessary for metapackages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8050d0b..ccc1ddf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2248,7 +2248,7 @@ check_sanity() { done local idx=("${!source[@]}") - if (( (idx[-1] + 1) != ${#source[*]} )); then + if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then error "$(gettext "Sparse arrays are not allowed for source")" ret=1 fi -- 1.8.4.1

1 0

[pacman-dev] [PATCH] Update existing sources instead of removing them first for VCS sources.
by Lukáš Jirkovský 16 Oct '13

16 Oct '13

Previously, the sources in $srcdir were always removed prior building. After this change the sources are only updated. This makes incremental builds possible. Also this goes in line with the current behaviour for other types of sources, where the sources are just being overwritten without being removed first. --- scripts/makepkg.sh.in | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ec240..bb4297c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -516,9 +516,11 @@ extract_bzr() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "bzr" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + bzr update + elif ! { bzr checkout "$dir" "${revision[@]}" --lightweight && ( cd "$repo" && bzr pull "$dir" -q --overwrite "${revision[@]}" ); }; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "bzr" plain "$(gettext "Aborting...")" @@ -580,9 +582,11 @@ extract_git() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! git clone "$dir"; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + git pull + cd_safe "$srcdir" + elif ! git clone "$dir"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -607,7 +611,7 @@ extract_git() { fi if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then + if ! git checkout -B makepkg $ref; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -662,7 +666,6 @@ extract_hg() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -677,7 +680,10 @@ extract_hg() { esac fi - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + if [[ -d "${dir##*/}" ]]; then + cd_safe "${dir##*/}" + hg pull -u + elif ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 @@ -739,7 +745,6 @@ extract_svn() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" local ref if [[ -n $fragment ]]; then @@ -754,16 +759,20 @@ extract_svn() { esac fi - cp -a "$dir" . - if [[ -n ${ref} ]]; then - cd_safe "$(get_filename "$netfile")" + cd_safe "$dir" if ! svn update -r ${ref}; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" fi fi + if [[ -d "${dir##*/}" ]]; then + cp -au "$dir" "$srcdir" + else + cp -a "$dir" . + fi + popd &>/dev/null } -- 1.8.4

4 10

[pacman-dev] [PATCH] makepkg.8: Document remaining environmental variables
by Allan McRae 16 Oct '13

16 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index d047aee..699d6bc 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -210,7 +210,7 @@ set up a development PKGBUILD. Environment Variables --------------------- -*PACMAN*:: +**PACMAN**:: The command that will be used to check for missing dependencies and to install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U operations must be supported by this command. If the variable is not @@ -224,6 +224,14 @@ Environment Variables Folder where the downloaded sources will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**SRCPKGDEST=**"/path/to/folder":: + Folder where source package files will be stored. Overrides the + corresponding value defined in linkman:makepkg.conf[5]. + +**LOGDEST=**"/path/to/folder":: + Folder where generated log files will be stored. Overrides the + corresponding value defined in linkman:makepkg.conf[5]. + **PACKAGER=**"John Doe <john(a)doe.com>":: String to identify the creator of the resulting package. Overrides the corresponding value defined in linkman:makepkg.conf[5]. @@ -236,6 +244,10 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: + Sets the compression used when making compiled or source packages. + Overrides the corresponding value defined in linkman:makepkg.conf[5]. + **GNUPGHOME=**"/path/to/folder":: Folder where the gpg keyring for signing the built package is stored. -- 1.8.4

2 2

[pacman-dev] [PATCH v3] Indicate ignored packages in -Qu output
by Allan McRae 16 Oct '13

16 Oct '13

Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd50b05..8814307 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -324,6 +324,10 @@ static int display(alpm_pkg_t *pkg) if(config->op_q_upgrade) { alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); + + if(alpm_pkg_should_ignore(config->handle, pkg)) { + printf(" %s", _("[ignored]")); + } } printf("\n"); -- 1.8.4

1 0

[pacman-dev] [PATCH] Expose alpm_pkg_should_ignore
by Allan McRae 16 Oct '13

16 Oct '13

This function is useful for frontends to annotate package upgrades that will be ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 1 - lib/libalpm/sync.c | 14 +++++++------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 29b9f37..2c8c1e6 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -793,6 +793,15 @@ alpm_list_t *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg); +/** Test if a package should be ignored. + * Checks if the package is ignored via IgnorePkg, or if the package is + * in a group ignored via IgnoreGroup. + * @param handle the context handle + * @param pkg the package to test + * @return 1 if the package should be ignored, 0 otherwise + */ +int alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); + /** @name Package Property Accessors * Any pointer returned by these functions points to internal structures * allocated by libalpm. They should not be freed nor modified in any diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 745eac1..cf7605e 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -664,7 +664,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, pkg = _alpm_db_get_pkgfromcache(db, dep->name); if(pkg && _alpm_depcmp_literal(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, @@ -693,7 +693,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, * possibly be the same string */ if(pkg->name_hash != dep->name_hash && _alpm_depcmp(pkg, dep) && !alpm_pkg_find(excluding, pkg->name)) { - if(_alpm_pkg_should_ignore(handle, pkg)) { + if(alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { QUESTION(handle, ALPM_QUESTION_INSTALL_IGNOREPKG, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index cfdbb3f..1294f8e 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -753,7 +753,7 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) * * @return 1 if the package should be ignored, 0 otherwise */ -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) +int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) { alpm_list_t *groups = NULL; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b7c3358..07b043c 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -148,7 +148,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); -int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a4b1bb8..066f1f2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -93,8 +93,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, _alpm_log(handle, ALPM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", lpkg->name, lpkg->version, spkg->version); /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -105,8 +105,8 @@ static int check_literal(alpm_handle_t *handle, alpm_pkg_t *lpkg, } else if(cmp < 0) { if(enable_downgrade) { /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"), lpkg->name, lpkg->version, spkg->version); } else { @@ -148,8 +148,8 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, int doreplace = 0; alpm_pkg_t *tpkg; /* check IgnorePkg/IgnoreGroup */ - if(_alpm_pkg_should_ignore(handle, spkg) - || _alpm_pkg_should_ignore(handle, lpkg)) { + if(alpm_pkg_should_ignore(handle, spkg) + || alpm_pkg_should_ignore(handle, lpkg)) { _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), lpkg->name, lpkg->version, spkg->name, spkg->version); @@ -270,7 +270,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, if(alpm_pkg_find(ignorelist, pkg->name)) { continue; } - if(_alpm_pkg_should_ignore(db->handle, pkg)) { + if(alpm_pkg_should_ignore(db->handle, pkg)) { ignorelist = alpm_list_add(ignorelist, pkg); int install = 0; QUESTION(db->handle, ALPM_QUESTION_INSTALL_IGNOREPKG, pkg, -- 1.8.4

1 0

[pacman-dev] [PATCH v2] Indicate ignored packages in -Qu output
by Allan McRae 16 Oct '13

16 Oct '13

Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: check IgnoreGroup too. src/pacman/query.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index bd50b05..77e783c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -317,13 +317,33 @@ static int display(alpm_pkg_t *pkg) if(!config->op_q_info && !config->op_q_list && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { + const char *pkgname = alpm_pkg_get_name(pkg); const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s", colstr->title, alpm_pkg_get_name(pkg), + + printf("%s%s %s%s%s", colstr->title, pkgname, colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + int ignored = 0; + printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); + + /* check if package or package group is ignored */ + if(alpm_list_find_str(alpm_option_get_ignorepkgs(config->handle), pkgname)) { + ignored = 1; + } else { + const alpm_list_t *g; + for(g = alpm_pkg_get_groups(pkg); g; g = g->next) { + if(alpm_list_find_str(alpm_option_get_ignoregroups(config->handle), g->data)) { + ignored = 1; + } + } + } + + if(ignored == 1) { + printf(" %s", _("[ignored]")); + } } printf("\n"); -- 1.8.4

2 1

[pacman-dev] [PATCH] repo-add.8: Provide example usage
by Allan McRae 15 Oct '13

15 Oct '13

Detail the current standard of generating two databases - with and without the file list. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/repo-add.8.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index e51fadf..d44a8a7 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -82,6 +82,19 @@ repo-add Options Remove old package files from the disk when updating their entry in the database. +Example +------- + +'repo-add' is often invoked twice to create two separate databases; a smaller +database used by pacman and a large database containing package file lists for +use by other utilities. + +'repo-add' foo.db.tar.xz <pkg1> [<pkg2> ...] +'repo-add' -f foo.files.tar.xz <pkg1> [<pkg2> ...] + +While pacman can use the large database (if given a db.tar* extension), there +is currently no additional benefit for the larger download. + See Also -------- linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] -- 1.8.4

1 0

[pacman-dev] [PATCH] makepkg.8: document environmental variables that affect gpg signing
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Replaces patch sent with just GNUPGHOME documented. doc/makepkg.8.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 448d447..d047aee 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -236,6 +236,13 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**GNUPGHOME=**"/path/to/folder":: + Folder where the gpg keyring for signing the built package is stored. + +**GPGKEY=**"keyid":: + Specify a key to use when signing packages, overriding the GPGKEY setting + in linkman:makepkg.conf[5] + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 1.8.4

1 0

[pacman-dev] [PATCH] doc: note use of GNUPGHOME to select keyring for signing packages
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 448d447..1687fc3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -236,6 +236,9 @@ Environment Variables Force build for a specific architecture. Useful for cross-compiling. Overrides the corresponding value defined in linkman:makepkg.conf[5]. +**GNUPGHOME=**"/path/to/folder":: + Folder where the gpg keyring for signing the built package is stored. + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 1.8.4

1 0

[pacman-dev] [PATCH] Fix detection of joint --native and --foreign usage
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f485692..f22f40f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -600,7 +600,8 @@ static void checkargs_query(void) } invalid_opt(config->op_q_deps && config->op_q_explicit, "--deps", "--explicit"); - invalid_opt(config->op_q_locality & (PKG_LOCALITY_NATIVE | PKG_LOCALITY_FOREIGN), + invalid_opt((config->op_q_locality & PKG_LOCALITY_NATIVE) && + (config->op_q_locality & PKG_LOCALITY_FOREIGN), "--native", "--foreign"); } -- 1.8.4

1 0