- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] crossrepomove: do not set svn propset
by Jelle van der Waa 19 Feb '19

19 Feb '19

svn propset's where determined to be non-reproducible and therefore where removed from svn. Don't introduce them when moving packages between repos. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- crossrepomove.in | 1 - 1 file changed, 1 deletion(-) diff --git a/crossrepomove.in b/crossrepomove.in index b45b8ae..a88b722 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -64,7 +64,6 @@ done msg "Adding %s to %s" "${pkgbase}" "${target_repo}" svn -q add "target_checkout/${pkgbase}" -svn -q propset svn:keywords 'Id' "target_checkout/${pkgbase}/trunk/PKGBUILD" svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout pushd "target_checkout/${pkgbase}/trunk" >/dev/null archrelease "${arch[@]/#/$target_repo-}" || die -- 2.20.1

1 0

[arch-projects] [devtools] [PATCH] doc: add man page for mkarchroot
by Jelle van der Waa 18 Feb '19

18 Feb '19

--- Makefile | 3 ++- doc/mkarchroot.1.asciidoc | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 doc/mkarchroot.1.asciidoc diff --git a/Makefile b/Makefile index e812936..870b523 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,8 @@ BASHCOMPLETION_LINKS = \ MANS = \ doc/lddd.1 \ - doc/checkpkg.1 + doc/checkpkg.1 \ + doc/mkarchroot.1 all: $(BINPROGS) bash_completion zsh_completion man diff --git a/doc/mkarchroot.1.asciidoc b/doc/mkarchroot.1.asciidoc new file mode 100644 index 0000000..6f35562 --- /dev/null +++ b/doc/mkarchroot.1.asciidoc @@ -0,0 +1,46 @@ +mkarchroot(1) +=============== + +Name +---- +mkarchroot - Creates an arch chroot in a specified location with a specified set of packages + +Synopsis +-------- +mkarchroot [options] [location] [packages] + +Description +----------- + +'mkarchroot' is a script to create an Arch Linux chroot at a specified location +with specified packages. Typically used by 'makechrootpkg' to create build +chroots. Apart from installing specified packages the chroot is created with an +en_US.UTF-8 and de_DE.UTF-8 locale and a generated machine-id. + +Options +------- + +*-C* <file>:: + Location of a pacman config file. + +*-M* <file>:: + Location of a makepkg config file. + +*-c* <dir>:: + Set pacman cache. + +*-f* <file>:: + Copy file from the host to the chroot. + +*-s*:: + Do not run setarch. + +*-h*:: + Output command line options. + +See Also +-------- + +linkman:pacman[1] + +include::footer.asciidoc[] -- 2.20.1

1 0

Re: [arch-projects] [netctl][PATCH] Move away from using wpa_actiond
by Emil Velikov 15 Feb '19

15 Feb '19

On Sat, 9 Feb 2019 at 09:19, Thomas Bächler <thomas.baechler(a)gmx.de> wrote: > > Am 8. Februar 2019 20:17:52 MEZ schrieb Jouke Witteveen <j.witteveen(a)gmail.com>: > >On Fri, Feb 8, 2019 at 3:36 PM Emil Velikov <emil.l.velikov(a)gmail.com> > >wrote: > >> > >> On Thu, 7 Feb 2019 at 14:50, Jouke Witteveen via arch-projects > >> <arch-projects(a)archlinux.org> wrote: > >> > > >> > The same functionality is provided by wpa_supplicant, so we do not > >need > >> > an extra and Arch Linux specific dependency. > >> > >> The introduction of wpa_actiond [1] hints there are issues with > >wpa_cli. Namely: > >> - partial or missing logging capabilities > >> - race conditions > >> > >> Sadly I don't know much more about this. It'll be great if can use > >> wpa_cli, while not introducing new issues. > >> > >> -Emil > >> > >> [1] > >https://git.archlinux.org/wpa_actiond.git/commit/?id=c5c587771403d31ab4538e… > > > >Thanks! This detective work is highly appreciated! For some reason I > >had assumed wpa_cli would have gained this functionality only after > >wpa_actiond came into existence. This couldn't really explain why both > >use the same parameter names though... > >I wonder if the issues with wpa_cli have been taken upstream. In my > >experience, the maintainer of wpa_supplicant is very pleasant to work > >with. > > > >autowifi and, later, wpa_actiond are important parts of the history of > >netctl, but I tend to give over 10 years of development in > >wpa_supplicant the benefit of the doubt. This means I would like to > >try to move away from wpa_actiond anyway. Currently, except from those > >using wpa_actiond directly, I think netctl is the only user of > >wpa_actiond. > > > >@Thomas: do you have an oppinion in these matters? > > > >Thanks, > >- Jouke > > I honestly don't remember why wpa_cli was insufficient at the time and why I wrote wpa_actiond. That must have been way over 10 years ago. I just remember that my first attempt used wpa_cli, and something obvious was missing. I'd imagine Jouke has been running the patch for a bit and has not seen serious issues. Guess we could merge this and consider any issues as/if they arise? If it were me I would have kept the cosmetics separate, but it's nothing major so. - s/wpa_config/WPAConfigFile/ - RFKill && -> if RFKill; then Thanks for the work guys. -Emil

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.20 created. 1.20
by Jouke Witteveen 12 Feb '19

