- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Allow querying directory ownership
by Allan McRae 21 May '12

21 May '12

The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. This combines ideas from two patches that have been around for a long time. Original-work-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not having this feature is beginning to annoy me! Hopefully I have captured the important bits of both patches... src/pacman/query.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 464efbf..beaf76c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -113,6 +113,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; + alpm_list_t *packages; /* This code is here for safety only */ if(targets == NULL) { @@ -133,13 +134,14 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path, root); db_local = alpm_get_localdb(config->handle); + packages = alpm_db_get_pkgcache(db_local); for(t = targets; t; t = alpm_list_next(t)) { char *filename, *dname, *rpath; const char *bname; struct stat buf; alpm_list_t *i; - int found = 0; + size_t found = 0, isdir, bname_len, dname_len; filename = strdup(t->data); @@ -162,16 +164,20 @@ static int query_fileowner(alpm_list_t *targets) } } - if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + /* make sure directories have a trailing '/' */ + if((isdir = S_ISDIR(buf.st_mode))) { + size_t len = strlen(filename); + if(filename[len-1] != '/') { + filename = realloc(filename, sizeof(char) * (len + 2)); + strcat(filename, "/"); + } } bname = mbasename(filename); + bname_len = strlen(bname); dname = mdirname(filename); + dname_len = strlen(dname); + /* for files in '/', there is no directory name to match */ if(strcmp(dname, "") == 0) { rpath = NULL; @@ -190,7 +196,7 @@ static int query_fileowner(alpm_list_t *targets) } free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + for(i = packages; i && (!found || isdir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -199,17 +205,27 @@ static int query_fileowner(alpm_list_t *targets) const alpm_file_t *file = filelist->files + j; char *ppath, *pdname; const char *pkgfile = file->name; + size_t pkgfile_len = strlen(pkgfile); - /* avoid the costly resolve_path usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + /* avoid the costly resolve_path usage if the basenames don't match; + * we can also cheat by comparing the final characters first and avoid + * a full string comparison */ + if(!isdir && (pkgfile[pkgfile_len - 1] != bname[bname_len - 1] || + strcmp(mbasename(pkgfile), bname) != 0)) { continue; + } else if(isdir) { + /* database path needs trailing slash */ + if(pkgfile[pkgfile_len - 1] != '/' && + pkgfile[pkgfile_len - 2] != dname[dname_len - 2]) { + continue; + } } /* for files in '/', there is no directory name to match */ if(!rpath) { print_query_fileowner(filename, info); found = 1; - continue; + break; } if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { -- 1.7.10.2

1 1

[pacman-dev] [PATCH] libalpm/remove.c - add doxygen
by andrew.gregory.8＠gmail.com 21 May '12

21 May '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 95 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 469ce9b..dfbad00 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -43,6 +43,15 @@ #include "handle.h" #include "conflict.h" +/** + * @brief Add a package removal action to the transaction. + * + * @param handle the context handle + * @param pkg the package to uninstall + * + * @return 0: success + * -1: error (pm_errno is set accordingly) + */ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) { const char *pkgname; @@ -73,6 +82,15 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) return 0; } +/** + * @brief Add dependencies to the removal transaction for cascading. + * + * @param handle the context handle + * @param lp TODO + * + * @return 0: on success + * -1: on error + */ static int remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) { alpm_trans_t *trans = handle->trans; @@ -105,6 +123,12 @@ static int remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) return 0; } +/** + * @brief Remove needed packages from the removal transaction. + * + * @param handle the context handle + * @param lp TODO + */ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) { alpm_trans_t *trans = handle->trans; @@ -135,13 +159,18 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) } } -/** Transaction preparation for remove actions. +/** + * @brief Transaction preparation for remove actions. + * * This functions takes a pointer to a alpm_list_t which will be * filled with a list of alpm_depmissing_t* objects representing * the packages blocking the transaction. + * * @param handle the context handle * @param data a pointer to an alpm_list_t* to fill - * @return 0 on success, -1 on error + * + * @return 0: on success + * -1: on error */ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) { @@ -209,6 +238,16 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) return 0; } +/** + * @brief Check if alpm can delete a file. + * + * @param handle the context handle + * @param file file to be removed + * @param skip_remove list of files that will not be removed + * + * @return 1: the file can be deleted + * 0: the file cannot be deleted + */ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, alpm_list_t *skip_remove) { @@ -235,8 +274,24 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } -/* Helper function for iterating through a package's file and deleting them - * Used by _alpm_remove_commit. */ +/** + * @brief Unlink a package file, backing it up if necessary. + * + * @note Helper function for iterating through a package's file and deleting + * them. + * @note Used by _alpm_remove_commit. + * + * @param handle the context handle + * @param oldpkg the package being removed + * @param newpkg the package replacing \a oldpkg + * @param fileobj file to remove + * @param skip_remove list of files that shouldn't be removed + * @param nosave whether files should be backed up + * + * @return 0: success + * -1: error unlinking file + * 1: file was skipped or did not exist + */ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, const alpm_file_t *fileobj, alpm_list_t *skip_remove, int nosave) @@ -354,6 +409,20 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, return 0; } +/** + * @brief Remove a package's files, optionally skipping its replacement's + * files. + * + * @param handle the context handle + * @param oldpkg package to remove + * @param newpkg package to replace \a oldpkg (optional) + * @param targ_count current index within the transaction (1-based) + * @param pkg_count the number of packages affected by the transaction + * + * @return 0: success + * -1: some files could not be deleted + * >0: the number of files that were not deleted + */ static int remove_package_files(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) @@ -433,6 +502,17 @@ static int remove_package_files(alpm_handle_t *handle, return err; } +/** + * @brief Remove a package from the filesystem. + * + * @param handle the context handle + * @param oldpkg package to remove + * @param newpkg package to replace \a oldpkg (optional) + * @param targ_count current index within the transaction (1-based) + * @param pkg_count the number of packages affected by the transaction + * + * @return 0 + */ int _alpm_remove_single_package(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) @@ -488,9 +568,18 @@ int _alpm_remove_single_package(alpm_handle_t *handle, pkgname); } - return 0; + return 0; /* TODO: useful return values */ } +/** + * @brief Remove packages in the current transaction. + * + * @param handle the context handle + * @param run_ldconfig whether to run ld_config after removing the packages + * + * @return 0: success + * -1: errors occurred while removing files + */ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig) { alpm_list_t *targ; @@ -508,6 +597,7 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig) return ret; } + /* TODO: _alpm_remove_single_package can't actually return -1 */ if(_alpm_remove_single_package(handle, pkg, NULL, targ_count, pkg_count) == -1) { handle->pm_errno = ALPM_ERR_TRANS_ABORT; -- 1.7.10.2

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-278-g9a76a45
by dan＠archlinux.org 21 May '12

21 May '12

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 9a76a458b898ea462666491cb74cd95372462da4 (commit) via 81bc390dc1a66841a332948fd906c2257720f37a (commit) via 18e0a972094d7c4bc874ba87ce3be6b2b308a832 (commit) via 7eb6dc2a9c2ecb723b07598b14cd24359004ef9e (commit) via 8abef73ba99d183c191732686b4feab75a644b32 (commit) via c4ea4e017fc35fe8c5057b86bab0a95dac75fc6f (commit) via e533478e02882170653d79b756ae3d5690d076e9 (commit) from 363894e27b07f00d7b1cd9f92214f3f457ac4c48 (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 9a76a458b898ea462666491cb74cd95372462da4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 19 23:09:22 2012 +1000 makepkg: rework libdepends Rewrite the handling of libdepends. The primary advantage are: - Moves functionality from write_pkginfo() to find_libdepends(). - The order of the depends array in the PKGBUILD is kept in the package. - An unneeded libdepends is only a warning and not an error. This allows putting a libdepend on a library that is dlopened. - It is now modular so can be extended to library types other than ELF *.so. - Finding the list of libraries a package depends only occurs when a libdepend is specified in the depends array. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 81bc390dc1a66841a332948fd906c2257720f37a Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 19 21:00:18 2012 +1000 repo-add: add makedepends information This is useful for tools that automatically rebuild packages and thus require to generate a build order. These entries are skipped by pacman. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 18e0a972094d7c4bc874ba87ce3be6b2b308a832 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 19 20:38:12 2012 +1000 makepkg: write makedepends into .PKGINFO Currently there is no way to access the makedepends for a package apart from parsing its PKGBUILD. Put these into the .PKGINFO file with the idea of making them available in the repo dbs so that automated build tools can readily determine build order. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7eb6dc2a9c2ecb723b07598b14cd24359004ef9e Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 8 17:05:11 2012 +1000 Define _FORTIFY_SOURCE in CPPFLAGS The -D_FORTIFY_SOURCE=2 define should be in CPPFLAGS and not CFLAGS Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8abef73ba99d183c191732686b4feab75a644b32 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 22 20:19:18 2011 +1000 makepkg: Add CPPFLAGS support Add CPPFLAGS support in addition to the current CFLAGS and CXXFLAGS. This keeps compiler flags split up in the same logical way done everywhere else. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4ea4e017fc35fe8c5057b86bab0a95dac75fc6f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 9 16:01:48 2012 -0500 updpkgsums: add new contrib script This updates checksums in a PKGBUILD in-place. If no sums are found, they are appended to the end. commit e533478e02882170653d79b756ae3d5690d076e9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue May 8 17:23:58 2012 -0400 fix -Wshadow warnings as reported by gcc 4.4.3 Apparently gcc 4.7 has decided that -Wshadow warnings aren't worth reporting anymore even with the flag enabled. These were found on an Ubuntu 10.04 install. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/updpkgsums.sh.in | 93 ++++++++++++++++++++++++++++++++++++++++++ doc/PKGBUILD.5.txt | 8 ++-- doc/makepkg.conf.5.txt | 3 ++ etc/makepkg.conf.in | 1 + lib/libalpm/be_sync.c | 6 +++ lib/libalpm/conflict.c | 4 +- lib/libalpm/deps.c | 16 ++++---- lib/libalpm/dload.c | 20 ++++----- m4/acinclude.m4 | 2 +- scripts/makepkg.sh.in | 102 ++++++++++++++++++++++++++++------------------ scripts/repo-add.sh.in | 23 ++++++----- 13 files changed, 209 insertions(+), 75 deletions(-) create mode 100755 contrib/updpkgsums.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-271-g363894e
by dan＠archlinux.org 20 May '12

20 May '12

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 363894e27b07f00d7b1cd9f92214f3f457ac4c48 (commit) via 9f6a67fee71a63848f958212c1b5a2abd0f735a5 (commit) via fc9002188b588cda1f5362d6d15bd6996c532982 (commit) via 9d3e59e311a863e140699dd2eaec7c0b0bf632f4 (commit) via c2fdc38b78d9b83e783ff2ec3f8c4d53e7f45634 (commit) via ceb23622097bb59ef568fd2565d71148069664c8 (commit) via 5de465d63efbb82da6127ac927ad29b9c8b1b542 (commit) via 233e5f610c409052d4f88382ce5fe97f54fd6e6c (commit) via 26abe8f6004777ba49777eaaec3bc0a47f50fcb2 (commit) via 267158112317b0696c210006fb216ce7dae5cac3 (commit) via 951d23e3ec03fbd7faa3fad910a664365f75b3c4 (commit) via 9e2078b1796dbc8dee201710b4680fb79114cbf3 (commit) via 3f202c780834557557baa4b3503690b629bf4222 (commit) via 1bf05e706b5edac92e9c913a69ca8686c6440f8b (commit) from 9d9c12e4e2dc92dfb6582ea7f79087e382348e71 (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 363894e27b07f00d7b1cd9f92214f3f457ac4c48 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun May 6 19:53:00 2012 -0400 contrib/pacsysclean: use a standard vim modeline Fix indenting to something more familiar with the rest of the codebase. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f6a67fee71a63848f958212c1b5a2abd0f735a5 Merge: fc90021 5de465d Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 20 17:41:21 2012 -0500 Merge branch 'maint' Conflicts: scripts/pacman-key.sh.in commit fc9002188b588cda1f5362d6d15bd6996c532982 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 12 22:15:09 2012 -0400 pacman-key: use mapfile over read Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 9d3e59e311a863e140699dd2eaec7c0b0bf632f4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 12 22:13:11 2012 -0400 makepkg: use mapfile where plausible With bash4 as a requirement, we can use mapfile when reading command output into an array. mapfile has the advantage of using block buffered I/O rather than line buffered I/O, making it slightly faster for most jobs. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c2fdc38b78d9b83e783ff2ec3f8c4d53e7f45634 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat May 5 13:34:07 2012 -0400 pacman: support group selection delimited by commas We support multiple arguments being comma separated elsewhere, so this seems like a natural extension to support in our multiparse selection code. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ceb23622097bb59ef568fd2565d71148069664c8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Apr 25 22:00:00 2012 -0400 pkgdelta: adopt parseopts for option parsing Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsysclean.sh.in | 62 ++++---- doc/index.txt | 26 +--- doc/pacman.8.txt | 15 +- lib/libalpm/add.c | 5 +- scripts/Makefile.am | 3 +- scripts/makepkg.sh.in | 11 +- scripts/pacman-key.sh.in | 18 +-- scripts/pkgdelta.sh.in | 44 +++--- scripts/po/en_GB.po | 324 ++++++++++++++++++++--------------------- scripts/po/pacman-scripts.pot | 43 ++++-- src/pacman/util.c | 2 +- 11 files changed, 276 insertions(+), 277 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-17-g5de465d
by dan＠archlinux.org 20 May '12

20 May '12

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 5de465d63efbb82da6127ac927ad29b9c8b1b542 (commit) via 233e5f610c409052d4f88382ce5fe97f54fd6e6c (commit) via 26abe8f6004777ba49777eaaec3bc0a47f50fcb2 (commit) via 267158112317b0696c210006fb216ce7dae5cac3 (commit) via 951d23e3ec03fbd7faa3fad910a664365f75b3c4 (commit) via 9e2078b1796dbc8dee201710b4680fb79114cbf3 (commit) via 3f202c780834557557baa4b3503690b629bf4222 (commit) via 1bf05e706b5edac92e9c913a69ca8686c6440f8b (commit) from 5f71570ec48588bf24bfe786f40b500216084d07 (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 5de465d63efbb82da6127ac927ad29b9c8b1b542 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun May 13 13:05:58 2012 -0400 pacman-key: test for content in keyring files Test for file content (-s) rather than just existance (-f). This fixes a bug that manifests itself in the case of an empty -revoked file. A zero element 'keys' array would be passed to gpg, forcing it to list and, subsequently, revoke all known keys. Bug introduced in d1240f67eab6. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 233e5f610c409052d4f88382ce5fe97f54fd6e6c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun May 6 19:49:43 2012 -0400 contrib/pacsysclean: avoid setting bogus PACMAN_OPTS PACMAN_OPTS would be erroneously set when it was undefined, causing pacsysclean to error out. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 26abe8f6004777ba49777eaaec3bc0a47f50fcb2 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 20 11:27:36 2012 -0500 Fix gettext usage in pkgdelta help instructions Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 267158112317b0696c210006fb216ce7dae5cac3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 20 11:22:51 2012 -0500 Update pacman-scripts message catalog Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 951d23e3ec03fbd7faa3fad910a664365f75b3c4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 18 10:04:27 2012 -0500 docs: remove 'in the wild' section We haven't updated this info in years and it is out of date. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9e2078b1796dbc8dee201710b4680fb79114cbf3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Feb 2 08:29:50 2012 -0600 pacman-key: clarify messages, s/keychain/keyring/ Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3f202c780834557557baa4b3503690b629bf4222 Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 4 14:37:48 2012 -0500 doc: remove --recursive documentation for non-remove operations This documentation was added in commit 857357f9 so was not caught in the removal of this option in commit 85712814. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1bf05e706b5edac92e9c913a69ca8686c6440f8b Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 4 11:41:40 2012 -0500 Ensure pre_upgrade scriptlet gets old package version This was accidentally broken in the refactor done in commit 73139ccb. Fixes FS#29371. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsysclean.in | 2 +- doc/index.txt | 26 +--- doc/pacman.8.txt | 7 - lib/libalpm/add.c | 5 +- scripts/pacman-key.sh.in | 16 +- scripts/pkgdelta.sh.in | 6 +- scripts/po/en_GB.po | 324 ++++++++++++++++++++--------------------- scripts/po/pacman-scripts.pot | 43 ++++-- 8 files changed, 208 insertions(+), 221 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: write makedepends into .PKGINFO
by Allan McRae 20 May '12

20 May '12

Currently there is no way to access the makedepends for a package apart from parsing its PKGBUILD. Put these into the .PKGINFO file with the idea of making them available in the repo dbs so that automated build tools can readily determine build order. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28d9073..8d018c0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1276,6 +1276,8 @@ write_pkginfo() { fi done + [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" + for it in "${packaging_options[@]}"; do check_option "$it" "y" case $? in -- 1.7.10.2

2 3

[pacman-dev] [PATCH] makepkg: rework libdepends
by Allan McRae 20 May '12

20 May '12

Rewrite the handling of libdepends. The primary advantage are: - Moves functionality from write_pkginfo() to find_libdepends(). - The order of the depends array in the PKGBUILD is kept in the package. - An unneeded libdepends is only a warning and not an error. This allows putting a libdepend on a library that is dlopened. - It is now modular so can be extended to library types other than ELF *.so. - Finding the list of libraries a package depends only occurs when a libdepend is specified in the depends array. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 126 +++++++++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 50 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d018c0..8930ec4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1131,32 +1131,76 @@ tidy_install() { } find_libdepends() { - local libdepends - find "$pkgdir" -type f -perm -u+x | while read filename - do - # get architecture of the file; if soarch is empty it's not an ELF binary - soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF$32\|64$/\1/p') - [ -n "$soarch" ] || continue - # process all libraries needed by the binary - for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p') - do - # extract the library name: libfoo.so - soname="${sofile%.so?(+(.+([0-9])))}".so - # extract the major version: 1 - soversion="${sofile##*\.so\.}" - if in_array "${soname}" ${depends[@]}; then - if ! in_array "${soname}=${soversion}-${soarch}" ${libdepends[@]}; then - # libfoo.so=1-64 - printf "%s" "${soname}=${soversion}-${soarch}" - libdepends+=("${soname}=${soversion}-${soarch}") + local d sodepends; + + sodepends=0; + for d in "${depends[@]}"; do + if [[ $d = *.so ]]; then + sodepends=1; + break; + fi + done + + if (( sodepends == 0 )); then + printf '%s\n' "${depends[@]}" + return; + fi + + local libdeps; + declare -A libdeps; + + if (( sodepends == 1 )); then + local filename soarch sofile soname soversion + + while read filename; do + # get architecture of the file; if soarch is empty it's not an ELF binary + soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF$32\|64$/\1/p') + [[ -n "$soarch" ]] || continue + + # process all libraries needed by the binary + for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p') + do + # extract the library name: libfoo.so + soname="${sofile%.so?(+(.+([0-9])))}".so + # extract the major version: 1 + soversion="${sofile##*\.so\.}" + + if [[ ${libdeps[$soname]} ]]; then + if [[ ! ${libdeps[$soname]} = *${soversion}-${soarch}* ]]; then + libdeps[$soname]+=" ${soversion}-${soarch}" + fi + else + libdeps[$soname]="${soversion}-${soarch}" fi - fi - done + done + done < <(find "$pkgdir" -type f -perm -u+x) + fi + + local libdepends v + for d in "${depends[@]}"; do + case "$d" in + *.so) + if [[ ${libdeps[$d]} ]]; then + for v in ${libdeps[$d]}; do + libdepends+=("$d=$v") + done + else + warning "$(gettext "Library listed in %s is not required by any files: %s")" "'depends'" "$d" + libdepends+=("$d") + fi + ;; + *) + libdepends+=("$d") + ;; + esac done + + printf '%s\n' "${libdepends[@]}" } + find_libprovides() { - local libprovides missing + local p libprovides missing for p in "${provides[@]}"; do missing=0 case "$p" in @@ -1246,38 +1290,20 @@ write_pkginfo() { printf "size = %s\n" "$size" printf "arch = %s\n" "$pkgarch" - [[ $license ]] && printf "license = %s\n" "${license[@]}" - [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" - [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" - [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" - mapfile -t provides < <(find_libprovides) - [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" - - [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" - + mapfile -t depends < <(find_libdepends) + + [[ $license ]] && printf "license = %s\n" "${license[@]}" + [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" + [[ $groups ]] && printf "group = %s\n" "${groups[@]}" + [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" + [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" + [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" + [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" + [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" local it - mapfile -t libdepends < <(find_libdepends) - depends+=("${libdepends[@]}") - - for it in "${depends[@]}"; do - if [[ $it = *.so ]]; then - # check if the entry has been found by find_libdepends - # if not, it's unneeded; tell the user so he can remove it - printf -v re '(^|\s)%s=.*' "$it" - if [[ ! $libdepends =~ $re ]]; then - error "$(gettext "Cannot find library listed in %s: %s")" "'depends'" "$it" - return 1 - fi - else - printf "depend = %s\n" "$it" - fi - done - - [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" - for it in "${packaging_options[@]}"; do check_option "$it" "y" case $? in -- 1.7.10.2

2 2

[pacman-dev] [PATCH] Allow leading "local/" in query operations
by Allan McRae 19 May '12

19 May '12

I find that when copying the output of "pacman -Qs foo" into a "pacman -Qi" operation to get more information on the packages, I consistently copy the "local/" prefix. It is a minor usability improvement to strip this if present. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index a1cc1cf..07509fa 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -554,6 +554,11 @@ int pacman_query(alpm_list_t *targets) for(i = targets; i; i = alpm_list_next(i)) { const char *strname = i->data; + /* strip leading "local/" */ + if(strncmp(strname, "local/", 6) == 0) { + strname+=6; + } + if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); } else { -- 1.7.10.2

1 0

[pacman-dev] [PATCH] pacman-key: test for content in keyring files
by Dave Reisner 13 May '12

13 May '12

Test for file content (-s) rather than just existance (-f). This fixes a bug that manifests itself in the case of an empty -revoked file. A zero element 'keys' array would be passed to gpg, forcing it to list and, subsequently, revoke all known keys. Bug introduced in d1240f67eab6. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I figured I should call this out on the list since a few people ran into it on IRC. Currently, running 'pacman-key --populate archlinux' with the archlinux-keyring package exhibits this bug. scripts/pacman-key.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index fb790f6..70117bb 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -287,7 +287,7 @@ populate_keyring() { # 40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:5: local -A trusted_ids for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then while IFS=: read key_id _; do # skip blank lines, comments; these are valid in this file [[ -z $key_id || ${key_id:0:1} = \# ]] && continue @@ -306,7 +306,7 @@ populate_keyring() { done msg "$(gettext "Importing owner trust values...")" for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" fi done @@ -317,7 +317,7 @@ populate_keyring() { # guarantee of identification for the keys. local -A revoked_ids for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then mapfile -t keys < "${KEYRING_IMPORT_DIR}/${keyring}-revoked" while IFS=: read _ _ _ _ key_id _; do if [[ -n $key_id ]]; then -- 1.7.10.2

1 0

[pacman-dev] [PATCH] makepkg: Add CPPFLAGS support
by Allan McRae 08 May '12

08 May '12

Add CPPFLAGS support in addition to the current CFLAGS and CXXFLAGS. This keeps compiler flags split up in the same logical way done everywhere else. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This will allow a certian disrtibution to put -D_FORTIFY_SOURCE where it should be... doc/PKGBUILD.5.txt | 8 ++++---- doc/makepkg.conf.5.txt | 3 +++ etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index eefdbd4..384af7c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -254,10 +254,10 @@ A normal sync or upgrade will not use its value. with distcc. *buildflags*;; - Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS) - during build as specified in linkman:makepkg.conf[5]. More useful in - its negative form `!buildflags` with select packages that have problems - building with custom buildflags. + Allow the use of user-specific buildflags (CPPFLAGS, CFLAGS, CXXFLAGS, + LDFLAGS) during build as specified in linkman:makepkg.conf[5]. More + useful in its negative form `!buildflags` with select packages that + have problems building with custom buildflags. *makeflags*;; Allow the use of user-specific makeflags during build as specified diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 5970946..de2b4b4 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -51,6 +51,9 @@ Options A string such as ``i686-pc-linux-gnu'', do not touch unless you know what you are doing. This can be commented out by most users if desired. +**CPPFLAGS=**"cppflags":: + Flags used for the C preprocessor; see CFLAGS for more info. + **CFLAGS=**"cflags":: Flags used for the C compiler. This is a key part to the use of makepkg. Usually several options are specified, and the most common string resembles diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index d8117a3..51df493 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -27,6 +27,7 @@ CARCH="@CARCH@" CHOST="@CHOST@" #-- Compiler and Linker Flags +#CPPFLAGS="" #CFLAGS="-O2 -pipe" #CXXFLAGS="-O2 -pipe" #LDFLAGS="" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..c7baa97 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -955,7 +955,7 @@ run_function() { # clear user-specified buildflags if requested if check_option "buildflags" "n"; then - unset CFLAGS CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS fi # clear user-specified makeflags if requested @@ -967,7 +967,7 @@ run_function() { cd_safe "$srcdir" # ensure all necessary build variables are exported - export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST # save our shell options so pkgfunc() can't override what we need local shellopts=$(shopt -p) -- 1.7.10.1

3 3