- Arch-projects - lists.archlinux.org

[arch-projects] [namcap] [PATCH 1/4] Split warning for non-unique source filenames from pkginfo rules
by James Harvey 27 May '19

27 May '19

This was originally here, because it used PkgInfoRule, but was changed to use PkgbuildRule and was left here. Signed-off-by: James P. Harvey <jamespharvey20 at gmail dot com> Namcap/rules/__init__.py | 1 + Namcap/rules/nonuniquesources.py | 34 ++++++++++++++++++++++++++++++++ Namcap/rules/pkginfo.py | 11 +---------- 3 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 Namcap/rules/nonuniquesources.py

1 0

[arch-projects] [namcap] [PATCH] Remove all trailing whitespace
by James Harvey 27 May '19

27 May '19

1 0

Re: [arch-projects] [netctl][PATCH] Move away from using wpa_actiond
by Emil Velikov 16 May '19

16 May '19

Hi team, On Sat, 9 Feb 2019 at 09:19, Thomas Bächler <thomas.baechler(a)gmx.de> wrote: > > Am 8. Februar 2019 20:17:52 MEZ schrieb Jouke Witteveen <j.witteveen(a)gmail.com>: > >On Fri, Feb 8, 2019 at 3:36 PM Emil Velikov <emil.l.velikov(a)gmail.com> > >wrote: > >> > >> On Thu, 7 Feb 2019 at 14:50, Jouke Witteveen via arch-projects > >> <arch-projects(a)archlinux.org> wrote: > >> > > >> > The same functionality is provided by wpa_supplicant, so we do not > >need > >> > an extra and Arch Linux specific dependency. > >> > >> The introduction of wpa_actiond [1] hints there are issues with > >wpa_cli. Namely: > >> - partial or missing logging capabilities > >> - race conditions > >> > >> Sadly I don't know much more about this. It'll be great if can use > >> wpa_cli, while not introducing new issues. > >> > >> -Emil > >> > >> [1] > >https://git.archlinux.org/wpa_actiond.git/commit/?id=c5c587771403d31ab4538e… > > > >Thanks! This detective work is highly appreciated! For some reason I > >had assumed wpa_cli would have gained this functionality only after > >wpa_actiond came into existence. This couldn't really explain why both > >use the same parameter names though... > >I wonder if the issues with wpa_cli have been taken upstream. In my > >experience, the maintainer of wpa_supplicant is very pleasant to work > >with. > > > >autowifi and, later, wpa_actiond are important parts of the history of > >netctl, but I tend to give over 10 years of development in > >wpa_supplicant the benefit of the doubt. This means I would like to > >try to move away from wpa_actiond anyway. Currently, except from those > >using wpa_actiond directly, I think netctl is the only user of > >wpa_actiond. > > > >@Thomas: do you have an oppinion in these matters? > > > >Thanks, > >- Jouke > > I honestly don't remember why wpa_cli was insufficient at the time and why I wrote wpa_actiond. That must have been way over 10 years ago. I just remember that my first attempt used wpa_cli, and something obvious was missing. After a bit of debugging I've noticed the move to wpa_cli broke my setup. Namely: wpa_cli does not reliably detect when the laptop resumes into another wireless network. Issue happens fairly intermittently - from once a week to multiple times a day - yet I have not seen it even once in the years of using wpa_actiond. Should I file a archlinux bug report, any suggestions how to proceed? Thanks Emil

2 2

[arch-projects] [devtools] [PATCH] Revert "makechrootpkg: sync_chroot: Make more general."
by Eli Schwartz 10 May '19

10 May '19

