From 59b8a5cc6384c11a9f8b9c6a967861dede964ca3 Mon Sep 17 00:00:00 2001
From: ZhenYu <iMercer@yeah.net>
Date: Thu, 12 Sep 2019 14:37:25 +0800
Subject: [PATCH 1/4] luci-app-haproxy-tcp & luci-app-qbittorrent: return to
 right display at make menu (#1608)

* luci-app-haproxy-tcp: fixed wrong location in make menu

* luci-app-qbittorrent: solved wrong luci-i18n-qbittorrent at make menu
---
 package/lean/luci-app-haproxy-tcp/Makefile    |  46 +--
 .../luci => luasrc}/controller/haproxy.lua    |   0
 .../lua/luci => luasrc}/model/cbi/haproxy.lua |   0
 .../zh-cn/haproxy-tcp.po}                     |   0
 .../{files => root}/etc/config/haproxy        |   0
 .../{files => root}/etc/haproxy_init.sh       |   0
 .../{files => root}/etc/haproxy_start         |   0
 .../etc/uci-defaults/z99-haproxy              |   0
 .../tools/po2lmo/Makefile                     |  12 -
 .../tools/po2lmo/src/po2lmo                   | Bin 19272 -> 0 bytes
 .../tools/po2lmo/src/po2lmo.c                 | 247 -------------
 .../tools/po2lmo/src/template_lmo.c           | 328 ------------------
 .../tools/po2lmo/src/template_lmo.h           |  92 -----
 package/lean/luci-app-qbittorrent/Makefile    |  68 +---
 .../luasrc/controller/qbittorrent.lua         |   4 +
 .../{src => luasrc/model}/cbi/qbittorrent.lua |   0
 .../po/zh-cn/qbittorrent.po                   |  53 +++
 .../{src => root/etc}/config/qbittorrent      |   0
 .../{src => root/etc}/init.d/qbittorrent      |   0
 .../src/controller/qbittorrent.lua            |   4 -
 .../src/i18n/qbittorrent.zh-cn.lmo            | Bin 656 -> 0 bytes
 21 files changed, 79 insertions(+), 775 deletions(-)
 rename package/lean/luci-app-haproxy-tcp/{files/usr/lib/lua/luci => luasrc}/controller/haproxy.lua (100%)
 mode change 100644 => 100755
 rename package/lean/luci-app-haproxy-tcp/{files/usr/lib/lua/luci => luasrc}/model/cbi/haproxy.lua (100%)
 mode change 100644 => 100755
 rename package/lean/luci-app-haproxy-tcp/{i18n/zh-cn/haproxy.zh-cn.po => po/zh-cn/haproxy-tcp.po} (100%)
 mode change 100755 => 100644
 rename package/lean/luci-app-haproxy-tcp/{files => root}/etc/config/haproxy (100%)
 rename package/lean/luci-app-haproxy-tcp/{files => root}/etc/haproxy_init.sh (100%)
 rename package/lean/luci-app-haproxy-tcp/{files => root}/etc/haproxy_start (100%)
 rename package/lean/luci-app-haproxy-tcp/{files => root}/etc/uci-defaults/z99-haproxy (100%)
 delete mode 100644 package/lean/luci-app-haproxy-tcp/tools/po2lmo/Makefile
 delete mode 100755 package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo
 delete mode 100644 package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo.c
 delete mode 100644 package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.c
 delete mode 100644 package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.h
 create mode 100755 package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua
 rename package/lean/luci-app-qbittorrent/{src => luasrc/model}/cbi/qbittorrent.lua (100%)
 mode change 100644 => 100755
 create mode 100644 package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po
 rename package/lean/luci-app-qbittorrent/{src => root/etc}/config/qbittorrent (100%)
 rename package/lean/luci-app-qbittorrent/{src => root/etc}/init.d/qbittorrent (100%)
 mode change 100644 => 100755
 delete mode 100644 package/lean/luci-app-qbittorrent/src/controller/qbittorrent.lua
 delete mode 100644 package/lean/luci-app-qbittorrent/src/i18n/qbittorrent.zh-cn.lmo

diff --git a/package/lean/luci-app-haproxy-tcp/Makefile b/package/lean/luci-app-haproxy-tcp/Makefile
index 8163fa267d..0be02c1614 100644
--- a/package/lean/luci-app-haproxy-tcp/Makefile
+++ b/package/lean/luci-app-haproxy-tcp/Makefile
@@ -1,25 +1,19 @@
+# Copyright (C) 2019 Openwrt.org
+#
+# This is a free software, use it under Apache Licene 2.0 & GNU General Public License v3.0.
+#
+
 include $(TOPDIR)/rules.mk
 
