July 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] removed duplicate macros SYMEXPORT and SYMHIDDEN from alpm_list.c, using them from util.h
by Paul Barbu Gheorghe 29 May '13

29 May '13

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm_list.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 39eded1..b9e7cba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -21,13 +21,11 @@ #include <stdlib.h> #include <string.h> +#include "util.h" + /* libalpm */ #include "alpm_list.h" -/* check exported library symbols with: nm -C -D <lib> */ -#define SYMEXPORT __attribute__((visibility("default"))) -#define SYMHIDDEN __attribute__((visibility("internal"))) - /** * @addtogroup alpm_list List Functions * @brief Functions to manipulate alpm_list_t lists. -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

6 9

[pacman-dev] [PATCH] fixed erroneous memory access to newurl in alpm_db_remove_server
by Barbu Paul - Gheorghe 09 Aug '12

09 Aug '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/db.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bf9c3f0..26b6250 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -198,16 +198,20 @@ int SYMEXPORT alpm_db_remove_server(alpm_db_t *db, const char *url) if(!newurl) { return -1; } + db->servers = alpm_list_remove_str(db->servers, newurl, &vdata); - free(newurl); + + int ret = 1; + if(vdata) { _alpm_log(db->handle, ALPM_LOG_DEBUG, "removed server URL from database '%s': %s\n", db->treename, newurl); free(vdata); - return 0; + ret = 0; } - return 1; + free(newurl); + return ret; } /** Get the name of a package database. */ -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 4

[pacman-dev] [PATCH 0/5] Properly detect conflicts with directory symlinks
by Allan McRae 07 Aug '12

07 Aug '12

This series of patches make pacman perform conflict checking with all directory paths resovled. This means that inter-package conflicts such as /lib/foo and /usr/lib/foo when /lib -> usr/lib are detected. Similarly, if a package moves a file from /lib/foo to /usr/lib/foo when /lib -> usr/lib (i.e. the file is effectively the same), this is no longer detected as a conflict with the filesystem. A big thanks to Andrew for fixing my initial attempt at the resolving of the filelist and making my idea for efficiently storing paths that are unchanged by resolving a reality. Allan McRae (3): Add resolved_path to alpm_filelist_t Resolve file paths during inter-package conflict check Avoid upgrade conflict with unchanged effective path Andrew Gregory (2): Add _alpm_filelist_resolve _alpm_filelist_resolve: use original filenames where possible lib/libalpm/alpm.h | 1 + lib/libalpm/conflict.c | 6 ++ lib/libalpm/filelist.c | 174 ++++++++++++++++++++++++++++++++--- lib/libalpm/filelist.h | 2 + lib/libalpm/package.c | 22 ++++- test/pacman/tests/fileconflict001.py | 2 - test/pacman/tests/fileconflict013.py | 2 - test/pacman/tests/fileconflict016.py | 2 - test/pacman/tests/fileconflict017.py | 26 ++++++ 9 files changed, 217 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/fileconflict017.py -- 1.7.11.3

3 10

[pacman-dev] [PATCH] Mark already installed optional dependencies
by Arokux B. 06 Aug '12

06 Aug '12

This patch adds "[installed]" prefix to already installed optional dependency. Signed-off-by: Arokux arokux(a)gmail.com --- src/pacman/util.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index a5242ae..d0a049e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1189,19 +1189,40 @@ static int depend_cmp(const void *d1, const void *d2) return ret; } +alpm_list_t *optdeps_to_strings(alpm_list_t *optdeps) +{ + alpm_list_t *i, *optstrings = NULL; + alpm_db_t *localdb = alpm_get_localdb(config->handle); + + /* turn optdepends list into a text list */ + for(i = optdeps; i; i = alpm_list_next(i)) { + alpm_depend_t *optdep = i->data; + char *optdepstring = alpm_dep_compute_string(optdep); + + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdepstring)) { + char *optdepstring_in; + pm_asprintf(&optdepstring_in, _("[installed] %s"), optdepstring); + free(optdepstring); + + optdepstring = optdepstring_in; + optdepstring_in = NULL; + } + + optstrings = alpm_list_add(optstrings, optdepstring); + } + + return optstrings; +} + void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) { - alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; + alpm_list_t *old, *new, *optdeps, *optstrings = NULL; old = alpm_pkg_get_optdepends(oldpkg); new = alpm_pkg_get_optdepends(newpkg); optdeps = alpm_list_diff(new, old, depend_cmp); - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(optdeps); if(optstrings) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); @@ -1214,15 +1235,9 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) void display_optdepends(alpm_pkg_t *pkg) { - alpm_list_t *i, *optdeps, *optstrings = NULL; + alpm_list_t *optstrings = NULL; - optdeps = alpm_pkg_get_optdepends(pkg); - - /* turn optdepends list into a text list */ - for(i = optdeps; i; i = alpm_list_next(i)) { - alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); - } + optstrings = optdeps_to_strings(alpm_pkg_get_optdepends(pkg)); if(optstrings) { printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));

