- Arch-projects - lists.archlinux.org

[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

[arch-projects] [devtools] [PATCH 0/3] small enhancements
by BlackEagle 16 Feb '14

16 Feb '14

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 lib/common.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 1.8.5.5

4 13

[arch-projects] [ABS] [PATCH] Remove bzr, git, hg and svn protos
by Maxime Gauduin 25 Jan '14

25 Jan '14

Merge those protos into a single PKGBUILD-vcs.proto to be included in pacman. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 64 ------------------------------------------ prototypes/PKGBUILD-git.proto | 64 ------------------------------------------ prototypes/PKGBUILD-hg.proto | 65 ------------------------------------------- prototypes/PKGBUILD-svn.proto | 63 ----------------------------------------- 4 files changed, 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto deleted file mode 100644 index 81f145f..0000000 --- a/prototypes/PKGBUILD-bzr.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from Bazaar sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-bzr -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('bzr') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_bzrtrunk=BZRURL -_bzrmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to Bazaar server...." - - if [[ -d "$_bzrmod" ]]; then - cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" - msg "The local files are updated." - else - bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" - fi - - msg "Bazaar checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_bzrmod-build" - cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build" - cd "$srcdir/$_bzrmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_bzrmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto deleted file mode 100644 index 05b721b..0000000 --- a/prototypes/PKGBUILD-git.proto +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from GIT sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-git -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('git') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_gitroot=GITURL -_gitname=MODENAME - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_gitname-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto deleted file mode 100644 index 8474533..0000000 --- a/prototypes/PKGBUILD-hg.proto +++ /dev/null @@ -1,65 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from Mercurial(hg) sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-hg -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('mercurial') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_hgroot=HGURL -_hgrepo=REPONAME - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - cd "$srcdir/$_hgrepo-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_hgrepo-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto deleted file mode 100644 index aff5ca9..0000000 --- a/prototypes/PKGBUILD-svn.proto +++ /dev/null @@ -1,63 +0,0 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines -# for more information on packaging from SVN sources. - -# Maintainer: Your Name <youremail(a)domain.com> -pkgname=NAME-svn -pkgver=VERSION -pkgrel=1 -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=('subversion') -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() #generate with 'makepkg -g' - -_svntrunk=SVNURL -_svnmod=MODNAME - -build() { - cd "$srcdir" - msg "Connecting to SVN server...." - - if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") - else - svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" - fi - - msg "SVN checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_svnmod-build" - svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" - - # - # BUILD HERE - # - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: -- 1.8.5.3

1 0

[arch-projects] [PATCH] [abs] [PKGBUILD-perl.proto] Fix broken default source URL
by Jason St. John 11 Jan '14

11 Jan '14

cpan.perl.org does not work anymore, as it has been obsoleted by cpan.org for by-modules downloads. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- Any packages using cpan.perl.org in the source array will not build because the download will time out after a couple of minutes. prototypes/PKGBUILD-perl.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto index 26b9c53..1e8a57e 100644 --- a/prototypes/PKGBUILD-perl.proto +++ b/prototypes/PKGBUILD-perl.proto @@ -29,7 +29,7 @@ replaces=() backup=() options=('!emptydirs') install= -source=("http://cpan.perl.org/modules/by-module/$_modnamespace/$_perlmod-$pkgver.tar…") +source=("http://cpan.org/modules/by-module/${_modnamespace}/${_perlmod}-${pkgver}.ta…") md5sums=() build() { -- 1.8.5.2

1 0

[arch-projects] [DEVTOOLS][PATCH] Switch to root when started as regular user
by Sébastien Luttringer 08 Jan '14

08 Jan '14

In collaborative builder machine, these scripts are often allowed to become root via sudo. This patch avoid to prefix them by sudo each time or call su. --- arch-nspawn.in | 2 +- archbuild.in | 4 +--- lib/common.sh | 13 +++++++++++++ makechrootpkg.in | 2 +- mkarchroot.in | 3 ++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 6900382..4436a0e 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -37,8 +37,8 @@ while getopts 'hC:M:c:' arg; do done shift $(($OPTIND - 1)) -(( $EUID != 0 )) && die 'This script must be run as root.' (( $# < 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 b1c96f9..ae2f511 100644 --- a/archbuild.in +++ b/archbuild.in @@ -40,9 +40,7 @@ done # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") -if (( EUID )); then - die 'This script must be run as root.' -fi +check_root "$0" "$@" if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then msg "Creating chroot for [${repo}] (${arch})..." diff --git a/lib/common.sh b/lib/common.sh index cb9db76..75cf2e0 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -228,3 +228,16 @@ find_cached_package() { return 1 esac } + +## +# usage : check_root ("$0" "$@") +## +check_root() { + (( EUID == 0 )) && return + if type -P sudo >/dev/null; then + exec sudo -- "$@" + else + exec su root -c "$(printf '%q' "$@")" + fi + die 'This script must be run as root.' +} diff --git a/makechrootpkg.in b/makechrootpkg.in index d03b703..a9510f4 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -82,7 +82,7 @@ while getopts 'hcur:I:l:nTD:d:' arg; do esac done -(( EUID != 0 )) && die 'This script must be run as root.' +check_root "$0" "$@" [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.' diff --git a/mkarchroot.in b/mkarchroot.in index 7cdb274..fb472bc 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -35,9 +35,10 @@ while getopts 'hC:M:c:' arg; do done shift $(($OPTIND - 1)) -(( $EUID != 0 )) && die 'This script must be run as root.' (( $# < 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