October 2013 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools][PATCH] checkpkg: Fix soname check
by Eric Bélanger 24 Oct '13

24 Oct '13

The bsdtar options were in the incorrect order and objdump couldn't find the files. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index ef46399..02c6543 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -73,9 +73,9 @@ for _pkgname in "${pkgname[@]}"; do if diff "$TEMPDIR/filelist-$_pkgname"{-old,} | grep '\.so' &>/dev/null; then mkdir -p "$TEMPDIR/pkg" - bsdtar -C "$TEMPDIR" xf ../"$pkgfile" #> /dev/null + bsdtar x -C "$TEMPDIR" -f "$pkgfile" #> /dev/null diff "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do - echo "${i}: " "$(objdump -p "$i" | grep SONAME)" + echo "${i}: " "$(objdump -p "$TEMPDIR/$i" | grep SONAME)" done else msg "No soname differences for $_pkgname." -- 1.8.4.1

2 2

[arch-projects] [netctl][PATCH] Minor rfkill refactorization
by Jouke Witteveen 24 Oct '13

24 Oct '13

Testing whether transmission is blocked at all is now possible through [[ -n $(rf_status "$Interface" "$RFKill") ]] Signed-off-by: Jouke Witteveen <j.witteveen(a)gmail.com> --- src/lib/connections/wireless | 4 ++-- src/lib/rfkill | 37 ++++++++++++++++++++++++------------- src/netctl-auto | 4 ++-- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless index 870af51..88ca3e3 100644 --- a/src/lib/connections/wireless +++ b/src/lib/connections/wireless @@ -19,7 +19,7 @@ wireless_up() { : ${TimeoutWPA:=15} if [[ $RFKill ]]; then - enable_rf "$Interface" "$RFKill" || return 1 + rf_enable "$Interface" "$RFKill" || return 1 fi # Kill any lingering WPA supplicants @@ -73,7 +73,7 @@ wireless_down() { wpa_stop "$Interface" bring_interface_down "$Interface" || return 1 if [[ $RFKill ]]; then - disable_rf "$Interface" "$RFKill" + rf_disable "$Interface" "$RFKill" fi } diff --git a/src/lib/rfkill b/src/lib/rfkill index e388f08..3f841f3 100644 --- a/src/lib/rfkill +++ b/src/lib/rfkill @@ -4,7 +4,7 @@ ## Determine the system interface of an rfkill device # $1: interface name # $2: rfkill name -get_rf_path() { +rf_get_path() { local interface=$1 rfkill_name=${2:-auto} path if [[ $rfkill_name == "auto" ]]; then @@ -26,33 +26,44 @@ get_rf_path() { return 1 } -## Unblock transmission through a wireless device +## Determine the blocking status of an rfkill device # $1: interface name # $2: rfkill name -enable_rf() { - local interface=$1 rfkill=$2 path hard soft +rf_status() { + local path + path=$(rf_get_path "$@") || return 1 - path=$(get_rf_path "$interface" "$rfkill") || return 1 - read hard < "$path/hard" - read soft < "$path/soft" + if (( $(< "$path/hard" ) )); then + echo "hard" + elif (( $(< "$path/soft" ) )); then + echo "soft" + fi +} - if (( hard )); then +## Unblock transmission through a wireless device +# $1: interface name +# $2: rfkill name +rf_enable() { + case $(rf_status "$@") in + hard) report_error "Transmission is hard-blocked on interface '$interface'" return 1 - elif (( soft )); then + ;; + soft) report_debug "$FUNCNAME: echo 0 > '$path/soft'" echo 0 > "$path/soft" timeout_wait 1 '(( ! $(< "$path/soft") ))' - fi + ;; + esac } ## Block transmission through a wireless device # $1: interface name # $2: rfkill name -disable_rf() { - local interface=$1 rfkill=$2 path +rf_disable() { + local path + path=$(rf_get_path "$@") || return 1 - path=$(get_rf_path "$interface" "$rfkill") || return 1 report_debug "$FUNCNAME: echo 1 > '$path/soft'" echo 1 > "$path/soft" timeout_wait 1 '(( $(< "$path/soft") ))' diff --git a/src/netctl-auto b/src/netctl-auto index 7519325..5cf104b 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -177,7 +177,7 @@ start() { source "$PROFILE_DIR/interfaces/$interface" fi if [[ $RFKill ]]; then - enable_rf "$interface" "$RFKill" || return 1 + rf_enable "$interface" "$RFKill" || return 1 fi @@ -227,7 +227,7 @@ stop() { fi timeout_wait 1 '! wpa_is_active "$interface"' || wpa_stop "$interface" ip link set dev "$interface" down - [[ $RFKill ]] && disable_rf "$interface" "$RFKill" + [[ $RFKill ]] && rf_disable "$interface" "$RFKill" return 0 } -- 1.8.4.1

1 1

[arch-projects] [devtools][PATCH 2/2] checkpkg: Create symlinks to old packages in $TEMPDIR instead of $PWD
by Eric Bélanger 24 Oct '13

24 Oct '13

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- checkpkg.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index 02c6543..870d543 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -58,15 +58,15 @@ for _pkgname in "${pkgname[@]}"; do if [[ $pkgurl = file://* ]]; then ln -s "${pkgurl#file://}" "${pkgurl##file://*/}" elif [[ -f "$PKGDEST/$oldpkg" ]]; then - ln -s "$PKGDEST/$oldpkg" "$oldpkg" + ln -s "$PKGDEST/$oldpkg" "$TEMPDIR/$oldpkg" elif [[ -f "$STARTDIR/$oldpkg" ]]; then - ln -s "$STARTDIR/$oldpkg" "$oldpkg" + ln -s "$STARTDIR/$oldpkg" "$TEMPDIR/$oldpkg" else - curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" + curl -fsLC - --retry 3 --retry-delay 3 -o "$TEMPDIR/$oldpkg" "$pkgurl" fi fi - bsdtar tf "$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old" + bsdtar tf "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old" bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname" sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" -- 1.8.4.1

1 0

[arch-projects] [netctl][PATCH] Better detection of hex keys
by Jouke Witteveen 23 Oct '13

23 Oct '13

Hex WEP keys are of even length, ASCII keys are of odd length. Using this information we make wifi-menu work better for WEP networks. Signed-off-by: Jouke Witteveen <j.witteveen(a)gmail.com> --- src/lib/wpa | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/wpa b/src/lib/wpa index d79fdbe..ff6d9ab 100644 --- a/src/lib/wpa +++ b/src/lib/wpa @@ -219,11 +219,15 @@ wpa_make_config_block() { wep) echo "key_mgmt=NONE" echo "wep_tx_keyidx=0" - echo "wep_key0=$(wpa_quote "$Key")" + if (( ${#Key} % 2 == 0 )) && [[ "$key" = +([[:xdigit:]]) ]]; then + echo "wep_key0=$Key" + else + echo "wep_key0=$(wpa_quote "$Key")" + fi ;; wpa) echo "proto=RSN WPA" - if [[ "${#Key}" -eq 64 ]]; then + if [[ "${#key}" -eq 64 && "$key" = +([[:xdigit:]]) ]]; then echo "psk=$Key" else echo "psk=$(wpa_quote "$Key")" -- 1.8.4.1

2 8

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.15.0-13-g95b2c16
by dreisner＠archlinux.org 21 Oct '13

21 Oct '13

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 95b2c16f44f02ac264686651cf1aa207c65cb93a (commit) from 344c27a8b56a4aa8bd168f98285165c3fc87cba3 (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 95b2c16f44f02ac264686651cf1aa207c65cb93a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 11 08:13:41 2013 -0400 lsinitcpio: separate decompression from archive reading This essentially reverts 306dcbd7b21f8a680 which foolishly assumes that kernel and libarchive decompression support stay in sync. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lsinitcpio | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [devtools] [PATCH 1/4] commitpkg: check all files at once for version control
by Dave Reisner 21 Oct '13

21 Oct '13

Instead of dying at the first sight of an unversioned file, this lets commitpkg dump all known unversioned files at once. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- commitpkg.in | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/commitpkg.in b/commitpkg.in index fe9348b..8dcbd7c 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -55,24 +55,28 @@ case "$cmd" in ;; esac -# check if all local source files are under version control +# find files which should be under source control +needsversioning=() for s in "${source[@]}"; do - if [[ $s != *://* ]] && ! svn status -v "$s@" | grep -q '^[ AMRX~]'; then - die "%s is not under version control" "$s" - fi + [[ $s != *://* ]] && needsversioning+=("$s") done - -# check if changelog and install files are under version control for i in 'changelog' 'install'; do while read -r file; do # evaluate any bash variables used eval file=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$file")\" - if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then - die "%s is not under version control" "$file" - fi + needsversioning+=("$file") done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) done +# assert that they really are controlled by SVN +if (( ${#needsversioning[*]} )); then + # svn status's output is only two columns when the status is unknown + while read -r status filename; do + [[ $status = '?' ]] && unversioned+=("$filename") + done < <(svn status -v "${needsversioning[@]}") + (( ${#unversioned[*]} )) && die "%s is not under version control" "${unversioned[@]}" +fi + rsyncopts=(-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y) archreleaseopts=() while getopts ':l:a:s:f' flag; do -- 1.8.4.1

2 4

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20131020 created. 20131020
by pierre＠archlinux.org 20 Oct '13

20 Oct '13

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, 20131020 has been created at a1528086d9dcd371d5723e03ac892aac67fc121d (tag) tagging 164f5b758d56ce36ac8b087c1d55b8719555711f (commit) replaces 20130808 tagged by Pierre Schmitz on Sun Oct 20 13:32:28 2013 +0200 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJSY79VAAoJEH8tQ0uXQeisk7wH/RSUjHqQJxFw8VTpFykq3taG HZv8EC8uUoVcDXjf6YGneROAgp7VpcC8xf0dLplpaxiQpu9hRb6h5lT+T6ZE7c6W H459vw2pKwoKNu1212uMWtb40/Newazy5x7pQVpFZ3XiZeiqQYyhTNFNB6Q2LUJm WO9tCfm2LpfScjQY2DXcQPwsoAqAPa20X8orV6zY5xahFRn9AxoecZXMePSJP8Ra BDhe5xRDljCNqgTDHYEN3yChhFunaeyp9Am0E3JCPMDdAp98JLohxPAAf7drCMHR 8jKTBxCpUoFEeNfKUXC/SHPecmk/MP4r2m07gpnl56EtR8IoQ6+FpbbfE1CMvE4= =Mfi8 -----END PGP SIGNATURE----- Allan McRae (1): Make !staticlibs the default in makepkg.conf Dave Reisner (5): arch-nspawn: avoid escaping mount_args arch-nspawn: allow oddly named directories ensure that PKGBUILDs aren't sourced via PATH checkpkg: avoid using PKGEXT to guess tarball name makechrootpkg: add generic support for additional bind mounts Pierre Schmitz (2): Remove libtool files by default prepare release ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130808-8-g164f5b7
by pierre＠archlinux.org 20 Oct '13

20 Oct '13

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 164f5b758d56ce36ac8b087c1d55b8719555711f (commit) via 1ae58aed5bbb12d9e08c5bc06d8fafcc04914366 (commit) from 0d16a9135055d0c998cac236608cb630c93f0ac7 (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 164f5b758d56ce36ac8b087c1d55b8719555711f Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Sun Oct 20 13:32:16 2013 +0200 prepare release commit 1ae58aed5bbb12d9e08c5bc06d8fafcc04914366 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Sun Oct 20 13:31:02 2013 +0200 Remove libtool files by default ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makepkg-i686.conf | 4 ++-- makepkg-x86_64.conf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20130808-6-g0d16a91
by pierre＠archlinux.org 19 Oct '13

19 Oct '13

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 0d16a9135055d0c998cac236608cb630c93f0ac7 (commit) from e77242c5393a5004fce42483c66f8256981f6ef5 (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 0d16a9135055d0c998cac236608cb630c93f0ac7 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 14:10:08 2013 +1000 Make !staticlibs the default in makepkg.conf Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: makepkg-i686.conf | 4 ++-- makepkg-x86_64.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools][PATCH] Make !staticlibs the default in makepkg.conf
by Allan McRae 15 Oct '13

15 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makepkg-i686.conf | 4 ++-- makepkg-x86_64.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index 96cdea6..395230a 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index b89d72b..c03b9a1 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs libtool !staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) -- 1.8.4

1 0