This reverts commit 6d1992909cc46e293027ff488ae2632047603e66. It has never worked. In commit c86823a2d4a4152c71faa1c3bab227756232996f it was noted that it compared the device numbers for [[ $1 = $1 ]] which was a useless check and always returned true, for *any* btrfs filesystem. Now that the function is corrected to compare [[ $1 = $2 ]] the check is still useless, but this time because it always returns false -- btrfs subvolumes on the same filesystem do *not* share device numbers. So let's go back to the original working implementation that only matters in terms of makechrootpkg, and just checks if makechrootpkg's root working directory is btrfs (in which case we know it will be a subvolume because mkarchroot will create it that way). This restores our special support for the btrfs filesystem. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- lib/archroot.sh | 8 -------- makechrootpkg.in | 32 +++++++++++++------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/lib/archroot.sh b/lib/archroot.sh index 2c03c82..06d4519 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -37,14 +37,6 @@ is_subvolume() { [[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]] } -## -# usage : is_same_fs( $path_a, $path_b ) -# return : whether $path_a and $path_b are on the same filesystem -## -is_same_fs() { - [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]] -} - ## # usage : subvolume_delete_recursive( $path ) # diff --git a/makechrootpkg.in b/makechrootpkg.in index dc647b3..52e834b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -75,37 +75,31 @@ load_vars() { return 0 } -# Usage: sync_chroot $rootdir $copydir [$copy] +# Usage: sync_chroot $chrootdir $copydir [$copy] sync_chroot() { - local rootdir=$1 + local chrootdir=$1 local copydir=$2 local copy=${3:-$2} - if [[ "$rootdir" -ef "$copydir" ]]; then + if [[ "$chrootdir/root" -ef "$copydir" ]]; then error 'Cannot sync copy with itself: %s' "$copydir" return 1 fi # Get a read lock on the root chroot to make # sure we don't clone a half-updated chroot - slock 8 "$rootdir.lock" \ - "Locking clean chroot [%s]" "$rootdir" - - stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$rootdir" "$copy" - if is_subvolume "$rootdir" && is_same_fs "$rootdir" "$(dirname -- "$copydir")" && ! mountpoint -q "$copydir"; then - if is_subvolume "$copydir"; then - subvolume_delete_recursive "$copydir" || - die "Unable to delete subvolume %s" "$copydir" - else - # avoid change of filesystem in case of an umount failure - rm --recursive --force --one-file-system "$copydir" || - die "Unable to delete %s" "$copydir" - fi - btrfs subvolume snapshot "$rootdir" "$copydir" >/dev/null || + slock 8 "$chrootdir/root.lock" \ + "Locking clean chroot [%s]" "$chrootdir/root" + + stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy" + if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then + subvolume_delete_recursive "$copydir" || + die "Unable to delete subvolume %s" "$copydir" + btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null || die "Unable to create subvolume %s" "$copydir" else mkdir -p "$copydir" - rsync -a --delete -q -W -x "$rootdir/" "$copydir" + rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir" fi stat_done @@ -388,7 +382,7 @@ main() { lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy" if [[ ! -d $copydir ]] || $clean_first; then - sync_chroot "$chrootdir/root" "$copydir" "$copy" + sync_chroot "$chrootdir" "$copydir" "$copy" fi $update_first && arch-nspawn "$copydir" \ -- 2.21.0

1 0

[arch-projects] [devtools] [PATCH] Remove finddeps tool
by Jelle van der Waa 06 May '19

06 May '19

From: Jelle van der Waa <jelle(a)vdwaa.nl> finddeps depends on a no longer existing ABS tree. This data can also be queried via archweb. --- .gitignore | 1 - Makefile | 1 - finddeps.in | 41 ----------------------------------------- zsh_completion.in | 6 +----- 4 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 finddeps.in diff --git a/.gitignore b/.gitignore index b63587b..49afce6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ archrelease bash_completion checkpkg commitpkg -finddeps lddd makechrootpkg mkarchroot diff --git a/Makefile b/Makefile index ba2d3e4..15c2786 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ IN_PROGS = \ archrelease \ archbuild \ lddd \ - finddeps \ rebuildpkgs \ find-libdeps \ crossrepomove\ diff --git a/finddeps.in b/finddeps.in deleted file mode 100644 index 2a085e5..0000000 --- a/finddeps.in +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# -# finddeps - find packages that depend on a given depname -# -# License: Unspecified - -m4_include(lib/common.sh) - -match=$1 - -if [[ -z $match ]]; then - echo 'Usage: finddeps <depname>' - echo '' - echo 'Find packages that depend on a given depname.' - echo 'Run this script from the top-level directory of your ABS tree.' - echo '' - exit 1 -fi - -find . -type d | while read -r d; do - if [[ -f "$d/PKGBUILD" ]]; then - pkgname=() depends=() makedepends=() optdepends=() - # shellcheck source=PKGBUILD.proto - . "$d/PKGBUILD" - for dep in "${depends[@]}"; do - # lose the version comparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (depends)" - done - for dep in "${makedepends[@]}"; do - # lose the version comparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (makedepends)" - done - for dep in "${optdepends[@]/:*}"; do - # lose the version comaparator, if any - depname=${dep%%[<>=]*} - [[ $depname = "$match" ]] && echo "$d (optdepends)" - done - fi -done diff --git a/zsh_completion.in b/zsh_completion.in index 45429bd..5f2111f 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,4 +1,4 @@ -#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco +#compdef archbuild archco arch-nspawn archrelease commitpkg makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco # License: Unspecified m4_include(lib/valid-tags.sh) @@ -29,10 +29,6 @@ _commitpkg_args=( '1:commit_msg' ) -_finddeps_args=( - '1:packages:_devtools_completions_all_packages' -) - _makechrootpkg_args=( '-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"' '-c[Clean the chroot before building]' -- 2.21.0

