- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] symlink handling in makepkg
by Christian Hesse 31 Dec '14

31 Dec '14

Hello everybody, pacman changed directory symlink handling, making some packages fail to install with conflict to /usr/lib64 and others. How about solving this in makepkg? We could create the same symlinks before PKGBUILD's package() in run_package(), then remove afterwards. This would make packages install their files to correct places without fiddling with install pathes. I could prepare a patch if interested. -- 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 4

[pacman-dev] [PATCH] pkgdelta: Use high compression options offered by xdelta3
by Mohammad Alsaleh 31 Dec '14

31 Dec '14

* 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> --- scripts/pkgdelta.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index be49326..fe63974 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -140,7 +140,7 @@ create_xdelta() deltafile=$(dirname "$newfile")/$pkgname-${oldver}_to_${newver}-$arch.delta local ret=0 - xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? + xdelta3 -q -f -9 -S lzma -s "$oldfile" "$newfile" "$deltafile" || ret=$? if (( ret )); then error "$(gettext "Delta could not be created.")" return 1 -- 2.2.0

3 3

[pacman-dev] [PATCH] makepkg: avoid expansion of var in arithmetic context
by Dave Reisner 30 Dec '14

30 Dec '14

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 --- Written against maint, naturally. scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 18b2822..1cd8756 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1498,7 +1498,7 @@ check_pgpsigs() { esac errors=1 else - if (( ${#validpgpkeys[@]} == 0 && ! $trusted )); then + if (( ${#validpgpkeys[@]} == 0 && !trusted )); then printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$fingerprint" >&2 errors=1 elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then -- 2.2.1

1 0

[pacman-dev] [PATCH 1/2] makepkg: respect package depends for dep checks
by Dave Reisner 29 Dec '14

29 Dec '14

Include package-specific and arch-specific dependencies when checking dependencies prior to the build. Fixes: https://bugs.archlinux.org/task/42191 --- scripts/makepkg.sh.in | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0db9912..6565809 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2537,6 +2537,22 @@ pkgbuild_get_attribute() { fi } +pkgbuild_get_all_for_arch() { + # $1: attribute name + # $2: architecture + # $3: output variable + local pkg __all l + + array_build __all "$1" + for pkg in "${pkgname[@]}"; do + pkgbuild_get_attribute "$pkg" "$1" 1 l && __all+=("${l[@]}") + pkgbuild_get_attribute "$pkg" "$1_$2" 1 l && __all+=("${l[@]}") + done + + mapfile -t __all < <(printf '%s\n' "${__all[@]}" | awk '!_[$0]++') + array_build "$3" __all +} + lint_pkgbase() { if [[ ${pkgbase:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" @@ -3626,7 +3642,8 @@ else deperr=0 msg "$(gettext "Checking runtime dependencies...")" - resolve_deps ${depends[@]} || deperr=1 + pkgbuild_get_all_for_arch 'depends' "$CARCH" all_deps + resolve_deps "${all_deps[@]}" || deperr=1 if (( RMDEPS && INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep -- 2.2.1

3 3

[pacman-dev] [PATCH] Fix typo in a comment in makepkg.conf
by Jason St. John 29 Dec '14

29 Dec '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- etc/makepkg.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ed7ef9..19f673d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o # /usr/bin/lftpget -c # /usr/bin/wget -#-- The the package required by makepkg to download VCS sources +#-- The package required by makepkg to download VCS sources # Format: 'protocol::package' VCSCLIENTS=('bzr::bzr' 'git::git' -- 2.2.1

1 0