aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python/Jinja2/Makefile2
-rw-r--r--libs/libsoup/Makefile7
-rw-r--r--net/gnurl/Makefile4
-rw-r--r--net/shorewall-core/Makefile4
-rw-r--r--net/shorewall-lite/Makefile4
-rw-r--r--net/shorewall/Makefile4
-rw-r--r--net/shorewall6-lite/Makefile4
-rw-r--r--net/shorewall6/Makefile4
-rw-r--r--net/travelmate/files/README.md3
-rw-r--r--utils/auc/Makefile6
-rw-r--r--utils/auc/src/auc.c184
11 files changed, 37 insertions, 189 deletions
diff --git a/lang/python/Jinja2/Makefile b/lang/python/Jinja2/Makefile
index 4c9d9eb2a..c9007df7c 100644
--- a/lang/python/Jinja2/Makefile
+++ b/lang/python/Jinja2/Makefile
@@ -28,7 +28,7 @@ define Package/python3-jinja2
SUBMENU:=Python
URL:=http://jinja.pocoo.org/
TITLE:=python3-jinja2
- DEPENDS:=+python3-light
+ DEPENDS:=+python3-light +python3-markupsafe
VARIANT:=python3
endef
diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile
index e872fe9d6..d26ef00e5 100644
--- a/libs/libsoup/Makefile
+++ b/libs/libsoup/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libsoup
PKG_VERSION:=2.65.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.65
@@ -35,13 +35,16 @@ define Package/libsoup
endef
CONFIGURE_ARGS += \
+ --disable-debug \
--disable-glibtest \
--disable-gtk-doc-html \
+ --disable-introspection \
--disable-more-warnings \
--disable-vala \
--without-apache-httpd \
--without-gnome \
- --without-gssapi
+ --without-gssapi \
+ --without-ntlm-auth
define package/libsoup/decription
Libsoup is an HTTP library implementation in C
diff --git a/net/gnurl/Makefile b/net/gnurl/Makefile
index 0d5ca2418..0a64aca83 100644
--- a/net/gnurl/Makefile
+++ b/net/gnurl/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnurl
-PKG_VERSION:=7.63.0
+PKG_VERSION:=7.64.0
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://ftp.gnu.org/gnu/gnunet
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=d435d9e35d6d1afda3a2a66db9f364d18a9f199d5f7b70e7296cd863bcf4c497
+PKG_HASH:=68b68a1be6a04f514a863eaac0d6b89f935833aff4e60bc2bcac472a465c755f
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile
index 942a0308c..3dafe1c85 100644
--- a/net/shorewall-core/Makefile
+++ b/net/shorewall-core/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-core
PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=3
-PKG_BUGFIX_MINOR_VERSION:=
+PKG_BUGFIX_MINOR_VERSION:=.1
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1
@@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=8e45f19470481e785376d61b7d2685eed77b9356ec0d0aaad84a15a93e10c90f
+PKG_HASH:=894d9ca5425e38880eeb270cbe26b83c90b4ca8490ebe48fb20be466e1704d03
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index 1d492579f..e75e2803f 100644
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=3
-PKG_BUGFIX_MINOR_VERSION:=
+PKG_BUGFIX_MINOR_VERSION:=.1
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1
@@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=3d56b3d7c67059241829f2ebb4d3a8807f3a0299fdcc34d7b4708ecd3eec26d5
+PKG_HASH:=7500900e071b516972fe9a39282a7ee5312b1dae3481247d20e8b767d7935c5d
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 2d9e6eaa1..51e2cb4f1 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall
PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=3
-PKG_BUGFIX_MINOR_VERSION:=
+PKG_BUGFIX_MINOR_VERSION:=.1
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1
@@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=793c3244eae750ed9c8e90cf91bf74fed7c5d045285a575486164314962c3fd8
+PKG_HASH:=736ba008c2a70f9588115bfeeef5e3206ffc2d28c586520f2f96352bb8ccf1cd
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile
index 686902644..a95b969c8 100644
--- a/net/shorewall6-lite/Makefile
+++ b/net/shorewall6-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6-lite
PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=3
-PKG_BUGFIX_MINOR_VERSION:=
+PKG_BUGFIX_MINOR_VERSION:=.1
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1
@@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=1e02cf809a2b8a4649673f2012716dc5f9dfb76f62c4f7d240857c9714f43989
+PKG_HASH:=83dae94e5f99f10100ee0c82774e15d67bf5f8be8ce3a424c31da90b75d5a415
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile
index 716b5c750..1b3fdd348 100644
--- a/net/shorewall6/Makefile
+++ b/net/shorewall6/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6
PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=3
-PKG_BUGFIX_MINOR_VERSION:=
+PKG_BUGFIX_MINOR_VERSION:=.1
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1
@@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=f64c3b59ea5d812cab455f4bd7c4a44564f708e67179e0232c069d398ae4ab1a
+PKG_HASH:=17710f45ab4547301341260e72e1794d20999c2a3f653e5223966036e2c915d6
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/travelmate/files/README.md b/net/travelmate/files/README.md
index 422eb7ad3..e261e7661 100644
--- a/net/travelmate/files/README.md
+++ b/net/travelmate/files/README.md
@@ -3,7 +3,7 @@
## Description
If you’re planning an upcoming vacation or a business trip, taking your laptop, tablet or smartphone give you the ability to connect with friends or complete work on the go. But many hotels don’t have a secure wireless network setup or you’re limited on using a single device at once. Investing in a portable, mini travel router is a great way to connect all of your devices at once while having total control over your own personalized wireless network.
A logical combination of AP+STA mode on one physical radio allows most of OpenWrt supported router devices to connect to a wireless hotspot/station (STA) and provide a wireless access point (AP) from that hotspot at the same time. Downside of this solution: whenever the STA interface looses the connection it will go into an active scan cycle which renders the radio unusable for AP mode operation, therefore the AP is taken down if the STA looses its association.
-To avoid these kind of deadlocks, travelmate set all station interfaces in an "always off" mode and connects automatically to available/configured hotspots.
+To avoid these kind of deadlocks, travelmate will set all station interfaces to an "always off" mode and connects automatically to available/configured hotspots.
## Main Features
* STA interfaces operating in an "always off" mode, to make sure that the AP is always accessible
@@ -24,6 +24,7 @@ To avoid these kind of deadlocks, travelmate set all station interfaces in an "a
* [OpenWrt](https://openwrt.org), tested with the stable release series (18.06.x) and with the latest OpenWrt snapshot
* iwinfo for wlan scanning, uclient-fetch for captive portal detection
* optional: qrencode 4.x for QR code support
+* optional: wpad (the full version, not wpad-mini) to use Enterprise WiFi
## Installation & Usage
* download the package [here](https://downloads.openwrt.org/snapshots/packages/x86_64/packages)
diff --git a/utils/auc/Makefile b/utils/auc/Makefile
index 444067010..4fecb7fca 100644
--- a/utils/auc/Makefile
+++ b/utils/auc/Makefile
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=auc
-PKG_VERSION:=0.0.9
-PKG_RELEASE:=2
+PKG_VERSION:=0.1.0
+PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0
include $(INCLUDE_DIR)/package.mk
@@ -17,7 +17,7 @@ define Package/auc
CATEGORY:=Base system
TITLE:=Attended sysUpgrade CLI (EXPERIMENTAL)
DEPENDS:=+attendedsysupgrade-common +libblobmsg-json +libubox +libubus \
- +libuci +libuclient +rpcd-mod-rpcsys
+ +libuci +libuclient +rpcd-mod-rpcsys +ucert
endef
define Package/auc/description
diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c
index 6c53b1bb5..5373abd81 100644
--- a/utils/auc/src/auc.c
+++ b/utils/auc/src/auc.c
@@ -252,7 +252,7 @@ static void pkglist_check_cb(struct ubus_request *req, int type, struct blob_att
return;
}
- blobmsg_add_field(buf, BLOBMSG_TYPE_TABLE, "packages", blobmsg_data(tb[PACKAGELIST_PACKAGES]), blobmsg_data_len(tb[PACKAGELIST_PACKAGES]));
+ blobmsg_add_field(buf, BLOBMSG_TYPE_TABLE, "installed", blobmsg_data(tb[PACKAGELIST_PACKAGES]), blobmsg_data_len(tb[PACKAGELIST_PACKAGES]));
};
/*
@@ -703,98 +703,6 @@ static int init_ustream_ssl(void) {
return 0;
}
-/**
- * use busybox sha256sum to verify sha256sums file
- */
-static int sha256sum_v(const char *sha256file, const char *msgfile) {
- pid_t pid;
- int fds[2];
- int status;
- FILE *f = fopen(sha256file, "r");
- char sumline[512] = {};
- char *fname;
- unsigned int fnlen;
- unsigned int cnt = 0;
-
- if (pipe(fds))
- return -1;
-
- if (!f)
- return -1;
-
-
- pid = fork();
- switch (pid) {
- case -1:
- return -1;
-
- case 0:
- uloop_done();
-
- dup2(fds[0], 0);
- close(1);
- close(2);
- close(fds[0]);
- close(fds[1]);
- if (execl("/bin/busybox", "/bin/busybox", "sha256sum", "-s", "-c", NULL));
- return -1;
-
- break;
-
- default:
- while (fgets(sumline, sizeof(sumline), f)) {
- fname = &sumline[66];
- fnlen = strlen(fname);
- fname[fnlen-1] = '\0';
- if (!strcmp(fname, msgfile)) {
- fname[fnlen-1] = '\n';
- write(fds[1], sumline, strlen(sumline));
- cnt++;
- }
- }
- fclose(f);
- close(fds[1]);
- waitpid(pid, &status, 0);
- close(fds[0]);
-
- if (cnt == 1)
- return WEXITSTATUS(status);
- else
- return -1;
- }
-
- return -1;
-}
-
-/**
- * use usign to verify sha256sums.sig
- */
-static int usign_v(const char *file) {
- pid_t pid;
- int status;
-
- pid = fork();
- switch (pid) {
- case -1:
- return -1;
-
- case 0:
- uloop_done();
-
- if (execl("/usr/bin/usign", "/usr/bin/usign",
- "-V", "-q", "-P", PUBKEY_PATH, "-m", file, NULL));
- return -1;
-
- break;
-
- default:
- waitpid(pid, &status, 0);
- return WEXITSTATUS(status);
- }
-
- return -1;
-}
-
static int ask_user(void)
{
fprintf(stderr, "Are you sure you want to continue the upgrade process? [N/y] ");
@@ -878,17 +786,19 @@ int main(int args, char *argv[]) {
goto freeconfig;
}
- rc = init_ustream_ssl();
- if (rc == -2) {
- fprintf(stderr, "No CA certificates loaded, please install ca-certificates\n");
- rc=-1;
- goto freessl;
- }
+ if (!strncmp(serverurl, "https", 5)) {
+ rc = init_ustream_ssl();
+ if (rc == -2) {
+ fprintf(stderr, "No CA certificates loaded, please install ca-certificates\n");
+ rc=-1;
+ goto freessl;
+ }
- if (rc || !ssl_ctx) {
- fprintf(stderr, "SSL support not available, please install ustream-ssl\n");
- rc=-1;
- goto freessl;
+ if (rc || !ssl_ctx) {
+ fprintf(stderr, "SSL support not available, please install ustream-ssl\n");
+ rc=-1;
+ goto freessl;
+ }
}
blobmsg_buf_init(&checkbuf);
@@ -1057,73 +967,6 @@ int main(int args, char *argv[]) {
goto freeboard;
}
- tmp=strrchr(url, '/');
-
- strcpy(tmp, "/sha256sums");
- server_request(url, NULL, NULL);
-
- if (stat("sha256sums", &imgstat)) {
- fprintf(stderr, "sha256sums download failed\n");
- rc=-1;
- goto freeboard;
- }
-
- if ((intmax_t)imgstat.st_size != out_len) {
- fprintf(stderr, "sha256sums download incomplete\n");
- unlink("sha256sums");
- rc=-1;
- goto freeboard;
- }
-
- if (out_len < 68) {
- fprintf(stderr, "sha256sums size mismatch\n");
- unlink("sha256sums");
- rc=-1;
- goto freeboard;
- }
-
- if (sha256sum_v("sha256sums", filename)) {
- fprintf(stderr, "checksum verification failed\n");
- unlink(filename);
- unlink("sha256sums");
- rc=-1;
- goto freeboard;
- }
-
- strcpy(tmp, "/sha256sums.sig");
- server_request(url, NULL, NULL);
-
- if (stat("sha256sums.sig", &imgstat)) {
- fprintf(stderr, "sha256sums.sig download failed\n");
- rc=-1;
- goto freeboard;
- }
-
- if ((intmax_t)imgstat.st_size != out_len) {
- fprintf(stderr, "sha256sums.sig download incomplete\n");
- unlink("sha256sums.sig");
- rc=-1;
- goto freeboard;
- }
-
- if (out_len < 16) {
- fprintf(stderr, "sha256sums.sig size mismatch\n");
- unlink("sha256sums.sig");
- rc=-1;
- goto freeboard;
- }
-
- if (usign_v("sha256sums")) {
- fprintf(stderr, "signature verification failed\n");
- if (!ignore_sig) {
- unlink(filename);
- unlink("sha256sums");
- unlink("sha256sums.sig");
- rc=-1;
- goto freeboard;
- }
- };
-
if (strcmp(filename, "firmware.bin")) {
if (rename(filename, "firmware.bin")) {
fprintf(stderr, "can't rename to firmware.bin\n");
@@ -1136,6 +979,7 @@ int main(int args, char *argv[]) {
valid = 0;
ubus_invoke(ctx, id, "upgrade_test", NULL, upgtest_cb, &valid, 3000);
if (!valid) {
+ fprintf(stdout, "image verification failed\n");
rc=-1;
goto freeboard;
}
Powered by cgit, Themed by Ted Yin.