3 4

[arch-projects] [mkinitcpio] [PATCH] lsinitcpio: Add zstd decompression support
by Jelle van der Waa 30 Apr '19

30 Apr '19

Add detection support for zstd compressed initramfs, the magic number of zstd is defined as 0xFD2FB528. https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- lsinitcpio | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lsinitcpio b/lsinitcpio index bcb4a19..d44a714 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -131,6 +131,12 @@ detect_filetype() { return fi + read -rd '' bytes < <(hexdump -n 4 -e '"%x"' "$1") + if [[ $bytes = 'fd2fb528' ]]; then + echo 'zstd' + return + fi + # still nothing? hrmm, maybe the user goofed and it's a kernel if kver "$1" >/dev/null; then die '%s is a kernel image, not an initramfs image!' "$1" -- 2.21.0

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20190329-2-g321e998
by Jelle van der Waa 20 Apr '19

20 Apr '19

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 321e998020cfdb337c1ebc1ac41f5e729b9e276c (commit) via c86823a2d4a4152c71faa1c3bab227756232996f (commit) from a49f55cbed51c815a9392c9f7fff5f8cec385935 (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 321e998020cfdb337c1ebc1ac41f5e729b9e276c Author: Erich Eckner <git(a)eckner.net> Date: Tue Apr 2 09:32:43 2019 +0200 fix whitespace/indentation errors Some lines are indented by spaces, while adjacent lines are indentet by tabs. We should use tabs on both. Signed-off-by: Erich Eckner <git(a)eckner.net> commit c86823a2d4a4152c71faa1c3bab227756232996f Author: Erich Eckner <git(a)eckner.net> Date: Wed Apr 17 13:16:36 2019 +0200 is_same_fs() in lib/archroot.sh should use $1 and $2, not $1 and $1 The old behaviour would always evaluate to true - this is certainly not what that function should do. Signed-off-by: Erich Eckner <git(a)eckner.net> ----------------------------------------------------------------------- Summary of changes: archbuild.in | 2 +- find-libdeps.in | 2 +- lib/archroot.sh | 2 +- mkarchroot.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] is_same_fs() in lib/archroot.sh should use $1 and $2, not $1 and $1
by arch＠eckner.net 17 Apr '19

17 Apr '19

From: Erich Eckner <git(a)eckner.net> The old behaviour would always evaluate to true - this is certainly not what that function should do. Signed-off-by: Erich Eckner <git(a)eckner.net> --- lib/archroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/archroot.sh b/lib/archroot.sh index f2796034..2c03c827 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -42,7 +42,7 @@ is_subvolume() { # return : whether $path_a and $path_b are on the same filesystem ## is_same_fs() { - [[ "$(stat -c %d "$1")" == "$(stat -c %d "$1")" ]] + [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]] } ## -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH] remove pointless mkdir -p in parsepkgbuild
by Eli Schwartz 11 Apr '19

11 Apr '19

As far as I can tell, this was never used. In commit 9b56647abc8dc33bf138d4b260b103c8d9265b7d the parsepkgbuild script was switched from defining a PATH as a directory in /tmp, to actually passing in a PATH=/dummy to `env -i`... which makes sense as the defined PATH did not used to be used. However, even before that, it's not safe to use mkdir -p in order to define a restricted shell without access to the PATH, as it's not guaranteed to be owned by the creator. In any event, the time for mkdir -p is long past. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- parsepkgbuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/parsepkgbuild b/parsepkgbuild index 009e89e..bedb0de 100755 --- a/parsepkgbuild +++ b/parsepkgbuild @@ -1,7 +1,5 @@ #!/bin/bash -mkdir -p /tmp/parsepkgbuild - source /etc/makepkg.conf PARSE_PKGBUILD_PATH=${PARSE_PKGBUILD_PATH:-/usr/share/namcap} -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH 1/2] parsepkgbuild: reduce a lot of boilerplate by being more templated
by Eli Schwartz 11 Apr '19

11 Apr '19

When listing out the contents of a variable, use loops and references to the variables in order to reduce code and make it easier to extend. In the future, a new metadata type can be added simply by appending to meta_keys=() Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- parsepkgbuild.sh | 127 +++++------------------------------------------ 1 file changed, 12 insertions(+), 115 deletions(-) diff --git a/parsepkgbuild.sh b/parsepkgbuild.sh index d85574d..66cea40 100644 --- a/parsepkgbuild.sh +++ b/parsepkgbuild.sh @@ -18,123 +18,20 @@ fi if [ -n "$pkgdesc" ]; then echo -e "%DESC%\n$pkgdesc\n" fi -if [ -n "$groups" ]; then - echo "%GROUPS%" - for i in ${groups[@]}; do echo $i; done - echo "" -fi - -if [ -n "$url" ]; then - echo -e "%URL%\n$url\n" -fi -if [ -n "$license" ]; then - echo "%LICENSE%" - for i in ${license[@]}; do echo $i; done - echo "" -fi -if [ -n "$arch" ]; then - echo "%ARCH%" - for i in ${arch[@]}; do echo $i; done - echo "" -fi -if [ -n "$builddate" ]; then - echo -e "%BUILDDATE%\n$builddate\n" -fi -if [ -n "$packager" ]; then - echo -e "%PACKAGER%\n$packager\n" -fi - -if [ -n "$replaces" ]; then - echo "%REPLACES%" - for i in "${replaces[@]}"; do echo $i; done - echo "" -fi -if [ -n "$force" ]; then - echo -e "%FORCE%\n" -fi -# create depends entry -if [ -n "$depends" ]; then - echo "%DEPENDS%" - for i in "${depends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$makedepends" ]; then - echo "%MAKEDEPENDS%" - for i in "${makedepends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$optdepends" ]; then - echo "%OPTDEPENDS%" - for i in "${optdepends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$conflicts" ]; then - echo "%CONFLICTS%" - for i in "${conflicts[@]}"; do echo $i; done - echo "" -fi -if [ -n "$provides" ]; then - echo "%PROVIDES%" - for i in "${provides[@]}"; do echo $i; done - echo "" -fi -if [ -n "$backup" ]; then - echo "%BACKUP%" - for i in "${backup[@]}"; do echo $i; done - echo "" -fi -if [ -n "$options" ]; then - echo "%OPTIONS%" - for i in "${options[@]}"; do echo $i; done - echo "" -fi -if [ -n "$source" ]; then - echo "%SOURCE%" - for i in "${source[@]}"; do echo $i; done - echo "" -fi -if [ -n "$validpgpkeys" ]; then - echo "%VALIDGPGKEYS%" - for i in "${validpgpkeys[@]}"; do echo $i; done - echo "" -fi -if [ -n "$md5sums" ]; then - echo "%MD5SUMS%" - for i in "${md5sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha1sums" ]; then - echo "%SHA1SUMS%" - for i in "${sha1sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha224sums" ]; then - echo "%SHA224SUMS%" - for i in "${sha224sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha256sums" ]; then - echo "%SHA256SUMS%" - for i in "${sha256sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha384sums" ]; then - echo "%SHA384SUMS%" - for i in "${sha384sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha512sums" ]; then - echo "%SHA512SUMS%" - for i in "${sha512sums[@]}"; do echo $i; done - echo "" -fi - -if [ -n "$install" ]; then - echo -e "%INSTALL%\n$install\n" -fi +meta_keys=(groups url license arch builddate packager replaces force depends + makedepends optdepends conflicts provides backup options source + validpgpkeys {md5,sha{1,224,256,384,512}}sums install) +for key in "${meta_keys[@]}"; do + arr="$key[@]" + if [[ -n ${!key} ]]; then + echo "%${key^^}%" + for i in "${!arr}"; do echo "$i"; done + echo "" + fi +done -unset i +unset arr key meta_keys i echo "%SETVARS%" compgen -A variable } -- 2.21.0

1 1