12 Feb '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The annotated tag, 1.20 has been created at f740dc6b4de8731345ab5b3014225b96b971707e (tag) tagging 7cb0a5ab146f3c26bc05706bda7e3e662af5408a (commit) replaces 1.19 tagged by Jouke Witteveen on Tue Feb 12 17:14:01 2019 +0100 - Log ----------------------------------------------------------------- Release 1.20 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAlxi8M8WHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFXEZB/4iVEZbfkIuAmUEFQP4Zjf5kmU+ VWxEMpvlBtXuJqI9h/3Lpo+Gcs37ifotblkc4UMqmxzIzb3XdN5T8PrXczan7z6m iWqoktNoCNHnWgyuZdmz03gi6AzTZuphJqEC2lqafe8ShCrygBsWfgLqRnf8LPpX GZXXwfd9alIGoVjCS85lgjFCmlihsQPVRR10CGQcOYR4du9DdWqQon4fXsN2RLhC tqe/pjN/xciCIn2Le0vWpVxL6/UbcOrfCVJ3wZZCbwrlb/EDytHIvI02xMoa+Jhs LJTX8S1tj0MWFnSd0+VFCzPtJzB7I9uSng78ZsRqmCqQeezwSGQKIBSusfSp =K4BJ -----END PGP SIGNATURE----- Eli Schwartz (1): Makefile: specify the correct shell to use Jouke Witteveen (3): Do not allow the kernel to try and be smarter than us Move away from using wpa_actiond 1.20 release updates ----------------------------------------------------------------------- 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.19-4-g7cb0a5a
by Jouke Witteveen 12 Feb '19

