- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 01/11] Add testrunner for makepkg-template
by Florian Pritz 10 Jan '15

10 Jan '15

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile.am | 2 + test/scripts/Makefile.am | 1 + test/scripts/makepkg-template-tests/.gitignore | 3 + test/scripts/makepkg-template_test.sh | 86 ++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 test/scripts/makepkg-template-tests/.gitignore create mode 100755 test/scripts/makepkg-template_test.sh diff --git a/Makefile.am b/Makefile.am index e9b3dfa..ab669ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*) TESTS = test/scripts/parseopts_test.sh \ test/scripts/human_to_size_test.sh \ + test/scripts/makepkg-template_test.sh \ test/scripts/pacman-db-upgrade-v9.py \ test/util/pacsorttest.sh \ test/util/vercmptest.sh @@ -37,6 +38,7 @@ TEST_SUITE_LOG = test/test-suite.log TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ + PMTEST_SCRIPT_DIR=$(top_srcdir)/scripts/; export PMTEST_SCRIPT_DIR; \ PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index 8d6bc84..ed1a951 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -1,6 +1,7 @@ check_SCRIPTS = \ parseopts_test.sh \ pacman-db-upgrade-v9.py \ + makepkg-template_test.sh \ human_to_size_test.sh noinst_SCRIPTS = $(check_SCRIPTS) diff --git a/test/scripts/makepkg-template-tests/.gitignore b/test/scripts/makepkg-template-tests/.gitignore new file mode 100644 index 0000000..c6fc2ee --- /dev/null +++ b/test/scripts/makepkg-template-tests/.gitignore @@ -0,0 +1,3 @@ +result +output +output_full diff --git a/test/scripts/makepkg-template_test.sh b/test/scripts/makepkg-template_test.sh new file mode 100755 index 0000000..b036b74 --- /dev/null +++ b/test/scripts/makepkg-template_test.sh @@ -0,0 +1,86 @@ +#!/bin/bash + +declare -i testcount=0 fail=0 pass=0 total=0 + +# source the library function +scriptdir=${1:-${PMTEST_SCRIPT_DIR}} +if [[ -z $scriptdir || ! -f $scriptdir/makepkg-template ]]; then + printf "Bail out! makepkg-template executable (%s) could not be located\n" "${scriptdir}/makepkg-template" + exit 1 +fi + +testdir="${0%/*}/makepkg-template-tests" + +total=$(find "$testdir" -maxdepth 1 -mindepth 1 -type d | wc -l) + +run_test() { + local testcase=$1 exitcode + local -i failed=0 + + (( ++testcount )) + + local -a arguments + + if [[ -f "$testdir/$testcase/arguments" ]]; then + arguments=($(cat "$testdir/$testcase/arguments")) + fi + + rm -f "$testdir/$testcase/result" + + "$scriptdir/makepkg-template" \ + --template-dir "$testdir/$testcase/templates" \ + -p "$testdir/$testcase/PKGBUILD" \ + -o "$testdir/$testcase/result" \ + &> "$testdir/$testcase/output_full" "${arguments[@]}" + exitcode=$? + + sed "$testdir/$testcase/output_full" >"$testdir/$testcase/output" \ + -e 's|./test/scripts/|./|' \ + -e 's| at '$scriptdir'/makepkg-template line [0-9]\+\.$||' + printf "%s\n" "$exitcode" >> "$testdir/$testcase/output" + + if [[ -f "$testdir/$testcase/result" ]]; then + if ! diff -u "$testdir/$testcase/"{result,expected_result}; then + failed=1 + fi + else + if [[ -f "$testdir/$testcase/expected_result" ]]; then + echo "$testcase: Found expected_result file but no result file" + failed=1 + fi + fi + + if ! diff -u "$testdir/$testcase/"{output,expected_output}; then + failed=1 + fi + + if ((!failed)); then + (( ++pass )) + printf "ok %d - %s\n" "$testcount" "$input" + else + (( ++fail )) + printf "not ok %d - %s\n" "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + fi +} + +summarize() { + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi +} +trap 'summarize' EXIT + +printf '# Beginning makepkg-template tests\n' + +echo "1..$total" + +for dir in "$testdir/"*; do + if [[ -d "$dir" ]]; then + run_test "${dir##*/}" + fi +done -- 2.2.1

3 32

[pacman-dev] [PATCH 1/3] paccache: exit in case of pacman error when -u flag is used
by Dave Reisner 10 Jan '15

10 Jan '15

