- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] common :: cleanup avoid overwriting exit code
by BlackEagle 07 Jun '14

07 Jun '14

BlackEagle (1): common :: cleanup avoid overwriting exit code lib/common.sh | 1 + 1 file changed, 1 insertion(+) -- 1.9.3

2 2

[arch-projects] [devtools] [PATCH 1/2] common: fix arg concatenation and unreachable statement
by Dave Reisner 02 Jun '14

02 Jun '14

We run from a non-interactive shell, so the exec which is inevitably called will replace the current process and 'die' will never run under any circumstances. Also fix a bug with the su fallback which would cause multiple arguments to be concatenated without any whitespace between them. --- lib/common.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/common.sh b/lib/common.sh index b885080..e4bb91f 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -236,8 +236,9 @@ check_root() { (( EUID == 0 )) && return if type -P sudo >/dev/null; then exec sudo -- "$@" + elif type -P su >/dev/null; then + exec su root -c "$(printf ' %q' "$@")" else - exec su root -c "$(printf '%q' "$@")" + die 'This script must be run as root.' fi - die 'This script must be run as root.' } -- 1.9.3

2 2

[arch-projects] [netctl][PATCH] Escape hatch for the restrictive umask
by Jouke Witteveen 27 May '14

27 May '14

Some things should not be run with the restrictive umask. This provides a means to do so: do_readable. --- The do_readable function feels clumsy, but I couldn't think of a better way. src/lib/dhcp/dhclient | 4 +--- src/lib/dhcp/dhcpcd | 4 +--- src/lib/globals | 16 ++++++++++++++-- src/lib/ip | 2 +- src/netctl.in | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/lib/dhcp/dhclient b/src/lib/dhcp/dhclient index 5dc637c..06b1222 100644 --- a/src/lib/dhcp/dhclient +++ b/src/lib/dhcp/dhclient @@ -8,12 +8,10 @@ dhclient_start() { *) return 1;; esac [[ $2 == "noaddr" ]] && options+=" -S" - rm -f "$pidfile" - if ! do_debug dhclient -$1 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then + if ! do_readable do_debug dhclient -$1 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'" return 1 fi - chmod 644 "$pidfile" } dhclient_stop() { diff --git a/src/lib/dhcp/dhcpcd b/src/lib/dhcp/dhcpcd index c729c08..c655d9a 100644 --- a/src/lib/dhcp/dhcpcd +++ b/src/lib/dhcp/dhcpcd @@ -5,16 +5,14 @@ dhcpcd_start() { report_error "Using 'dhcpcd' for IPv6 is currently not possible in netctl" return 1 fi - rm -f "/run/dhcpcd-$Interface".{pid,cache} # If using own dns, tell dhcpcd to NOT replace resolv.conf [[ $DNS ]] && DhcpcdOptions+=" -C resolv.conf" - do_debug dhcpcd -4qL -t "${TimeoutDHCP:-30}" $DhcpcdOptions "$Interface" |& report_debug "$(cat)" + do_readable do_debug dhcpcd -4qL -t "${TimeoutDHCP:-30}" $DhcpcdOptions "$Interface" |& report_debug "$(cat)" # The first array value of PIPESTATUS is the exit status of dhcpcd if (( PIPESTATUS != 0 )); then report_error "DHCP IP lease attempt failed on interface '$Interface'" return 1 fi - chmod 644 "/run/dhcpcd-$Interface.pid" } dhcpcd_stop() { diff --git a/src/lib/globals b/src/lib/globals index cf99575..42ac177 100644 --- a/src/lib/globals +++ b/src/lib/globals @@ -4,8 +4,6 @@ SUBR_DIR="/usr/lib/network" STATE_DIR="/run/network" STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}" -umask 077 - ### Logging/Error reporting @@ -72,6 +70,16 @@ do_debug() { "$@" } +## Evaluate with a permissive umask +do_readable() { + local result + umask 022 + "$@" + result=$? + umask 077 + return $result +} + ## Exit if we are not effectively root # $1: program name (optional) ensure_root() { @@ -126,4 +134,8 @@ load_profile() { } +# Set a restrictive umask +do_readable : + + # vim: ft=sh ts=4 et sw=4: diff --git a/src/lib/ip b/src/lib/ip index e737fc5..66aab56 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -27,7 +27,7 @@ dhcp_call() { resolvconf_add() { local interface="$1" shift - printf "%s\n" "$@" | resolvconf -a "$interface" + printf "%s\n" "$@" | do_readable resolvconf -a "$interface" } diff --git a/src/netctl.in b/src/netctl.in index 90be39e..9bbd013 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -168,7 +168,7 @@ case $# in switch_to "$2";; enable|disable) ensure_root "$(basename "$0")" - "unit_$1" "$2" + do_readable "unit_$1" "$2" if sd_booted; then systemctl daemon-reload fi;; -- 1.9.3