2 5

[pacman-dev] [PATCH 0/3] Code and docs enhancements
by Barbu Paul - Gheorghe 01 Aug '12

01 Aug '12

Some small code and documentation enhancements. Barbu Paul - Gheorghe (3): fixed coding standard violation fixed typo added coding standard HACKING | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/db.c | 7 ++++++- test/pacman/README | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 5

[pacman-dev] FS#30582 : add a postextract() to PKGBUILD
by Enjolras 29 Jul '12

29 Jul '12

Hi A lot of PKGBUILD calls patch in build(), causing errors when you run makepkg --noextract. Patchs/sed and other non-idempotent operations on the sources should be run in another function, which whould only been called after extracting the sources, and not all the times build() is run. Patch attached : diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index abfabdf..cf4b542 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -70,6 +70,7 @@ LOGGING=0 SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 +POSTEXTRACTFUNC=0 BUILDFUNC=0 CHECKFUNC=0 PKGFUNC=0 @@ -1004,6 +1005,10 @@ run_function() { eval "$shellopts" } +run_postextract() { + run_function_safe "postextract" +} + run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) if check_buildenv "distcc" "y" && ! check_option "distc" "n"; then @@ -2280,6 +2285,9 @@ if (( ${#pkgname[@]} > 1 )); then fi # test for available PKGBUILD functions +if declare -f postextract >/dev/null; then + POSTEXTRACTFUNC=1 +fi if declare -f build >/dev/null; then BUILDFUNC=1 fi @@ -2491,6 +2499,9 @@ else download_sources check_source_integrity extract_sources + if (( POSTEXTRACTFUNC )); then + run_postextract + fi fi if (( NOBUILD )); then

3 6

[pacman-dev] [PATCH] fixed wrong parameter name in alpm_db_update's signature
by Barbu Paul Gheorghe 28 Jul '12

28 Jul '12

Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> --- lib/libalpm/alpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..dd01a41 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -626,7 +626,7 @@ int alpm_db_add_server(alpm_db_t *db, const char *url); int alpm_db_remove_server(alpm_db_t *db, const char *url); /** @} */ -int alpm_db_update(int level, alpm_db_t *db); +int alpm_db_update(int force, alpm_db_t *db); /** Get a package entry from a package database. * @param db pointer to the package database to get the package from -- Barbu Paul - Gheorghe Common sense is not so common - Voltaire Visit My GitHub profile to see my open-source projects - https://github.com/paullik

2 2

[pacman-dev] [PATCH 1/3] query_fileowner: remove resolve_path function
by Andrew Gregory 26 Jul '12

26 Jul '12

resolve_path is a equivalent to calling realpath(path, NULL) except that the returned string is guaranteed to be PATH_MAX long. We never append to the returned string, so this is unnecessary. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 9b1ea6f..bb75465 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -38,23 +38,6 @@ #define LOCAL_PREFIX "local/" -static char *resolve_path(const char *file) -{ - char *str = NULL; - - str = calloc(PATH_MAX, sizeof(char)); - if(!str) { - return NULL; - } - - if(!realpath(file, str)) { - free(str); - return NULL; - } - - return str; -} - /* check if filename exists in PATH */ static int search_path(char **filename, struct stat *bufptr) { @@ -178,7 +161,7 @@ static int query_fileowner(alpm_list_t *targets) if(strcmp(dname, "") == 0) { rpath = NULL; } else { - rpath = resolve_path(dname); + rpath = realpath(dname, NULL); if(!rpath) { pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), @@ -202,7 +185,7 @@ static int query_fileowner(alpm_list_t *targets) char *ppath, *pdname; const char *pkgfile = file->name; - /* avoid the costly resolve_path usage if the basenames don't match */ + /* avoid the costly realpath usage if the basenames don't match */ if(strcmp(mbasename(pkgfile), bname) != 0) { continue; } @@ -223,7 +206,7 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path + rootlen, pkgfile); pdname = mdirname(path); - ppath = resolve_path(pdname); + ppath = realpath(pdname, NULL); free(pdname); if(ppath && strcmp(ppath, rpath) == 0) { -- 1.7.11.2

2 9

[pacman-dev] pacman -Qo with different root
by Allan McRae 25 Jul '12

25 Jul '12

Does this even work or am I missing something completely... > mkdir -p ~/root/var/lib/pacman > sudo pacman-maint -r ~/root -Sy bash > pacman-maint -r ~/root -Qo /bin/bash error: No package owns /bin/bash That is using pacman 4.0.x from the maint branch. Allan

1 1

[pacman-dev] [PATCH] Inform the user to generate entropy
by Daniel Wallace 23 Jul '12

23 Jul '12

FS#30286 Inform the user that entropy is needed Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- scripts/pacman-key.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ae491d2..41498c6 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -144,6 +144,7 @@ generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF %echo Generating pacman keyring master key... +%echo Please do something to help gather entropy Key-Type: RSA Key-Length: 2048 Key-Usage: sign -- 1.7.11.2

4 3