Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.11: merge r9571 - r9573

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-12-29 13:15:53 +00:00
parent 60b81d978a
commit 13224b696d
11 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-polipo/root/usr/sbin/polipo_purge
View file

@ -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

4
contrib/uhttpd/patches/001-pass-env.patch
View file

@ -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();

11
contrib/uhttpd/patches/002-link-order.patch Normal file
View file

@ -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

1
contrib/uhttpd/patches/series
View file

@ -1 +1,2 @@
001-pass-env.patch
002-link-order.patch

2
po/ca/upnp.po
View file

@ -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"

2
po/de/upnp.po
View file

@ -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"

2
po/en/upnp.po
View file

@ -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"

2
po/es/upnp.po
View file

@ -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"

2
po/pt/upnp.po
View file

@ -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"

2
po/pt_BR/upnp.po
View file

@ -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)"

2
po/vi/upnp.po
View file

@ -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"