- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] find_fileconflicts: rename tmpfiles -> newfiles
by Andrew Gregory 17 Dec '16

17 Dec '16

The files belong to the new version of a package being installed, they are not temporary in any way. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- This has confused me every single time I have looked at this function. lib/libalpm/conflict.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 092b019a..b9e30870 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -419,7 +419,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(current = 0, i = upgrade; i; i = i->next, current++) { alpm_pkg_t *p1 = i->data; alpm_list_t *j; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *newfiles = NULL; alpm_pkg_t *dbpkg; int percent = (current * 100) / numtargs; @@ -483,18 +483,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * be freed. */ if(dbpkg) { /* older ver of package currently installed */ - tmpfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), + newfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg)); } else { /* no version of package currently installed */ alpm_filelist_t *fl = alpm_pkg_get_files(p1); size_t filenum; for(filenum = 0; filenum < fl->count; filenum++) { - tmpfiles = alpm_list_add(tmpfiles, fl->files[filenum].name); + newfiles = alpm_list_add(newfiles, fl->files[filenum].name); } } - for(j = tmpfiles; j; j = j->next) { + for(j = newfiles; j; j = j->next) { const char *filestr = j->data; const char *relative_path; alpm_list_t *k; @@ -653,12 +653,12 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); return NULL; } } } - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); } PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); -- 2.11.0

1 0

[pacman-dev] [PATCH] dload: s/CURLOPT_WRITEHEADER/CURLOPT_HEADERDATA/
by Dave Reisner 11 Dec '16

11 Dec '16

The former is really old, and should be avoided. --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e889609..b0f81b6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -267,7 +267,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); - curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); + curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(curl, CURLOPT_TCP_KEEPIDLE, 60L); -- 2.10.2

1 0

[pacman-dev] [PATCH v2] Give a "success!" message on database check
by Patrick Eigensatz 08 Dec '16

08 Dec '16

'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> --- doc/pacman.8.txt | 6 +++++- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 2bafa41..0522981 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -456,7 +456,7 @@ Database Options (apply to '-D')[[QO]] package installed even when it was initially installed as a dependency of another package. -*-k \--check*:: +*-k, \--check*:: Check the local package database is internally consistent. This will check all required files are present and that installed packages have the required dependencies, do not conflict and that multiple packages @@ -464,6 +464,10 @@ Database Options (apply to '-D')[[QO]] a check on the sync databases to ensure all specified dependencies are available. +*-q, \--quiet*:: + Apply to '-q' or '--quiet' to suppress the message that the + database check was successful and no errors have been found. + File Options (apply to '-F')[[FO]] ---------------------------------- *-y, --refresh*:: diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..3990ea2 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("No database errors have been found!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..3881829 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -171,6 +171,7 @@ static void usage(int op, const char * const myname) addlist(_(" --asdeps mark packages as non-explicitly installed\n")); addlist(_(" --asexplicit mark packages as explicitly installed\n")); addlist(_(" -k, --check test local database for validity (-kk for sync databases)\n")); + addlist(_(" -q, --quiet Suppress the success message of the validity check\n")); } else if(op == PM_OP_DEPTEST) { printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -466,6 +467,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

2 7

[pacman-dev] [PATCH 1/1] make pacman even more candy-aware
by Christian Hesse 08 Dec '16