From: Dario Giovannetti <dariogiova(a)gmail.com> Fixes https://bugs.archlinux.org/task/43286 Signed-off-by: Dario Giovannetti <dariogiova(a)gmail.com> --- contrib/paccache.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 6a68d4d..1690583 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -256,6 +256,8 @@ while :; do delete=1 ;; -u|--uninstalled) IFS=$'\n' read -r -d '' -a ign < <(pacman -Qq) + # pacman -Qq may exit with an error, thus making ign an empty array + (( ${#ign[@]} )) || die 'failed to retrieve the list of installed packages' blacklist+=("${ign[@]}") unset ign ;; -V|--version) -- 2.2.1

2 4

[pacman-dev] arch specific depends arrays
by Christian Hesse 09 Jan '15

09 Jan '15

Hello everybody, I've created a new package vmware-horizon-client [0] that tries to use the new architecture specific depends arrays. But makepkg does ignore them completely, I do not see them in my packages. Is anything wrong with my PKGBUILD? I wonder why AUR does list the dependencies correctly... [0] https://aur.archlinux.org/packages/vmware-horizon-client/ -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

2 3

[pacman-dev] [PATCH] makepkg: do not eval dlcmd
by lolilolicon 07 Jan '15

07 Jan '15

Something like `source=('$pkgname-$pkgver.tar.gz')` in the PKGBUILD would "just work" with this eval. This could be a security issue since URLs are arbitrary external data. Instead, expand the dlagent command line into an array, replace the %o, %u place holders, and run the resultant command line as is. A shortcoming of this is the dlagent command line cannot have embedded spaces. If this turns out to be a problem, we can do an early eval before substituting %o and %u. --- scripts/makepkg.sh.in | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8e8a64c..a134453 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -288,12 +288,12 @@ get_protocol() { get_downloadclient() { local proto=$1 - # loop through DOWNLOAD_AGENTS variable looking for protocol + # loop through DLAGENTS variable looking for protocol local i for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" if [[ $proto = "$handler" ]]; then - local agent="${i##*::}" + local agent="${i#*::}" break fi done @@ -308,8 +308,7 @@ get_downloadclient() { # ensure specified program is installed local program="${agent%% *}" if [[ ! -x $program ]]; then - local baseprog="${program##*/}" - error "$(gettext "The download program %s is not installed.")" "$baseprog" + error "$(gettext "The download program '%s' is not installed.")" "$program" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PROGRAM fi @@ -342,15 +341,16 @@ download_file() { local proto=$(get_protocol "$netfile") # find the client we should use for this URL - local dlcmd - dlcmd=$(get_downloadclient "$proto") || exit $? + local -a cmdline + local IFS=' ' + cmdline=($(get_downloadclient "$proto")) || exit local filename=$(get_filename "$netfile") local url=$(get_url "$netfile") if [[ $proto = "scp" ]]; then # scp downloads should not pass the protocol in the url - url="${url##*://}" + url="${url#*://}" fi msg2 "$(gettext "Downloading %s...")" "$filename" @@ -359,20 +359,18 @@ download_file() { local dlfile="${url##*/}" # replace %o by the temporary dlfile if it exists - if [[ $dlcmd = *%o* ]]; then - dlcmd=${dlcmd//\%o/\"$filename.part\"} - dlfile="$filename.part" + if [[ ${cmdline[*]} = *%o* ]]; then + dlfile=$filename.part + cmdline=("${cmdline[@]//%o/"$dlfile"}") fi # add the URL, either in place of %u or at the end - if [[ $dlcmd = *%u* ]]; then - dlcmd=${dlcmd//\%u/\"$url\"} + if [[ ${cmdline[*]} = *%u* ]]; then + cmdline=("${cmdline[@]//%u/"$url"}") else - dlcmd="$dlcmd \"$url\"" + cmdline+=("$url") fi - local ret=0 - eval "$dlcmd >&2 || ret=\$?" - if (( ret )); then + if ! command -- "${cmdline[@]}" >&2; then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" plain "$(gettext "Aborting...")" -- 2.1.0

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-64-g95da285
by allan＠archlinux.org 02 Jan '15

02 Jan '15

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 95da285f5670a56faf3bac0d999a6ba6d7153fab (commit) via 8da9be0955fc759f43c40dab8985f9d17ac8462a (commit) via 4060c5c77f41f69b26597dcc6d9285cf546000cf (commit) via 0acd794226e50bae1c776aba863baee400279410 (commit) via 62d5a71fba691e73b216036aa8fc16e5ea07a874 (commit) via aa4c61f9993cf634e610a98643304bd6978c61d1 (commit) via e8a3e3d81a4aee62db24f66b71c01d8a996d41d5 (commit) via 194dea2de10c3507608e4f826c66802671a719a8 (commit) via fafcbdeb8c7af439f2f3b85fa82f27b1dd4a3f79 (commit) via 89b9e9d1dced68587b704cb9e9a2aab55fb60b06 (commit) via 80e6d8a6fe3c94e9a385322494b27885837b7b3a (commit) via ca5a2771aeb0babca8270b83b0cb0172db4cebe5 (commit) via 39fe2d0e39956961bdcb9c4bd78ca11247f044bd (commit) from f1e010a5a7c562da02a74ffb043520760db49ba3 (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 95da285f5670a56faf3bac0d999a6ba6d7153fab Author: Mohammad Alsaleh <ce.mohammad.alsaleh(a)gmail.com> Date: Tue Dec 30 17:14:08 2014 +0200 pkgdelta: Use high compression options offered by xdelta3 * Add -9 which is the highest compression level. * Use lzma for secondary compression. Decompression speed is largely unaffected as most cycles are consumed by xz for re-compression. Some numbers: clang x86_64 [3.5.0-2.1 to 3.5.0-3] 17.21MiB default (0.73) 15.67MiB -9 (0.67) 13.59MiB -9 -S djw (0.58) 12.01MiB -9 -S lzma (0.51) inkscape x86_64 [0.48.5-3 to 0.48.5-4] 02.69MiB default (0.21) 01.64MiB -9 (0.13) 01.30MiB -9 -S djw (0.10) 01.01MiB -9 -S lzma (0.08) Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8da9be0955fc759f43c40dab8985f9d17ac8462a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jan 1 19:00:23 2015 -0500 initialize pointers passed to _alpm_pkg_dup _alpm_pkg_dup leaves the destination pointer unaltered in case of fatal errors, so when commits 2f0ca00e and be4198b3 freed the pointer, they fixed a memory leak on non-fatal errors by replacing it with a segmentation fault on fatal errors. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4060c5c77f41f69b26597dcc6d9285cf546000cf Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jan 1 19:00:22 2015 -0500 be_package.c: fix style violation Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0acd794226e50bae1c776aba863baee400279410 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 21:48:07 2014 +1000 add alpm_pkg_get_base() to README Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62d5a71fba691e73b216036aa8fc16e5ea07a874 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 21:33:16 2014 +1000 Remove testdb Replaced by pacman -Dk / -Dkk Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa4c61f9993cf634e610a98643304bd6978c61d1 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 22:00:57 2014 +1000 Document database checking options The required adding a Database Option section to the pacman man page and adding more complete documentation for --asdeps and --asexplicit as well. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8a3e3d81a4aee62db24f66b71c01d8a996d41d5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 21:28:59 2014 +1000 Integrate testdb into pacman The functionality of testdb is now available in pacman. pacman -Dk will check the local database for consistency, and pacman -Dkk will check the sync databases. Note that unlike testdb, you can not specify individual sync databases to check as sync databases act as a whole and not individually. A single database can be checked using an alternative pacman.conf file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 194dea2de10c3507608e4f826c66802671a719a8 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 28 19:08:59 2014 +1000 Split install reason changing into its own function Prepare for other functions to be added to the --database option. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fafcbdeb8c7af439f2f3b85fa82f27b1dd4a3f79 Merge: f1e010a 89b9e9d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 2 21:43:56 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 3 + README | 8 ++ contrib/updpkgsums.sh.in | 8 +- doc/PKGBUILD.5.txt | 9 +- doc/pacman.8.txt | 29 ++++- etc/makepkg.conf.in | 2 +- lib/libalpm/be_package.c | 3 +- lib/libalpm/db.c | 2 +- lib/libalpm/deps.c | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- src/pacman/database.c | 218 +++++++++++++++++++++++++++++++++- src/pacman/pacman.c | 23 +++- src/pacman/util.c | 2 +- src/util/.gitignore | 2 - src/util/Makefile.am | 5 +- src/util/testdb.c | 297 ----------------------------------------------- 17 files changed, 286 insertions(+), 331 deletions(-) delete mode 100644 src/util/testdb.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-17-g89b9e9d
by allan＠archlinux.org 02 Jan '15

02 Jan '15

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, maint has been updated via 89b9e9d1dced68587b704cb9e9a2aab55fb60b06 (commit) via 80e6d8a6fe3c94e9a385322494b27885837b7b3a (commit) via ca5a2771aeb0babca8270b83b0cb0172db4cebe5 (commit) via 39fe2d0e39956961bdcb9c4bd78ca11247f044bd (commit) from acc639adf20da077ed6f0141289d953997be92f8 (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 89b9e9d1dced68587b704cb9e9a2aab55fb60b06 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Dec 29 02:28:40 2014 -0500 Fix typo in a comment in makepkg.conf Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80e6d8a6fe3c94e9a385322494b27885837b7b3a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 29 22:35:53 2014 -0500 makepkg: avoid expansion of var in arithmetic context This bombs out when "$trusted" expands to the empty string. We're better off passing the var by name and letting bash default to "0" when the var is empty Fixes: https://bugs.archlinux.org/task/43269 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ca5a2771aeb0babca8270b83b0cb0172db4cebe5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Dec 31 14:33:31 2014 -0500 updpkgsums: retain permissions on rewritten PKGBUILD This could have been easy with something like chown's --reference flag, but this is GNU specific. Instead, just truncate and rewrite the file. Our exit trap cleans up after us. Fixes: https://bugs.archlinux.org/task/43272 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 39fe2d0e39956961bdcb9c4bd78ca11247f044bd Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 2 21:37:31 2015 +1000 Remove outdated fakeroot information from PKGBUILD man page Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/updpkgsums.sh.in | 8 +++----- doc/PKGBUILD.5.txt | 9 ++++----- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove outdated fakeroot information from PKGBUILD man page
by Allan McRae 02 Jan '15

02 Jan '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 7fa91ff..c95c41d 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -216,7 +216,7 @@ underscore and the architecture name e.g., 'checkdepends_x86_64=()'. and are not utilized by pacman during dependency resolution. The format for specifying optdepends is: - optdepends=('fakeroot: for makepkg usage as normal user') + optdepends=('python: for library bindings') + Additional architecture-specific optdepends can be added by appending an underscore and the architecture name e.g., 'optdepends_x86_64=()'. @@ -336,10 +336,9 @@ files into the packaging directory, with optional `prepare()`, `build()`, and *package() Function*:: The `package()` function is used to install files into the directory that will become the root directory of the built package and is run after all - the optional functions listed below. When specified in combination with - the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage - will be limited to running the packaging stage. All other functions will - be run as the user calling makepkg. + the optional functions listed below. The packaging stage is run using + fakeroot to ensure correct file permissions in the resulting package. + All other functions will be run as the user calling makepkg. *prepare() Function*:: An optional `prepare()` function can be specified in which operations to -- 2.2.1

1 0

[pacman-dev] [PATCH] initialize pointers passed to _alpm_pkg_dup
by Andrew Gregory 02 Jan '15

02 Jan '15

_alpm_pkg_dup leaves the destination pointer unaltered in case of fatal errors, so when commits 2f0ca00e and be4198b3 freed the pointer, they fixed a memory leak on non-fatal errors by replacing it with a segmentation fault on fatal errors. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/db.c | 2 +- lib/libalpm/deps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index bfc80ac..ebcd1f8 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -565,7 +565,7 @@ alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db) /* "duplicate" pkg then add it to pkgcache */ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg) { - alpm_pkg_t *newpkg; + alpm_pkg_t *newpkg = NULL; if(db == NULL || pkg == NULL || !(db->status & DB_STATUS_PKGCACHE)) { return -1; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index d4fbf95..c340f11 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -609,7 +609,7 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit) 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; + 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 */ -- 2.2.1

2 2

[pacman-dev] [PATCH] be_package.c: fix style violation
by Andrew Gregory 02 Jan '15

02 Jan '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2d42465..06b24a8 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -437,6 +437,7 @@ static int add_entry_to_files_list(alpm_pkg_t *pkg, size_t *files_size, static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, struct archive *archive) { int ret = 0; + size_t i; size_t mtree_maxsize = 0; size_t mtree_cursize = 0; size_t files_size = 0; /* we clean up the existing array so this is fine */ @@ -448,7 +449,7 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str "found mtree for package %s, getting file list\n", pkg->filename); /* throw away any files we might have already found */ - for (size_t i = 0; i < pkg->files.count; i++) { + for(i = 0; i < pkg->files.count; i++) { free(pkg->files.files[i].name); } free(pkg->files.files); -- 2.2.1

1 0

[pacman-dev] [PATCH] updpkgsums: retain permissions on rewritten PKGBUILD
by Dave Reisner 31 Dec '14

31 Dec '14

This could have been easy with something like chown's --reference flag, but this is GNU specific. Instead, just truncate and rewrite the file. Our exit trap cleans up after us. Fixes: https://bugs.archlinux.org/task/43272 --- contrib/updpkgsums.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index b0d2d69..7b92efe 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -82,9 +82,6 @@ fi export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) -# In case the eventual replacement fails, we don't want to leave behind -# $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement -# succeeds. trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' awk -v newsums="$newsums" ' @@ -100,8 +97,9 @@ awk -v newsums="$newsums" ' END { if (!w) print newsums } ' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD' -# Replace the original buildfile. -if ! mv -- "$newbuildfile" "$buildfile"; then +# Rewrite the original buildfile. Use cat instead of mv/cp to preserve +# permissions implicitly. +if ! cat -- "$newbuildfile" >"$buildfile"; then die "Failed to update %s. The file has not been modified." "$buildfile" fi -- 2.2.1

1 0