1 0

[arch-projects] [archweb] FS#33004 remove underline when hovered from navbar
by Jelle van der Waa 26 May '14

26 May '14

--- sitestatic/archweb.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 53fa627..0b8d02d 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -28,7 +28,7 @@ /* style the links */ #archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } -#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; } +#archnavbarlist li a:hover { color: white !important; } /* END ARCH GLOBAL NAVBAR */ -- 1.9.3

1 0

[arch-projects] [DEVTOOLS][PATCH] check_root must be run before args parsing
by Sébastien Luttringer 17 May '14

17 May '14

check_root function reexecute the running script with sudo (or su) and needs all arguments to be untouched. So we have to run it before args parsing, which may call shift. Thanks to Jan Steffens for reporting it. --- arch-nspawn.in | 3 ++- archbuild.in | 4 ++-- makechrootpkg.in | 4 ++-- mkarchroot.in | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 4436a0e..f0517de 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -10,6 +10,8 @@ m4_include(lib/common.sh) +check_root "$0" "$@" + CHROOT_VERSION='v3' working_dir='' @@ -38,7 +40,6 @@ done shift $(($OPTIND - 1)) (( $# < 1 )) && die 'You must specify a directory.' -check_root "$0" "$@" working_dir=$(readlink -f "$1") shift 1 diff --git a/archbuild.in b/archbuild.in index ae2f511..e0e03ee 100644 --- a/archbuild.in +++ b/archbuild.in @@ -2,6 +2,8 @@ m4_include(lib/common.sh) +check_root "$0" "$@" + base_packages=(base-devel) makechrootpkg_args=(-c -n) @@ -40,8 +42,6 @@ done # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") -check_root "$0" "$@" - if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then msg "Creating chroot for [${repo}] (${arch})..." diff --git a/makechrootpkg.in b/makechrootpkg.in index 97c7780..dbfe946 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -10,6 +10,8 @@ m4_include(lib/common.sh) +check_root "$0" "$@" + shopt -s nullglob makepkg_args='-s --noconfirm -L --holdver' @@ -81,8 +83,6 @@ while getopts 'hcur:I:l:nTD:d:' arg; do esac done -check_root "$0" "$@" - [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.' # Canonicalize chrootdir, getting rid of trailing / diff --git a/mkarchroot.in b/mkarchroot.in index fb472bc..e0fbeef 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -10,6 +10,8 @@ m4_include(lib/common.sh) +check_root "$0" "$@" + CHROOT_VERSION='v3' working_dir='' @@ -37,8 +39,6 @@ shift $(($OPTIND - 1)) (( $# < 2 )) && die 'You must specify a directory and one or more packages.' -check_root "$0" "$@" - working_dir="$(readlink -f $1)" shift 1 -- Sébastien "Seblu" Luttringer

1 0

[arch-projects] [devtools] [PATCH] Pass the correct exit argument to cleanup
by Joel Teichroeb 16 May '14

16 May '14

cleanup was recently changed to exit 0 if no arguments are passed. Since trap_exit calls cleanup with no arguments, it always exits 0, regardless of the original parameter to exit. This patch passes the parameter from exit to cleanup. --- lib/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/common.sh b/lib/common.sh index b885080..55dc9ad 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -79,8 +79,9 @@ trap_abort() { } trap_exit() { + STATUS=$? trap - EXIT INT QUIT TERM HUP - cleanup + cleanup $STATUS } die() { -- 1.9.2

1 0

[arch-projects] [devtools] [PATCH 0/9] Changes I've been maintaining in Parabola's fork
by Luke Shumaker 12 May '14

12 May '14

Hi, I maintain Parabola's "fork" of devtools. I've always had a set of "generic" changes to contribute back upstream, but until now never got around to pulling them into nice changesets. I also had one to allow makechrootpkg to handle arguments with spaces, but I just sent that as a reply in another thread since Dave Reisner seems to have just written the same thing! These are arranged roughly by how "controversial" I expect them to be; I expect that no one will object to the first couple commits, while someone might question the utility of the changes to lock/slock. Happy hacking, ~ Luke Shumaker Luke Shumaker (9): arch-nspawn: Fix a grammar mistake (a/an) in an error message. archbuild: Fix a variable name mistake. ($copydir -> $copy) mkarchroot: Correct "Usage:" text. makechrootpkg: Use the btrfs mountpoint/subvolume check consistently. arch-nspawn: Avoid errors where $working_dir is longer than HOST_NAME_MAX. lib/common.sh: Add a lock_close function. lib/common.sh:stat_busy(): Accept printf-style arguments. lib/common.sh: Improve lock() and slock(). Replace multiple uses of string interpolation with printf-type arguments. arch-nspawn.in | 10 ++++++++-- archbuild.in | 10 +++++----- archrelease.in | 2 +- checkpkg.in | 4 ++-- crossrepomove.in | 8 ++++---- lddd.in | 4 ++-- lib/common.sh | 48 +++++++++++++++++++++++++++++++++++++----------- makechrootpkg.in | 10 +++++----- mkarchroot.in | 4 ++-- rebuildpkgs.in | 14 +++++++------- 10 files changed, 73 insertions(+), 41 deletions(-) -- 1.9.2

3 18

[arch-projects] [devtools] [PATCH 0/9] Changes I've been maintaining in Parabola's fork
by Luke Shumaker 11 May '14

11 May '14

Hi, I maintain Parabola's "fork" of devtools. I've always had a set of "generic" changes to contribute back upstream, but until now never got around to pulling them into nice changesets. I also had one to allow makechrootpkg to handle arguments with spaces, but I just sent that as a reply in another thread since Dave Reisner seems to have just written the same thing! These are arranged roughly by how "controversial" I expect them to be; I expect that no one will object to the first couple commits, while someone might question the utility of the changes to lock/slock. Happy hacking, ~ Luke Shumaker Luke Shumaker (9): arch-nspawn: Fix a grammar mistake (a/an) in an error message. archbuild: Fix a variable name mistake. ($copydir -> $copy) mkarchroot: Correct "Usage:" text. makechrootpkg: Use the btrfs mountpoint/subvolume check consistently. arch-nspawn: Avoid errors where $working_dir is longer than HOST_NAME_MAX. lib/common.sh: Add a lock_close function. lib/common.sh:stat_busy(): Accept printf-style arguments. lib/common.sh: Improve lock() and slock(). Replace multiple uses of string interpolation with printf-type arguments. arch-nspawn.in | 10 ++++++++-- archbuild.in | 10 +++++----- archrelease.in | 2 +- checkpkg.in | 4 ++-- crossrepomove.in | 8 ++++---- lddd.in | 4 ++-- lib/common.sh | 48 +++++++++++++++++++++++++++++++++++++----------- makechrootpkg.in | 10 +++++----- mkarchroot.in | 4 ++-- rebuildpkgs.in | 14 +++++++------- 10 files changed, 73 insertions(+), 41 deletions(-) -- 1.9.2

1 0

[arch-projects] [devtools] [PATCH 1/3] makechrootpkg: use a simpler/safer expression with eval
by Dave Reisner 11 May '14

11 May '14

--- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 97c7780..5ed7390 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -113,7 +113,7 @@ for arg in "${@:OPTIND}"; do done if [[ -n $SUDO_USER ]]; then - USER_HOME=$(eval echo ~$SUDO_USER) + eval "USER_HOME=~$SUDO_USER" else USER_HOME=$HOME fi -- 1.9.2

3 4

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20140510 created. 20140510
by pierre＠archlinux.org 10 May '14

10 May '14

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, 20140510 has been created at a9e52d7e0db3af13e9a507009d918af3771fddc8 (tag) tagging 905198295dcb4fffcd16edff3fd7052a4cfc5788 (commit) replaces 20131107 tagged by Pierre Schmitz on Sat May 10 08:10:00 2014 +0200 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJTbcLAAAoJEH8tQ0uXQeis9tYIALeZ6Ht50MkSm4jKz2KAIefg UFXs70WL1i4pZBQvGMPqYcim5JzLmi1Exjm4gLiLKOQXNcERak9E+rCIxnLWl0gs EbgAajODqumzyraJyVXvXTnK+tjbVTeBsTbJ7KeULcmqmsD8J5VnhF9PHB9P1GLm kOi4SfND0YFQbaWxjNtqJUXCGksJ2lI/QD/6wp3jWZp6LnMb9oRHTqUSswd8/igx bPdzCoPdxqiX3lWrbya1BTFZUxZPgT42VFXjTQ7EzarZH0Zlopd6Fjf/FnYrC0bF hUmtRbgzSG5j2e5F06gITO4xaTMDoTdld9Ys+98OxU6Dg+Hfoh3C8ijOZB12uWY= =1DyW -----END PGP SIGNATURE----- Allan McRae (1): Use -fstack-protector-strong BlackEagle (3): abort and die are serious errors so throw 255 out when cleanup is called without code exit with 0 get_full_version :: remove duplicated epoch check Jan Alexander Steffens (heftig) (1): Update mtime of chroot when building Joel Teichroeb (1): Remove broken unknown arguments check and fix usage Pierre Schmitz (1): Prepare release Sébastien Luttringer (1): Switch to root when started as regular user ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0