12 Feb '19

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 7cb0a5ab146f3c26bc05706bda7e3e662af5408a (commit) via f2c3edb19eea8d3b8f5b61b8f9015a2db135a2f3 (commit) via 162af2a44bc3eac92929f396ca8950eb9b736975 (commit) from ea9ccfd2e249880c9b09553c3963a9b3d735faca (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 7cb0a5ab146f3c26bc05706bda7e3e662af5408a Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Feb 12 17:12:20 2019 +0100 1.20 release updates commit f2c3edb19eea8d3b8f5b61b8f9015a2db135a2f3 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Feb 7 15:25:24 2019 +0100 Move away from using wpa_actiond The same functionality is provided by wpa_supplicant, so we do not need an extra and Arch Linux specific dependency. commit 162af2a44bc3eac92929f396ca8950eb9b736975 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Feb 7 13:52:40 2019 +0100 Do not allow the kernel to try and be smarter than us When accept_ra is set to 1, router advertisements are still ignored if the interface is in forwarding mode. For such configurations, the interface should have a static configuration and netctl already sets accept_ra to 0. Setting it to 2 otherwise forces the kernel to accept router advertisements regardless of the forwarding setting. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 4 ++++ README | 4 ++-- contrib/PKGBUILD.in | 1 - src/lib/auto.action | 36 +++++++++++++++++------------------- src/lib/ip | 9 ++++++--- src/netctl-auto | 30 +++++++++++++----------------- 7 files changed, 43 insertions(+), 43 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-8-g6230601
by Levente Polyak 09 Feb '19

09 Feb '19

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 62306018f2cea57aafae410f00d00d2594592e8f (commit) from 65b50dac40fff6032e8e6a28a2b7bf0a6482bf2e (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 62306018f2cea57aafae410f00d00d2594592e8f Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Sat Feb 9 14:27:31 2019 +0100 conf: sync makepkg.conf with latest version from pacman package ----------------------------------------------------------------------- Summary of changes: makepkg-x86_64.conf | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [netctl][PATCH] Move away from using wpa_actiond
by Jouke Witteveen 08 Feb '19

08 Feb '19

The same functionality is provided by wpa_supplicant, so we do not need an extra and Arch Linux specific dependency. --- README | 4 ++-- contrib/PKGBUILD.in | 1 - src/lib/auto.action | 31 ++++++++++++++----------------- src/netctl-auto | 30 +++++++++++++----------------- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/README b/README index 95df087..f3ca634 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ Optional: - dhcpcd or dhclient: for DHCP support - wpa_supplicant: for WPA support - dialog: for the interactive assistant -- ifplugd: for automatic connection -- wpa_actiond: for automatic connection +- ifplugd: for automatic wired connections +- ppp: for PPP support For documentation generation: - asciidoc diff --git a/contrib/PKGBUILD.in b/contrib/PKGBUILD.in index b5ce44c..f3359c6 100644 --- a/contrib/PKGBUILD.in +++ b/contrib/PKGBUILD.in @@ -15,7 +15,6 @@ optdepends=('dialog: for the menu based wifi assistant' 'dhcpcd: for DHCP support (or dhclient)' 'wpa_supplicant: for wireless networking support' 'ifplugd: for automatic wired connections through netctl-ifplugd' - 'wpa_actiond: for automatic wireless connections through netctl-auto' 'ppp: for PPP connections' 'openvswitch: for Open vSwitch connections' ) diff --git a/src/lib/auto.action b/src/lib/auto.action index f81d4e3..999f66f 100755 --- a/src/lib/auto.action +++ b/src/lib/auto.action @@ -5,16 +5,17 @@ . "$SUBR_DIR/ip" export INTERFACE="$1" -export SSID="$2" -export ACTION="$4" +export ACTION="$2" +PROFILE_STATE="$STATE_DIR/netctl-auto-$INTERFACE.profile" -load_profile "$3" load_interface_config "$INTERFACE" case $ACTION in - CONNECT) + CONNECTED) + load_profile "$WPA_ID_STR" DhcpcdOptions+=" -K -L" ip_set || exit 1 + echo "$Profile" > "$PROFILE_STATE" # Sandbox the eval if ! ( do_debug eval "$ExecUpPost" ); then # Failing ExecUpPost will take the connection down @@ -22,20 +23,16 @@ case $ACTION in exit 1 fi ;; - DISCONNECT) - # Sandbox the eval - if ! ( do_debug eval "$ExecDownPre" ); then - exit 1 + DISCONNECTED) + if [[ -s "$PROFILE_STATE" ]]; then + load_profile "$(< "$PROFILE_STATE")" + rm -f "$PROFILE_STATE" + # Sandbox the eval + if ! ( do_debug eval "$ExecDownPre" ); then + exit 1 + fi + ip_unset fi - ip_unset - ;; - LOST|REESTABLISHED) - # Not handled. - exit 0 - ;; - *) - # ??? - exit 1 ;; esac diff --git a/src/netctl-auto b/src/netctl-auto index 18d2e10..7e4062e 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -6,7 +6,6 @@ . "$SUBR_DIR/rfkill" . "$SUBR_DIR/wpa" -: ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant} : ${ACTION_SCRIPT:=$SUBR_DIR/auto.action} @@ -193,11 +192,10 @@ list() { done } -## Start and generate config file for the WPA supplicant, start wpa_actiond +## Start and generate config file for the WPA supplicant, monitor for changes # $1: interface start() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" if interface_is_up "$interface"; then exit_error "The interface '$interface' is already up" @@ -206,12 +204,11 @@ start() { rf_enable "$interface" "$RFKill" || return 1 fi - local wpa_conf - if ! wpa_conf=$(wpa_make_config_file "$interface"); then + if ! WPAConfigFile=$(wpa_make_config_file "$interface"); then exit_error "Could not create the configuration file for interface '$interface'" fi - # Disable p2p to prevent wpa_supplicant from creating another control interface. - echo "p2p_disabled=1" >> "$wpa_conf" + # Disable p2p to prevent wpa_supplicant from creating another control interface + echo "p2p_disabled=1" >> "$WPAConfigFile" local profile list_profiles | while IFS= read -r profile; do @@ -222,16 +219,16 @@ start() { is_yes "${ExcludeAuto:-no}" && exit # Set default and exclude wpa-config as it does not fit this scheme [[ ${Security:=none} != "wpa-config" ]] || exit - printf '%s\n' "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$wpa_conf" + printf '%s\n' "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$WPAConfigFile" report_notice "Included profile '$profile'" ) done - # Start the WPA supplicant and wpa_actiond + # Start the WPA supplicant and wpa_cli : ${WPADriver:=nl80211,wext} WPAOptions+=" -W" - if wpa_start "$interface" "$WPADriver" "$wpa_conf"; then - if $ACTIOND -i "$interface" -P "$pidfile" -a "$ACTION_SCRIPT"; then + if wpa_start "$interface" "$WPADriver" "$WPAConfigFile"; then + if wpa_call "$interface" -B -a "$ACTION_SCRIPT"; then return 0 fi wpa_stop "$interface" @@ -241,17 +238,16 @@ start() { return 1 } -## Stop the WPA supplicant and wpa_actiond +## Stop the WPA supplicant, which automatically stops wpa_cli # $1: interface stop() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" - [[ -e "$pidfile" ]] && kill "$(< "$pidfile")" - timeout_wait 1 '! wpa_is_active "$interface"' || wpa_stop "$interface" + wpa_stop "$interface" bring_interface_down "$interface" - [[ $RFKill ]] && rf_disable "$interface" "$RFKill" - return 0 + if [[ $RFKill ]]; then + rf_disable "$interface" "$RFKill" + fi } ## Remove WPA supplicant configuration files -- 2.20.1

