Remove unneeded files and update license

4 files changed, 11 insertions, 151 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 660e13e9d468..91ded842c591 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = dn42-peerfinder-client
 	pkgdesc = A probe for the dn42 PeerFinder system
 	pkgver = 1.0.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://git.dn42.us/dn42/pingfinder
 	arch = any
-	license = unknown
+	license = BSD
 	depends = iputils
 	depends = curl
 	backup = etc/dn42-peerfinder-client.conf
 	source = client.sh::https://git.dn42.us/dn42/pingfinder/raw/master/clients/generic-linux-debian-redhat-busybox.sh
+	source = LICENSE::https://git.dn42.us/dn42/pingfinder/raw/master/LICENSE.txt
 	source = dn42-peerfinder-client.conf
 	source = dn42-peerfinder-client.service
 	source = dn42-peerfinder-client.timer
 	md5sums = 3a736fd810f67468434fdcdaf10d2815
+	md5sums = bb9f80fd1814f45ecce2616098653c50
 	md5sums = 9ace51cd9696f22f925860525aac3261
 	md5sums = 6e582d4de4073d5f7b94a56fb639fcf1
 	md5sums = 94048a42d72fe761cf3475feb06fbb31
diff --git a/.gitignore b/.gitignore
index be9bcc37a863..af8f0a901859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *~
 *.pkg.tar.*
+/client.sh
+/LICENSE
 /src
 /pkg
diff --git a/PKGBUILD b/PKGBUILD
index 610816cc407b..f3323bdac5c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,24 @@
 
 pkgname=dn42-peerfinder-client
 pkgver=1.0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A probe for the dn42 PeerFinder system"
 arch=('any')
 url="https://git.dn42.us/dn42/pingfinder"
-license=('unknown')
+license=('BSD')
 depends=('iputils' 'curl')
 backup=(
   'etc/dn42-peerfinder-client.conf'
 )
 source=(
   'client.sh::https://git.dn42.us/dn42/pingfinder/raw/master/clients/generic-linux-debian-redhat-busybox.sh'
+  'LICENSE::https://git.dn42.us/dn42/pingfinder/raw/master/LICENSE.txt'
   'dn42-peerfinder-client.conf'
   'dn42-peerfinder-client.service'
   'dn42-peerfinder-client.timer'
 )
 md5sums=('3a736fd810f67468434fdcdaf10d2815'
+         'bb9f80fd1814f45ecce2616098653c50'
          '9ace51cd9696f22f925860525aac3261'
          '6e582d4de4073d5f7b94a56fb639fcf1'
          '94048a42d72fe761cf3475feb06fbb31')
