- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] test: common.bash: Fix syntax mistake: $pkgarches[@] -> ${pkgarches[@]}
by Luke Shumaker 15 Jun '18

15 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 --- test/lib/common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lib/common.bash b/test/lib/common.bash index 36c735f..b82643e 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -273,7 +273,7 @@ checkRemovedPackageDB() { if [[ ${pkgarches[@]} == any ]]; then tarches=(${ARCHES[@]}) else - tarches=($pkgarches[@]) + tarches=(${pkgarches[@]}) fi for db in ${DBEXT} ${FILESEXT}; do -- 2.17.1

2 1

[arch-projects] [devtools] [PATCH] test: ftpdir-cleanup: Fix variable name mistake: ${pkg[0]} -> ${pkgs[0]}
by Luke Shumaker 15 Jun '18

15 Jun '18

From: Luke Shumaker <lukeshu(a)parabola.nu> This mistake was introduced in 7628525156110022fa70ad91e4bc13ee8a3cceb0 --- test/cases/ftpdir-cleanup.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats index 8c713c6..74215d0 100644 --- a/test/cases/ftpdir-cleanup.bats +++ b/test/cases/ftpdir-cleanup.bats @@ -111,7 +111,7 @@ __checkRepoRemovedPackage() { ftpdir-cleanup for arch in ${arches[@]}; do - __checkRepoRemovedPackage extra ${pkg[0]} ${arch} + __checkRepoRemovedPackage extra ${pkgs[0]} ${arch} done checkRemovedPackage extra ${pkgs[0]} -- 2.17.1

1 0

[arch-projects] [archweb] [PATCH 1/1] Highlighting row on hover in the search results. FS#53612
by nodivbyzero 11 Jun '18

11 Jun '18

--- sitestatic/archweb.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 209561f..ef178e8 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -698,11 +698,19 @@ table.results { } .results tr.odd { + background: #f5f5f5; + } + + .results tr.odd:hover { background: #fff; } .results tr.even { - background: #e4eeff; + background: #ccdfff; + } + + .results tr.even:hover { + background: #b3cfff; } .results .flagged { -- 2.17.0

2 1

[arch-projects] [projects][pacman] [PATCH] libalpm: ignore .hook suffix when sorting hooks
by Jouke Witteveen 09 Jun '18

09 Jun '18

It is desirable to have 'a-post.hook' ordered after 'a.hook'. For this, it is needed to ignore the suffix when sorting. --- Two years ago, I suggested this patch in https://bugs.archlinux.org/task/49653. Today, I do so again :-). Regards, - Jouke lib/libalpm/hook.c | 16 ++++++++++++---- lib/libalpm/hook.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 0805e661..d90ed2da 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -551,7 +551,16 @@ static int _alpm_hook_triggered(alpm_handle_t *handle, struct _alpm_hook_t *hook static int _alpm_hook_cmp(struct _alpm_hook_t *h1, struct _alpm_hook_t *h2) { - return strcmp(h1->name, h2->name); + size_t suflen = strlen(ALPM_HOOK_SUFFIX), l1, l2; + int ret; + l1 = strlen(h1->name) - suflen; + l2 = strlen(h2->name) - suflen; + /* exclude the suffixes from comparison */ + ret = strncmp(h1->name, h2->name, l1 <= l2 ? l1 : l2); + if(ret == 0 && l1 != l2) { + return l1 < l2 ? -1 : 1; + } + return ret; } static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) @@ -634,8 +643,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) alpm_event_hook_t event = { .when = when }; alpm_event_hook_run_t hook_event; alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL; - const char *suffix = ".hook"; - size_t suflen = strlen(suffix), triggered = 0; + size_t suflen = strlen(ALPM_HOOK_SUFFIX), triggered = 0; int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { @@ -681,7 +689,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) memcpy(path + dirlen, entry->d_name, name_len + 1); if(name_len < suflen - || strcmp(entry->d_name + name_len - suflen, suffix) != 0) { + || strcmp(entry->d_name + name_len - suflen, ALPM_HOOK_SUFFIX) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); continue; } diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index 364d22d7..30d565df 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -22,6 +22,8 @@ #include "alpm.h" +#define ALPM_HOOK_SUFFIX ".hook" + int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* ALPM_HOOK_H */ -- 2.17.1

2 1

[arch-projects] [devtools] [PATCH v2] makechrootpkg: respect GNUPGHOME
by Emiel Wiedijk 31 May '18

31 May '18

Previously, makechrootpkg hardcoded ~/.gnupg. Therefore, if a user uses a custom GPG home directory, the siganture checking would fail. Now makechrootpkg uses $GNUPGHOME, with a fallback to ~/.gnupg. Signed-off-by: Emiel Wiedijk <me(a)aimileus.nl> --- makechrootpkg.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index afcd121..653847f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -252,7 +252,8 @@ download_sources() { chmod 1777 "$builddir" # Ensure sources are downloaded - sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ + sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ + env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || die "Could not download sources." @@ -341,7 +342,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH + check_root SOURCE_DATE_EPOCH,GNUPGHOME # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -- 2.16.2

2 1

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20170824 created. 20170824
by Jan Steffens 31 May '18

31 May '18

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 devtools repository". The annotated tag, 20170824 has been created at 97687a9ed53b5f10e6e2768770706cc3e8a02e7e (tag) tagging 24a298d475ae0af6d8d0a109b9476dd567cbdf7b (commit) replaces 20170813 tagged by Jan Alexander Steffens (heftig) on Thu Aug 24 17:21:17 2017 +0200 - Log ----------------------------------------------------------------- Version 20170824 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEghj4iEmqxSLpTPRwpekojE+kFfoFAlme7u0ACgkQpekojE+k FfqleggAsM3cViq2lFxHvwN+vlx5me3MJOJ1vnc6zQZwn4GFSWDZXXMUTBWogPXh Ahrs3FCZjUQdI3ZB+3ph5ztQVRWF36UbMAq6Q9IO6XfpMyidJynq7ly6VPdRDA3v B6f5BiofKlRN3ExLi3wATaBXBemrrqH10LoQUcnqdAN3Gh66oIv8p4Ti749UaLC/ MDxLjZFYuzB5P91RQ0Puv26sHrkDFgMjMoGB9GaZ+GIN51UNBQRjh9IuUX8xNfrr xmG/ojtKSWkVSpdyRIV3sGm6Cjs84AhXdiV3LdbWuXCjO9741FEyzyQSzD6t4crj nYWaIOBVNdkhX9ZRnubLHcDCZhLVqw== =VhQP -----END PGP SIGNATURE----- Jan Alexander Steffens (heftig) (3): arch-nspawn: Add --keep-unit to prevent scope conflicts makechrootpkg: Also look for -e as --noextract Version 20170824 Martchus (1): makechrootpkg: Prevent removing build dir when --noextract specified ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20180531 created. 20180531
by Jan Steffens 31 May '18

31 May '18

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 devtools repository". The annotated tag, 20180531 has been created at 5f8e54905d430a75bf5fe98809b75bb0447d41de (tag) tagging 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f (commit) replaces 20180528 tagged by Jan Alexander Steffens (heftig) on Thu May 31 16:06:18 2018 +0200 - Log ----------------------------------------------------------------- Version 20180531 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEghj4iEmqxSLpTPRwpekojE+kFfoFAlsQAVsACgkQpekojE+k FfqxIgf/SYPfJhWPPCyKY+Lj0udQTKy65IyWHxJ4IpcDD/ItiK+KqTpeA6BMJ7kd yZzS35ejkY7ZqjtgWVNsdmn+rgvtbYTaDX0TSEYcWSILsWvfWFP+pCZFaqyNhFf1 vr9xQBAhsIGWD6vF3D04WXe0KO67lenzHu3SE2/JyWSxsUIkM6kAjjZPHs+tFjZm LhrdjlvHwgwD1rTSod7ltJIopHap+6v2uzCNDeEPU4mYDBK4czBQrvYyV+GRkjy9 5jg0dWBFE7TT3U+Tjn96Rlzk3RhHeqr2iSGBkP6DJ7XC0K+huqCxo0SQS6U0K9VK FYpkReBuzjQ8yciLlXn9cglPm/26HQ== =V5WJ -----END PGP SIGNATURE----- Allan McRae (1): update makefile for current version Eli Schwartz via arch-projects (1): makechrootpkg: whitelist return code 14 from makepkg Jan Alexander Steffens (heftig) (1): Version 20180531 ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180528-3-g6364b3c
by Jan Steffens 31 May '18

31 May '18

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 devtools repository". The branch, master has been updated via 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f (commit) via 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe (commit) from e414173f8984485ff850e1fba0f8cf97cd970064 (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 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Thu May 31 16:05:49 2018 +0200 Version 20180531 commit 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe Author: Eli Schwartz via arch-projects <arch-projects(a)archlinux.org> Date: Tue May 29 17:23:10 2018 -0400 makechrootpkg: whitelist return code 14 from makepkg makepkg 5.1 implements error codes, and 14 means that installing the packages after they were built has failed. We don't care about this error and would like makechrootpkg to succeed regardless, e.g. for split packages that are mutually exclusive. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makechrootpkg.in | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [pyalpm] Workaround https://bugs.python.org/issue33012
by Chih-Hsuan Yen 30 May '18

30 May '18

This fixes building with GCC 8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 887b7a1..ba3ae2a 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ os.putenv('LC_CTYPE', 'en_US.UTF-8') pyalpm_version = '0.8' cflags = ['-Wall', '-Wextra', '-Werror', - '-Wno-unused-parameter', + '-Wno-unused-parameter', '-Wno-cast-function-type', '-std=c99', '-D_FILE_OFFSET_BITS=64'] alpm = Extension('pyalpm', -- 2.17.0

2 2

[arch-projects] [devtools] [PATCH] makechrootpkg: whitelist return code 14 from makepkg
by Eli Schwartz 29 May '18

29 May '18

makepkg 5.1 implements error codes, and 14 means that installing the packages after they were built has failed. We don't care about this error and would like makechrootpkg to succeed regardless, e.g. for split packages that are mutually exclusive. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- makechrootpkg.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index 37e97e7..d81be84 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -226,6 +226,13 @@ _chrootbuild() { # ${1} is OK, but $foo or $1 isn't. # https://bugzilla.sudo.ws/show_bug.cgi?id=765 sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" + ret=$? + case $ret in + 0|14) + return 0;; + *) + return $ret;; + esac } _chrootnamcap() { -- 2.17.0

1 0