- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH 1/2] add test harness for parse_cmdline
by Dave Reisner 07 Jul '16

07 Jul '16

Some of these tests currently fail including hard failures where the shell quits entirely (this would lead to a kernel panic). A followup commit will rewrite the parse_cmdline function to improve it and fix these deficiencies. --- Makefile | 3 + test/test_parse_cmdline | 233 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+) create mode 100755 test/test_parse_cmdline diff --git a/Makefile b/Makefile index 5af0eb2..6c70718 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,9 @@ man/%: man/%.txt Makefile -a manversion=$(VERSION) \ -a manmanual="mkinitcpio manual" $< +check: + @r=0; for t in test/test_*; do $$t || { echo $$t fail; r=1; }; done; exit $$r + clean: $(RM) mkinitcpio-${VERSION}.tar.gz $(MANPAGES) diff --git a/test/test_parse_cmdline b/test/test_parse_cmdline new file mode 100755 index 0000000..9afd9cb --- /dev/null +++ b/test/test_parse_cmdline @@ -0,0 +1,233 @@ +#!/lib/initcpio/busybox ash + +. ./init_functions + +failed=0 +tests=0 + +e_ok=0 +e_parser_failure=2 +e_assertion_failure=130 + +assert() { + local expect_fail= key= expected_value= actual_value + + if [ "$1" = '--expect-fail' ]; then + expect_fail=y + shift + fi + + key=$1 expected_value=$2 + eval actual_value=\$"$1" + + case $actual_value in + $expected_value) + if [ -n "$expect_fail" ]; then + echo "EXPECTED FAIL: $key: expected='$expected_value', got='$actual_value'" + return 1 + fi + ;; + *) + if [ -z "$expect_fail" ]; then + echo "FAIL: $key: expected='$expected_value', got='$actual_value'" + return 1 + fi + ;; + esac + + return 0 +} + +test_parse() { + local flag= cmdline= expect_fail= expect_parse_fail= + + tests=$(( tests + 1 )) + + for flag; do + case $flag in + --expect-fail) + expect_fail='--expect-fail' + shift + ;; + --expect-parse-fail) + expect_parse_fail=y + shift + ;; + *) + break + ;; + esac + done + + cmdline=$1; shift + [ -n "$V" ] && echo "testing cmdline: $cmdline" + + echo "$cmdline" | { + parse_cmdline + + result=0 + while [ "$#" -gt 0 ]; do + key=$1 expected_value=$2 + shift 2 + + assert $expect_fail "$key" "$expected_value" || result=$e_assertion_failure + done + + exit "$result" + } 2>/dev/null + + case $? in + $e_parser_failure) + # parser failure + if [ -z "$expect_parse_fail" ]; then + echo "FAIL: parse_cmdline failed" + failed=$(( failed + 1 )) + fi + ;; + $e_assertion_failure) + # test assertion failure + failed=$(( failed + 1 )) + ;; + $e_ok) + if [ -n "$expect_parse_fail" ]; then + echo "EXPECTED_FAIL: parse_cmdline succeeded" + failed=$(( failed + 1 )) + fi + ;; + esac +} + +# bare words +test_parse 'foo' \ + 'foo' 'y' +test_parse 'foo bar' \ + 'foo' 'y' \ + 'bar' 'y' + +# overwriting +test_parse 'foo=bar bar=baz foo bar="no pe"' \ + 'bar' 'no pe' \ + 'foo' 'y' + +# simple key=value assignment +test_parse 'foo=bar' \ + 'foo' 'bar' +test_parse 'foo=bar bar=baz' \ + 'foo' 'bar' \ + 'bar' 'baz' +test_parse '_derpy=hooves' \ + '_derpy' 'hooves' +test_parse 'f5=abc f_5_=abc' \ + 'f5' 'abc' \ + 'f_5_' 'abc' +test_parse 'v="foo bar=baz"' \ + 'v' 'foo bar=baz' + +# double quoting +test_parse 'foo="bar"' \ + 'foo' 'bar' +test_parse 'foo="bar baz"' \ + 'foo' 'bar baz' + +# single quoting +test_parse --expect-fail "foo='bar'" \ + 'foo' 'bar' +test_parse --expect-parse-fail "foo='bar baz'" \ + 'foo' 'bar baz' + +# dangling quotes +test_parse --expect-fail 'foo="bar' \ + 'foo' '"bar' +test_parse 'foo=bar"' \ + 'foo' 'bar"' + +# nested quotes +test_parse --expect-parse-fail "foo='\"bar baz\"' herp='\"de\"rp'" \ + 'foo' '"bar baz"' \ + 'herp' '"de"rp' + +# escaped quotes +test_parse 'foo=bar"baz' \ + 'foo' 'bar"baz' + +# neighboring quoted regions +test_parse --expect-fail 'foo="bar""baz"' \ + 'foo' 'barbaz' +test_parse --expect-fail "foo=\"bar\"'baz'" \ + 'foo' "barbaz" +test_parse --expect-fail "foo='bar'\"baz\"" \ + 'foo' "barbaz" + +# comments +test_parse 'foo=bar # ignored content' \ + 'foo' 'bar' \ + 'ignored' '' \ + 'content' '' +test_parse 'foo=bar #ignored content' \ + 'foo' 'bar' \ + 'ignored' '' \ + 'content' '' +test_parse 'foo="bar #baz" parse=this' \ + 'foo' 'bar #baz' \ + 'parse' 'this' + +# shell metachars +test_parse 'foo=*' \ + 'foo' '\*' +test_parse --expect-fail 'Make*' \ + 'Makefile' '' +test_parse --expect-fail '[Makefile]*' \ + 'Makefile' '' \ + 'init' '' \ + 'functions' '' + +# invalid names +test_parse 'in-valid=name' +test_parse '6foo=bar' +test_parse --expect-parse-fail '"gar bage"' \ + 'gar' '' \ + 'bage' '' + +# special handling +test_parse 'rw' \ + 'ro' '' \ + 'rw' '' \ + 'rwopt' 'rw' +test_parse 'ro' \ + 'ro' '' \ + 'rw' '' \ + 'rwopt' 'ro' +test_parse --expect-fail 'fstype=btrfs' \ + 'rootfstype' 'btrfs' +test_parse 'fsck.mode=force' \ + 'forcefsck' 'y' \ + 'fastboot' '' +test_parse 'fsck.mode=skip' \ + 'forcefsck' '' \ + 'fastboot' 'y' +test_parse 'rd.debug' \ + 'rd_debug' 'y' +test_parse 'rd.log' \ + 'rd_logmask' '6' +test_parse 'rd.log=all' \ + 'rd_logmask' '7' +test_parse 'rd.log=console' \ + 'rd_logmask' '4' +test_parse 'rd.log=kmsg' \ + 'rd_logmask' '2' +test_parse 'rd.log=file' \ + 'rd_logmask' '1' + +# a mix of stuff +test_parse 'foo=bar bareword bar="ba az"' \ + 'foo' 'bar' \ + 'bareword' 'y' \ + 'bar' 'ba az' + +if [ "$failed" -eq 0 ]; then + echo "PASS: ${0##*/test_} ($tests tests)" + exit 0 +else + echo "FAIL: $failed tests failed" + exit 1 +fi -- 2.8.3