@@ -27,6 +29,7 @@ package() {
   install -Dm644 "${srcdir}/dn42-peerfinder-client.conf" "${pkgdir}/etc/dn42-peerfinder-client.conf"
   install -Dm644 "${srcdir}/dn42-peerfinder-client.service" "${pkgdir}/usr/lib/systemd/system/dn42-peerfinder-client.service"
   install -Dm644 "${srcdir}/dn42-peerfinder-client.timer" "${pkgdir}/usr/lib/systemd/system/dn42-peerfinder-client.timer"
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/client.sh b/client.sh
deleted file mode 100644
index 93e95a210f02..000000000000
--- a/client.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-#
-# Measurement script for the dn42 peer finder, see http://dn42.us/peers
-# Dependencies: curl, sed, ping
-#
-# This script is designed to be run in cron every 5 minutes, like this:
-#
-#   UUID=<Your UUID goes here>
-#   */5 * * * * /home/foo/cron.sh
-#
-
-# Put your UUID here, and keep it secret!
-UUID=${UUID}
-PEERFINDER=${PEERFINDER:-"https://dn42.us/peers"}
-NB_PINGS=${NB_PINGS:-5}
-LOGFILE=${LOGFILE:-/dev/stdout}   # Set to /dev/null to only receive errors.
-                                  # Set to a file writable by the cron runner to record pings.
-                                  #  (Errors will be sent in cron mail)
-WARNLOCK=${WARNLOCK:-warn.lock}   # Set this variable if you want a file written when the script updates.
-LOCKFILE=${LOCKFILE:-exec.lock}   # Set this variable if you want the script to not run multiple instances at once.
-LOCKFD=${LOCKFD:-42}
-
-# This avoids synchronisation (everybody fetching jobs and running
-# measurements simultaneously)
-RANDOM_DELAY=30
-
-function die() {
-  echo "## PEERFINDER ERROR $(date) ## " \
-    "$*"
-  exit 1
-}
-
-if command -v flock >/dev/null 2>&1; then
-  eval "exec $LOCKFD>$LOCKFILE"
-  flock -n $LOCKFD || die "Unable to acquire lock."
-fi
-
-VERSION=1.0.10
-ver() { printf "%03d%03d%03d%03d" $(echo "$1" | tr '.' ' '); }
-
-[ -e $LOGFILE ] || touch $LOGFILE
-exec >> $LOGFILE
-
-echo "STARTING PEERFINDER (v. $VERSION)"
-
-SLEEP=$((RANDOM % RANDOM_DELAY))
-
-# check for ping binary
-PING=$(which ping)
-if [ -z "$PING" ]; then
-  die "Unable to find a suitable ping binary."
-fi
-
-CURL=$(which curl)
-if [ -z "$CURL" ]; then
-  die "Unable to find a suitable curl binary."
-fi
-CURL="$CURL -A PeerFinder -sf"
-
-case $OSTYPE in
-  solaris*)
-    GREP=$(which ggrep)
-
-    function ping_cmd() {
-      $PING -sn $3 56 $2
-    }
-    ;;
-  *-gnu|*)
-    # check for IPv6 binary. if ping6 is missing assume 'ping -6'
-    PING6=$(which ping6)
-    [ -z "$PING6" -a -n "$PING" ] && PING6="$PING -6"
-
-    GREP=$(which grep)
-
-    function ping_cmd() {
-      [ "$1" -eq "1" -a -n "$PING" ] && $PING -nqc $2 $3
-      [ "$1" -eq "2" -a -n "$PING6" ] && $PING6 -nqc $2 $3
-    }
-    ;;
-esac
-
-while true ; do
-
-  JOB=$(mktemp)
-
-  $CURL -H 'accept: text/environment' "$PEERFINDER/pending/$UUID" | tee $JOB
-
-  REQ_ID=$($GREP REQ_ID $JOB|cut -d'=' -f2|tr -d '[$`;><{}%|&!()]"/\\')
-  REQ_IP=$($GREP REQ_IP $JOB|cut -d'=' -f2|tr -d '[$`;><{}%|&!()]"/\\')
-  REQ_FAMILY=$($GREP REQ_FAMILY $JOB|cut -d'=' -f2|tr -d '[$`;><{}%|&!()]"/\\')
-  CUR_VERSION=$($GREP SCRIPT_VERSION $JOB|cut -d'=' -f2|tr -d '[$`;><{}%|&!()]"/\\')
-
-  rm "$JOB"
-
-  if [ $(ver "$VERSION") -lt $(ver "$CUR_VERSION") ]; then
-    echo "## PEERFINDER WARN $(date) ## " \
-         "Current script version is $CUR_VERSION. You are running $VERSION " \
-         "Get it here: https://dn42.us/peers/script"
-
-    [ -z "$WARNLOCK" ] && touch $WARNLOCK
-  else
-    [ -z "$WARNLOCK" -o -f "$WARNLOCK" ] && rm $WARNLOCK
-  fi
-
-  # Avoid empty fields
-  [ -z "$REQ_ID" -a -z "$REQ_IP" ] && exit
-
-  echo "PINGING TO: $REQ_IP for $REQ_ID..."
-
-  # Parsing ping output, for Linux
-  if ! output=$(ping_cmd "$REQ_FAMILY" "$NB_PINGS" "$REQ_IP" 2>&1 | $GREP -A1 "packets transmitted"); then
-    sent=0
-    received=0
-    args="res_latency=NULL"
-    echo "Target $REQ_ID ($REQ_IP) is unreachable"
-  else
-     pattern='([0-9]*) packets transmitted, ([0-9]*)( packets)? received'
-     if [[ $output =~ $pattern ]]; then
-         sent=${BASH_REMATCH[1]}
-         received=${BASH_REMATCH[2]}
-         if [ "$received" -eq 0 ]
-         then
-             args="res_latency=NULL"
-             echo "Target $REQ_ID ($REQ_IP) is unreachable"
-         else
-             pattern='(rtt|round-trip).* min/avg/max.*= ([^/]*)/([^/]*)/([^/]*)(/(.*))?( ms)?'
-             if [[ $output =~ $pattern ]]; then
-                 minrtt=${BASH_REMATCH[1]}
-                 avgrtt=${BASH_REMATCH[2]}
-                 maxrtt=${BASH_REMATCH[3]}
-                 jitter=${BASH_REMATCH[4]}
-                 [ -z "$avgrtt" ] && exit
-                 echo "RTT to target $REQ_ID ($REQ_IP) is $avgrtt"
-                 args="res_latency=${avgrtt}"
-             else
-                 args="res_latency=NULL"
-             fi
-         fi
-      else
-          args="res_latency=NULL"
-      fi
-  fi
-
-  # Report results back to peerfinder
-  $CURL -X POST "$PEERFINDER/req/$REQ_ID" -d "peer_id=$UUID&peer_version=$VERSION&$args" -H 'accept: text/environment'
-
-done