+LUCI_TITLE:=luci for haproxy and shadowsocks
+LUCI_DEPENDS:=+haproxy
+LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-haproxy-tcp
 PKG_VERSION=1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Alex Zhuo <1886090@gmail.com>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
-	SUBMENU:=Luci
-	TITLE:=luci for haproxy and shadowsocks
-	PKGARCH:=all
-	DEPENDS:=+haproxy
-endef
-
-define Package/$(PKG_NAME)/description
-    A luci app for haproxy with shadowsocks
-endef
+include $(TOPDIR)/feeds/luci/luci.mk
 
 define Package/$(PKG_NAME)/postinst
 #!/bin/sh
@@ -30,22 +24,4 @@ echo stopping haproxy
 echo haproxy disabled
 endef
 
-define Build/Prepare
-	$(foreach po,$(wildcard ${CURDIR}/i18n/zh-cn/*.po), \
-		po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.*.lmo $(1)/usr/lib/lua/luci/i18n/
-	$(CP) ./files/* $(1)/
-
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/package/lean/luci-app-haproxy-tcp/files/usr/lib/lua/luci/controller/haproxy.lua b/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua
old mode 100644
new mode 100755
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/usr/lib/lua/luci/controller/haproxy.lua
rename to package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua
diff --git a/package/lean/luci-app-haproxy-tcp/files/usr/lib/lua/luci/model/cbi/haproxy.lua b/package/lean/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy.lua
old mode 100644
new mode 100755
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/usr/lib/lua/luci/model/cbi/haproxy.lua
rename to package/lean/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy.lua
diff --git a/package/lean/luci-app-haproxy-tcp/i18n/zh-cn/haproxy.zh-cn.po b/package/lean/luci-app-haproxy-tcp/po/zh-cn/haproxy-tcp.po
old mode 100755
new mode 100644
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/i18n/zh-cn/haproxy.zh-cn.po
rename to package/lean/luci-app-haproxy-tcp/po/zh-cn/haproxy-tcp.po
diff --git a/package/lean/luci-app-haproxy-tcp/files/etc/config/haproxy b/package/lean/luci-app-haproxy-tcp/root/etc/config/haproxy
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/etc/config/haproxy
rename to package/lean/luci-app-haproxy-tcp/root/etc/config/haproxy
diff --git a/package/lean/luci-app-haproxy-tcp/files/etc/haproxy_init.sh b/package/lean/luci-app-haproxy-tcp/root/etc/haproxy_init.sh
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/etc/haproxy_init.sh
rename to package/lean/luci-app-haproxy-tcp/root/etc/haproxy_init.sh
diff --git a/package/lean/luci-app-haproxy-tcp/files/etc/haproxy_start b/package/lean/luci-app-haproxy-tcp/root/etc/haproxy_start
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/etc/haproxy_start
rename to package/lean/luci-app-haproxy-tcp/root/etc/haproxy_start
diff --git a/package/lean/luci-app-haproxy-tcp/files/etc/uci-defaults/z99-haproxy b/package/lean/luci-app-haproxy-tcp/root/etc/uci-defaults/z99-haproxy
similarity index 100%
rename from package/lean/luci-app-haproxy-tcp/files/etc/uci-defaults/z99-haproxy
rename to package/lean/luci-app-haproxy-tcp/root/etc/uci-defaults/z99-haproxy
diff --git a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/Makefile b/package/lean/luci-app-haproxy-tcp/tools/po2lmo/Makefile
deleted file mode 100644
index ad2c133207..0000000000
--- a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-INSTALL = install
-PREFIX  = /usr/bin
-
-po2lmo: src/po2lmo.o src/template_lmo.o
-	$(CC) $(LDFLAGS) -o src/po2lmo src/po2lmo.o src/template_lmo.o
-
-install:
-	$(INSTALL) -m 755 src/po2lmo $(PREFIX)
-
-clean:
-	$(RM) src/po2lmo src/*.o
diff --git a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo b/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo
deleted file mode 100755
index 68d4c13aca2d2894ac62de3c5f4425cf99ed84fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19272
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

diff --git a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo.c b/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo.c
deleted file mode 100644
index 0da792b680..0000000000
--- a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/po2lmo.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * lmo - Lua Machine Objects - PO to LMO conversion tool
- *
- *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include "template_lmo.h"
-
-static void die(const char *msg)
-{
-	fprintf(stderr, "Error: %s\n", msg);
-	exit(1);
-}
-
-static void usage(const char *name)
-{
-	fprintf(stderr, "Usage: %s input.po output.lmo\n", name);
-	exit(1);
-}
-
-static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-	if( fwrite(ptr, size, nmemb, stream) == 0 )
-		die("Failed to write stdout");
-}
-
-static int extract_string(const char *src, char *dest, int len)
-{
-	int pos = 0;
-	int esc = 0;
-	int off = -1;
-
-	for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ )
-	{
-		if( (off == -1) && (src[pos] == '"') )
-		{
-			off = pos + 1;
-		}
-		else if( off >= 0 )
-		{
-			if( esc == 1 )
-			{
-				switch (src[pos])
-				{
-				case '"':
-				case '\\':
-					off++;
-					break;
-				}
-				dest[pos-off] = src[pos];
-				esc = 0;
-			}
-			else if( src[pos] == '\\' )
-			{
-				dest[pos-off] = src[pos];
-				esc = 1;
-			}
-			else if( src[pos] != '"' )
-			{
-				dest[pos-off] = src[pos];
-			}
-			else
-			{
-				dest[pos-off] = '\0';
-				break;
-			}
-		}
-	}
-
-	return (off > -1) ? strlen(dest) : -1;
-}
-
-static int cmp_index(const void *a, const void *b)
-{
-	uint32_t x = ((const lmo_entry_t *)a)->key_id;
-	uint32_t y = ((const lmo_entry_t *)b)->key_id;
-
-	if (x < y)
-		return -1;
-	else if (x > y)
-		return 1;
-
-	return 0;
-}
-
-static void print_uint32(uint32_t x, FILE *out)
-{
-	uint32_t y = htonl(x);
-	print(&y, sizeof(uint32_t), 1, out);
-}
-
-static void print_index(void *array, int n, FILE *out)
-{
-	lmo_entry_t *e;
-
-	qsort(array, n, sizeof(*e), cmp_index);
-
-	for (e = array; n > 0; n--, e++)
-	{
-		print_uint32(e->key_id, out);
-		print_uint32(e->val_id, out);
-		print_uint32(e->offset, out);
-		print_uint32(e->length, out);
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	char line[4096];
-	char key[4096];
-	char val[4096];
-	char tmp[4096];
-	int state  = 0;
-	int offset = 0;
-	int length = 0;
-	int n_entries = 0;
-	void *array = NULL;
-	lmo_entry_t *entry = NULL;
-	uint32_t key_id, val_id;
-
-	FILE *in;
-	FILE *out;
-
-	if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) )
-		usage(argv[0]);
-
-	memset(line, 0, sizeof(key));
-	memset(key, 0, sizeof(val));
-	memset(val, 0, sizeof(val));
-
-	while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) )
-	{
-		if( state == 0 && strstr(line, "msgid \"") == line )
-		{
-			switch(extract_string(line, key, sizeof(key)))
-			{
-				case -1:
-					die("Syntax error in msgid");
-				case 0:
-					state = 1;
-					break;
-				default:
-					state = 2;
-			}
-		}
-		else if( state == 1 || state == 2 )
-		{
-			if( strstr(line, "msgstr \"") == line || state == 2 )
-			{
-				switch(extract_string(line, val, sizeof(val)))
-				{
-					case -1:
-						state = 4;
-						break;
-					default:
-						state = 3;
-				}
-			}
-			else
-			{
-				switch(extract_string(line, tmp, sizeof(tmp)))
-				{
-					case -1:
-						state = 2;
-						break;
-					default:
-						strcat(key, tmp);
-				}
-			}
-		}
-		else if( state == 3 )
-		{
-			switch(extract_string(line, tmp, sizeof(tmp)))
-			{
-				case -1:
-					state = 4;
-					break;
-				default:
-					strcat(val, tmp);
-			}
-		}
-
-		if( state == 4 )
-		{
-			if( strlen(key) > 0 && strlen(val) > 0 )
-			{
-				key_id = sfh_hash(key, strlen(key));
-				val_id = sfh_hash(val, strlen(val));
-
-				if( key_id != val_id )
-				{
-					n_entries++;
-					array = realloc(array, n_entries * sizeof(lmo_entry_t));
-					entry = (lmo_entry_t *)array + n_entries - 1;
-
-					if (!array)
-						die("Out of memory");
-
-					entry->key_id = key_id;
-					entry->val_id = val_id;
-					entry->offset = offset;
-					entry->length = strlen(val);
-
-					length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
-
-					print(val, length, 1, out);
-					offset += length;
-				}
-			}
-
-			state = 0;
-			memset(key, 0, sizeof(key));
-			memset(val, 0, sizeof(val));
-		}
-
-		memset(line, 0, sizeof(line));
-	}
-
-	print_index(array, n_entries, out);
-
-	if( offset > 0 )
-	{
-		print_uint32(offset, out);
-		fsync(fileno(out));
-		fclose(out);
-	}
-	else
-	{
-		fclose(out);
-		unlink(argv[2]);
-	}
-
-	fclose(in);
-	return(0);
-}
diff --git a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.c b/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.c
deleted file mode 100644
index 27205a7228..0000000000
--- a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * lmo - Lua Machine Objects - Base functions
- *
- *   Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include "template_lmo.h"
-
-/*
- * Hash function from http://www.azillionmonkeys.com/qed/hash.html
- * Copyright (C) 2004-2008 by Paul Hsieh
- */
-
-uint32_t sfh_hash(const char *data, int len)
-{
-	uint32_t hash = len, tmp;
-	int rem;
-
-	if (len <= 0 || data == NULL) return 0;
-
-	rem = len & 3;
-	len >>= 2;
-
-	/* Main loop */
-	for (;len > 0; len--) {
-		hash  += sfh_get16(data);
-		tmp    = (sfh_get16(data+2) << 11) ^ hash;
-		hash   = (hash << 16) ^ tmp;
-		data  += 2*sizeof(uint16_t);
-		hash  += hash >> 11;
-	}
-
-	/* Handle end cases */
-	switch (rem) {
-		case 3: hash += sfh_get16(data);
-			hash ^= hash << 16;
-			hash ^= data[sizeof(uint16_t)] << 18;
-			hash += hash >> 11;
-			break;
-		case 2: hash += sfh_get16(data);
-			hash ^= hash << 11;
-			hash += hash >> 17;
-			break;
-		case 1: hash += *data;
-			hash ^= hash << 10;
-			hash += hash >> 1;
-	}
-
-	/* Force "avalanching" of final 127 bits */
-	hash ^= hash << 3;
-	hash += hash >> 5;
-	hash ^= hash << 4;
-	hash += hash >> 17;
-	hash ^= hash << 25;
-	hash += hash >> 6;
-
-	return hash;
-}
-
-uint32_t lmo_canon_hash(const char *str, int len)
-{
-	char res[4096];
-	char *ptr, prev;
-	int off;
-
-	if (!str || len >= sizeof(res))
-		return 0;
-
-	for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++)
-	{
-		if (isspace(*str))
-		{
-			if (!isspace(prev))
-				*ptr++ = ' ';
-		}
-		else
-		{
-			*ptr++ = *str;
-		}
-	}
-
-	if ((ptr > res) && isspace(*(ptr-1)))
-		ptr--;
-
-	return sfh_hash(res, ptr - res);
-}
-
-lmo_archive_t * lmo_open(const char *file)
-{
-	int in = -1;
-	uint32_t idx_offset = 0;
-	struct stat s;
-
-	lmo_archive_t *ar = NULL;
-
-	if (stat(file, &s) == -1)
-		goto err;
-
-	if ((in = open(file, O_RDONLY)) == -1)
-		goto err;
-
-	if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL)
-	{
-		memset(ar, 0, sizeof(*ar));
-
-		ar->fd     = in;
-		ar->size = s.st_size;
-
-		fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC);
-
-		if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED)
-			goto err;
-
-		idx_offset = ntohl(*((const uint32_t *)
-		                     (ar->mmap + ar->size - sizeof(uint32_t))));
-
-		if (idx_offset >= ar->size)
-			goto err;
-
-		ar->index  = (lmo_entry_t *)(ar->mmap + idx_offset);
-		ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t);
-		ar->end    = ar->mmap + ar->size;
-
-		return ar;
-	}
-
-err:
-	if (in > -1)
-		close(in);
-
-	if (ar != NULL)
-	{
-		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
-			munmap(ar->mmap, ar->size);
-
-		free(ar);
-	}
-
-	return NULL;
-}
-
-void lmo_close(lmo_archive_t *ar)
-{
-	if (ar != NULL)
-	{
-		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
-			munmap(ar->mmap, ar->size);
-
-		close(ar->fd);
-		free(ar);
-
-		ar = NULL;
-	}
-}
-
-
-lmo_catalog_t *_lmo_catalogs = NULL;
-lmo_catalog_t *_lmo_active_catalog = NULL;
-
-int lmo_load_catalog(const char *lang, const char *dir)
-{
-	DIR *dh = NULL;
-	char pattern[16];
-	char path[PATH_MAX];
-	struct dirent *de = NULL;
-
-	lmo_archive_t *ar = NULL;
-	lmo_catalog_t *cat = NULL;
-
-	if (!lmo_change_catalog(lang))
-		return 0;
-
-	if (!dir || !(dh = opendir(dir)))
-		goto err;
-
-	if (!(cat = malloc(sizeof(*cat))))
-		goto err;
-
-	memset(cat, 0, sizeof(*cat));
-
-	snprintf(cat->lang, sizeof(cat->lang), "%s", lang);
-	snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang);
-
-	while ((de = readdir(dh)) != NULL)
-	{
-		if (!fnmatch(pattern, de->d_name, 0))
-		{
-			snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
-			ar = lmo_open(path);
-
-			if (ar)
-			{
-				ar->next = cat->archives;
-				cat->archives = ar;
-			}
-		}
-	}
-
-	closedir(dh);
-
-	cat->next = _lmo_catalogs;
-	_lmo_catalogs = cat;
-
-	if (!_lmo_active_catalog)
-		_lmo_active_catalog = cat;
-
-	return 0;
-
-err:
-	if (dh) closedir(dh);
-	if (cat) free(cat);
-
-	return -1;
-}
-
-int lmo_change_catalog(const char *lang)
-{
-	lmo_catalog_t *cat;
-
-	for (cat = _lmo_catalogs; cat; cat = cat->next)
-	{
-		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
-		{
-			_lmo_active_catalog = cat;
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash)
-{
-	unsigned int m, l, r;
-	uint32_t k;
-
-	l = 0;
-	r = ar->length - 1;
-
-	while (1)
-	{
-		m = l + ((r - l) / 2);
-
-		if (r < l)
-			break;
-
-		k = ntohl(ar->index[m].key_id);
-
-		if (k == hash)
-			return &ar->index[m];
-
-		if (k > hash)
-		{
-			if (!m)
-				break;
-
-			r = m - 1;
-		}
-		else
-		{
-			l = m + 1;
-		}
-	}
-
-	return NULL;
-}
-
-int lmo_translate(const char *key, int keylen, char **out, int *outlen)
-{
-	uint32_t hash;
-	lmo_entry_t *e;
-	lmo_archive_t *ar;
-
-	if (!key || !_lmo_active_catalog)
-		return -2;
-
-	hash = lmo_canon_hash(key, keylen);
-
-	for (ar = _lmo_active_catalog->archives; ar; ar = ar->next)
-	{
-		if ((e = lmo_find_entry(ar, hash)) != NULL)
-		{
-			*out = ar->mmap + ntohl(e->offset);
-			*outlen = ntohl(e->length);
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-void lmo_close_catalog(const char *lang)
-{
-	lmo_archive_t *ar, *next;
-	lmo_catalog_t *cat, *prev;
-
-	for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next)
-	{
-		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
-		{
-			if (prev)
-				prev->next = cat->next;
-			else
-				_lmo_catalogs = cat->next;
-
-			for (ar = cat->archives; ar; ar = next)
-			{
-				next = ar->next;
-				lmo_close(ar);
-			}
-
-			free(cat);
-			break;
-		}
-	}
-}
diff --git a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.h b/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.h
deleted file mode 100644
index 57f59aa56b..0000000000
--- a/package/lean/luci-app-haproxy-tcp/tools/po2lmo/src/template_lmo.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * lmo - Lua Machine Objects - General header
- *
- *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef _TEMPLATE_LMO_H_
-#define _TEMPLATE_LMO_H_
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fnmatch.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <limits.h>
-
-#if (defined(__GNUC__) && defined(__i386__))
-#define sfh_get16(d) (*((const uint16_t *) (d)))
-#else
-#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
-					   +(uint32_t)(((const uint8_t *)(d))[0]) )
-#endif
-
-
-struct lmo_entry {
-	uint32_t key_id;
-	uint32_t val_id;
-	uint32_t offset;
-	uint32_t length;
-} __attribute__((packed));
-
-typedef struct lmo_entry lmo_entry_t;
-
-
-struct lmo_archive {
-	int         fd;
-	int	        length;
-	uint32_t    size;
-	lmo_entry_t *index;
-	char        *mmap;
-	char		*end;
-	struct lmo_archive *next;
-};
-
-typedef struct lmo_archive lmo_archive_t;
-
-
-struct lmo_catalog {
-	char lang[6];
-	struct lmo_archive *archives;
-	struct lmo_catalog *next;
-};
-
-typedef struct lmo_catalog lmo_catalog_t;
-
-
-uint32_t sfh_hash(const char *data, int len);
-uint32_t lmo_canon_hash(const char *data, int len);
-
-lmo_archive_t * lmo_open(const char *file);
-void lmo_close(lmo_archive_t *ar);
-
-
-extern lmo_catalog_t *_lmo_catalogs;
-extern lmo_catalog_t *_lmo_active_catalog;
-
-int lmo_load_catalog(const char *lang, const char *dir);
-int lmo_change_catalog(const char *lang);
-int lmo_translate(const char *key, int keylen, char **out, int *outlen);
-void lmo_close_catalog(const char *lang);
-
-#endif
diff --git a/package/lean/luci-app-qbittorrent/Makefile b/package/lean/luci-app-qbittorrent/Makefile
index 04aaef77af..70f4703b62 100644
--- a/package/lean/luci-app-qbittorrent/Makefile
+++ b/package/lean/luci-app-qbittorrent/Makefile
@@ -1,63 +1,17 @@
+# Copyright (C) 2019 Openwrt.org
+#
+# This is a free software, use it under Apache Licene 2.0 & GNU General Public License v3.0.
+#
+
 include $(TOPDIR)/rules.mk
 
+LUCI_TITLE:=qbittorrent-nox for LuCI
+LUCI_DEPENDS:=+qBittorrent
+LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-qbittorrent
 PKG_VERSION=1.0
-PKG_RELEASE:=2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_RELEASE:=4
 
-include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
-define Package/luci-app-qbittorrent/temple
-    SECTION:=luci
-    CATEGORY:=LuCI
-    SUBMENU:=3. Applications
-    TITLE:=qbittorrent-nox for LuCI
-    PKGARCH:=all
-    DEPENDS:=+qBittorrent
-endef
-
-define Package/luci-app-qbittorrent
-    $(call Package/luci-app-qbittorrent/temple)
-endef
-
-define Package/luci-i18n-qbittorrent-zh-cn
-    $(call Package/luci-app-qbittorrent/temple)
-    DEPENDS:=+luci-app-qbittorrent
-endef
-
-define Package/luci-app-qbittorrent/description
-    This package contains LuCI configuration pages for qbittorrent-nox
-endef
-
-define Package/luci-i18n-qbittorrent-zh-cn/description
-    Translation support for luci-app-qbittorrent - 简体中文 (Simplified Chinese)
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-qbittorrent/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
-    
-	$(INSTALL_CONF) ./src/config/qbittorrent $(1)/etc/config/qbittorrent
-	$(INSTALL_BIN) ./src/init.d/qbittorrent $(1)/etc/init.d/qbittorrent
-	$(INSTALL_DATA) ./src/cbi/qbittorrent.lua $(1)/usr/lib/lua/luci/model/cbi/qbittorrent.lua
-	$(INSTALL_DATA) ./src/controller/qbittorrent.lua $(1)/usr/lib/lua/luci/controller/qbittorrent.lua
-endef
-
-define Package/luci-i18n-qbittorrent-zh-cn/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
-	$(INSTALL_DATA) ./src/i18n/*.lmo $(1)/usr/lib/lua/luci/i18n/
-endef
-
-$(eval $(call BuildPackage,luci-app-qbittorrent))
-$(eval $(call BuildPackage,luci-i18n-qbittorrent-zh-cn))
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua
new file mode 100755
index 0000000000..5363ac9786
--- /dev/null
+++ b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua
@@ -0,0 +1,4 @@
+module("luci.controller.qbittorrent",package.seeall)
+function index()
+	entry({"admin","nas","qbittorrent"},cbi("qbittorrent"),_("qbittorrent"))
+end
diff --git a/package/lean/luci-app-qbittorrent/src/cbi/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua
old mode 100644
new mode 100755
similarity index 100%
rename from package/lean/luci-app-qbittorrent/src/cbi/qbittorrent.lua
rename to package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua
diff --git a/package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po b/package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po
new file mode 100644
index 0000000000..d7a834ede1
--- /dev/null
+++ b/package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po
@@ -0,0 +1,53 @@
+msgid "qbittorrent"
+msgstr "BT下载器-qb"
+
+msgid "Running"
+msgstr "运行中"
+
+msgid "Not running"
+msgstr "未运行"
+
+msgid "qbittorrent Run Status"
+msgstr "qbittorrent运行状态"
+
+msgid "Basic Settings"
+msgstr "基本设置"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "A BT/PT downloader base on Qt"
+msgstr "一个基于QT的BT/PT下载器"
+
+msgid "profile_dir"
+msgstr "配置文件目录"
+
+msgid "Store configuration files in the Path"
+msgstr "配置文件存放路径"
+
+msgid "program_dir"
+msgstr "程序目录"
+
+msgid "library_dir"
+msgstr "库目录"
+
+msgid "Store Program files in the Path"
+msgstr "程序文件存放路径"
+
+msgid "Store Library in the Path"
+msgstr "库文件存放路径"
+
+msgid "Download Settings"
+msgstr "下载设置"
+
+msgid "download_dir"
+msgstr "下载目录"
+
+msgid "Store download files in the Path"
+msgstr "下载文件存放目录"
+
+msgid "WEBUI Settings"
+msgstr "WEBUI设置"
+
+msgid "WEBUI listening port"
+msgstr "WEBUI监听端口"
diff --git a/package/lean/luci-app-qbittorrent/src/config/qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent
similarity index 100%
rename from package/lean/luci-app-qbittorrent/src/config/qbittorrent
rename to package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent
diff --git a/package/lean/luci-app-qbittorrent/src/init.d/qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent
old mode 100644
new mode 100755
similarity index 100%
rename from package/lean/luci-app-qbittorrent/src/init.d/qbittorrent
rename to package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent
diff --git a/package/lean/luci-app-qbittorrent/src/controller/qbittorrent.lua b/package/lean/luci-app-qbittorrent/src/controller/qbittorrent.lua
deleted file mode 100644
index ca43cb43d4..0000000000
--- a/package/lean/luci-app-qbittorrent/src/controller/qbittorrent.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-module("luci.controller.qbittorrent",package.seeall)
-function index()
-	entry({"admin","services","qbittorrent"},cbi("qbittorrent"),_("qbittorrent"))
-end
\ No newline at end of file
diff --git a/package/lean/luci-app-qbittorrent/src/i18n/qbittorrent.zh-cn.lmo b/package/lean/luci-app-qbittorrent/src/i18n/qbittorrent.zh-cn.lmo
deleted file mode 100644
index c43425dfd2e54500f3b54130535febe56cea2f12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmaFa+WUO(x@XhcpX}cDeD=Dhd#5rmJlWCxV((rE?<JD_)3r06P1y$#hp2(*LlzHr
zbqe)-*0=m=$F`^a8$f0?JlV18>HJ+!cJ&38JfGF#6rvvx0@3|+<_d-v`zO3u*z;t^
zS_TG&XLD9TxIlJcQf5g>eo;|sUdi*WZO<ASfnq>Yp3PbFV%<KViy<aJ*kC&$Oa?If
z`Rs{LC#-qCdi~S>#Xx<?Tx7Nr!X3JWNkDZgx}Waqhx&W+zGr<)pYECr4HSqRYB;?_
zQ^O#9hU3=CGaW!H6M$Hr(RWYCo3l)PK(+!9OEAwV__wo7d<T#X!aOXmA0B8`IGxGB
zz^DP_3n?u6HZ$^6=3OAW0f;%x%lIpqe}r@c<t2c8{!nGkTG1OmkwEqZAQp_e`@i{0
zu7DkoZ2`m*u@`n9sSVHP0kWR}F%J^|1Bf4Qx7w90+p87G?g3)XIyRHT+fKUL0NHCm
z@{MfCB2fE4V*E`ro{4Uex;!1oo&m&yi&ji|$Jx5!AdvkBi20TnOxwRA=9>@DeIPq|
z*2^=@ut@tp2gnWp$#36%jb|;-oGKt21cdgxCP~+C-l7R)9|2<SOXe3ccZun&2C_wf
J7-$Bg4*)L#D9!)?


From b6f5ffdf18ead8952566453c7b63c7a40b086713 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Thu, 12 Sep 2019 00:24:40 -0700
Subject: [PATCH 2/4] ramips: add XiaoYu mt7621 support

---
 .../ramips/base-files/etc/board.d/01_leds     |   1 +
 .../ramips/base-files/etc/board.d/02_network  |   4 +
 target/linux/ramips/dts/XiaoYu-C5.dts         | 117 ++++++++++++++++++
 target/linux/ramips/image/mt7621.mk           |  11 +-
 4 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 target/linux/ramips/dts/XiaoYu-C5.dts

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 6f2e624a1d..fd0a4ea968 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -416,6 +416,7 @@ wrh-300cr)
 	set_wifi_led "$boardname:green:wlan"
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
 	;;
+XiaoYu-C5|\
 xzwifi,creativebox-v1)
 	ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10"
 	;;
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 258d8f251f..fb0896db64 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -34,6 +34,10 @@ ramips_setup_interfaces()
 	11acnas|\
 	d-team,newifi-d2|\
 	w2914nsv2|\
+	XiaoYu-C5)
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
+		;;
 	zbt-we2026)
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
diff --git a/target/linux/ramips/dts/XiaoYu-C5.dts b/target/linux/ramips/dts/XiaoYu-C5.dts
new file mode 100644
index 0000000000..5152714b8b
--- /dev/null
+++ b/target/linux/ramips/dts/XiaoYu-C5.dts
@@ -0,0 +1,117 @@
+/dts-v1/;
+
+#include "mt7621.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "XiaoYu-C5", "mediatek,mt7621-soc";
+	model = "XiaoYu-C5";
+
+	aliases {
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		led_system:system {
+			label = "XiaoYu-C5:green:system";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+		};
+
+		work {
+			label = "XiaoYu-C5:green:usb3.0";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		m25p,chunked-io = <32>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x50000 0x1fa0000>;
+			};
+			partition@1ff0000 {
+				label = "mib0";
+				reg = <0x1ff0000 0x10000>;
+			};
+		};
+	};
+};
+
+&pcie {
+	status = "okay";
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag" , "uart2", "uart3";
+			ralink,function = "gpio";
+		};
+	};
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 1c414bd8a6..cc66390668 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -580,6 +580,15 @@ define Device/wsr-600
 endef
 TARGET_DEVICES += wsr-600
 
+define Device/XiaoYu-C5
+  DTS := XiaoYu-C5
+  IMAGE_SIZE := $(ralink_default_fw_size_32M)
+  DEVICE_TITLE := XiaoYu-C5
+  DEVICE_PACKAGES := \
+	kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+endef
+TARGET_DEVICES += XiaoYu-C5
+
 define Device/zbt-we1326
   DTS := ZBT-WE1326
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
@@ -629,4 +638,4 @@ define Device/zbt-wg3526-32M
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
-TARGET_DEVICES += zbt-wg3526-32M
+TARGET_DEVICES += zbt-wg3526-32M
\ No newline at end of file

From 46b8d68dacc8daacc27fb6c91fc9a6c5551d9df4 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Thu, 12 Sep 2019 00:26:58 -0700
Subject: [PATCH 3/4] qt5:fix qBittorrent with ssl runtime crash

---
 package/lean/qt5/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile
index bb6868fab9..d675212a4e 100644
--- a/package/lean/qt5/Makefile
+++ b/package/lean/qt5/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt5
 PKG_VERSION:=5.8
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MD5SUM:=a9f2494f75f966e2f22358ec367d8f41
 
 PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE).tar.gz
@@ -115,7 +115,7 @@ define Build/Configure
 			-no-opengl \
 			-no-directfb \
 			-no-xcb \
-			-no-ssl \
+			-openssl-runtime \
 			-qt-zlib \
 			-qt-pcre \
 			-qt-freetype \

From 4ed39c663b23fd6db361676004d413bcf2184c45 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Thu, 12 Sep 2019 00:28:15 -0700
Subject: [PATCH 4/4] qBittorrent: bump to version 4.1.7

---
 package/lean/qBittorrent/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lean/qBittorrent/Makefile b/package/lean/qBittorrent/Makefile
index 8acaa16d68..9fbe23ab54 100644
--- a/package/lean/qBittorrent/Makefile
+++ b/package/lean/qBittorrent/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qBittorrent
-PKG_VERSION:=4.1.3
+PKG_VERSION:=4.1.7
 PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/qbittorrent/qBittorrent.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a574c4a70a5a3293d2f6135952c301d930d23627
+PKG_SOURCE_VERSION:=05a82afeb6c927bfc0cda4fe8fb25ecc3faecd86
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_LICENSE:=GPL-2.0+