- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [PATCH 1/1] libalpm: check for valid public key algorithm
by Allan McRae 23 Jun '14

23 Jun '14

Accidentally replied off-list. On 23/06/14 22:08, Allan McRae wrote: > On 12/06/14 16:48, Christian Hesse wrote: >> --- >> lib/libalpm/signing.c | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c >> index 8fb909d..f657110 100644 >> --- a/lib/libalpm/signing.c >> +++ b/lib/libalpm/signing.c >> @@ -350,7 +350,14 @@ static int key_search(alpm_handle_t *handle, const char *fpr, >> break; >> } >> >> - ret = 1; >> + /* We do not want to add a default case above to receive compiler >> + * error on new public key algorithm in gpgme. So check here if we >> + * have a valid pubkey_algo, should have been initialize with 0. */ >> + if (pgpkey->pubkey_algo != 0) { >> + ret = 1; >> + } else { >> + _alpm_log(handle, ALPM_LOG_DEBUG, "unknown public key algorithm\n"); >> + } >> > > If we set ret=1 here, at gpg_error: we try printing the error... > >> gpg_error: >> if(ret != 1) { >> > > How about adding "cleanup:" after the if(ret != 1) block and using this > after your comment: > > if (pgpkey->pubkey_algo == 0) { > _alpm_log(handle, ALPM_LOG_DEBUG, "unknown public key algorithm\n"); > ret = 1; > goto cleanup; > } >

1 0

[pacman-dev] [PATCH] [RFC] Add bacman manpage, fix #36419
by prflr88＠gmail.com 23 Jun '14

23 Jun '14

From: Pablo Lezaeta <prflr88(a)gmail.com> This add bacman manpage (if I'm not missing something) for bacman. I think this manpage could be improved, but for a first draft (and a RFC) is ok. Signed-off-by: Pablo Lezaeta <prflr88(a)gmail.com> --- doc/Makefile.am | 4 ++++ doc/bacman.8.txt | 36 ++++++++++++++++++++++++++++++++++++ doc/index.txt | 1 + 3 files changed, 41 insertions(+) create mode 100644 doc/bacman.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index a7908df..30fc672 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,7 @@ # man_MANS if --enable-asciidoc and/or --enable-doxygen are used. ASCIIDOC_MANS = \ + bacman.8 \ pacman.8 \ makepkg.8 \ makepkg-template.1 \ @@ -20,6 +21,7 @@ ASCIIDOC_MANS = \ DOXYGEN_MANS = $(wildcard man3/*.3) HTML_MANPAGES = \ + bacman.8.html \ pacman.8.html \ makepkg.8.html \ makepkg-template.1.html \ @@ -46,6 +48,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ + bacman.8.txt \ pacman.8.txt \ makepkg.8.txt \ makepkg-template.1.txt \ @@ -148,6 +151,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am %.3.html: ASCIIDOC_OPTS += -d manpage # Dependency rules +bacman.8 bacman.8.html: bacman.8.txt pacman.8 pacman.8.html: pacman.8.txt makepkg.8 makepkg.8.html: makepkg.8.txt makepkg-template.1 makepkg-template.1.html: makepkg-template.1.txt diff --git a/doc/bacman.8.txt b/doc/bacman.8.txt new file mode 100644 index 0000000..c677fc0 --- /dev/null +++ b/doc/bacman.8.txt @@ -0,0 +1,36 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +bacman(8) +========= + + +Name +---- +bacman - recreates a package using pacman's db and system files + + +Synopsis +-------- +'bacman' [options] installed-package-name + +Description +----------- +recreates a package using pacman's db and system files + +Options +------- +*-h, \--help*:: + Output syntax and command line options. + +*-v, \--version*:: + Output version of bacman and exit. + +*\--nocolor*:: + Output without colors. + +See Also +-------- +linkman:pacman[8] + +include::footer.txt[] \ No newline at end of file diff --git a/doc/index.txt b/doc/index.txt index ab1dc79..1b611bc 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -43,6 +43,7 @@ configuration files dealing with pacman. * linkman:libalpm[3] * linkman:makepkg[8] * linkman:makepkg.conf[5] +* linkman:bacman[8] * linkman:pacman[8] * linkman:pacman-key[8] * linkman:pacman.conf[5] -- 2.0.0

2 1

[pacman-dev] [PATCH] check_pkg_full: check user/group names
by Andrew Gregory 13 Jun '14

13 Jun '14

The effect on MTREE file size is negligible and this provides a more reliable way to verify file ownership given that user/group ids are not standardized. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- src/pacman/check.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..c77b28b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1999,7 +1999,7 @@ create_package() { msg2 "$(gettext "Generating .MTREE file...")" LANG=C bsdtar -czf .MTREE --format=mtree \ - --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \ + --options='!all,use-set,type,uid,uname,gid,gname,mode,time,size,md5,sha256,link' \ "${comp_files[@]}" * comp_files+=(".MTREE") diff --git a/src/pacman/check.c b/src/pacman/check.c index a7c66ba..d4a11a5 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -20,6 +20,8 @@ #include <limits.h> #include <string.h> #include <errno.h> +#include <grp.h> +#include <pwd.h> /* pacman */ #include "check.h" @@ -69,6 +71,10 @@ static int check_file_permissions(const char *pkgname, const char *filepath, { int errors = 0; mode_t fsmode; + struct passwd *pw = getpwuid(st->st_uid); + struct group *gr = getgrgid(st->st_gid); + const char *uname = archive_entry_uname(entry); + const char *gname = archive_entry_gname(entry); /* uid */ if(st->st_uid != archive_entry_uid(entry)) { @@ -79,6 +85,15 @@ static int check_file_permissions(const char *pkgname, const char *filepath, } } + /* owner name */ + if(uname && (!pw || strcmp(pw->pw_name, uname) != 0)) { + errors++; + if(!config->quiet) { + pm_printf(ALPM_LOG_WARNING, _("%s: %s (Owner mismatch)\n"), + pkgname, filepath); + } + } + /* gid */ if(st->st_gid != archive_entry_gid(entry)) { errors++; @@ -88,6 +103,15 @@ static int check_file_permissions(const char *pkgname, const char *filepath, } } + /* group name */ + if(gname && (!gr || strcmp(gr->gr_name, gname) != 0)) { + errors++; + if(!config->quiet) { + pm_printf(ALPM_LOG_WARNING, _("%s: %s (Group mismatch)\n"), + pkgname, filepath); + } + } + /* mode */ fsmode = st->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); if(fsmode != (~AE_IFMT & archive_entry_mode(entry))) { -- 2.0.0

2 2

Re: [pacman-dev] [PATCH 1/1] libalpm: add default switch case to handle unknown pubkey algorithm
by Allan McRae 12 Jun '14

12 Jun '14

On 11/06/14 23:37, Christian Hesse wrote: > --- > lib/libalpm/signing.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c > index 8fb909d..a7a70f6 100644 > --- a/lib/libalpm/signing.c > +++ b/lib/libalpm/signing.c > @@ -348,6 +348,11 @@ static int key_search(alpm_handle_t *handle, const char *fpr, > #endif > pgpkey->pubkey_algo = 'E'; > break; > + > + default: > + _alpm_log(handle, ALPM_LOG_DEBUG, "unknown public key algorithm\n"); > + ret = 0; > + goto gpg_error; > } > > ret = 1; > I like how we got a compile failure on the last gpgme update to flag we needed to deal with the new enum value. So I am not sure about adding the default here.

2 1

[pacman-dev] [PATCH] Use C locale for bsdtar calls during package creation
by Allan McRae 12 Jun '14

12 Jun '14

This ensures packages build on a UTF-8 locale system with non-ASCII character names can be installed on non-UTF-8 systems. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Arch Linux has been explicitly setting the C locale when packaging with devtools for a long time. I think it is best we address this at the source. bsdtar will give a warning when dealing with a file having non-ASCII characters during packaging, but the resulting package works. scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4174ba5..e20b707 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1998,7 +1998,7 @@ create_package() { shopt -s nullglob msg2 "$(gettext "Generating .MTREE file...")" - bsdtar -czf .MTREE --format=mtree \ + LANG=C bsdtar -czf .MTREE --format=mtree \ --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \ "${comp_files[@]}" * comp_files+=(".MTREE") @@ -2009,7 +2009,7 @@ create_package() { # bsdtar's gzip compression always saves the time stamp, making one # archive created using the same command line distinct from another. # Disable bsdtar compression and use gzip -n for now. - bsdtar -cf - "${comp_files[@]}" * | + LANG=C bsdtar -cf - "${comp_files[@]}" * | case "$PKGEXT" in *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; @@ -2143,7 +2143,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd_safe "${srclinks}" - if ! bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then + if ! LANG=C bsdtar -cL ${TAR_OPT} -f "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 2.0.0

1 0

[pacman-dev] Small fix in NEWS, sped to speed
by Pablo Lezaeta 11 Jun '14

11 Jun '14

rom 8cea596625362cf21c68786ce303c74e71127225 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta <prflr88(a)gmail.com> Date: Wed, 11 Jun 2014 01:56:35 -0400 Subject: [PATCH] Small ortographyc fix to NEWS The actual fix is because in some places sped is an insult, so we not want insult here, and I not thing and insult is what is supposed belong here. Signed-off-by: Pablo Lezaeta <prflr88(a)gmail.com> --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 02148d3..4217b20 100644 --- a/NEWS +++ b/NEWS @@ -999,7 +999,7 @@ VERSION DESCRIPTION - Other bug fixes 2.5.1 - Minor bug fixes 2.5 - Added an URL tag to package info - - Sped up package load times by about 500% by introducing + - Speed up package load times by about 500% by introducing a .FILELIST into the package - Renamed the install scriptlet from ._install to .INSTALL - Added patch from Aurlien Foret: -- 2.0.0

3 2

[pacman-dev] [PATCH] Add test case for the perl 5.20 dependency breakage
by Florian Pritz 10 Jun '14

10 Jun '14

This test currently fails. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- test/pacman/tests/sync-perl520-breakage.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 test/pacman/tests/sync-perl520-breakage.py diff --git a/test/pacman/tests/sync-perl520-breakage.py b/test/pacman/tests/sync-perl520-breakage.py new file mode 100644 index 0000000..3c1c145 --- /dev/null +++ b/test/pacman/tests/sync-perl520-breakage.py @@ -0,0 +1,21 @@ +self.description = "Upgrade a package that loose a provides entry which moves to a dedicated package" + +lp1 = pmpkg("perl", "5.18-1") +lp1.provides = ["perl-scalar-list-utils=1.27"] +lp2 = pmpkg("perl-data-optlist") +lp2.depends = ["perl-scalar-list-utils"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("perl", "5.20-1") +p2 = pmpkg("perl-scalar-list-utils", "1.38-1") + +for p in p1, p2: + self.addpkg2db("sync", p) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=perl-scalar-list-utils|1.38-1") +self.addrule("PKG_VERSION=perl|5.20-1") -- 1.9.2

4 8

[pacman-dev] [PATCH] makepkg: Progress bar at package compression stage
by Yanus Poluektovich 09 Jun '14

09 Jun '14

If pv is installed, use it to provide progress indication for package compression stage. --- scripts/makepkg.sh.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 96e5349..0bb619f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2006,10 +2006,21 @@ create_package() { msg2 "$(gettext "Compressing package...")" # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail + + comp_files+=( $(ls) ) + local pv_uncompressed="cat" + local pv_compressed="cat" + if [[ -f "/usr/bin/pv" ]]; then + local uncompressed_size=$( du -sb "${comp_files[@]}" | awk 'BEGIN {s=0} {s += $1} END {print s}' ) + pv_uncompressed="/usr/bin/pv -c -N uncompressed -perab -s $uncompressed_size" + pv_compressed="/usr/bin/pv -c -N compressed -trab" + fi + # bsdtar's gzip compression always saves the time stamp, making one # archive created using the same command line distinct from another. # Disable bsdtar compression and use gzip -n for now. - bsdtar -cf - "${comp_files[@]}" * | + bsdtar -cf - "${comp_files[@]}" | + $pv_uncompressed | case "$PKGEXT" in *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; @@ -2020,7 +2031,7 @@ create_package() { *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT"; cat ;; - esac > "${pkg_file}" || ret=$? + esac | $pv_compressed > "${pkg_file}" || ret=$? shopt -u nullglob shopt -u -o pipefail -- 2.0.0

3 8

[pacman-dev] [PATCH] Verbose package list now show if packages are explicit or dependencies
by Guillaume Bouchard 09 Jun '14

09 Jun '14

When verbose package is activated, the table is displayed two times, once for explicit packages and a second time for dependencies. This helps understanding the upgrade process. You can focus on on explicit package and gives less attention to dependencies. Design choices: -- If a table does not fit in terminal width, it fallbacks to traditional compact display, but this fallback can happen on none, one or both tables -- The header name stay short, "Package" and "Dependancies". This is to avoid too long column name, but i think it is enough explicit as is. --- src/pacman/util.c | 59 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b..864b7a3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -774,12 +774,12 @@ void signature_display(const char *title, alpm_siglist_t *siglist, } /* creates a header row for use with table_display */ -static alpm_list_t *create_verbose_header(size_t count) +static alpm_list_t *create_verbose_header(size_t count, int is_explicit) { alpm_list_t *ret = NULL; char *header; - pm_asprintf(&header, "%s (%zd)", _("Package"), count); + pm_asprintf(&header, "%s (%zd)", (is_explicit ? _("Package") : _("Dependency")), count); add_table_cell(&ret, header, CELL_TITLE | CELL_FREE); add_table_cell(&ret, _("Old Version"), CELL_TITLE); @@ -846,7 +846,11 @@ static void _display_targets(alpm_list_t *targets, int verbose) char *str; off_t isize = 0, rsize = 0, dlsize = 0; unsigned short cols; - alpm_list_t *i, *names = NULL, *header = NULL, *rows = NULL; + alpm_list_t *i, + *names = NULL, *names_explicit = NULL, *names_deps = NULL, + *header_explicit = NULL, *header_deps = NULL, + *rows = NULL, *explicit = NULL, *deps = NULL; + size_t count_explicit = 0, count_deps = 0; if(!targets) { return; @@ -870,10 +874,6 @@ static void _display_targets(alpm_list_t *targets, int verbose) for(i = targets; i; i = alpm_list_next(i)) { pm_target_t *target = i->data; - if(verbose) { - rows = alpm_list_add(rows, create_verbose_row(target)); - } - if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); @@ -885,27 +885,60 @@ static void _display_targets(alpm_list_t *targets, int verbose) alpm_pkg_get_version(target->remove), _("removal")); } names = alpm_list_add(names, str); + + if(verbose) { + // Check if package is installed as a explicit or as a dependency + // and store it in associated lists + if(alpm_pkg_get_reason(target->remove ? target->remove : target->install) == ALPM_PKG_REASON_DEPEND) { + deps = alpm_list_add(deps, create_verbose_row(target)); + names_explicit = alpm_list_add(names_explicit, str); + count_deps += 1; + } else { + explicit = alpm_list_add(explicit, create_verbose_row(target)); + names_deps = alpm_list_add(names_deps, str); + count_explicit += 1; + } + } + } /* print to screen */ - pm_asprintf(&str, "%s (%zd)", _("Packages"), alpm_list_count(targets)); printf("\n"); cols = getcols(fileno(stdout)); if(verbose) { - header = create_verbose_header(alpm_list_count(targets)); - if(table_display(header, rows, cols) != 0) { + header_explicit = create_verbose_header(count_explicit, 1); + if(table_display(header_explicit, explicit, cols) != 0) { + /* fallback to list display if table wouldn't fit */ + pm_asprintf(&str, "%s (%zd)", _("Packages"), count_explicit); + list_display(str, names_explicit, cols); + free(str); + } + printf("\n"); + header_deps = create_verbose_header(count_deps, 0); + if(table_display(header_deps, deps, cols) != 0) { /* fallback to list display if table wouldn't fit */ - list_display(str, names, cols); + pm_asprintf(&str, "%s (%zd)", _("Dependencies"), count_deps); + list_display(str, names_deps, cols); + free(str); } + } else { + pm_asprintf(&str, "%s (%zd)", _("Packages"), alpm_list_count(targets)); list_display(str, names, cols); + free(str); } printf("\n"); - table_free(header, rows); + table_free(header_explicit, explicit); + table_free(header_deps, deps); + FREELIST(names); - free(str); + /* The content of names_explicit and names_deps has allready been free'ed + * FREELIST(names), so we only free the containers */ + free(names_explicit); + free(names_deps); + rows = NULL; if(dlsize > 0 || config->op_s_downloadonly) { -- 1.9.2

3 4

[pacman-dev] (no subject)
by me＠the-compiler.org 06 Jun '14

06 Jun '14

This was quickly discussed in IRC with others and we saw no reason which would prevent this from being changed. See the commit message for details. Note this is my first time contributing to arch/pacman and using git-send-email, so if there's anything wrong, please let me know!

4 6