- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH] Fix btrfs module deps for linux 3.14
by WorMzy Tykashi 03 Mar '14

03 Mar '14

This patch adds in some extra hackery to make sure that users with btrfs root filesystems don't end up with unusable initrds due to the following change made upstream [1]. TL;DR: The btrfs module has dropped it's libcrc32c dependency, so mkinitcpio no longer pulls in the crc32c module necessary for the btrfs module to be inserted. The crc32c module was only pulled in previously due to mkinitcpio hackery [2], so extra hackery now seems like the logical path. This problem can be experienced by using linux-mainline on an Arch machine with a btrfs root filesystem. Besides from this extra hackery, an alternative workaround would be for users in this situation to add crc32c to their MODULES aray in their mkintcpio.conf. Of course, this needs to be done ahead of the linux-3.14 upgrade for them to avoid the problem (assuming none of their other modules depend on libcrc32c). [1] http://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg30912.html [2] https://projects.archlinux.org/mkinitcpio.git/tree/functions?id=v16#n398 --- functions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/functions b/functions index 33bd28d..fc9e96b 100644 --- a/functions +++ b/functions @@ -406,6 +406,10 @@ add_module() { add_module "crc32c_intel?" add_module "crc32c?" ;; + btrfs) + add_module "crc32c_intel?" + add_module "crc32c?" + ;; esac } -- 1.9.0

2 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.4-20-g39f35c0
by jouke＠archlinux.org 03 Mar '14

03 Mar '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 "Network control utility based on systemd". The branch, master has been updated via 39f35c0beec935a894821b239247cde3b79d7b4a (commit) via 79442a6fb85b22b495885175a34d4e4d1f5dc16d (commit) from 0b4246c76c37d45666f1a5b739bb3d1e1a371ea8 (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 39f35c0beec935a894821b239247cde3b79d7b4a Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Mar 3 10:42:32 2014 +0100 Fix rfkill unblocking through rf_enable After 755c8d5, rf_enable did not know the rfkill path anymore. Observed by: Tom <reztho(a)archlinux.us> commit 79442a6fb85b22b495885175a34d4e4d1f5dc16d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Mar 2 18:56:34 2014 +0100 Document TimeoutUp ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 4 ++++ src/lib/rfkill | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 16 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.4-18-g0b4246c
by jouke＠archlinux.org 02 Mar '14

