From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 29 Dec 2012 13:15:53 +0000 (+0000)
Subject: luci-0.11: merge r9571 - r9573
X-Git-Tag: 0.11.0~3
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=13224b696d0ea71fb2f8e2b4b0e8eca6caa9ae90;hp=60b81d978aa8fb6e2291d7f3127f119e4068d310

luci-0.11: merge r9571 - r9573
---

diff --git a/applications/luci-polipo/root/usr/sbin/polipo_purge b/applications/luci-polipo/root/usr/sbin/polipo_purge
index ce7c88559b..23ba571927 100755
--- a/applications/luci-polipo/root/usr/sbin/polipo_purge
+++ b/applications/luci-polipo/root/usr/sbin/polipo_purge
@@ -5,7 +5,7 @@ PIDFILE=`uci get polipo.daemon.pidFile`
 CFGFILE=/var/etc/polipo.conf
 
 [ -e "$PIDFILE" ] && {
-	PID=`cat $PID_FILE`
+	PID=`cat $PIDFILE`
 
 	# send Polipo USR1 signal to write its in-memory cache to disk
 	kill -USR1 $PID
diff --git a/contrib/uhttpd/patches/001-pass-env.patch b/contrib/uhttpd/patches/001-pass-env.patch
index b69ff17653..ab607dbf2d 100644
--- a/contrib/uhttpd/patches/001-pass-env.patch
+++ b/contrib/uhttpd/patches/001-pass-env.patch
@@ -1,7 +1,7 @@
 --- a/uhttpd-cgi.c
 +++ b/uhttpd-cgi.c
-@@ -204,7 +204,7 @@ void uh_cgi_request(struct client *cl, s
- 			    (pi->stat.st_mode & S_IXOTH)
+@@ -216,7 +216,7 @@ void uh_cgi_request(
+ 			     (pi->stat.st_mode & S_IXOTH)) || (ip != NULL)
  			) {
  				/* build environment */
 -				clearenv();
diff --git a/contrib/uhttpd/patches/002-link-order.patch b/contrib/uhttpd/patches/002-link-order.patch
new file mode 100644
index 0000000000..8bdd3353e1
--- /dev/null
+++ b/contrib/uhttpd/patches/002-link-order.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -70,7 +70,7 @@ endif
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ compile: $(OBJ) $(TLSLIB) $(LUALIB)
+-	$(CC) -o uhttpd $(LDFLAGS) $(LIB) $(OBJ)
++	$(CC) -o uhttpd $(LDFLAGS) $(OBJ) $(LIB)
+ 
+ clean:
+ 	rm -f *.o *.so uhttpd
diff --git a/contrib/uhttpd/patches/series b/contrib/uhttpd/patches/series
index dc852df8b0..8a1834ecf8 100644
--- a/contrib/uhttpd/patches/series
+++ b/contrib/uhttpd/patches/series
@@ -1 +1,2 @@
 001-pass-env.patch
+002-link-order.patch
diff --git a/po/ca/upnp.po b/po/ca/upnp.po
index 393a562998..ad0f408671 100644
--- a/po/ca/upnp.po
+++ b/po/ca/upnp.po
@@ -139,7 +139,7 @@ msgid "UPnP lease file"
 msgstr ""
 
 msgid "Universal Plug & Play"
-msgstr "Universal Plug &amp; Play"
+msgstr "Universal Plug & Play"
 
 msgid "Uplink"
 msgstr "Enllaç de pujada"
diff --git a/po/de/upnp.po b/po/de/upnp.po
index acfdb65fb1..7c7ec082fe 100644
--- a/po/de/upnp.po
+++ b/po/de/upnp.po
@@ -143,7 +143,7 @@ msgid "UPnP lease file"
 msgstr "UPnP Lease-Datei"
 
 msgid "Universal Plug & Play"
-msgstr "Universal Plug &amp; Play"
+msgstr "Universal Plug & Play"
 
 msgid "Uplink"
 msgstr "Uplink"
diff --git a/po/en/upnp.po b/po/en/upnp.po
index 25e374d9ec..0afabe26a1 100644
--- a/po/en/upnp.po
+++ b/po/en/upnp.po
@@ -138,7 +138,7 @@ msgid "UPnP lease file"
 msgstr ""
 
 msgid "Universal Plug & Play"
-msgstr "Universal Plug &amp; Play"
+msgstr "Universal Plug & Play"
 
 msgid "Uplink"
 msgstr "Uplink"
diff --git a/po/es/upnp.po b/po/es/upnp.po
index 975ad1a58a..3ad9b01d08 100644
--- a/po/es/upnp.po
+++ b/po/es/upnp.po
@@ -143,7 +143,7 @@ msgid "UPnP lease file"
 msgstr "Tiempo de cesión UPnP"
 
 msgid "Universal Plug & Play"
-msgstr "Plug &amp; Play universal"
+msgstr "Plug & Play universal"
 
 msgid "Uplink"
 msgstr "Enlace de subida"
diff --git a/po/pt/upnp.po b/po/pt/upnp.po
index 2a0992ca7a..ea74caf5cf 100644
--- a/po/pt/upnp.po
+++ b/po/pt/upnp.po
@@ -137,7 +137,7 @@ msgid "UPnP lease file"
 msgstr ""
 
 msgid "Universal Plug & Play"
-msgstr "Plug &amp; Play Universal"
+msgstr "Plug & Play Universal"
 
 msgid "Uplink"
 msgstr "Link para Upload"
diff --git a/po/pt_BR/upnp.po b/po/pt_BR/upnp.po
index 049604d12d..9df27ee74a 100644
--- a/po/pt_BR/upnp.po
+++ b/po/pt_BR/upnp.po
@@ -143,7 +143,7 @@ msgid "UPnP lease file"
 msgstr "Arquivo de concessão do UPnP"
 
 msgid "Universal Plug & Play"
-msgstr "Plug &amp; Play Universal"
+msgstr "Plug & Play Universal"
 
 msgid "Uplink"
 msgstr "Velocidade de envio do enlace (uplink)"
diff --git a/po/vi/upnp.po b/po/vi/upnp.po
index cb2b54e9a3..f13b14b46e 100644
--- a/po/vi/upnp.po
+++ b/po/vi/upnp.po
@@ -138,7 +138,7 @@ msgid "UPnP lease file"
 msgstr ""
 
 msgid "Universal Plug & Play"
-msgstr "Universal Plug &amp; Play"
+msgstr "Universal Plug & Play"
 
 msgid "Uplink"
 msgstr "Uplink"