1 1

[arch-projects] [archweb][PATCH] Fix typo in known_bad help text
by Jelle van der Waa 05 Jul '16

05 Jul '16

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- packages/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/models.py b/packages/models.py index 03f0342..83cc7cb 100644 --- a/packages/models.py +++ b/packages/models.py @@ -86,7 +86,7 @@ class SignoffSpecification(models.Model): enabled = models.BooleanField(default=True, help_text="Is this package eligible for signoffs?") known_bad = models.BooleanField(default=False, - help_text="Is package is known to be broken in some way?") + help_text="Is this package known to be broken in some way?") comments = models.TextField(null=True, blank=True) objects = SignoffSpecificationManager() -- 2.9.0

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag v20 created. v20
by dreisner＠archlinux.org 03 Jul '16

03 Jul '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 mkinitcpio repository". The annotated tag, v20 has been created at 19d255722ca6e3eb3ad440d5b59baed613ab4f9e (tag) tagging d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c (commit) replaces v19 tagged by Dave Reisner on Sun Jul 3 14:15:25 2016 -0400 - Log ----------------------------------------------------------------- tag as v20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQE0BAABCAAeBQJXeVY9FxxkcmVpc25lckBhcmNobGludXgub3JnAAoJEB6yY4/1 bAxTroQIAJfsmegBTgwfrxyGqYuv1Gl+p7lfSjSjAr/vjgbAyuOpO1JJbUnHboCJ S92mO4w7p1FVbk6+nWR/Rp1CkwiYS4tup6JBYErwexdlT1qg6RIV+1FtO9WZd2JW 0Hctag4AgejErrfS7uTuHlVLE7/tCwbNFO13ZLQY4R62YFXVlXZapTF2b0VvHLrD //DW4anaXLTfRkus3ORNSryDnMAK2T1sQ6HmpKkdUKlgBIJ3jh8lYtgRColD/HQ6 wKghqetYOQOQuy0CyFjWoJ72gsFt/oxZUIV3Vel3bvrTyDefUXBPm7C/WfrymBnD GuMbEdV2+hOfF06sX2wfhSKkepiL7uw= =UKJN -----END PGP SIGNATURE----- Dave Reisner (6): Handle softdeps in modules handle the case of modinfo returning multiple modules add f2fs quirk for libcrc32c keymap: fall back to us if KEYMAP is not defined init: handle rootfstype as a synonym for fstype error out if asked to extract a kver from image on non-x86 ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v19-6-gd73d34e
by dreisner＠archlinux.org 03 Jul '16