02 Mar '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 "Network control utility based on systemd". The branch, master has been updated via 0b4246c76c37d45666f1a5b739bb3d1e1a371ea8 (commit) via 6d83ce0798af47143a9698847f05b272e3fcb7e0 (commit) via 23ae1791917d48da7237d918f19dfa55a6a13d8f (commit) via 965c476fd5cd10885a7708f0c111c51e697d6694 (commit) via e5ac40075728c92775ce974dcdaf1a60a9533e4b (commit) via 79ef3fb789375dfe4f191fd42d8cf7ff2dbb8cc5 (commit) via de8c80f6748f1202d5b28594f4b8195417f4e219 (commit) via 3b77f8666f19ca2ed1fc242d05d88706b8261863 (commit) via f64a2f25d435edd3507e477a25cb4c4e15297794 (commit) via 349f9b0360f6f7305475fca57656f9e187d859d2 (commit) via 58e8dd21f999357497bbbe5c914b2d50f0a07e1d (commit) via 7f497011aee03f141a5bd055222ca337383f43a3 (commit) from 03afcdce237b2dc52a6c1fea72b715cf6c34bf05 (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 0b4246c76c37d45666f1a5b739bb3d1e1a371ea8 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Dec 3 12:04:58 2013 -0600 Add macvlan connection support commit 6d83ce0798af47143a9698847f05b272e3fcb7e0 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 1 21:44:34 2014 +0100 Minor improvements to bridge/vlan code commit 23ae1791917d48da7237d918f19dfa55a6a13d8f Author: ajs124_desk <ajs(a)online.de> Date: Sat Mar 1 21:42:52 2014 +0100 port bonding from ifenslave to iproute2 Ifenslave is deprecated according to the kernel documentation: https://www.kernel.org/doc/Documentation/networking/bonding.txt It also added an additional, unnecessary dependency. I tried to update the documentation to reflect this change. commit 965c476fd5cd10885a7708f0c111c51e697d6694 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Mar 1 21:10:38 2014 +0100 Update bash-completion for netctl-auto commit e5ac40075728c92775ce974dcdaf1a60a9533e4b Author: Matt Bray <mattjbray(a)gmail.com> Date: Thu Jan 9 16:45:27 2014 +0000 Update zsh-completion for netctl-auto commit 79ef3fb789375dfe4f191fd42d8cf7ff2dbb8cc5 Author: Sebastian Wicki <gandro(a)gmx.net> Date: Sun Feb 2 18:32:14 2014 +0100 Prohibit user invocation of netctl-auto [start|stop] Instead of using systemctl to manage the netctl-auto service, some users try to invoke the start/stop commands of netctl-auto directly. Although this behaviour is explicitly discouraged in the man page, this seems to be a source of confusion. The changes introduced in de8c80f will cause other netctl-auto commands to fail if the netctl-auto service was not spawned by systemd. Therefore, this change emits an error message if netctl-auto [start|stop] is invoked from an interactive terminal. commit de8c80f6748f1202d5b28594f4b8195417f4e219 Author: Sebastian Wicki <gandro(a)gmx.net> Date: Sun Feb 2 16:55:58 2014 +0100 Change how netctl-auto looks for active interfaces Instead of searching for wpa_actiond pid files, the netctl-auto utility now looks for running systemd netctl-auto units. commit 3b77f8666f19ca2ed1fc242d05d88706b8261863 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Feb 27 13:58:57 2014 +0100 Introduce a new PPP connection type This should at some point take care of most PPP use cases, but currently is just a frontend to pppoe. The main difference is that the new connection type keeps track of profiles by their 'dynamic' interface name. Hence it is not wise to use both pppoe and ppp profiles. commit f64a2f25d435edd3507e477a25cb4c4e15297794 Author: Ivan Shapovalov <intelfx100(a)gmail.com> Date: Tue Feb 25 15:26:17 2014 +0100 wifi-menu: handle interface's rfkill switch Temporarily enable the interface's rfkill (if specified) before issuing a scan and restore its state afterwards. commit 349f9b0360f6f7305475fca57656f9e187d859d2 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 25 15:22:31 2014 +0100 wifi-menu: generate keys in proper quoting syntax commit 58e8dd21f999357497bbbe5c914b2d50f0a07e1d Author: Lasse Dalegaard <dalegaard(a)gmail.com> Date: Tue Feb 25 14:31:31 2014 +0100 Make dhcpcd/dhclient pid files world readable Needed since 8a41497. commit 7f497011aee03f141a5bd055222ca337383f43a3 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 25 14:22:22 2014 +0100 Factor out DHCP client support Support for additional DHCP clients is now easy to add. ----------------------------------------------------------------------- Summary of changes: Makefile | 3 +- README | 2 - contrib/PKGBUILD.in | 1 - contrib/bash-completion | 9 ++- contrib/zsh-completion | 23 +++++--- docs/examples/macvlan-dhcp | 10 ++++ docs/examples/{vlan-static => macvlan-static} | 11 ++-- docs/netctl.profile.5.txt | 56 ++++++++++++++---- src/lib/connections/README | 2 +- src/lib/connections/bond | 8 +-- src/lib/connections/bridge | 2 +- src/lib/connections/macvlan | 31 ++++++++++ src/lib/connections/ppp | 28 +++++++++ src/lib/connections/vlan | 3 + src/lib/dhcp/README | 34 +++++++++++ src/lib/dhcp/dhclient | 28 +++++++++ src/lib/dhcp/dhcpcd | 29 ++++++++++ src/lib/ip | 83 ++++++++------------------- src/lib/network | 2 +- src/netctl-auto | 18 +++--- src/wifi-menu | 48 +++++++++++++--- 21 files changed, 321 insertions(+), 110 deletions(-) create mode 100644 docs/examples/macvlan-dhcp copy docs/examples/{vlan-static => macvlan-static} (54%) create mode 100644 src/lib/connections/macvlan create mode 100644 src/lib/connections/ppp create mode 100644 src/lib/dhcp/README create mode 100644 src/lib/dhcp/dhclient create mode 100644 src/lib/dhcp/dhcpcd hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v16-5-g869c314
by dreisner＠archlinux.org 01 Mar '14

