May 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Added the --bell switch.
by Eric Toombs 26 Jun '16

26 Jun '16

This switch rings the terminal bell when user input is required. Obviously, it has no effect if --noconfirm is also passed. --- doc/pacman.8.txt | 3 +++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 3 +++ src/pacman/util.c | 15 +++++++++------ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 514f559..6e0617a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -148,6 +148,9 @@ Options *\--arch* <arch>:: Specify an alternate architecture. +*\--bell*:: + Sound the terminal bell when input is required. + *\--cachedir* <dir>:: Specify an alternative package cache location (a typical default is +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 7a7e9cf..463ae48 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short bell; double deltaratio; char *arch; char *print_format; @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_BELL }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 94685a7..07282e7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -221,6 +221,7 @@ static void usage(int op, const char * const myname) addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); addlist(_(" --confirm always ask for confirmation\n")); + addlist(_(" --bell sound the terminal bell when input is required\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -480,6 +481,7 @@ static int parsearg_global(int opt) case OP_CONFIRM: config->noconfirm = 0; break; + case OP_BELL: config->bell = 1; break; case OP_DBPATH: case 'b': free(config->dbpath); @@ -981,6 +983,7 @@ static int parseargs(int argc, char *argv[]) {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, + {"bell", no_argument, 0, OP_BELL}, {0, 0, 0, 0} }; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e8..9183047 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1396,13 +1396,14 @@ int multiselect_question(char *array, int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, response_len, stdin)) { @@ -1463,13 +1464,14 @@ int select_question(int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a number (default=%d)"), preset); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, sizeof(response), stdin)) { @@ -1517,13 +1519,14 @@ static int question(short preset, const char *format, va_list args) } fputs(config->colstr.nocolor, stream); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); return preset; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fd_in); if(safe_fgets(response, sizeof(response), stdin)) { -- 2.6.2

3 8

[pacman-dev] [PATCH] Files that contain references to srcdir and pkgdir are listed
by Ashley Whetter 12 Jun '16

12 Jun '16

Fixes FS#31558 Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- .../libmakepkg/lint_package/build_references.sh.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/lint_package/build_references.sh.in b/scripts/libmakepkg/lint_package/build_references.sh.in index 67c14e6..dd6b88c 100644 --- a/scripts/libmakepkg/lint_package/build_references.sh.in +++ b/scripts/libmakepkg/lint_package/build_references.sh.in @@ -29,10 +29,24 @@ source "$LIBRARY/util/message.sh" lint_package_functions+=('warn_build_references') warn_build_references() { - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" + warn_single_build_references "$srcdir" srcdir + warn_single_build_references "$pkgdirbase" pkgdir +} + +warn_single_build_references() { + local to_find=$1 ref_name=$2 + + mapfile -t refs < <(cd "$pkgdir" && find_files_that_ref "$to_find") + if (( ${#refs[*]} )); then + warning "$(gettext "Package contains reference to %s")" "\$$ref_name" + printf " %s\n" "${refs[@]}" fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then - warning "$(gettext "Package contains reference to %s")" "\$pkgdir" +} + +find_files_that_ref() { + if [[ -z "$1" ]]; then + return 1 fi + + find -type f -exec grep -Il "$1" {} + } -- 2.8.2

2 1

[pacman-dev] [PATCH] Can place local source files in directories
by Ashley Whetter 12 Jun '16

12 Jun '16

For example a source file 'mydir/myfile.sh' is now valid, whereas before 'myfile.sh' would have needed to be placed in the same directory as the PKGBUILD. Fixes FS#43020 Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- I've tested this by generating checksums, making a package, and making a source package, all with downloadable and local files. Local files were tested in both the PKGBUILD directory and a subdirectory. This doesn't work for files that have been placed under a fake protocol to force makepkg not to include the file in the source package (for example 'file://a_sub_dir/my_huge_source_file.tar.gz'). scripts/libmakepkg/source/file.sh.in | 4 +++- scripts/libmakepkg/source/local.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 17 +++++++++++++++++ scripts/makepkg.sh.in | 8 ++++++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 20493a6..6f17884 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -87,7 +87,9 @@ extract_file() { local filepath=$(get_filepath "$file") rm -f "$srcdir/${file}" - ln -s "$filepath" "$srcdir/" + local intermediatedirs=$(get_intermediate_dirs "$file") + mkdir -p "$srcdir/$intermediatedirs" + ln -s "$filepath" "$srcdir/$intermediatedirs" if in_array "$file" "${noextract[@]}"; then # skip source files in the noextract=() array diff --git a/scripts/libmakepkg/source/local.sh.in b/scripts/libmakepkg/source/local.sh.in index 6a4b882..ef4829a 100644 --- a/scripts/libmakepkg/source/local.sh.in +++ b/scripts/libmakepkg/source/local.sh.in @@ -33,7 +33,7 @@ download_local() { local filepath=$(get_filepath "$netfile") if [[ -n "$filepath" ]]; then - msg2 "$(gettext "Found %s")" "${filepath##*/}" + msg2 "$(gettext "Found %s")" "$netfile" else local filename=$(get_filename "$netfile") error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename" diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index 9d4ba4a..f16d3c6 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -74,6 +74,10 @@ get_filename() { filename=${filename%%.git*} fi ;; + local) + # If it is a local file then leave the full path as is + filename=$netfile + ;; *) # if it is just an URL, we only keep the last component filename="${netfile##*/}" @@ -142,3 +146,16 @@ get_downloadclient() { printf "%s\n" "$agent" } + +# Get the directories that exist before a source file +get_intermediate_dirs() { + local netfile=$1 + local intermediatedirs + + if [[ "$(get_protocol "$netfile")" = 'local' ]] && [[ "$netfile" = */* ]] + then + intermediatedirs=${netfile%/*} + fi + + printf "%s\n" "$intermediatedirs" +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f80e37a..392b1b3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1231,8 +1231,12 @@ create_srcpackage() { if [[ "$file" = "$(get_filename "$file")" ]] || (( SOURCEONLY == 2 )); then local absfile absfile=$(get_filepath "$file") || missing_source_file "$file" - msg2 "$(gettext "Adding %s...")" "${absfile##*/}" - ln -s "$absfile" "$srclinks/$pkgbase" + msg2 "$(gettext "Adding %s...")" "$(get_filename "$file")" + + local intermediatedirs="$(get_intermediate_dirs "$file")" + mkdir -p "$srclinks/$pkgbase/$intermediatedirs" + + ln -s "$absfile" "$srclinks/$pkgbase/$intermediatedirs" fi done -- 2.8.0

2 1

[pacman-dev] [PATCH] recursedeps: include cyclic dependencies
by Andrew Gregory 04 Jun '16

04 Jun '16

Cyclic dependencies (A depends on B, B depends on A) were not selected because neither package could be removed individually, so can_remove_package would always return false for both. By preselecting all dependencies then filtering back out any dependencies still required by any packages that will not be uninstalled, groups of unneeded cyclic dependencies can be found. Fixes FS#41031 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 104 ++++++++++++++-------------- test/pacman/tests/TESTS | 1 + test/pacman/tests/remove-recursive-cycle.py | 41 +++++++++++ 3 files changed, 94 insertions(+), 52 deletions(-) create mode 100644 test/pacman/tests/remove-recursive-cycle.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index c35a275..ae5d60b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -551,44 +551,29 @@ error: return NULL; } -/* These parameters are messy. We check if this package, given a list of - * targets and a db is safe to remove. We do NOT remove it if it is in the - * target list, or if the package was explicitly installed and - * include_explicit == 0 */ -static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, - alpm_list_t *targets, int include_explicit) +/** Move package dependencies from one list to another + * @param from list to scan for dependencies + * @param to list to add dependencies to + * @param pkg package whose dependencies are moved + * @param explicit if 0, explicitly installed packages are not moved + */ +static void _alpm_select_depends(alpm_list_t **from, alpm_list_t **to, + alpm_pkg_t *pkg, int explicit) { - alpm_list_t *i; - - if(alpm_pkg_find(targets, pkg->name)) { - return 0; - } - - if(!include_explicit) { - /* see if it was explicitly installed */ - if(alpm_pkg_get_reason(pkg) == ALPM_PKG_REASON_EXPLICIT) { - _alpm_log(db->handle, ALPM_LOG_DEBUG, - "excluding %s -- explicitly installed\n", pkg->name); - return 0; + alpm_list_t *i, *next; + if(!alpm_pkg_get_depends(pkg)) { + return; + } + for(i = *from; i; i = next) { + alpm_pkg_t *deppkg = i->data; + next = i->next; + if((explicit || alpm_pkg_get_reason(deppkg) != ALPM_PKG_REASON_EXPLICIT) + && _alpm_pkg_depends_on(pkg, deppkg)) { + *to = alpm_list_add(*to, deppkg); + *from = alpm_list_remove_item(*from, i); + free(i); } } - - /* TODO: checkdeps could be used here, it handles multiple providers - * better, but that also makes it slower. - * Also this would require to first add the package to the targets list, - * then call checkdeps with it, then remove the package from the targets list - * if checkdeps detected it would break something */ - - /* see if other packages need it */ - for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { - alpm_pkg_t *lpkg = i->data; - if(_alpm_pkg_depends_on(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { - return 0; - } - } - - /* it's ok to remove */ - return 1; } /** @@ -604,31 +589,46 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, */ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit) { - alpm_list_t *i, *j; + alpm_list_t *i, *keep, *rem = NULL; if(db == NULL || targs == NULL) { return -1; } + keep = alpm_list_copy(_alpm_db_get_pkgcache(db)); for(i = *targs; i; i = i->next) { - alpm_pkg_t *pkg = i->data; - for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { - alpm_pkg_t *deppkg = j->data; - if(_alpm_pkg_depends_on(pkg, deppkg) - && can_remove_package(db, deppkg, *targs, include_explicit)) { - alpm_pkg_t *copy = NULL; - _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", - deppkg->name); - /* add it to the target list */ - if(_alpm_pkg_dup(deppkg, &copy)) { - /* we return memory on "non-fatal" error in _alpm_pkg_dup */ - _alpm_pkg_free(copy); - return -1; - } - *targs = alpm_list_add(*targs, copy); - } + keep = alpm_list_remove(keep, i->data, _alpm_pkg_cmp, NULL); + } + + /* recursively select all dependencies for removal */ + for(i = *targs; i; i = i->next) { + _alpm_select_depends(&keep, &rem, i->data, include_explicit); + } + for(i = rem; i; i = i->next) { + _alpm_select_depends(&keep, &rem, i->data, include_explicit); + } + + /* recursively select any still needed packages to keep */ + for(i = keep; i && rem; i = i->next) { + _alpm_select_depends(&rem, &keep, i->data, 1); + } + alpm_list_free(keep); + + /* copy selected packages into the target list */ + for(i = rem; i; i = i->next) { + alpm_pkg_t *pkg = i->data, *copy = NULL; + _alpm_log(db->handle, ALPM_LOG_DEBUG, + "adding '%s' to the targets\n", pkg->name); + if(_alpm_pkg_dup(pkg, &copy)) { + /* we return memory on "non-fatal" error in _alpm_pkg_dup */ + _alpm_pkg_free(copy); + alpm_list_free(rem); + return -1; } + *targs = alpm_list_add(*targs, copy); } + alpm_list_free(rem); + return 0; } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 62d1f2a..bd5a0b6 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -109,6 +109,7 @@ TESTS += test/pacman/tests/querycheck002.py TESTS += test/pacman/tests/querycheck_fast_file_type.py TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/remove-assumeinstalled.py +TESTS += test/pacman/tests/remove-recursive-cycle.py TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove002.py TESTS += test/pacman/tests/remove010.py diff --git a/test/pacman/tests/remove-recursive-cycle.py b/test/pacman/tests/remove-recursive-cycle.py new file mode 100644 index 0000000..b9864c8 --- /dev/null +++ b/test/pacman/tests/remove-recursive-cycle.py @@ -0,0 +1,41 @@ +self.description = "Recursively remove a package with cyclical dependencies" + +lpkg1 = pmpkg('pkg1') +self.addpkg2db('local', lpkg1) +lpkg1.depends = [ 'dep1' ] + +lpkg2 = pmpkg('pkg2') +self.addpkg2db('local', lpkg2) +lpkg2.depends = [ 'dep3' ] + +# cyclic dependency 1 +ldep1 = pmpkg('dep1') +self.addpkg2db('local', ldep1) +ldep1.depends = [ 'dep2', 'dep3', 'dep4' ] +ldep1.reason = 1 + +# cyclic dependency 2 +ldep2 = pmpkg('dep2') +self.addpkg2db('local', ldep2) +ldep2.depends = [ 'dep1' ] +ldep2.reason = 1 + +# dependency required by another package +ldep3 = pmpkg('dep3') +self.addpkg2db('local', ldep3) +ldep3.reason = 1 + +# explicitly installed dependency +ldep4 = pmpkg('dep4') +self.addpkg2db('local', ldep4) +ldep4.reason = 0 + +self.args = "-Rs pkg1" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=dep3") +self.addrule("PKG_EXIST=dep4") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=dep1") +self.addrule("!PKG_EXIST=dep2") -- 2.8.2

2 1

[pacman-dev] A WIP fix for removing unneeded dependency cycles
by Ashley Whetter 22 May '16

22 May '16

This is a work in progress patchset. DO NOT MERGE! I've been looking at a fix for FS#41031 [1]. What I've attempted to do in this prototype is to fix the issue without needing to calculate the strongly connected components of the dependency graph to see if I could improve on run time performance or memory consumption. The way this works is I first perform depth-first cycle detection on the graph. When a cycle is detected the list of packages in the cycle is added to the removes list of each package in the cycle. This marks a package as "in a cycle". After this preprocessing step a package is determined as removable by pretending that every other package in the cycle is being removed, and then determining what or not the package itself is removable as normal. My thinking from this prototype though is that it isn't as great a solution as calculating the strongly connected components of the dependency graph. Doing cycle detection this way means that dependency graphs with packages belonging to more than one cycle aren't detected. Although this is a crazy edge case, it's theoretically a potential graph, and implementing Tarjan's strongly connected components algorithm instead of the cycle detection used here shouldn't be much more work. It can still use the removes array and the `_can_remove_cycle` method for determining whether a cycle is removable; only the preprocessing step would need to change. The only way that I think calculating the strongly connected components could be worse than this prototype is that it requires a list of every vertex in the dependency graph. This is easy enough to calculate with a breadth first search but it will use more memory than simple cycle detection. So I wanted to see what people's thoughts were on these two solutions and if there was a preference to one or the other. Ashley [1] https://bugs.archlinux.org/task/41031

3 4

[pacman-dev] [GIT] The official pacman repository branch, release/5.0.x, updated. v5.0.1-6-gc2f9758
by allan＠archlinux.org 18 May '16

18 May '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, release/5.0.x has been updated via c2f9758018479c15a34887d960f36ba9b532175f (commit) from 5469161dad387b71d605cfeb2c6c369df6f939e3 (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 c2f9758018479c15a34887d960f36ba9b532175f Author: Leonid Isaev <leonid.isaev(a)jila.colorado.edu> Date: Sat May 7 17:24:17 2016 -0600 Use a more generic regexp when parsing output of gpg(1) in signature verification. The current way of extracting key trust from output of gpg --verify is not very robust against changes in the format of said output. As a result, pacman-key can return an error even if the signature is actuall good. This change relaxes the regexp when parsing output of gpg. Signed-off-by: Leonid Isaev <leonid.isaev(a)jila.colorado.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 892a1076c00a2b0097145c35f5d8ef590216dac0) ----------------------------------------------------------------------- Summary of changes: scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-35-g839417e
by allan＠archlinux.org 18 May '16

18 May '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 839417e8c65e73e632c77d3ecd68539494850de1 (commit) via f018317f488e35f3a9a3ce43c977baceec13d08b (commit) via 4f114f38178aeaffcc571aa42e2f930ca916f79d (commit) via 892a1076c00a2b0097145c35f5d8ef590216dac0 (commit) via 87082e3f44c4f92c63d881db38a0fff0565fc9bc (commit) via 7bebe4deff0afd4e220b5c4d6024bffb08bd794f (commit) via 02a0bf550a22e199f48537b7eee87361b112e8a0 (commit) from 3729ef7a9acf75080fb6f60d13ea80cfd36d855d (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 839417e8c65e73e632c77d3ecd68539494850de1 Author: Christian Hesse <mail(a)eworm.de> Date: Tue May 17 13:23:44 2016 +0200 pacman.8: add link to alpm-hooks(5) in see also Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f018317f488e35f3a9a3ce43c977baceec13d08b Author: Christian Hesse <mail(a)eworm.de> Date: Tue May 17 13:23:43 2016 +0200 libalpm.3: add link to alpm-hooks(5) in see also Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4f114f38178aeaffcc571aa42e2f930ca916f79d Author: Ashley Whetter <ashley(a)awhetter.co.uk> Date: Sun May 8 17:28:28 2016 +0100 libmakepkg: extract functions for integrity checking Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 892a1076c00a2b0097145c35f5d8ef590216dac0 Author: Leonid Isaev <leonid.isaev(a)jila.colorado.edu> Date: Sat May 7 17:24:17 2016 -0600 Use a more generic regexp when parsing output of gpg(1) in signature verification. The current way of extracting key trust from output of gpg --verify is not very robust against changes in the format of said output. As a result, pacman-key can return an error even if the signature is actuall good. This change relaxes the regexp when parsing output of gpg. Signed-off-by: Leonid Isaev <leonid.isaev(a)jila.colorado.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87082e3f44c4f92c63d881db38a0fff0565fc9bc Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sun Apr 3 16:19:49 2016 +1200 makepkg: ignore the architecture for --printsrcinfo Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7bebe4deff0afd4e220b5c4d6024bffb08bd794f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 29 22:00:02 2016 +1000 Report local file URL for -Sp operations if package is in cache When using "pacman -Sp" operation to get URLs of packages to download, it is useful to know which packages are already in the file cache and do not need downloaded. Print packages in the cache with a file:// prefix. e.g $ pacman -Sp glibc file:///var/cache/pacman/glibc-2.23-1-x86_64.pkg.tar.xz Also use package locations in case statements rather than opersations. This allows the ALPM_PKG_SYNCDB to fall thorough to just printing the package name for weird serverless repo setups. Fixes FS#15868 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 02a0bf550a22e199f48537b7eee87361b112e8a0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Apr 2 22:41:17 2016 +1000 makepkg: move build enviroment set-up to function This is a requirement to split the preparation of the build environment into libmakepkg, which will allow dropping in extensions (e.g. to allow PGO). After this patch, disabling buildflags or makeflags and enabling debug CFLAGS will only effect the build(), check() and package() functions. The relevant variables are no longer exported for the prepare() function. This should have zero impact for the prepare() function of a properly written PKGBUILD, as no building/linking is done there... Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/libalpm.3.txt | 3 +- doc/pacman.8.txt | 3 +- scripts/Makefile.am | 6 + scripts/libmakepkg/.gitignore | 2 + .../{lint_package.sh.in => integrity.sh.in} | 37 +- .../libmakepkg/integrity/generate_checksum.sh.in | 107 +++++ .../generate_signature.sh.in} | 44 +- scripts/libmakepkg/integrity/verify_checksum.sh.in | 130 ++++++ .../libmakepkg/integrity/verify_signature.sh.in | 216 +++++++++ scripts/libmakepkg/util/pkgbuild.sh.in | 20 +- scripts/makepkg.sh.in | 509 ++------------------- scripts/pacman-key.sh.in | 2 +- scripts/po/POTFILES.in | 5 + src/pacman/util.c | 27 +- 14 files changed, 600 insertions(+), 511 deletions(-) copy scripts/libmakepkg/{lint_package.sh.in => integrity.sh.in} (53%) create mode 100644 scripts/libmakepkg/integrity/generate_checksum.sh.in copy scripts/libmakepkg/{tidy/purge.sh.in => integrity/generate_signature.sh.in} (56%) create mode 100644 scripts/libmakepkg/integrity/verify_checksum.sh.in create mode 100644 scripts/libmakepkg/integrity/verify_signature.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] libalpm.3: add link to alpm-hooks(5) in see also
by Christian Hesse 18 May '16

18 May '16

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- doc/libalpm.3.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index e2ea32c..aa667a1 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -34,6 +34,7 @@ See linkman:pacman.conf[5] for more details on configuring libalpm using the See Also -------- -linkman:pacman[8], linkman:makepkg[8], linkman:pacman.conf[5] +linkman:alpm-hooks[5], linkman:makepkg[8], linkman:pacman[8], +linkman:pacman.conf[5] include::footer.txt[] -- 2.8.2

2 2

[pacman-dev] Proposal to split out makepkg integrity methods
by Ashley Whetter 18 May '16

18 May '16

Hello everyone, I'm looking to split some makepkg methods out into a of makepkg.sh.in and into a new libmakepkg module. My plan is to have an "integrity" folder in libmakepkg. In this folder there would be a "generate.sh" file with the `generate_checksums`, `generate_one_checksum`, and `create_signature` methods. Another file, "check.sh" would contain `check_source_integrity`and it's dependencies; namely `check_checksums`, `check_pgpsigs`, `parse_gpg_statusfile`, `verify_integrity_sums`, and `verify_integrity_one`. "integrity" would depend on "util/pkgbuild.sh" as `check_checksums` and `verify_integrity_sum` both call `array_build`, and `check_pgpsigs` calls `get_all_sources` and `get_all_sources_for_arch`. I also plan on moving `get_integlist` into "util/pkgbuild.sh", or maybe into an "integrity/util.sh" file (but "util/pkgbuild.sh" makes more sense to me). Another option would be to have an "integrity.sh" file under "integrity" (or maybe some other name) and also a "signature.sh" file, and to split the methods by whether they are related to strictly integrity checking or signature checking. Are there any thoughts or suggestions on this plan of attack? Ashley

2 5

[pacman-dev] [PATCH] makepkg: ignore the architecture for --printsrcinfo
by Alastair Hughes 05 May '16

05 May '16

Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- It appears that SRCINFO files should be independent of architecture, however makepkg will currently fail if the SRCINFO file is being generated on a machine with a different architecture. This is in the same vein as c72ca3d5; I believe that creating source tarballs would be the only other candidate, but IGNOREARCH gets set later in that case. scripts/makepkg.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f80e37a..5487884 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1707,7 +1707,8 @@ while true; do -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; - --printsrcinfo) PRINTSRCINFO=1 ;; + # generating a srcinfo does not depend on architecture + --printsrcinfo) PRINTSRCINFO=1 IGNOREARCH=1;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; -- 2.8.0

2 1