- Pacman-dev - lists.archlinux.org

[pacman-dev] Discrepancy between -Si and -Qi output
by Jason St. John 22 Dec '13

22 Dec '13

I noticed that "Required By" and "Optional For" are shown in the output of "pacman -Qi <package>", but these fields are missing from the output of "pacman -Si <package>". Is this omission intentional or should I file a bug on the bug tracker? Jason

3 3

[pacman-dev] [PATCH 1/2] Add test to check for indirect optdepend removal
by Chirantan Ekbote 21 Dec '13

21 Dec '13

If package brown-sugar provides package sugar and package coffee optionally depends on sugar, pacman should print a warning when brown-sugar is removed. Signed-off-by: Chirantan Ekbote <chirantan.ekbote(a)gmail.com> --- test/pacman/tests/TESTS | 1 + test/pacman/tests/remove072.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/pacman/tests/remove072.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..6c56268 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -112,6 +112,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/remove072.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/remove072.py b/test/pacman/tests/remove072.py new file mode 100644 index 0000000..0a29b39 --- /dev/null +++ b/test/pacman/tests/remove072.py @@ -0,0 +1,14 @@ +self.description = "Remove a package that provides an optdepend" + +p1 = pmpkg("brown-sugar") +p1.provides = ["sugar"] +self.addpkg2db("local", p1) + +p2 = pmpkg("coffee") +p2.optdepends = ["sugar"] +self.addpkg2db("local", p2) + +self.args = "-R %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=coffee optionally requires sugar") -- 1.8.5.1

2 3

[pacman-dev] [PATCH] Fix build with --disable-gpgme
by Allan McRae 21 Dec '13

21 Dec '13

The alpm_decode_signature function was made available for frontends to display signature information, but this required libalpm to be build with gpgme support. As that function did not require anything from gpgme, have it build unconditionally. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/Makefile.am | 6 +---- lib/libalpm/signing.c | 60 ++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 171bc46..16a46ef 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -30,6 +30,7 @@ libalpm_la_SOURCES = \ alpm.h alpm.c \ alpm_list.h alpm_list.c \ backup.h backup.c \ + base64.h base64.c \ be_local.c \ be_package.c \ be_sync.c \ @@ -63,11 +64,6 @@ libalpm_la_SOURCES += \ sha2.h sha2.c endif -if HAVE_LIBGPGME -libalpm_la_SOURCES += \ - base64.h base64.c -endif - libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index b594a9b..6043a8e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -24,17 +24,46 @@ #if HAVE_LIBGPGME #include <locale.h> /* setlocale() */ #include <gpgme.h> -#include "base64.h" #endif /* libalpm */ #include "signing.h" #include "package.h" +#include "base64.h" #include "util.h" #include "log.h" #include "alpm.h" #include "handle.h" +/** + * Decode a loaded signature in base64 form. + * @param base64_data the signature to attempt to decode + * @param data the decoded data; must be freed by the caller + * @param data_len the length of the returned data + * @return 0 on success, -1 on failure to properly decode + */ + +int SYMEXPORT alpm_decode_signature(const char *base64_data, + unsigned char **data, size_t *data_len) +{ + size_t len = strlen(base64_data); + unsigned char *usline = (unsigned char *)base64_data; + /* reasonable allocation of expected length is 3/4 of encoded length */ + size_t destlen = len * 3 / 4; + MALLOC(*data, destlen, goto error); + if(base64_decode(*data, &destlen, usline, len)) { + free(*data); + goto error; + } + *data_len = destlen; + return 0; + +error: + *data = NULL; + *data_len = 0; + return -1; +} + #if HAVE_LIBGPGME #define CHECK_ERR(void) do { \ if(gpg_err_code(gpg_err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \ @@ -418,35 +447,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr) } /** - * Decode a loaded signature in base64 form. - * @param base64_data the signature to attempt to decode - * @param data the decoded data; must be freed by the caller - * @param data_len the length of the returned data - * @return 0 on success, -1 on failure to properly decode - */ - -int SYMEXPORT alpm_decode_signature(const char *base64_data, - unsigned char **data, size_t *data_len) -{ - size_t len = strlen(base64_data); - unsigned char *usline = (unsigned char *)base64_data; - /* reasonable allocation of expected length is 3/4 of encoded length */ - size_t destlen = len * 3 / 4; - MALLOC(*data, destlen, goto error); - if(base64_decode(*data, &destlen, usline, len)) { - free(*data); - goto error; - } - *data_len = destlen; - return 0; - -error: - *data = NULL; - *data_len = 0; - return -1; -} - -/** * Check the PGP signature for the given file path. * If base64_sig is provided, it will be used as the signature data after * decoding. If base64_sig is NULL, expect a signature file next to path -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Fix build warnings with --disable-nls
by Allan McRae 21 Dec '13

