projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: b3f9e70)
Merge pull request #4355 from sartura/sysrepo_mirror_hash
authorLuka Perkov <luka.perkov@sartura.hr>
Sat, 13 May 2017 22:41:23 +0000 (00:41 +0200)
committerGitHub <noreply@github.com>
Sat, 13 May 2017 22:41:23 +0000 (00:41 +0200)
Sysrepo mirror hash

libs/libuv/Makefile patch | blob | history
net/mwan3/Makefile patch | blob | history
net/mwan3/files/etc/hotplug.d/iface/15-mwan3 patch | blob | history
net/mwan3/files/lib/mwan3/mwan3.sh patch | blob | history
net/mwan3/files/usr/libexec/rpcd/mwan3 patch | blob | history
net/mwan3/files/usr/sbin/mwan3 patch | blob | history
net/mwan3/files/usr/sbin/mwan3track patch | blob | history

diff --git a/libs/libuv/Makefile b/libs/libuv/Makefile
index 4f40a2021576fee9f264fed040163993fee3b15f..154c093ec62d399b15f077bdcbaff02060679e79 100644 (file)
--- a/libs/libuv/Makefile
+++ b/libs/libuv/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libuv
-PKG_VERSION:=1.10.2
+PKG_VERSION:=1.11.0
 PKG_RELEASE:=1
 
 PKG_LICENSE_FILES:=LICENSE
@@ -17,7 +17,7 @@ PKG_MAINTAINER:=Luka Perkov <luka.perkov@sartura.hr>
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dist.libuv.org/dist/v$(PKG_VERSION)/
-PKG_MD5SUM:=fad96b56f517c1ad3f274a19a10c53b2
+PKG_MD5SUM:=29bdf5e00fb8e0c8392aac53a2cc380a
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 4a0856edc430c82cf1d38facef5a4c864712e88a..394a642f9a823fcc15429b4028901c4e4b93d6f0 100644 (file)
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
-PKG_VERSION:=2.5.1
+PKG_VERSION:=2.5.2
 PKG_RELEASE:=5
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
 PKG_LICENSE:=GPLv2
diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index a13ff832452d07b555596c3538798153ca4873f4..e3fd16cef0f27f492bb78f288e4ffdc9ef23f078 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -11,12 +11,6 @@ if [ "$ACTION" == "ifup" ]; then
         [ -n "$DEVICE" ] || exit 3
 fi
 
-[ -x /usr/bin/ip ] || exit 4
-[ -x /usr/sbin/ipset ] || exit 5
-[ -x /usr/sbin/iptables ] || exit 6
-[ -x /usr/sbin/ip6tables ] || exit 7
-[ -x /usr/bin/logger ] || exit 8
-
 mwan3_set_connected_iptables
 
 config_load mwan3
diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index f0ebcc42e1bfed194c765c017fcbc9aa378152a0..3798d7eb055c00e4d09a8497bdc8bcbe8618d68d 100644 (file)
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-IP4="/usr/bin/ip -4"
-IP6="/usr/bin/ip -6"
-IPS="/usr/sbin/ipset"
-IPT4="/usr/sbin/iptables -t mangle -w"
-IPT6="/usr/sbin/ip6tables -t mangle -w"
-LOG="/usr/bin/logger -t mwan3 -p"
+IP4="ip -4"
+IP6="ip -6"
+IPS="ipset"
+IPT4="iptables -t mangle -w"
+IPT6="ip6tables -t mangle -w"
+LOG="logger -t mwan3 -p"
 CONNTRACK_FILE="/proc/net/nf_conntrack"
 
 mwan3_get_iface_id()
@@ -390,10 +390,7 @@ mwan3_track()
        }
        config_list_foreach $1 track_ip mwan3_list_track_ips
 