03 Jul '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 mkinitcpio repository". The branch, master has been updated via d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c (commit) via 14487ea9a6104c17b00c6fa7bcb65c617c7490c8 (commit) via 89bf8b56137196907b25e9d131e82dec90edaff0 (commit) from 08762d8401ff8e01a3c7a1558e69d5c30c983d20 (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 d73d34e017ecb0e89c2de8e39da6b14afd6c5f1c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 15:18:11 2016 -0400 error out if asked to extract a kver from image on non-x86 Version extraction only works on x86 (i686 and x86_64) kernels. ref: https://bugs.archlinux.org/task/43256 commit 14487ea9a6104c17b00c6fa7bcb65c617c7490c8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 11:06:50 2016 -0400 init: handle rootfstype as a synonym for fstype rootfstype is handled by the kernel, so we should handle it, too. ref: https://bugs.archlinux.org/task/45117 commit 89bf8b56137196907b25e9d131e82dec90edaff0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 11:02:24 2016 -0400 keymap: fall back to us if KEYMAP is not defined ref: https://bugs.archlinux.org/task/44805 ----------------------------------------------------------------------- Summary of changes: init_functions | 3 ++- install/keymap | 13 ++++--------- man/mkinitcpio.8.txt | 5 +++-- mkinitcpio | 8 +++++++- 4 files changed, 16 insertions(+), 13 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH 1/2] keymap: fall back to us if KEYMAP is not defined
by Dave Reisner 02 Jul '16

02 Jul '16

ref: https://bugs.archlinux.org/task/44805 --- install/keymap | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/install/keymap b/install/keymap index c1948b1..7de6acb 100644 --- a/install/keymap +++ b/install/keymap @@ -14,16 +14,11 @@ build() { [[ $LANG ]] && LOCALE=$LANG LANG=$l - if [[ $KEYMAP ]]; then - if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then - touch "$BUILDROOT/keymap.utf8" - uc=-u - fi - loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin" - else - warning "keymap: hook specified, but no KEYMAP found in configuration" - return 1 + if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then + touch "$BUILDROOT/keymap.utf8" + uc=-u fi + loadkeys -q $uc ${KEYMAP:-us} -b > "$BUILDROOT/keymap.bin" ) && add_runscript } -- 2.8.3

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v19-3-g08762d8
by dreisner＠archlinux.org 30 Jun '16

30 Jun '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 mkinitcpio repository". The branch, master has been updated via 08762d8401ff8e01a3c7a1558e69d5c30c983d20 (commit) via 73189f9515cc40015381a24731205c493107f04f (commit) via 97ac4d37aae084a050be512f6d8f4489054668ad (commit) from 730bf42e4ce461c654598effcc04b7bde4367de7 (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 08762d8401ff8e01a3c7a1558e69d5c30c983d20 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 12:41:09 2016 -0400 add f2fs quirk for libcrc32c ref: https://bugs.archlinux.org/task/49380 commit 73189f9515cc40015381a24731205c493107f04f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 12:28:39 2016 -0400 handle the case of modinfo returning multiple modules This is true of more and more modules with the advent of aliases, e.g. $ modinfo -F filename crc32c /lib/modules/4.6.2-rampage/kernel/arch/x86/crypto/crc32c-intel.ko.gz /lib/modules/4.6.2-rampage/kernel/crypto/crc32c_generic.ko.gz commit 97ac4d37aae084a050be512f6d8f4489054668ad Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 26 09:26:03 2016 -0400 Handle softdeps in modules modinfo outputs softdeps which we can add if they exist (failing quietly on not-found). this obviates the need for some of our own module quirks. The output of modinfo can take many forms, as it's nearly freeform text in the .modinfo section of the kernel module. The basic form is: softdep: pre: foo But it might also be: softdep: pre: foo bar post: baz Or: softdep: pre: foo softdep: post: bar So just parse the entire line, discarding anything that ends with a ':'. ----------------------------------------------------------------------- Summary of changes: functions | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio][PATCH 1/3] Handle softdeps in modules
by Dave Reisner 27 Jun '16

27 Jun '16