08 Dec '16

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/callback.c | 15 +++++++++++++-- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7f72b84..9cdd9a4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -112,8 +112,19 @@ static void fill_progress(const int bar_percent, const int disp_percent, if(hashlen > 0) { fputs(" [", stdout); for(i = hashlen; i > 0; --i) { - /* if special progress bar enabled */ - if(config->chomp) { + /* progress bar with pacman in unicode: [ ᗧ••ᗣ••] */ + if(config->chomp_unicode) { + if(i > hashlen - hash) { + putchar(' '); + } else if(i == hashlen - hash) { + fputs("\033[1;33mᗧ\033[m", stdout); + } else if(i % 3 == 0) { + printf("\033[1;%dmᗣ\033[m", i % 5 + 31); + } else { + fputs("\033[0;37m•\033[m", stdout); + } + } /* progress bar with pacman in ascii: [--C o ] */ + else if(config->chomp) { if(i > hashlen - hash) { putchar('-'); } else if(i == hashlen - hash) { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index d8d64fb..430bb81 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -479,6 +479,9 @@ static int _parse_options(const char *key, char *value, if(strcmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); + } else if(strcmp(key, "ILoveSweetCandy") == 0) { + config->chomp_unicode = 1; + pm_printf(ALPM_LOG_DEBUG, "config: chomp_unicode\n"); } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 945de7c..577f236 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -109,6 +109,8 @@ typedef struct __config_t { /* conf file options */ /* I Love Candy! */ unsigned short chomp; + /* I Love Sweet Candy! */ + unsigned short chomp_unicode; /* format target pkg lists as table */ unsigned short verbosepkglists; /* When downloading, display the amount downloaded, rate, ETA, and percent -- 2.10.2

1 1

[pacman-dev] makedepends and checkdepends in .PKGINFO and repo databases
by Mark Weiman 08 Dec '16

08 Dec '16

I am working on a repository manager in PHP that uses a PHP extension that allows use of libalpm from PHP. While designing this though, I've noticed that makedepends and checkdepends are listed in packages created with makepkg in .PKGINFO that libalpm seems to not care about. Then when adding a package to a repository with repo-add, those values get copied over into the desc file for said package. Since there's no effective way to open xz compressed archives in PHP (because most packages in Arch use .tar.xz), it brought up questions of why are these values included in packages and repositories when libalpm seemingly doesn't take note of them and if there is a reason for it, why doesn't libalpm have ways of getting those values back. My suggestion would be either of the following: 1. Remove checkdepends and makedepends from makepkg and repo-add. 2. Add alpm_pkg_get_checkdepends() and alpm_pkg_get_makedepends() to libalpm. Either of the above are something I'm willing to work on if one of these are appropriate to add. Mark Weiman

2 1

[pacman-dev] [PATCH 1/2] Build a single debug package for all packages from a PKGBUILD
by Allan McRae 06 Dec '16

06 Dec '16

We want to provide source files with debug symbol packages to allow easy stepping through the program. This becomes difficult with split packages due to the binaries in many of these sharing source files across packages. There are (at least) two solutions to this problem. #1: ensure common source files are located in the debug package for the package lowest in the dependency chain and add dependencies to the debug packages so all require source files are present, or #2: create one debug package for all split packages in a PKGBUILD. The second is a more robust approach despite potentially creating very large debug packages. This patch creates a single $pkgbase-debug package and adds provides such that installing $pkgname-debug will always work. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/makepkg.sh.in | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1c7aacf..9baed9f 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -88,7 +88,7 @@ tidy_strip() { [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" if check_option "debug" "y"; then - dbgdir="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug" + dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug" mkdir -p "$dbgdir" fi diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2000451..de709ba 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -787,18 +787,24 @@ create_debug_package() { return fi - pkgdir="${pkgdir}-@DEBUGSUFFIX@" + pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then return fi - depends=("$pkgname=$(get_full_version)") - pkgdesc="Detached debugging symbols for $pkgname" - pkgname=$pkgname-@DEBUGSUFFIX@ + unset groups depends optdepends provides conflicts replaces backup install changelog - unset groups optdepends provides conflicts replaces backup install changelog + local pkg + for pkg in ${pkgname[@]}; do + if [[ $pkg != $pkgbase ]]; then + provides+=("$pkg-@DEBUGSUFFIX@") + fi + done + + pkgdesc="Detached debugging symbols for $pkgname" + pkgname=$pkgbase-@DEBUGSUFFIX@ create_package } @@ -1169,10 +1175,10 @@ run_split_packaging() { tidy_install lint_package || exit 1 create_package - create_debug_package restore_package_variables done pkgname=("${pkgname_backup[@]}") + create_debug_package } usage() { -- 2.10.2

2 3

[pacman-dev] [PATCH] extract db files with dbonly
by Andrew Gregory 06 Dec '16

06 Dec '16

Some database files (install, mtree, and changelog) are extracted directly from the package, but DBONLY was skipping extraction altogether, causing those files to be missing after the transaction. Fixes #52052 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 112 +++++++++++++++------------- test/pacman/tests/TESTS | 1 + test/pacman/tests/dbonly-extracted-files.py | 16 ++++ 3 files changed, 78 insertions(+), 51 deletions(-) create mode 100644 test/pacman/tests/dbonly-extracted-files.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index d132e52..6501b68 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -405,6 +405,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, alpm_event_package_operation_t event; const char *log_msg = "adding"; const char *pkgfile; + struct archive *archive; + struct archive_entry *entry; + int fd, cwdfd; + struct stat buf; ASSERT(trans != NULL, return -1); @@ -477,39 +481,44 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, goto cleanup; } - if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { - struct archive *archive; - struct archive_entry *entry; - struct stat buf; - int fd, cwdfd; - - _alpm_log(handle, ALPM_LOG_DEBUG, "extracting files\n"); + fd = _alpm_open_archive(db->handle, pkgfile, &buf, + &archive, ALPM_ERR_PKG_OPEN); + if(fd < 0) { + ret = -1; + goto cleanup; + } - fd = _alpm_open_archive(db->handle, pkgfile, &buf, - &archive, ALPM_ERR_PKG_OPEN); - if(fd < 0) { - ret = -1; - goto cleanup; - } + /* save the cwd so we can restore it later */ + OPEN(cwdfd, ".", O_RDONLY | O_CLOEXEC); + if(cwdfd < 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n")); + } - /* save the cwd so we can restore it later */ - OPEN(cwdfd, ".", O_RDONLY | O_CLOEXEC); - if(cwdfd < 0) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not get current working directory\n")); + /* libarchive requires this for extracting hard links */ + if(chdir(handle->root) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), + handle->root, strerror(errno)); + _alpm_archive_read_free(archive); + if(cwdfd >= 0) { + close(cwdfd); } + close(fd); + ret = -1; + goto cleanup; + } - /* libarchive requires this for extracting hard links */ - if(chdir(handle->root) != 0) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), - handle->root, strerror(errno)); - _alpm_archive_read_free(archive); - if(cwdfd >= 0) { - close(cwdfd); + if(trans->flags & ALPM_TRANS_FLAG_DBONLY) { + _alpm_log(handle, ALPM_LOG_DEBUG, "extracting db files\n"); + while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { + const char *entryname = archive_entry_pathname(entry); + if(entryname[0] == '.') { + errors += extract_db_file(handle, archive, entry, newpkg, entryname); + } else { + archive_read_data_skip(archive); } - close(fd); - ret = -1; - goto cleanup; } + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "extracting files\n"); /* call PROGRESS once with 0 percent, as we sort-of skip that here */ PROGRESS(handle, progress, newpkg->name, 0, pkg_count, pkg_current); @@ -535,33 +544,34 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); } - _alpm_archive_read_free(archive); - close(fd); + } - /* restore the old cwd if we have it */ - if(cwdfd >= 0) { - if(fchdir(cwdfd) != 0) { - _alpm_log(handle, ALPM_LOG_ERROR, - _("could not restore working directory (%s)\n"), strerror(errno)); - } - close(cwdfd); + _alpm_archive_read_free(archive); + close(fd); + + /* restore the old cwd if we have it */ + if(cwdfd >= 0) { + if(fchdir(cwdfd) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not restore working directory (%s)\n"), strerror(errno)); } + close(cwdfd); + } - if(errors) { - ret = -1; - if(is_upgrade) { - _alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while upgrading %s\n"), - newpkg->name); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "error: problem occurred while upgrading %s\n", - newpkg->name); - } else { - _alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while installing %s\n"), - newpkg->name); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "error: problem occurred while installing %s\n", - newpkg->name); - } + if(errors) { + ret = -1; + if(is_upgrade) { + _alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while upgrading %s\n"), + newpkg->name); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "error: problem occurred while upgrading %s\n", + newpkg->name); + } else { + _alpm_log(handle, ALPM_LOG_ERROR, _("problem occurred while installing %s\n"), + newpkg->name); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "error: problem occurred while installing %s\n", + newpkg->name); } } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2d87796..cfe50d2 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -11,6 +11,7 @@ TESTS += test/pacman/tests/database002.py TESTS += test/pacman/tests/database010.py TESTS += test/pacman/tests/database011.py TESTS += test/pacman/tests/database012.py +TESTS += test/pacman/tests/dbonly-extracted-files.py TESTS += test/pacman/tests/depconflict100.py TESTS += test/pacman/tests/depconflict110.py TESTS += test/pacman/tests/depconflict111.py diff --git a/test/pacman/tests/dbonly-extracted-files.py b/test/pacman/tests/dbonly-extracted-files.py new file mode 100644 index 0000000..a1bc48d --- /dev/null +++ b/test/pacman/tests/dbonly-extracted-files.py @@ -0,0 +1,16 @@ +import util +import os.path + +self.description = "Install a package with dbonly" + +sp = pmpkg("foobar", "1-1") +sp.files = ["bin/foobar"] +sp.install['post_install'] = "echo foobar" +self.addpkg2db("sync", sp) + +self.args = "-S --dbonly %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=foobar") +self.addrule("FILE_EXIST=%s" % os.path.join(util.PM_DBPATH, "local/foobar-1-1/install")) +self.addrule("!FILE_EXIST=bin/foobar") -- 2.10.2

