Page MenuHomeSolus
Files F10707731

D11008.id.diff
No OneTemporary
Actions

D11008.id.diff
View Options

diff --git a/files/0001-wg-quick-wait-on-process-substitutions.patch b/files/0001-wg-quick-wait-on-process-substitutions.patch
--- a/files/0001-wg-quick-wait-on-process-substitutions.patch
+++ b/files/0001-wg-quick-wait-on-process-substitutions.patch
@@ -1,4 +1,4 @@
-From 1d42ae3facb30af9915e87f10c9a123e1351b334 Mon Sep 17 00:00:00 2001
+From 0d5f8bb890625ad71fad3923606a78f6cf6bcb8f Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 3 Aug 2020 10:18:40 +0200
Subject: [PATCH] wg-quick: wait on process substitutions
@@ -10,234 +10,9 @@
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
- src/wg-quick/darwin.bash | 28 ++++++++++++++--------------
- src/wg-quick/freebsd.bash | 24 ++++++++++++------------
- src/wg-quick/linux.bash | 22 +++++++++++-----------
- src/wg-quick/openbsd.bash | 22 +++++++++++-----------
- 4 files changed, 48 insertions(+), 48 deletions(-)
+ src/wg-quick/linux.bash | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
-diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash
-index cde1b54..26c6cd3 100755
---- a/src/wg-quick/darwin.bash
-+++ b/src/wg-quick/darwin.bash
-@@ -92,7 +92,7 @@ detect_launchd() {
- LAUNCHED_BY_LAUNCHD=1
- break
- fi
-- done < <(launchctl procinfo $$ 2>/dev/null)
-+ done < <(launchctl procinfo $$ 2>/dev/null); wait $!
- }
-
- read_bool() {
-@@ -132,14 +132,14 @@ del_routes() {
- local todelete=( ) destination gateway netif
- while read -r destination _ _ _ _ netif _; do
- [[ $netif == "$REAL_INTERFACE" ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet "$destination" >/dev/null || true
- done
- todelete=( )
- while read -r destination gateway _ netif; do
- [[ $netif == "$REAL_INTERFACE" || ( $netif == lo* && $gateway == "$REAL_INTERFACE" ) ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet6 "$destination" >/dev/null || true
- done
-@@ -181,7 +181,7 @@ set_mtu() {
- defaultif="$netif"
- break
- fi
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
- [[ -n $defaultif && $(ifconfig "$defaultif") =~ mtu\ ([0-9]+) ]] && mtu="${BASH_REMATCH[1]}"
- [[ $mtu -gt 0 ]] || mtu=1500
- mtu=$(( mtu - 80 ))
-@@ -197,14 +197,14 @@ collect_gateways() {
- [[ $destination == default ]] || continue
- GATEWAY4="$gateway"
- break
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
-
- GATEWAY6=""
- while read -r destination gateway _; do
- [[ $destination == default ]] || continue
- GATEWAY6="$gateway"
- break
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- }
-
- collect_endpoints() {
-@@ -212,7 +212,7 @@ collect_endpoints() {
- while read -r _ endpoint; do
- [[ $endpoint =~ ^\[?([a-z0-9:.]+)\]?:[0-9]+$ ]] || continue
- ENDPOINTS+=( "${BASH_REMATCH[1]}" )
-- done < <(wg show "$REAL_INTERFACE" endpoints)
-+ done < <(wg show "$REAL_INTERFACE" endpoints); wait $!
- }
-
- declare -A SERVICE_DNS
-@@ -230,7 +230,7 @@ collect_new_service_dns() {
- get_response="$(cmd networksetup -getsearchdomains "$service")"
- [[ $get_response == *" "* ]] && get_response="Empty"
- [[ -n $get_response ]] && SERVICE_DNS_SEARCH["$service"]="$get_response"
-- done; } < <(networksetup -listallnetworkservices)
-+ done; } < <(networksetup -listallnetworkservices); wait $!
-
- for service in "${!SERVICE_DNS[@]}"; do
- if ! [[ -n ${found_services["$service"]} ]]; then
-@@ -304,7 +304,7 @@ set_dns() {
- else
- cmd networksetup -setsearchdomains "$service" "${DNS_SEARCH[@]}"
- fi
-- )
-+ ); wait $!
- done
- }
-
-@@ -316,7 +316,7 @@ del_dns() {
- done < <(
- cmd networksetup -setdnsservers "$service" ${SERVICE_DNS["$service"]} || true
- cmd networksetup -setsearchdomains "$service" ${SERVICE_DNS_SEARCH["$service"]} || true
-- )
-+ ); wait $!
- done
- }
-
-@@ -339,7 +339,7 @@ monitor_daemon() {
- set_dns
- sleep 2 && kill -ALRM $pid 2>/dev/null &
- fi
-- done < <(route -n monitor)) &
-+ done < <(route -n monitor); wait $!) &
- [[ -n $LAUNCHED_BY_LAUNCHD ]] || disown
- }
-
-@@ -367,7 +367,7 @@ add_route() {
- }
-
- set_config() {
-- cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
-+ cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG"); wait $!
- }
-
- save_config() {
-@@ -375,7 +375,7 @@ save_config() {
- new_config=$'[Interface]\n'
- while read -r address; do
- [[ $address =~ inet6?\ ([^ ]+) ]] && new_config+="Address = ${BASH_REMATCH[1]}"$'\n'
-- done < <(ifconfig "$REAL_INTERFACE")
-+ done < <(ifconfig "$REAL_INTERFACE"); wait $!
- # TODO: actually determine current DNS for interface
- for address in "${DNS[@]}"; do
- new_config+="DNS = $address"$'\n'
-@@ -458,7 +458,7 @@ cmd_up() {
- done
- set_mtu
- up_if
-- for i in $(while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$REAL_INTERFACE" allowed-ips) | sort -nr -k 2 -t /); do
-+ for i in $({ while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$REAL_INTERFACE" allowed-ips); wait $!; } | sort -nr -k 2 -t /); do
- add_route "$i"
- done
- [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route
-diff --git a/src/wg-quick/freebsd.bash b/src/wg-quick/freebsd.bash
-index 88aa2b4..b15cb8a 100755
---- a/src/wg-quick/freebsd.bash
-+++ b/src/wg-quick/freebsd.bash
-@@ -132,14 +132,14 @@ del_routes() {
- local todelete=( ) destination gateway netif
- while read -r destination _ _ _ _ netif _; do
- [[ $netif == "$INTERFACE" ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet "$destination" || true
- done
- todelete=( )
- while read -r destination gateway _ netif; do
- [[ $netif == "$INTERFACE" || ( $netif == lo* && $gateway == "$INTERFACE" ) ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet6 "$destination" || true
- done
-@@ -206,9 +206,9 @@ set_mtu() {
- [[ ${BASH_REMATCH[1]} == *:* ]] && family=inet6
- output="$(route -n get "-$family" "${BASH_REMATCH[1]}" || true)"
- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}"
-- done < <(wg show "$INTERFACE" endpoints)
-+ done < <(wg show "$INTERFACE" endpoints); wait $!
- if [[ $mtu -eq 0 ]]; then
-- read -r output < <(route -n get default || true) || true
-+ read -r output < <(route -n get default) || true
- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}"
- fi
- [[ $mtu -gt 0 ]] || mtu=1500
-@@ -224,14 +224,14 @@ collect_gateways() {
- [[ $destination == default ]] || continue
- GATEWAY4="$gateway"
- break
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
-
- GATEWAY6=""
- while read -r destination gateway _; do
- [[ $destination == default ]] || continue
- GATEWAY6="$gateway"
- break
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- }
-
- collect_endpoints() {
-@@ -239,7 +239,7 @@ collect_endpoints() {
- while read -r _ endpoint; do
- [[ $endpoint =~ ^\[?([a-z0-9:.]+)\]?:[0-9]+$ ]] || continue
- ENDPOINTS+=( "${BASH_REMATCH[1]}" )
-- done < <(wg show "$INTERFACE" endpoints)
-+ done < <(wg show "$INTERFACE" endpoints); wait $!
- }
-
- set_endpoint_direct_route() {
-@@ -308,7 +308,7 @@ monitor_daemon() {
- if_exists || break
- [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route
- # TODO: set the mtu as well, but only if up
-- done < <(route -n monitor)) & disown
-+ done < <(route -n monitor); wait $!) & disown
- }
-
- HAVE_SET_DNS=0
-@@ -357,13 +357,13 @@ save_config() {
- new_config=$'[Interface]\n'
- { read -r _; while read -r _ _ _ address _; do
- new_config+="Address = $address"$'\n'
-- done } < <(netstat -I "$INTERFACE" -n -W -f inet)
-+ done } < <(netstat -I "$INTERFACE" -n -W -f inet); wait $!
- { read -r _; while read -r _ _ _ address _; do
- new_config+="Address = $address"$'\n'
-- done } < <(netstat -I "$INTERFACE" -n -W -f inet6)
-+ done } < <(netstat -I "$INTERFACE" -n -W -f inet6); wait $!
- while read -r address; do
- [[ $address =~ ^nameserver\ ([a-zA-Z0-9_=+:%.-]+)$ ]] && new_config+="DNS = ${BASH_REMATCH[1]}"$'\n'
-- done < <(resolvconf -l "$INTERFACE" 2>/dev/null)
-+ done < <(resolvconf -l "$INTERFACE" 2>/dev/null); wait $!
- [[ -n $MTU ]] && new_config+="MTU = $MTU"$'\n'
- [[ -n $TABLE ]] && new_config+="Table = $TABLE"$'\n'
- [[ $SAVE_CONFIG -eq 0 ]] || new_config+=$'SaveConfig = true\n'
-@@ -441,7 +441,7 @@ cmd_up() {
- set_mtu
- up_if
- set_dns
-- for i in $(while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$INTERFACE" allowed-ips) | sort -nr -k 2 -t /); do
-+ for i in $({ while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$INTERFACE" allowed-ips); wait $!; } | sort -nr -k 2 -t /); do
- add_route "$i"
- done
- [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route
diff --git a/src/wg-quick/linux.bash b/src/wg-quick/linux.bash
index e4d4c4f..8bda740 100755
--- a/src/wg-quick/linux.bash
@@ -319,101 +94,6 @@
add_route "$i"
done
execute_hooks "${POST_UP[@]}"
-diff --git a/src/wg-quick/openbsd.bash b/src/wg-quick/openbsd.bash
-index 15550c8..7b8d4e1 100755
---- a/src/wg-quick/openbsd.bash
-+++ b/src/wg-quick/openbsd.bash
-@@ -122,14 +122,14 @@ del_routes() {
- [[ -n $REAL_INTERFACE ]] || return 0
- while read -r destination _ _ _ _ netif _; do
- [[ $netif == "$REAL_INTERFACE" ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet "$destination" || true
- done
- todelete=( )
- while read -r destination gateway _ netif; do
- [[ $netif == "$REAL_INTERFACE" || ( $netif == lo* && $gateway == "$REAL_INTERFACE" ) ]] && todelete+=( "$destination" )
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- for destination in "${todelete[@]}"; do
- cmd route -q -n delete -inet6 "$destination" || true
- done
-@@ -175,9 +175,9 @@ set_mtu() {
- [[ ${BASH_REMATCH[1]} == *:* ]] && family=inet6
- output="$(route -n get "-$family" "${BASH_REMATCH[1]}" || true)"
- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}"
-- done < <(wg show "$REAL_INTERFACE" endpoints)
-+ done < <(wg show "$REAL_INTERFACE" endpoints); wait $!
- if [[ $mtu -eq 0 ]]; then
-- read -r output < <(route -n get default || true) || true
-+ read -r output < <(route -n get default) || true
- [[ $output =~ interface:\ ([^ ]+)$'\n' && $(ifconfig "${BASH_REMATCH[1]}") =~ mtu\ ([0-9]+) && ${BASH_REMATCH[1]} -gt $mtu ]] && mtu="${BASH_REMATCH[1]}"
- fi
- [[ $mtu -gt 0 ]] || mtu=1500
-@@ -193,14 +193,14 @@ collect_gateways() {
- [[ $destination == default ]] || continue
- GATEWAY4="$gateway"
- break
-- done < <(netstat -nr -f inet)
-+ done < <(netstat -nr -f inet); wait $!
-
- GATEWAY6=""
- while read -r destination gateway _; do
- [[ $destination == default ]] || continue
- GATEWAY6="$gateway"
- break
-- done < <(netstat -nr -f inet6)
-+ done < <(netstat -nr -f inet6); wait $!
- }
-
- collect_endpoints() {
-@@ -208,7 +208,7 @@ collect_endpoints() {
- while read -r _ endpoint; do
- [[ $endpoint =~ ^\[?([a-z0-9:.]+)\]?:[0-9]+$ ]] || continue
- ENDPOINTS+=( "${BASH_REMATCH[1]}" )
-- done < <(wg show "$REAL_INTERFACE" endpoints)
-+ done < <(wg show "$REAL_INTERFACE" endpoints); wait $!
- }
-
- set_endpoint_direct_route() {
-@@ -276,7 +276,7 @@ monitor_daemon() {
- ifconfig "$REAL_INTERFACE" >/dev/null 2>&1 || break
- [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route
- # TODO: set the mtu as well, but only if up
-- done < <(route -n monitor)) & disown
-+ done < <(route -n monitor); wait $!) & disown
- }
-
- set_dns() {
-@@ -325,7 +325,7 @@ add_route() {
- }
-
- set_config() {
-- cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
-+ cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG"); wait $!
- }
-
- save_config() {
-@@ -333,7 +333,7 @@ save_config() {
- new_config=$'[Interface]\n'
- { read -r _; while read -r _ _ network address _; do
- [[ $network == *Link* ]] || new_config+="Address = $address"$'\n'
-- done } < <(netstat -I "$REAL_INTERFACE" -n -v)
-+ done } < <(netstat -I "$REAL_INTERFACE" -n -v); wait $!
- # TODO: actually determine current DNS for interface
- for address in "${DNS[@]}"; do
- new_config+="DNS = $address"$'\n'
-@@ -414,7 +414,7 @@ cmd_up() {
- set_mtu
- up_if
- set_dns
-- for i in $(while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$REAL_INTERFACE" allowed-ips) | sort -nr -k 2 -t /); do
-+ for i in $({ while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$REAL_INTERFACE" allowed-ips); wait $!; } | sort -nr -k 2 -t /); do
- add_route "$i"
- done
- [[ $AUTO_ROUTE4 -eq 1 || $AUTO_ROUTE6 -eq 1 ]] && set_endpoint_direct_route
--
2.30.2
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : wireguard-tools
-version : 1.0.20210315
-release : 5
+version : 1.0.20210424
+release : 6
source :
- - https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz : af001d5492be6bf58ef0bebe04b446b6f50eb53e1226fab679cc34af40733a22
+ - https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210424.tar.xz : b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad
license : GPL-2.0-only
component : network.util
summary : Required tools for WireGuard, such as wg(8) and wg-quick(8)
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -30,12 +30,12 @@
</Files>
</Package>
<History>
- <Update release="5">
- <Date>2021-03-17</Date>
- <Version>1.0.20210315</Version>
+ <Update release="6">
+ <Date>2021-05-07</Date>
+ <Version>1.0.20210424</Version>
<Comment>Packaging update</Comment>
<Name>Silke Hofstra</Name>
<Email>silke@slxh.eu</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Apr 28 2023, 9:43 AM (15 w, 8 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5801451
Default Alt Text
D11008.id.diff (14 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.