[tarent-useful-scripts SCM] {mirkarte} branch master updated. 36005ff11faa34a74692fefc58db12a06911f7fc
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Nov 14 00:10:39 CET 2014 • <20141113231040.109AE4A25DE@evolvis.org>
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 "MirKarte source code repository".
The branch, master has been updated
via 36005ff11faa34a74692fefc58db12a06911f7fc (commit)
from 3082e96e1940c835f044e57922f7ec8896813620 (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 36005ff11faa34a74692fefc58db12a06911f7fc
Author: Thorsten Glaser <tg at mirbsd.org>
Date: Thu Nov 13 23:10:24 2014 +0000
send proper X-Forwarded-For HTTP header
(requires up-to-date MirBSD ftp(1) as of today, or GNU wget)
-----------------------------------------------------------------------
Summary of changes:
geodashing.cgi | 8 +++++---
geohashing.cgi | 8 +++++---
geovexilla.cgi | 8 +++++---
ghtomorrow.cgi | 8 +++++---
ghybermorgen.cgi | 8 +++++---
gpx.sh | 10 ++++++----
6 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/geodashing.cgi b/geodashing.cgi
index fe3a948..fca6bf8 100755
--- a/geodashing.cgi
+++ b/geodashing.cgi
@@ -25,8 +25,10 @@ defzoom=9
set -A defyear -- $(date +'%y %m')
defmon=${defyear[1]}
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
# for xmlstarlet on MirPorts
PATH=$PATH:/usr/mpkg/bin
@@ -91,7 +93,7 @@ Content-type: text/html; charset=utf-8
EOF
print " mirkarte_default_loc = [$deflat, $deflon, $defzoom];"
-$fetch "http://geodashing.gpsgames.org/cgi-bin/stats.pl?startmonth=$defmon&startyear=$defyear&endmonth=$defmon&endyear=$defyear&radius=200&lat_1=$deflat&lon_1=$deflon&statstype=circle&download=Download&downloadformat=LOC" | \
+"${fetch[@]}" "http://geodashing.gpsgames.org/cgi-bin/stats.pl?startmonth=$defmon&startyear=$defyear&endmonth=$defmon&endyear=$defyear&radius=200&lat_1=$deflat&lon_1=$deflon&statstype=circle&download=Download&downloadformat=LOC" | \
xmlstarlet sel -t -m //waypoint -v name/@id -o ' ' -v coord/@lat -o ' ' -v coord/@lon -n |&
n=0; print " var geodashing_arr = ["
while read -pr id lat lon; do
diff --git a/geohashing.cgi b/geohashing.cgi
index 814ca95..ec70adc 100755
--- a/geohashing.cgi
+++ b/geohashing.cgi
@@ -188,15 +188,17 @@ set -A t -- $(mjd_explode $((t[0] - 1)) 0)
(( dM = t[tm_mon] + 1 ))
(( dD = t[tm_mday] ))
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
function gnumd5 {
md5sum | sed 's/ .*$//'
}
md=gnumd5
whence -p md5 >/dev/null 2>&1 && md=md5
-i=$($fetch http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
+i=$("${fetch[@]}" http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
if [[ -z $i ]]; then
cat <<'EOF'
Content-type: text/html; charset=utf-8
diff --git a/geovexilla.cgi b/geovexilla.cgi
index 55cac53..cf6eaa1 100755
--- a/geovexilla.cgi
+++ b/geovexilla.cgi
@@ -23,8 +23,10 @@ deflat=50.7
deflon=7.11
defzoom=9
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
cat <<'EOF'
Content-type: text/html; charset=utf-8
@@ -82,7 +84,7 @@ Content-type: text/html; charset=utf-8
EOF
print " mirkarte_default_loc = [$deflat, $deflon, $defzoom];"
-$fetch "http://geovexilla.gpsgames.org/cgi-bin/vx.pl?zoom=$defzoom&lat=$deflat&lon=$deflon" | \
+"${fetch[@]}" "http://geovexilla.gpsgames.org/cgi-bin/vx.pl?zoom=$defzoom&lat=$deflat&lon=$deflon" | \
fgrep google.maps.InfoWindow | sed \
-e 's/^.*content: "[ '\'']*//' \
-e 's/[ '\''
]*".*$//' \
diff --git a/ghtomorrow.cgi b/ghtomorrow.cgi
index e6cecc9..f8fa17d 100755
--- a/ghtomorrow.cgi
+++ b/ghtomorrow.cgi
@@ -188,15 +188,17 @@ set -A t -- $(mjd_explode $((t[0] + 1 - 1)) 0)
(( dM = t[tm_mon] + 1 ))
(( dD = t[tm_mday] ))
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
function gnumd5 {
md5sum | sed 's/ .*$//'
}
md=gnumd5
whence -p md5 >/dev/null 2>&1 && md=md5
-i=$($fetch http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
+i=$("${fetch[@]}" http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
if [[ -z $i ]]; then
cat <<'EOF'
Content-type: text/html; charset=utf-8
diff --git a/ghybermorgen.cgi b/ghybermorgen.cgi
index 00f6daf..92fc9b1 100755
--- a/ghybermorgen.cgi
+++ b/ghybermorgen.cgi
@@ -188,15 +188,17 @@ set -A t -- $(mjd_explode $((t[0] + 2 - 1)) 0)
(( dM = t[tm_mon] + 1 ))
(( dD = t[tm_mday] ))
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
function gnumd5 {
md5sum | sed 's/ .*$//'
}
md=gnumd5
whence -p md5 >/dev/null 2>&1 && md=md5
-i=$($fetch http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
+i=$("${fetch[@]}" http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD 2>/dev/null)
if [[ -z $i ]]; then
cat <<'EOF'
Content-type: text/html; charset=utf-8
diff --git a/gpx.sh b/gpx.sh
index 4532c2b..b0f9bd5 100755
--- a/gpx.sh
+++ b/gpx.sh
@@ -228,8 +228,10 @@ function decmin2txt {
typeset -i10 -Z4 dY
typeset -i10 -Z2 dM dD
-fetch='ftp -o -'
-whence -p wget >/dev/null 2>&1 && fetch='wget -qO- -T3'
+xff="${HTTP_X_FORWARDED_FOR:+$HTTP_X_FORWARDED_FOR, }$REMOTE_ADDR"
+set -A fetch -- ftp -H "X-Forwarded-For: $xff" -o -
+whence -p wget >/dev/null 2>&1 && \
+ set -A fetch -- wget --header "X-Forwarded-For: $xff" -qO- -T3
function gnumd5 {
md5sum | sed 's/ .*$//'
}
@@ -325,7 +327,7 @@ case $wptype {
(( dM = t[tm_mon] + 1 ))
(( dD = t[tm_mday] ))
# get DJIA
- i=$($fetch http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD \
+ i=$("${fetch[@]}" http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD \
2>/dev/null)
[[ -n $i ]] || exit 1
# get hash day
@@ -380,7 +382,7 @@ case $wptype {
(( dM = t[tm_mon] + 1 ))
(( dD = t[tm_mday] ))
# get DJIA
- i=$($fetch http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD \
+ i=$("${fetch[@]}" http://carabiner.peeron.com/xkcd/map/data/$dY/$dM/$dD \
2>/dev/null)
[[ -n $i ]] || exit 1
# get hash day
hooks/post-receive
--
MirKarte source code repository
(Evolvis project useful-scripts repository mirkarte)
More information about the useful-scripts-commits
mailing list