1 0

[pacman-dev] [PATCH] makepkg: Disallow forward slashes in pkgver
by Allan McRae 06 Dec '16

06 Dec '16

From: Steef Hegeman <steefhegeman(a)hotmail.com> scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in now raises an error when pkgver contains forward slashes. pkgver containing a forward slash results in a package filename containing a forward slash, which isn't a valid filename. Signed-off-by: Steef Hegeman <steefhegeman(a)hotmail.com> --- >From bugtracker (FS#51481) doc/PKGBUILD.5.txt | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 08ef3e4..4c1ef4b 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -48,7 +48,7 @@ similar to `$_basekernver`. *pkgver*:: The version of the software as released from the author (e.g., '2.7.1'). - The variable is not allowed to contain colons or hyphens. + The variable is not allowed to contain colons, forward slashes or hyphens. + The `pkgver` variable can be automatically updated by providing a `pkgver()` function in the PKGBUILD that outputs the new package version. diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 09041d1..8d22a11 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -35,8 +35,8 @@ check_pkgver() { return 1 fi - if [[ $1 = *[[:space:]:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" + if [[ $1 = *[[:space:]/:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver" return 1 fi } -- 2.10.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-117-gc40ee73
by allan＠archlinux.org 05 Dec '16

05 Dec '16

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 c40ee73bc40d239702d288f922e50db1a82915d4 (commit) via fc756c3c70d39fc8c58deb85a0ffd759634cd773 (commit) via 36f456ccaee64c41b6ae27f885700521f9b7c2e9 (commit) via 97459e9eb786f44f45837ac3e62639e9ebd3a09c (commit) via 46324d9b26bd4bf5624dd8743bcd2b8f9dc5616d (commit) via e83e868a77865d42a33076605f9a90a165f7c93a (commit) via c3b954e7b93140aa85559fa350582160f3c0a72b (commit) via e3e9cc14a52062e2c3e0f4e2c4c6dec8efc68be4 (commit) via 5dd764eb47e0109407702a4064e74dc25df3c982 (commit) via 46101bea1c1232621fa80409586b5eeeaefdac47 (commit) via d3dc2002634637bd3635c460c68885bdd755292a (commit) via 7114ca6208d3dffe685b994f0802c90727303fc8 (commit) via 263e65dbb3c841c70766e9509f0dcbdd1186c366 (commit) via 0b30edacd4c163b4fa5990d06cca71053248123b (commit) via 90f1dd165769f3a0e7f7275d3e9c72e902325146 (commit) via 9ce2c9b1872b44cebe1ce54c2a7398fbbc31fc6a (commit) via cef0d726b454fcd93fc3d42ee7372c1f290db758 (commit) via e7fc5608667ce0c0d5b48c6c838c65ff288f254b (commit) via 37b73fe4fbec05e86959d234413510463ea35141 (commit) via 0dbc55a35738d0e3718f99a428253140f282ef9a (commit) from 5fbb361261d6a697f891dc4bfc4e504c4ca363bf (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 c40ee73bc40d239702d288f922e50db1a82915d4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 3 09:53:26 2016 -0500 be_local: remove unused error return LAZY_LOAD has completely ignored the errret value since commit 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc756c3c70d39fc8c58deb85a0ffd759634cd773 Author: Christian Hesse <mail(a)eworm.de> Date: Fri Dec 2 11:58:01 2016 +0100 add generated scripts to gitignore These files are generated at build time. Ignore in git. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36f456ccaee64c41b6ae27f885700521f9b7c2e9 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sat Aug 20 08:52:39 2016 +1200 Make DUFLAGS be overrideable during configure Not all du implementations on linux accept --apparent-size, so let the user configure the arguments passed to du if required. This fixes FS#47943. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 97459e9eb786f44f45837ac3e62639e9ebd3a09c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 2 15:57:18 2016 +1000 Suppress more output messages on successful -D options with -q Suppress output on successful use of --asdeps and --asexplicit. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46324d9b26bd4bf5624dd8743bcd2b8f9dc5616d Author: Patrick Eigensatz <patrickeigensatz(a)gmail.com> Date: Fri Oct 7 21:45:07 2016 +0200 Give a "success!" message on database check 'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e83e868a77865d42a33076605f9a90a165f7c93a Author: Martin Kühne <mysatyre(a)gmail.com> Date: Mon Oct 17 16:40:37 2016 +0200 Parametrise the different ways in which the payload is reset In FS#43434, Downloads which fail and are restarted on a different server will resume and may display a negative download speed. The payload's progress in libalpm was not properly reset which ultimately caused terminal noise because the line width calculation assumes positive download speeds. This patch fixes the incomplete reset of the payload by mimicing what be_sync.c:alpm_db_update() does over in sync.c:download_single_file(). The new dload.c:_alpm_dload_payload_reset_for_retry() extends beyond the current behavior by updating initial_size and prevprogress for this case. This makes pacman reset the progress properly in the next invocation of the callback and display positive download speeds. Fixes FS#43434. Signed-off-by: Martin Kühne <mysatyre(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c3b954e7b93140aa85559fa350582160f3c0a72b Author: Christian Hesse <mail(a)eworm.de> Date: Fri Nov 11 21:18:35 2016 +0100 libalpm/signing: support EDDSA from gpgme 1.7.0 Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e3e9cc14a52062e2c3e0f4e2c4c6dec8efc68be4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:17 2016 -0400 makepkg: reject packages with newlines in paths libalpm's local database format does not support paths with newlines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dd764eb47e0109407702a4064e74dc25df3c982 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:16 2016 -0400 makepkg: abort on lint_package errors Allows lint_package to prevent makepkg from creating an invalid package. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46101bea1c1232621fa80409586b5eeeaefdac47 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:15 2016 -0400 makepkg: reject package data with newlines The PKGINFO format cannot handle values that contain newlines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d3dc2002634637bd3635c460c68885bdd755292a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:14 2016 -0400 makepkg: fix find_lib{depends, provides} results Neither function was checking for the existence of actual results before calling printf, resulting in them returning a list with a single empty value if there were no depends/provides. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7114ca6208d3dffe685b994f0802c90727303fc8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 7 10:21:22 2016 -0500 dload: use curl's keepalive mechanism This does exactly the same thing as it code it replaces, but punt to curl to do it for brevity. Requires curl 7.25.0, which we already cover. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 263e65dbb3c841c70766e9509f0dcbdd1186c366 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Dec 25 13:11:54 2014 -0500 makepkg: unset potentially architecture-specific vars I'm not convinced this is a worthwhile goal, but let's follow suit. Since we can't know the names of all the vars that might exist, unset them by pattern. commit 0b30edacd4c163b4fa5990d06cca71053248123b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 21:12:50 2014 -0500 makepkg: fix quoting in calls to dependency checking commit 90f1dd165769f3a0e7f7275d3e9c72e902325146 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 20:20:02 2014 -0500 makepkg: fix quoting in calls to check_deps The inside needs quoting, and this is separate from the declartion, which does not (in these cases). commit 9ce2c9b1872b44cebe1ce54c2a7398fbbc31fc6a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 09:04:53 2014 -0500 makepkg: make run_function_safe more robust Use shopt to set/reset errexit and errtrace, which lets us: 1) be more vigilant, resetting anything the user might do to us in PKGBUILD functions. 2) use human-readable words (errexit vs. -e) On top of this, introduce a new save/restore for the shell's other shopts. A user should not have any expectations that what happens in one function is available in another function, if it isn't explicitly defined in the PKGBUILD. While this change does not make that assertion, it gets us closer. We also replace a variable which comes from out of nowhere (pkgfunc) with the positional parameter containing the same value. Quoting is adjusted to make the expansion happen at the time the trap is set, rather than later on. commit cef0d726b454fcd93fc3d42ee7372c1f290db758 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 08:44:55 2014 -0500 makepkg: remove vestiges of global errexit These 'set +E' diversions haven't been needed since global errexit was disabled in dca10b062f2 (January 2012). commit e7fc5608667ce0c0d5b48c6c838c65ff288f254b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 31 10:19:31 2016 -0400 makepkg.conf: add -g to default curl options This disables globbing, which should never be used in source URL specifications as it would lead to mismatches in the checksum mapping and un-checked sources. commit 37b73fe4fbec05e86959d234413510463ea35141 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Oct 25 21:02:02 2016 +0200 Make sure all proper scripts are installed instead of the wrappers After 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee all scripts that were changed to using the wrapper for in-tree use have the wrappers installed to the system instead of the actual script, so change the install command to support all wrapped scripts instead of just makepkg. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0dbc55a35738d0e3718f99a428253140f282ef9a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 24 10:00:46 2016 +1000 Remove pacsort Moved to the pacman-contrib project Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - configure.ac | 14 +- doc/pacman.8.txt | 6 +- etc/makepkg.conf.in | 6 +- lib/libalpm/be_local.c | 42 +- lib/libalpm/dload.c | 56 +-- lib/libalpm/dload.h | 1 + lib/libalpm/signing.c | 4 + lib/libalpm/sync.c | 4 +- scripts/Makefile.am | 6 +- scripts/libmakepkg/.gitignore | 3 + scripts/libmakepkg/lint_package.sh.in | 4 +- .../libmakepkg/lint_package/build_references.sh.in | 1 + .../util.sh.in => lint_package/file_names.sh.in} | 27 +- .../libmakepkg/lint_package/missing_backup.sh.in | 1 + scripts/makepkg.sh.in | 110 ++-- scripts/po/POTFILES.in | 1 + src/pacman/database.c | 14 +- src/pacman/pacman.c | 5 + src/util/.gitignore | 2 - src/util/Makefile.am | 5 +- src/util/pacsort.c | 552 --------------------- test/util/Makefile.am | 1 - test/util/pacsorttest.sh | 129 ----- 24 files changed, 164 insertions(+), 831 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild/util.sh.in => lint_package/file_names.sh.in} (57%) delete mode 100644 src/util/pacsort.c delete mode 100755 test/util/pacsorttest.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-97-g5fbb361
by allan＠archlinux.org 05 Dec '16

05 Dec '16

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 5fbb361261d6a697f891dc4bfc4e504c4ca363bf (commit) from a79c0038ae84c38fe063bd7426a839f3c01c10e8 (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 5fbb361261d6a697f891dc4bfc4e504c4ca363bf Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 5 15:12:03 2016 +1000 Revert "[RFC] Provide source files for useful debug packages" This reverts commit a79c0038ae84c38fe063bd7426a839f3c01c10e8. I merged the wrong branch into master... ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/tidy/strip.sh.in | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0