-       if [ -e /var/run/mwan3track-$1.pid ] ; then
-               kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null
-       fi
-
+       kill $(pgrep -f "mwan3track $1") &> /dev/null
        if [ -n "$track_ips" ]; then
                [ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track $1 $2 $track_ips &
        fi
@@ -401,18 +398,13 @@ mwan3_track()
 
 mwan3_track_signal()
 {
-       local pid status
+       local pid
 
-       if [ -f "/var/run/mwan3track-${1}.pid" ]; then
-               pid="$(cat "/var/run/mwan3track-${1}.pid")"
-               status="$(pgrep -f mwan3track | grep "${pid}")"
-               if [ "${status}" != "" ]; then
-                       kill -USR1 "${pid}"
-               else
-                       $LOG warn "Unable to send signal USR1 to mwan3track on interface $1 with pid ${pid}"
-               fi
+       pid="$(pgrep -f "mwan3track $1")"
+       if [ "${pid}" != "" ]; then
+               kill -USR1 "${pid}"
        else
-               $LOG warn "Unable to find \"/var/run/mwan3track-${1}.pid\" file for mwan3track on interface $1"
+               $LOG warn "Unable to send signal USR1 to mwan3track on interface $1 with pid ${pid}"
        fi
 }
 
diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3
index 028dafe1db8ca63f829b7e3bb0f0d5af79eb8b34..bbc570f6c2b3c3b185e3f27e4d7ff4abdb85a85e 100755 (executable)
--- a/net/mwan3/files/usr/libexec/rpcd/mwan3
+++ b/net/mwan3/files/usr/libexec/rpcd/mwan3
@@ -6,9 +6,9 @@
 MWAN3_STATUS_DIR="/var/run/mwan3track"
 MWAN3_PID_FILE="/var/run/mwan3track"
 
-IPS="/usr/sbin/ipset"
-IPT4="/usr/sbin/iptables -t mangle -w"
-IPT6="/usr/sbin/ip6tables -t mangle -w"
+IPS="ipset"
+IPT4="iptables -t mangle -w"
+IPT6="ip6tables -t mangle -w"
 
 report_connected_v4() {
        local address
@@ -34,16 +34,12 @@ get_mwan3_status() {
        local iface="${1}"
        local iface_select="${2}"
        local running="0"
-       local pid=""
-       local status=""
+       local pid
 
        if [ "${iface}" = "${iface_select}" ] || [ "${iface_select}" = "" ]; then
-               if [ -f "${MWAN3_PID_FILE}-${iface}.pid" ]; then
-                       pid="$(cat "${MWAN3_PID_FILE}-${iface}.pid")"
-                       status="$(pgrep -f mwan3track | grep "${pid}")"
-                       if [ "${status}" != "" ]; then
-                               running="1"
-                       fi
+               pid="$(pgrep -f "mwan3track $iface_selected")"
+               if [ "${pid}" != "" ]; then
+                       running="1"
                fi
 
                json_add_object "${iface}"
diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
index 63617316cb2d8ed6b92ee7b732981787f6e45f5b..f23d2e71b72c468c871feb454d6842b5e2e7b020 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3
+++ b/net/mwan3/files/usr/sbin/mwan3
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-[ -x /usr/bin/ip ] || exit 4
-[ -x /usr/sbin/ipset ] || exit 5
-[ -x /usr/sbin/iptables ] || exit 6
-[ -x /usr/sbin/ip6tables ] || exit 7
-[ -x /usr/bin/logger ] || exit 8
-
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
@@ -42,9 +36,7 @@ ifdown()
 
        ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
 
-       if [ -e /var/run/mwan3track-$1.pid ] ; then
-               kill $(cat /var/run/mwan3track-$1.pid)
-       fi
+       kill $(pgrep -f "mwan3track $1") &> /dev/null
 }
 
 ifup()
diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track
index 0d7b5ab5d9cf43e70871b65568b054d33e5b4b11..8afe9012939b91cd13ba0b6efb9508b37e1fd0eb 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3track
+++ b/net/mwan3/files/usr/sbin/mwan3track
@@ -2,7 +2,7 @@
 
 . /lib/functions.sh
 
-LOG="/usr/bin/logger -t $(basename "$0")[$$] -p"
+LOG="logger -t $(basename "$0")[$$] -p"
 INTERFACE=""
 DEVICE=""
 
@@ -10,8 +10,9 @@ IFDOWN_EVENT=0
 
 clean_up() {
        $LOG notice "Stopping mwan3track for interface \"${INTERFACE}\""
-       rm "/var/run/mwan3track-${INTERFACE}.pid" &> /dev/null
-       rm -rf "/var/run/mwan3track/${INTERFACE}" &> /dev/null
+       if [ "$(pgrep -f "mwan3track ${INTERFACE}")" = "" ]; then
+               rm -rf "/var/run/mwan3track/${INTERFACE}" &> /dev/null
+       fi
        if [ -z "$(ls -A "/var/run/mwan3track")" ]; then
                rm -rf "/var/run/mwan3track"
        fi
@@ -31,7 +32,6 @@ main() {
 
        INTERFACE=$1
        DEVICE=$2
-       echo "$$" > /var/run/mwan3track-$1.pid
        mkdir -p /var/run/mwan3track/$1
        trap clean_up SIGINT SIGTERM
        trap if_down SIGUSR1
@@ -103,13 +103,13 @@ main() {
                        if [ $score -eq $up ]; then
                                $LOG notice "Interface $1 ($2) is online"
                                env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
-                               rm /var/run/mwan3track-$1.pid
                                rm -rf "/var/run/mwan3track/${1}" &> /dev/null
                                exit 0
                        fi
                fi
 
                let turn++
+               mkdir -p "/var/run/mwan3track/${1}"
                echo "${lost}" > /var/run/mwan3track/$1/LOST
                echo "${score}" > /var/run/mwan3track/$1/SCORE
                echo "${turn}" > /var/run/mwan3track/$1/TURN
Mirror of packages feed