2 2

[arch-projects] [devtools] uses MAKEFLAGS (+others) from /etc/makepkg.conf not /usr/share/devtools/
by james harvey 08 Feb '19

08 Feb '19

I got extremely confused when I accidentally found out that the MAKEFLAGS that is needed to be set for parallel building using devtools is the one in "/etc/makepkg.conf", instead of one like "/usr/share/devtools/makepkg-x86_64.conf". Turns out this is because "makechrootpkg"::20180531-4::638 is: load_vars /etc/makepkg.conf load_vars() only reads "{SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER", so without me having set any of the others, it turns out the only variable it uses from /etc is MAKEFLAGS. For me, I think this is the only makepkg/pacman variable in an entire devtools run that isn't out of /usr/share/devtools, since "archbuild" gives those to "mkarchroot" and "arch-nspawn... pacman -Syu", and they are copied into "/var/lib/archbuild/extra-x86_64/root/etc/" for anything ran in the chroot. Should this be fixed? I originally thought of a new "makechrootpkg -M" option, but I think it could instead run: load_vars ${copydir}/etc/makepkg.conf If not, should "/usr/share/devtools/makepkg-x86_64.conf" be updated with a comment where those variables are, to say they're actually used out of "/etc/makepkg.conf"?

3 5

[arch-projects] [devtools] conf files could be closer to pacman's
by james harvey 07 Feb '19

07 Feb '19

It could be worth a developer diff'ing: * pacman::makepkg.conf and devtools::makepkg-x86_64.conf * pacman::pacman.conf and devtools::pacman*.conf When trying to figure out my /etc/ vs /usr/share/devtools/ confusion with MAKEFLAGS, I saw these differ in more areas than I would have expected. I don't know if any of the differences matter in the end, but I think it's nice they almost match, and I think it would be nicer if they only differ in areas where they need to. They probably used to match better, and diverged in a few areas where they didn't need to. Some of the differences are certainly nitpicky. pacman just dropped "-fstack-protector-strong" since it's enabled by default. https://bugs.archlinux.org/task/54736 Others might matter in some situations, like different options on DLAGENTS. (I'm assuming it's right to have file:// missing from devtools, talkinga bout the curl options.) devtools gives package options "!optipng !upx". devtools has a different comment for XferCommand and IgnorePkg. Stuff like that.

3 2

[arch-projects] [netctl][PATCH] Do not allow the kernel to try and be smarter than us
by Jouke Witteveen 07 Feb '19

07 Feb '19

When accept_ra is set to 1, router advertisements are still ignored if the interface is in forwarding mode. For such configurations, the interface should have a static configuration and netctl already sets accept_ra to 0. Setting it to 2 otherwise forces the kernel to accept router advertisements regardless of the forwarding setting. --- src/lib/ip | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/ip b/src/lib/ip index 65057ab..e3f6a2f 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -50,13 +50,16 @@ ip_set() { dhcp|dhcp-noaddr|stateless|static) [[ -d "/proc/sys/net/ipv6" ]] || modprobe ipv6 sysctl -q -w "net.ipv6.conf.$interface_sysctl.disable_ipv6=0" - [[ $IP6 == "static" ]] - sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=$?" + if [[ $IP6 == "static" ]]; then + sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=0" + else # Accept router advertisements regardless of the forwarding setting + sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=2" + fi ;; no) [[ -d "/proc/sys/net/ipv6" ]] && sysctl -q -w "net.ipv6.conf.$interface_sysctl.disable_ipv6=1" ;; - "") # undefined IP6 does not prevent RA's from being received -> nop + "") # Having IP6= unset does not prevent router advertisements from being received ;; *) report_error "IP6 must be 'dhcp', 'dhcp-noaddr', 'stateless', 'static' or 'no'" -- 2.20.1

1 0