21 Dec '13

The gettext functions return a "char *", so do the same for the defines in the case where gettext is unavailable. This prevents a number of warnings about const being dropped. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.h | 2 +- src/pacman/util.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index c12b39b..2142171 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -47,7 +47,7 @@ /* define _() as shortcut for gettext() */ #define _(str) dgettext ("libalpm", str) #else -#define _(s) s +#define _(s) (char *)s #endif void _alpm_alloc_fail(size_t size); diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..9920e74 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -34,8 +34,8 @@ #define _(str) gettext(str) #define _n(str1, str2, ct) ngettext(str1, str2, ct) #else -#define _(str) str -#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) +#define _(str) (char *)str +#define _n(str1, str2, ct) (char *)(ct == 1 ? str1 : str2) #endif typedef struct _pm_target_t { -- 1.8.5.2

1 0

[pacman-dev] [PATCH] Flag parameters of mount_point_load_fsinfo as potentially unused
by Allan McRae 21 Dec '13

21 Dec '13

Fixes build issue on FreeBSD. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/diskspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index dcab3b0..66d83c2 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -69,7 +69,7 @@ static void mount_point_list_free(alpm_list_t *mount_points) FREELIST(mount_points); } -static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint) +static int mount_point_load_fsinfo(alpm_handle_t UNUSED *handle, alpm_mountpoint_t UNUSED *mountpoint) { #if defined(HAVE_GETMNTENT) /* grab the filesystem usage */ -- 1.8.5.2

1 0

[pacman-dev] [PATCH 0/2] two minor fixes to the build
by Jeremy Heiner 21 Dec '13

21 Dec '13

One: get VPATH builds working again. Two: use $(PYTHON) instead of #!/usr/bin/python2 to run tests. Jeremy Heiner (2): GNU make $(wildcard) assumes $(builddir) for relative paths. Use the 'configure'd PYTHON to run pactest. Makefile.am | 7 ++++--- test/pacman/README | 4 ++-- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 1 - test/pacman/pmenv.py | 1 - test/pacman/pmfile.py | 1 - test/pacman/pmpkg.py | 1 - test/pacman/pmrule.py | 1 - test/pacman/pmtest.py | 1 - test/pacman/tests/Makefile.am | 4 ++-- test/pacman/tests/sync200.py.in | 1 + test/pacman/util.py | 1 - 12 files changed, 10 insertions(+), 15 deletions(-) mode change 100755 => 100644 test/pacman/pactest.py -- 1.8.5.2

4 17

[pacman-dev] Typo in makepkg
by Maxime Arthaud 21 Dec '13

21 Dec '13

Hi, I just found a typo in makepkg. Here is the patch : From 67b42356fc0b00ca9c90d86536fb0047dd6a57c2 Mon Sep 17 00:00:00 2001 From: Maxime Arthaud <maxime.arthaud(a)gmail.com> Date: Fri, 20 Dec 2013 16:10:58 +0100 Subject: [PATCH] Fix typo in makepkg Signed-off-by: Maxime Arthaud <maxime.arthaud(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 81354df..0896a9c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2340,7 +2340,7 @@ check_software() { fi # distcc - compilation with distcc - if check_buildenv "distcc" "y" && ! check_option "distcc" "n" ]]; then + if check_buildenv "distcc" "y" && ! check_option "distcc" "n"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" ret=1 -- 1.8.5.1 Best regards, Maxime Arthaud

2 1

[pacman-dev] [PATCH] trans_prepare: always sort trans->remove by deps
by Andrew Gregory 19 Dec '13

19 Dec '13

Packages can be removed during a sync transaction either directly or due to conflicts and need to be sorted. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 7 ------- lib/libalpm/sync.c | 5 ----- lib/libalpm/trans.c | 16 ++++++++++++++++ test/pacman/tests/TESTS | 1 + test/pacman/tests/sync046.py | 29 +++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 test/pacman/tests/sync046.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9417a61..6c50ab3 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -240,13 +240,6 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) } } - /* re-order w.r.t. dependencies */ - _alpm_log(handle, ALPM_LOG_DEBUG, "sorting by dependencies\n"); - lp = _alpm_sortbydeps(handle, trans->remove, NULL, 1); - /* free the old alltargs */ - alpm_list_free(trans->remove); - trans->remove = lp; - /* -Rcs == -Rc then -Rs */ if((trans->flags & ALPM_TRANS_FLAG_CASCADE) && (trans->flags & ALPM_TRANS_FLAG_RECURSE)) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7dbb8a0..ba71d89 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -625,11 +625,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } goto cleanup; } - - /* re-order w.r.t. dependencies */ - alpm_list_t *add_orig = trans->add; - trans->add = _alpm_sortbydeps(handle, add_orig, trans->remove, 0); - alpm_list_free(add_orig); } for(i = trans->add; i; i = i->next) { /* update download size field */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index a795a1f..6ace823 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -39,6 +39,7 @@ #include "remove.h" #include "sync.h" #include "alpm.h" +#include "deps.h" /** \addtogroup alpm_trans Transaction Functions * @brief Functions to manipulate libalpm transactions @@ -134,6 +135,21 @@ int SYMEXPORT alpm_trans_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "sorting by dependencies\n"); + if(trans->add) { + alpm_list_t *add_orig = trans->add; + trans->add = _alpm_sortbydeps(handle, add_orig, trans->remove, 0); + alpm_list_free(add_orig); + } + if(trans->remove) { + alpm_list_t *rem_orig = trans->remove; + trans->remove = _alpm_sortbydeps(handle, rem_orig, NULL, 1); + alpm_list_free(rem_orig); + } + } + trans->state = STATE_PREPARED; return 0; diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index fc6a7e8..f52a1f7 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -158,6 +158,7 @@ TESTS += test/pacman/tests/sync042.py TESTS += test/pacman/tests/sync043.py TESTS += test/pacman/tests/sync044.py TESTS += test/pacman/tests/sync045.py +TESTS += test/pacman/tests/sync046.py TESTS += test/pacman/tests/sync050.py TESTS += test/pacman/tests/sync051.py TESTS += test/pacman/tests/sync052.py diff --git a/test/pacman/tests/sync046.py b/test/pacman/tests/sync046.py new file mode 100644 index 0000000..63e8cc3 --- /dev/null +++ b/test/pacman/tests/sync046.py @@ -0,0 +1,29 @@ +self.description = "Install a sync package with interdependent conflicts" + +sp = pmpkg("pkg1") +sp.conflicts = ["pkg2", "pkg3", "pkg4"] +self.addpkg2db("sync", sp); + +lp1 = pmpkg("pkg2") +lp1.depends = ["pkg3"] +lp1.install['pre_remove'] = "[ -f pkg3file ] && echo '' > pkg2ok" +self.addpkg2db("local", lp1); + +lp2 = pmpkg("pkg3") +lp2.files = ["pkg3file"] +self.addpkg2db("local", lp2); + +lp3 = pmpkg("pkg4") +lp3.depends = ["pkg3"] +lp3.install['pre_remove'] = "[ -f pkg3file ] && echo '' > pkg4ok" +self.addpkg2db("local", lp3); + +self.args = "-S %s --ask=4" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") +self.addrule("!PKG_EXIST=pkg4") +self.addrule("FILE_EXIST=pkg2ok") +self.addrule("FILE_EXIST=pkg4ok") -- 1.8.5.1

2 1

[pacman-dev] [PATCH] dload: allow curl to response to any auth challenge
by Dave Reisner 19 Dec '13

19 Dec '13

Previously, we only allowed the default of responding to basic auth challenges. Mirrors requiring authorization are far and away the edge case, but there's no sense in preventing access to them. Implements FS#38184. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c74d2ad..d5906a3 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -301,6 +301,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, dload_sockopt_cb); curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA, (void *)handle); + curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); -- 1.8.5.2

2 1

[pacman-dev] [PATCH 4/4] makepkg: git: update existing sources in srcdir without removing them first.
by SamLT 18 Dec '13

18 Dec '13

Hello, [sorry could not hit the reply button since I'm new to this list] > William Giokas 1007380 at gmail.com > Tue Dec 10 14:56:18 EST 2013 > > Previous message: [pacman-dev] [PATCH 4/4] makepkg: git: update existing sources in srcdir without removing them first. > Next message: [pacman-dev] [PATCH 4/4] makepkg: git: update existing sources in srcdir without removing them first. > Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] > > On Tue, Dec 10, 2013 at 09:39:51AM +0100, Lukas Jirkovsky wrote: > > On Mon, Dec 9, 2013 at 10:10 PM, Dave Reisner <d at falconindy.com> wrote: > > > This groundbreaking idea has been proposed and rejected several times > > > already. > > > > > > > Can you point me to where they were rejected? I have submitted the > > patches implementing this functionality in the past, but they were > > rejected because of technical problems, not because of the idea > > itself. This new patch series should fix all the issues that were > > present in my previous attempts. Also I remember that Allan set > > FS#35050 as due in 4.2.0 probably because I was working on it. > > For the tl;dr: > > Here's how we use git sources at the moment: > > - Create bare clone (no checked out files) > - Clone the bare clone to build dir > - Build > - Possible cleanup > > With a shallow clone the first two steps won't work at all. Look at the > manual page for git-clone(1): > > A shallow repository has a number of limitations (you cannot clone or > fetch from it, nor push from nor into it)... > > As you can see, we can't do the second step, and if we do the first step > with --depth=1, then it would essentially just give us a useless set of > files. I've also read the link you gave earlier about why shallow clones are bad: https://mailman.archlinux.org/pipermail/aur-general/2013-April/022938.html While I agree that the first step should *not* be a shallow clone, I fail to see why we clone the whole history for the build dir. AFAICS, the whole discussion in both of these threads is about the first step, I'm talking about the second step, ie making the sources to the build dir Uwe Koloska said "local clones are cheap", (https://mailman.archlinux.org/pipermail/aur-general/2013-April/022955.html ) while I agree it's fast it also copies a whole bunch of files which won't be used for the build (namely the .git directory). Although, this does not feel right(to me), I cannot find any tangible reason other that premature EOL of our beloved SSD *sick*. Anyway, why not just doing something like this for step 2: cd $git archive --format=tar --prefix=$pkgname/ . | tar xf - -C $srcdir (or even a shallow clone) I may be missing something, eg, I've never played with git submodules and don't know how well this approach would work with them. What do you think? Thanks for your time! sam > > Thanks, > -- > William Giokas | KaiSforza | http://kaictl.net/ > GnuPG Key: 0x73CD09CF > Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF >

3 3