modinfo outputs softdeps which we can add if they exist (failing quietly on not-found). this obviates the need for some of our own module quirks. The output of modinfo can take many forms, as it's nearly freeform text in the .modinfo section of the kernel module. The basic form is: softdep: pre: foo But it might also be: softdep: pre: foo bar post: baz Or: softdep: pre: foo softdep: post: bar So just parse the entire line, discarding anything that ends with a ':'. --- functions | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/functions b/functions index 362d07b..500dcc0 100644 --- a/functions +++ b/functions @@ -348,7 +348,7 @@ add_module() { # discovered and added. # $1: module name - local module= path= deps= field= value= firmware=() + local module= path= softdeps= deps= field= value= firmware=() local ign_errors=0 [[ $KERNELVERSION == none ]] && return 0 @@ -375,6 +375,14 @@ add_module() { firmware) firmware+=("$value") ;; + softdep) + read -ra softdeps <<<"$value" + for module in "${softdeps[@]}"; do + [[ $module == *: ]] && continue + add_module "$module" + done + add_module "$softdep?" + ;; esac done < <(modinfo -b "$_optmoduleroot" -k "$KERNELVERSION" -0 "$module" 2>/dev/null) @@ -403,9 +411,8 @@ add_module() { ocfs2) add_module "configfs?" ;; - btrfs|libcrc32c) - add_module "crc32c_intel?" - add_module "crc32c?" + btrfs) + add_module "libcrc32c?" ;; esac } @@ -780,7 +787,7 @@ install_modules() { depmod -b "$BUILDROOT" "$KERNELVERSION" # remove all non-binary module.* files (except devname for on-demand module loading) - rm "$moduledest"/modules.!(*.bin|devname) + rm "$moduledest"/modules.!(*.bin|devname|softdep) } # vim: set ft=sh ts=4 sw=4 et: -- 2.8.3

2 3

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.12-1-gc3fb2fd
by jouke＠archlinux.org 24 Jun '16

24 Jun '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 "Network control utility based on systemd". The branch, master has been updated via c3fb2fd1d8008146bfa05a3f08f6f226f36771e9 (commit) from 32005f510011698587cc505f5194821d5edc50df (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 c3fb2fd1d8008146bfa05a3f08f6f226f36771e9 Author: Konstantin Shalygin <k0ste(a)k0ste.ru> Date: Thu Jun 23 10:52:07 2016 +0600 Add PPPUnit option to mobile_ppp. ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 3 +++ src/lib/connections/mobile_ppp | 1 + 2 files changed, 4 insertions(+) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [namcap][PATCH] Fix FS#49733
by Michael Straube 17 Jun '16

17 Jun '16

This is a fix for https://bugs.archlinux.org/task/49733 diff --git a/Namcap/util.py b/Namcap/util.py index 21d7163..f99ada1 100644 --- a/Namcap/util.py +++ b/Namcap/util.py @@ -70,6 +70,8 @@ def script_type(path): if m != None: cmd = m.group(1).split() name = cmd[0] + if not re.match('^[a-zA-Z0-9_-]*$', name): + return None if name == 'env': name = cmd[1] return name

2 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.12 created. 1.12
by jouke＠archlinux.org 13 Jun '16

13 Jun '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 "Network control utility based on systemd". The annotated tag, 1.12 has been created at da8a62e32b16eb99ea4470e6872f2276d0f16845 (tag) tagging 32005f510011698587cc505f5194821d5edc50df (commit) replaces 1.11 tagged by Jouke Witteveen on Mon Jun 13 15:26:50 2016 +0200 - Log ----------------------------------------------------------------- Release 1.12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJXXrSwAAoJEFa2H7+CSSwV228H/2j57zQ/iNxwerbM9jpZdsXU ifyyXXQdX/xsiUpuNTTxPh8V3OwZEDsNIi5BSm9IqY5sdk7nDxgxwcCJlkIqqiu/ 1hwkRcsTg94tE72yPn9rRtZjis0i39OpTkLc+zpUW9VEcBtcOZUYNxj3dWmdE3gW aP4wtATPDY/pztuv1R0CjaBNFBVKHCDcIgBaXCwSuxLLIR3C1qgivhx5nkd+MgvH ZGv6My8jGgYD7VqojWipyCAXb/F6RxfCKDUoFDz4B87CU+oGefHkCw0rhnC7U6IZ 0OAvrKXRdR9DuIuAtkCNQrjow+GMRN6SBx9bFmAjDilzF3DfDYks3KSifuhiOxY= =ApxQ -----END PGP SIGNATURE----- Jouke Witteveen (7): Fix source URL Fix wifi-menu for profile names containing spaces Fix stopping of terminated wpa_supplicant Support the 'is-active' command Fix documentation link Add quotes for code readability 1.12 release updates Robert Fenk (1): Disable p2p in wpa_supplicant ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0