01 Mar '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 mkinitcpio repository". The branch, master has been updated via 869c314159497c74aa6cf477862629b05a9fd2b0 (commit) from ed65f93eb4d23aee3129611c90fa2b81e0cb7f42 (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 869c314159497c74aa6cf477862629b05a9fd2b0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 1 16:38:21 2014 -0500 Always use the --target flag with findmnt Prevents problems with bogusly named filesystems, e.g.: mount -t tmpfs / /mount/point Fixes FS#39090. ----------------------------------------------------------------------- Summary of changes: hooks/usr | 6 +++--- install/autodetect | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [netctl][PATCH 1/2] Factor out DHCP client support
by Jouke Witteveen 27 Feb '14

27 Feb '14

Support for additional DHCP clients is now easy to add. --- Makefile | 3 +- docs/netctl.profile.5.txt | 16 +++++---- src/lib/connections/README | 2 +- src/lib/dhcp/README | 34 +++++++++++++++++++ src/lib/dhcp/dhclient | 27 +++++++++++++++ src/lib/dhcp/dhcpcd | 28 ++++++++++++++++ src/lib/ip | 83 ++++++++++++++-------------------------------- 7 files changed, 126 insertions(+), 67 deletions(-) create mode 100644 src/lib/dhcp/README create mode 100644 src/lib/dhcp/dhclient create mode 100644 src/lib/dhcp/dhcpcd diff --git a/Makefile b/Makefile index b22fbe0..08ad462 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,10 @@ install: install -d $(DESTDIR)/etc/netctl/{examples,hooks,interfaces} install -m644 docs/examples/* $(DESTDIR)/etc/netctl/examples/ # Libs - install -d $(DESTDIR)/usr/lib/network/connections + install -d $(DESTDIR)/usr/lib/network/{connections,dhcp} install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/network/ install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/network/connections/ + install -m644 src/lib/dhcp/* $(DESTDIR)/usr/lib/network/dhcp/ install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/ # Scripts install -d $(DESTDIR)/usr/bin diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index dfc13bb..2cf0285 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -137,18 +137,20 @@ network. In particular, these connection types are +ethernet+, An array of custom routes of the form + `**<address range>** via **<gateway>**'. -'DHCPClient=' [requires a DHCP setting]:: - The name of the preferred DHCP client. Supported options are - `dhcpcd' and `dhclient'. Defaults to `dhcpcd'. +'DHCPClient=' [requires 'IP=dhcp']:: + The name of the DHCP client to use. Clients may accept additional + options through client-specific variables. By default, *netctl* + comes with support for `dhcpcd' and `dhclient'. Defaults to + `++dhcpcd++'. + +'DHCP6Client=' [requires 'IP6=dhcp' or 'IP6=dhcp-noaddr']:: + The name of the DHCPv6 client to use. By default, only `dhclient' + is supported. Defaults to `++dhclient++'. 'DHCPReleaseOnStop=':: Set to `++yes++' to release the DHCP lease when the profile is stopped. -'DhcpcdOptions=', 'DhclientOptions=', 'DhclientOptions6=':: - Additional options to be passed to the DHCP client. Do not use this - unless you know what you are doing. - 'IPCustom=()':: An array of argument lines to pass to `ip`. This can be used to achieve complicated configurations within the framework of *netctl*. diff --git a/src/lib/connections/README b/src/lib/connections/README index 6d8db9b..2dd4b7b 100644 --- a/src/lib/connections/README +++ b/src/lib/connections/README @@ -10,7 +10,7 @@ for the aviancarrier connection type will be provided by the file: Files that implement support for a connection type should NOT be executable. Such files should contain valid Bash code, among which two functions, namely <connection_type>_up and <connection_type>_down. For -the aviancarrier file this would be: +the aviancarrier file these would be: aviancarrier_up aviancarrier_down diff --git a/src/lib/dhcp/README b/src/lib/dhcp/README new file mode 100644 index 0000000..f55a06e --- /dev/null +++ b/src/lib/dhcp/README @@ -0,0 +1,34 @@ +Support for dhcp clients is implemented by files in + + /usr/lib/network/dhcp/ + +The file name determines the name of the client for the profile, so +support for a client named dhcpcd is provided by the file: + + /usr/lib/network/connections/dhcpcd + +Files that implement support for a connection type should NOT be +executable. Such files should contain valid Bash code, among which two +functions, namely <client_name>_start and <client_name>_stop. For +the client named dhcpcd these would be: + + dhcpcd_start + dhcpcd_stop + +These functions are responsible for starting and stopping the dhcp +client. When the functions are called, three bash files are already +sourced, so all functions and variables in those files are available. +The readily sourced files are: + + /usr/lib/network/network + /usr/lib/network/globals + /etc/netctl/<profile> + +Here, <profile> is the profile file specifying the desired network +configuration. + +When called, the start and stop functions get as their first argument +the version of the IP protocol that the dhcp client is expected to use. +In the case of starting the client for IPv6, an additional second +argument 'noaddr' may be supplied, which indicates that the dhcp client +should configure everything but an IP address. diff --git a/src/lib/dhcp/dhclient b/src/lib/dhcp/dhclient new file mode 100644 index 0000000..42b5f14 --- /dev/null +++ b/src/lib/dhcp/dhclient @@ -0,0 +1,27 @@ +type dhclient &> /dev/null || return + +dhclient_start() { + local options pidfile="/run/dhclient$1-$Interface.pid" + case $1 in + 4) options=$DhclientOptions;; + 6) options=$DhclientOptions6;; + *) 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 + report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'" + return 1 + fi +} + +dhclient_stop() { + local stop="-x" pidfile="/run/dhclient$1-$Interface.pid" + if [[ -f $pidfile ]]; then + is_yes "${DHCPReleaseOnStop:-no}" && stop="-r" + do_debug dhclient -$1 -q $stop "$Interface" -pf "$pidfile" > /dev/null + fi +} + + +# vim: ft=sh ts=4 et sw=4: diff --git a/src/lib/dhcp/dhcpcd b/src/lib/dhcp/dhcpcd new file mode 100644 index 0000000..42f33ef --- /dev/null +++ b/src/lib/dhcp/dhcpcd @@ -0,0 +1,28 @@ +type dhcpcd &> /dev/null || return + +dhcpcd_start() { + if [[ $1 != "4" ]]; then + 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)" + # 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 +} + +dhcpcd_stop() { + local stop="-x" + if [[ -f "/run/dhcpcd-$Interface.pid" ]]; then + is_yes "${DHCPReleaseOnStop:-no}" && stop="-k" + do_debug dhcpcd -q $stop "$Interface" > /dev/null + fi +} + + +# vim: ft=sh ts=4 et sw=4: diff --git a/src/lib/ip b/src/lib/ip index 4698595..e737fc5 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -1,6 +1,26 @@ ## /usr/lib/network/globals needs to be sourced before this file +## Interface a DHCP client +# $1: DHCP client +# $2: command +# $3...: additional arguments +dhcp_call() { + local client="$1" command="$2" + shift 2 + + if [[ ! -r "$SUBR_DIR/dhcp/$client" ]]; then + report_error "DHCP client '$client' is unsupported" + return 127 + fi + if ! source "$SUBR_DIR/dhcp/$client"; then + report_error "DHCP client '$client' is not installed or not ready" + return 127 + fi + "${client}_$command" "$@" +} + + ## Add resolv.conf entries for an interface # $1: interface name # $2...: entries, one line per variable @@ -43,30 +63,7 @@ ip_set() { case $IP in dhcp) - case ${DHCPClient:-dhcpcd} in - dhcpcd) - 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)" - # 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 - ;; - dhclient) - rm -f "/run/dhclient-${Interface}.pid" - if ! do_debug dhclient -4 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "/run/dhclient-$Interface.pid" $DhclientOptions "$Interface"; then - report_error "DHCP IP lease attempt failed on interface '$Interface'" - return 1 - fi - ;; - *) - report_error "Unsupported DHCP client: '$DHCPClient'" - return 1 - ;; - esac + dhcp_call "${DHCPClient:-dhcpcd}" start 4 || return ;; static) for addr in "${Address[@]}"; do @@ -103,17 +100,8 @@ ip_set() { fi case "$IP6" in - dhcp*) - if ! type dhclient &>/dev/null; then - report_error "You need to install dhclient to use DHCPv6" - return 1 - fi - [[ $IP6 == "dhcp-noaddr" ]] && DhclientOptions6+=" -S" - rm -f "/run/dhclient6-${Interface}.pid" - if ! do_debug dhclient -6 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "/run/dhclient6-${Interface}.pid" $DhclientOptions6 "$Interface"; then - report_error "DHCPv6 IP lease attempt failed on interface '$Interface'" - return 1 - fi + dhcp|dhcp-noaddr) + dhcp_call "${DHCP6Client:-dhclient}" start 6 ${IP6:5} || return ;; stateless|static) for addr in "${Address6[@]}"; do @@ -179,29 +167,8 @@ ip_set() { # $IP: type of IPv4 configuration # $IP6: type of IPv6 configuration ip_unset() { - local stop="-x" - if [[ $IP == "dhcp" ]]; then - case ${DHCPClient:-dhcpcd} in - dhcpcd) - if [[ -f "/run/dhcpcd-$Interface.pid" ]]; then - is_yes "${DHCPReleaseOnStop:-no}" && stop="-k" - do_debug dhcpcd -q $stop "$Interface" >/dev/null - fi - ;; - dhclient) - if [[ -f "/run/dhclient-$Interface.pid" ]]; then - is_yes "${DHCPReleaseOnStop:-no}" && stop="-r" - do_debug dhclient -q $stop "$Interface" -pf "/run/dhclient-$Interface.pid" >/dev/null - fi - ;; - esac - fi - if [[ $IP6 == dhcp* ]]; then - if [[ -f "/run/dhclient6-$Interface.pid" ]]; then - do_debug dhclient -6 -q -x "$Interface" -pf "/run/dhclient6-$Interface.pid" >/dev/null - fi - fi - + [[ $IP == "dhcp" ]] && dhcp_call "${DHCPClient:-dhcpcd}" stop 4 + [[ $IP6 == dhcp* ]] && dhcp_call "${DHCP6Client:-dhclient}" stop 6 [[ $DNS ]] && resolvconf -d "$Interface" ip route flush dev "$Interface" &>/dev/null ip -6 route flush dev "$Interface" &>/dev/null -- 1.9.0

4 9

[arch-projects] [netctl][PATCH 0/2] wifi-menu: handle rfkill switches.
by Ivan Shapovalov 27 Feb '14

27 Feb '14

This is an usability improvement that makes wifi-menu to temporarily enable the interface's rfkill switch before doing a network scan. I don't think that this is too much of automatism and "software being smart", because it honors existing per-interface rfkill settings, so it is just in line with the rest of netctl's wireless support. Ivan Shapovalov (2): rfkill: add rf_is_enabled (query current rfkill state) wifi-menu: handle interface's rfkill switch src/lib/rfkill | 13 +++++++++++++ src/wifi-menu | 19 ++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) -- 1.8.4

3 8

[arch-projects] [netctl][PATCH] wifi-menu: generate keys in proper quoting syntax
by Jouke Witteveen 27 Feb '14

27 Feb '14

--- src/wifi-menu | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/wifi-menu b/src/wifi-menu index 0323e51..80eadd4 100755 --- a/src/wifi-menu +++ b/src/wifi-menu @@ -19,6 +19,16 @@ Arguments: END } +# Prepares $1 for use in a special quoting context +quote_safe() +{ + if [[ "$1" = \"* ]]; then + printf '""%s"' "$1" + else + printf "%s" "$1" + fi +} + # Fills PROFILES and ESSIDS with the profile names and essids of the profiles # for interface $1. init_profiles() @@ -125,13 +135,21 @@ create_profile() [[ "$OBSCURE" ]] && box="--insecure --passwordbox" || box="--inputbox" msg="Enter $security security key for\n'$1'" key=$(dialog $box "$msg" 10 40 --stdout) || return $? - if [[ "${#key}" -ge 8 && "${#key}" -le 63 ]]; then + if [[ "${BASH_REMATCH[0]}" = "WEP" ]]; then + if [[ "$key" = +([[:xdigit:]][[:xdigit:]]) ]]; then + key="\"$key" + else + key=$(quote_safe "$key") + fi + elif [[ "${#key}" -ge 8 && "${#key}" -le 63 ]]; then if [[ "$OBSCURE" ]]; then - key=$(wpa_passphrase "$1" "$key" | sed -n "s/^[[:space:]]*psk=//p") + key="\"$(wpa_passphrase "$1" "$key" | sed -n "s/^[[:space:]]*psk=//p")" else - key=$(printf "%q" "$key") + key=$(quote_safe "$key") fi - elif ! [[ "${#key}" -eq 64 && "$key" = +([[:xdigit:]]) ]]; then + elif [[ "${#key}" -eq 64 && "$key" = +([[:xdigit:]]) ]]; then + key="\"$key" + else return 4 fi fi @@ -140,9 +158,9 @@ Description='Automatically generated profile by wifi-menu' Interface=$INTERFACE Connection=wireless Security=$security -ESSID=$(printf "%q" "$1") +ESSID=$(printf "%q" "$(quote_safe "$1")") IP=dhcp -${key+Key=$key} +${key+Key=$(printf "%q" "$key")} EOF printf "%s" "$PROFILE" return 0 -- 1.9.0

1 0

[arch-projects] [netctl][PATCH 2/2] Make dhcpcd/dhclient pid files world readable
by Lasse Dalegaard 27 Feb '14

27 Feb '14

Needed since 8a41497. --- src/lib/dhcp/dhclient | 1 + src/lib/dhcp/dhcpcd | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lib/dhcp/dhclient b/src/lib/dhcp/dhclient index 42b5f14..5dc637c 100644 --- a/src/lib/dhcp/dhclient +++ b/src/lib/dhcp/dhclient @@ -13,6 +13,7 @@ dhclient_start() { 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 42f33ef..c729c08 100644 --- a/src/lib/dhcp/dhcpcd +++ b/src/lib/dhcp/dhcpcd @@ -14,6 +14,7 @@ dhcpcd_start() { report_error "DHCP IP lease attempt failed on interface '$Interface'" return 1 fi + chmod 644 "/run/dhcpcd-$Interface.pid" } dhcpcd_stop() { -- 1.9.0

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.4-6-g03afcdc
by jouke＠archlinux.org 27 Feb '14

27 Feb '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 "Network control utility based on systemd". The branch, master has been updated via 03afcdce237b2dc52a6c1fea72b715cf6c34bf05 (commit) via bcca0a027786c0d23f3f70c9f21b3332f41786e1 (commit) via 05959bbbae46724d9abe1c32ca69eaaf2ca20722 (commit) via 3931048281b7bbe80d21ce84a7234db0c7931271 (commit) via 33c6ca7f01a36551ca436a96aafd1bf639bcea2f (commit) from 3dc6d75f5fa4813fe5c998b13582912fffd88159 (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 03afcdce237b2dc52a6c1fea72b715cf6c34bf05 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Feb 27 13:43:22 2014 +0100 Uniform adding and deleting of interfaces The main benefit is the possibility to use interface hooks for links that are created at runtime. commit bcca0a027786c0d23f3f70c9f21b3332f41786e1 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Feb 27 12:48:12 2014 +0100 Add option to bypass Duplicate Address Detection After several requests, here is SkipDAD to bypass Duplicate Address Detection. commit 05959bbbae46724d9abe1c32ca69eaaf2ca20722 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 25 14:37:54 2014 +0100 Remove CONN_DIR variable It is not of much use. commit 3931048281b7bbe80d21ce84a7234db0c7931271 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 25 15:15:53 2014 +0100 No daemon-reload in chroot (FS#37691) commit 33c6ca7f01a36551ca436a96aafd1bf639bcea2f Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 25 14:50:28 2014 +0100 Code style and output improvements Now a bit more verbose when useful. ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 12 ++++++++---- src/lib/connections/bond | 5 ++--- src/lib/connections/bridge | 5 ++--- src/lib/connections/dummy | 6 ++---- src/lib/connections/ethernet | 6 ++++-- src/lib/connections/vlan | 7 ++++--- src/lib/globals | 5 ++--- src/lib/ip | 12 +++++++----- src/lib/network | 21 +++++++++++++++++++++ src/lib/wpa | 21 +++++++++++++-------- src/netctl.in | 16 ++++++++++++---- src/wifi-menu | 2 +- 12 files changed, 78 insertions(+), 40 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [namcap][PATCH] Add setuptools rule
by Felix Yan 22 Feb '14

22 Feb '14

This rule detects python imports from pkg_resources from python*-setupsools in /usr/bin/*. Missing dependency on corresponding setuptools package will render the executables unusable. Signed-off-by: Felix Yan <felixonmars(a)gmail.com> --- Namcap/rules/__init__.py | 1 + Namcap/rules/setuptools.py | 73 +++++++++++++++++++++++++++++++++ Namcap/tests/package/test_setuptools.py | 71 ++++++++++++++++++++++++++++++++ namcap-tags | 2 + 4 files changed, 147 insertions(+) create mode 100644 Namcap/rules/setuptools.py create mode 100644 Namcap/tests/package/test_setuptools.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index f7780d2..d42a241 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -44,6 +44,7 @@ from . import ( permissions, rpath, scrollkeeper, + setuptools, shebangdepends, sodepends, symlink diff --git a/Namcap/rules/setuptools.py b/Namcap/rules/setuptools.py new file mode 100644 index 0000000..1b1a3b4 --- /dev/null +++ b/Namcap/rules/setuptools.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +# +# namcap rules - setuptools +# Copyright (C) 2014 Felix Yan <felixonmars(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from Namcap.ruleclass import * +import Namcap.depends + +def check_setuptools(pyfile): + "returns python prefix if need setuptools, else False" + try: + shebang = pyfile.readline().decode("utf8") + except UnicodeDecodeError: + # Not a text file + return False + + if "python" in shebang: + try: + rest_of_file = "\n" + pyfile.read().decode("utf8") + except UnicodeDecodeError: + return False + + # Simple test + if "\nfrom pkg_resources import" in rest_of_file or "\nimport pkg_resources" in rest_of_file: + return "python2" if "python2" in shebang else "python" + + return False + +class package(TarballRule): + name = "setuptools" + description = "Checks that Python executables under /usr/bin that uses pkg_resources have setuptools as a dependency" + def analyze(self, pkginfo, tar): + executables = [ f for f in tar + if f.name.startswith("usr/bin") and f.isfile() ] + if len(executables) == 0: + return + + # If there are executables, check for pkg_resources reference + + need_setuptools = [] + for executable in executables: + pyfile = tar.extractfile(executable) + + if pyfile is None: + continue + + python_prefix = check_setuptools(pyfile) + if python_prefix: + need_setuptools.append(executable.name) + + if len(need_setuptools): + potential_depends = (python_prefix + "-setuptools", python_prefix + "-distribute") + if not any(dependency in pkginfo.get("depends") or dependency in Namcap.depends.getcovered(pkginfo.get("depends")) for dependency in potential_depends): + self.infos.append(("setuptools-needed-dep %s in %s", (python_prefix + "-setuptools", need_setuptools))) + reasons = pkginfo.detected_deps.setdefault(python_prefix + "-setuptools", []) + reasons.append( ('setuptools-needed %s', str(need_setuptools)) ) + +# vim: set ts=4 sw=4 noet: diff --git a/Namcap/tests/package/test_setuptools.py b/Namcap/tests/package/test_setuptools.py new file mode 100644 index 0000000..1593604 --- /dev/null +++ b/Namcap/tests/package/test_setuptools.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +# +# namcap tests - setuptools +# Copyright (C) 2014 Felix Yan <felixonmars(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# + +import os + +from Namcap.tests.makepkg import MakepkgTest +import Namcap.rules.setuptools + +class SetuptoolsProgramsTest(MakepkgTest): + pkgbuild = """ +pkgname=__namcap_test_setuptools +pkgver=1.0 +pkgrel=1 +pkgdesc="A Good Python2 package" +arch=('any') +url="http://www.example.com/" +license=('GPL') +depends=('python2') +options=(!purge !zipman) +source=() +build() { + true +} +package() { + mkdir -p "${pkgdir}/usr/bin" + tee "${pkgdir}/usr/bin/foobar" << EOF +#!/usr/bin/python2 +from pkg_resources import load_entry_point +EOF +} +""" + + def test_setuptools_files(self): + pkgfile = "__namcap_test_setuptools-1.0-1-any.pkg.tar" + with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: + f.write(self.pkgbuild) + self.run_makepkg() + pkg, r = self.run_rule_on_tarball( + os.path.join(self.tmpdir, pkgfile), + Namcap.rules.setuptools.package + ) + e, w, i = Namcap.depends.analyze_depends(pkg) + self.assertEqual(e + r.errors, + [('dependency-detected-not-included %s (%s)', + ('python2-setuptools', "needed for programs ['usr/bin/foobar']") + )]) + self.assertEqual(r.warnings, []) + self.assertTrue( + ("setuptools-needed-dep %s in %s", ("python2-setuptools", ["usr/bin/foobar"])) + in r.infos) + + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index d638478..fa23abe 100644 --- a/namcap-tags +++ b/namcap-tags @@ -69,6 +69,7 @@ potential-non-fhs-info-page %s :: Potential non-FHS info page (%s) found. potential-non-fhs-man-page %s :: Potential non-FHS man page (%s) found. script-link-detected %s in %s :: Script link detected (%s) in file %s scrollkeeper-dir-exists %s :: Scrollkeeper directory exists (%s). Remember to not run scrollkeeper till post_{install,upgrade,remove}. +setuptools-needed-dep %s in %s :: %s probably needed for python programs %s to run correctly site-ruby :: Found usr/lib/ruby/site_ruby in package, usr/lib/ruby/vendor_ruby should be used instead. specific-host-type-used %s :: Reference to %s should be changed to $CARCH specific-sourceforge-mirror :: Attempting to use specific sourceforge mirror, use downloads.sourceforge.net instead @@ -98,3 +99,4 @@ kdebase-runtime-needed %s :: needed for programs %s java-environment-needed %s :: found class files %s libraries-needed %s %s :: libraries %s needed in files %s programs-needed %s %s :: programs %s needed in scripts %s +setuptools-needed %s :: needed for programs %s -- 1.9.0

2 2