Michal Vasilek · Michal Vasilek · Glenn Strauss · Michal Vasilek · Michal Vasilek · Karel Koci
--- a/collect/haas-proxy/Makefile
+++ b/collect/haas-proxy/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=haas-proxy
 PKG_VERSION:=2.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=proxy-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://gitlab.nic.cz/haas/proxy/-/archive/v$(PKG_VERSION)/

--- a/collect/haas-proxy/files/haas-proxy.init
+++ b/collect/haas-proxy/files/haas-proxy.init
 #!/bin/sh /etc/rc.common

 USE_PROCD=1
-START=99
+START=96
 STOP=10

 DEFAULT_LOCAL_PORT=2525

--- a/collect/sentinel/sentinel-fwlogs/Makefile
+++ b/collect/sentinel/sentinel-fwlogs/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=sentinel-fwlogs
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/sentinel/fwlogs.git

--- a/collect/sentinel/sentinel-fwlogs/files/init
+++ b/collect/sentinel/sentinel-fwlogs/files/init
 #!/bin/sh /etc/rc.common

 USE_PROCD=1
-START=99
+START=96
 STOP=10



--- a/collect/sentinel/sentinel-minipot/Makefile
+++ b/collect/sentinel/sentinel-minipot/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=sentinel-minipot
 PKG_VERSION:=2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/sentinel/minipot.git

--- a/collect/sentinel/sentinel-minipot/files/init
+++ b/collect/sentinel/sentinel-minipot/files/init
 #!/bin/sh /etc/rc.common

 USE_PROCD=1
-START=99
+START=96
 STOP=10



--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=tvheadend
 PKG_VERSION:=4.2.8
-PKG_RELEASE:=6
+PKG_RELEASE:=7

 PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

--- a/multimedia/tvheadend/files/tvheadend.init
+++ b/multimedia/tvheadend/files/tvheadend.init
 #!/bin/sh /etc/rc.common

-START=99
+START=98
 STOP=00

 USE_PROCD=1

--- a/net/knot-resolver/Makefile
+++ b/net/knot-resolver/Makefile
@@ -10,12 +10,12 @@ PKG_RELRO_FULL:=0
 include $(TOPDIR)/rules.mk

 PKG_NAME:=knot-resolver
-PKG_VERSION:=5.4.0
-PKG_RELEASE:=2
+PKG_VERSION:=5.4.2
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
-PKG_HASH:=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+PKG_HASH:=ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b

 PKG_MAINTAINER:=Knot DNS <knot-dns@labs.nic.cz>
 PKG_LICENSE:=GPL-3.0-later
@@ -71,7 +71,6 @@ MESON_ARGS+= \
 	-Dkeyfile_default=/etc/root.keys \
 	-Dprefix=/usr \
 	-Dunit_tests=disabled \
-	-Dkres_gen_test=false \
 	-Dutils=disabled

 define Package/knot-resolver/install

--- a/net/knot-resolver/patches/020-shorter-timeout.patch
+++ b/net/knot-resolver/patches/020-shorter-timeout.patch
 --- a/lib/defines.h
 +++ b/lib/defines.h
-@@ -46,7 +46,7 @@ static inline int KR_COLD kr_error(int x
+@@ -47,7 +47,7 @@ static inline int KR_COLD kr_error(int x
  * @cond internal
  */
 #define KR_CONN_RTT_MAX 2000 /* Timeout for network activity */

--- a/net/knot-resolver/patches/030-fix-policy-hack.patch
+++ b/net/knot-resolver/patches/030-fix-policy-hack.patch
@@ -2,7 +2,7 @@ This patch fixes the problem with forwarding in knot-resolver v4.3.0.
 It reintroduces a fix which enables  policy related hack (knot/knot-resolver#205 (comment 94566) )
 --- a/modules/policy/policy.lua
 +++ b/modules/policy/policy.lua
-@@ -982,7 +982,7 @@ policy.layer = {
+@@ -1000,7 +1000,7 @@ policy.layer = {
 		if bit.band(state, bit.bor(kres.FAIL, kres.DONE)) ~= 0 then return state end
 		local qry = req:initial() -- same as :current() but more descriptive
 		return policy.evaluate(policy.rules, req, qry, state)

--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.59
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.61
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_HASH:=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5
+PKG_HASH:=43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=BSD-3-Clause

--- a/net/lighttpd/patches/0010-uncomment-auth-module-import.patch
+++ b/net/lighttpd/patches/0010-uncomment-auth-module-import.patch
-From c299d82d3b6c2e8f586a53aa16e80938e52778a3 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal.vasilek@nic.cz>
-Date: Fri, 22 Oct 2021 01:38:49 +0200
-Subject: [PATCH] uncomment auth module import
-
---
- doc/config/conf.d/auth.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/config/conf.d/auth.conf b/doc/config/conf.d/auth.conf
-index fa4c86d..6039478 100644
--- a/doc/config/conf.d/auth.conf
-+++ b/doc/config/conf.d/auth.conf
-@@ -7,7 +7,7 @@
- ## for more info and many more options.
- ##
- 
-#server.modules += ( "mod_auth" )
-+server.modules += ( "mod_auth" )
- 
- #server.modules += ( "mod_authn_file" )
- #auth.backend                 = "plain"
-- 
-2.33.1
-
--- a/net/lighttpd/patches/0001-meson.patch
+++ b/net/lighttpd/patches/0001-meson.patch
@@ -14,7 +14,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>

 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -377,7 +377,7 @@ endif
+@@ -390,7 +390,7 @@ endif
 liblua = []
 if get_option('with_lua')
 	found_lua = false

--- a/net/lighttpd/patches/020-meson-zstd.patch
+++ b/net/lighttpd/patches/020-meson-zstd.patch
-From a737572aa4b7a50fd9ac3f54245e40fd5cd2609d Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Wed, 3 Feb 2021 00:35:34 -0500
-Subject: [PATCH] [meson] add with_zstd to meson_options.txt
-
-Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
---
- meson_options.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -148,6 +148,11 @@ option('with_zlib',
- 	value: true,
- 	description: 'with deflate-support for mod_deflate [default: on]',
- )
-+option('with_zstd',
-+	type: 'boolean',
-+	value: false,
-+	description: 'with zstd-support for mod_deflate [default: off]',
-+)
- 
- option('build_extra_warnings',
- 	type: 'boolean',
--- a/net/lighttpd/patches/020-mod-alias.patch
+++ b/net/lighttpd/patches/020-mod-alias.patch
+From 584a69c4ae756f6b304e7d0592cf00859eff6daa Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Fri, 29 Oct 2021 08:15:41 -0400
+Subject: [PATCH] [mod_alias] fix use-after-free bug (fixes #3114)
+
+(thx LoneFox)
+
+bug introduced in 62a874df in lighttpd 1.4.59
+
+x-ref:
+  "Use-after-free bug in mod_alias"
+  https://redmine.lighttpd.net/issues/3114
+---
+ src/mod_alias.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/src/mod_alias.c
+++ b/src/mod_alias.c
+@@ -128,7 +128,7 @@ mod_alias_remap (request_st * const r, const array * const aliases)
+     if (0 == path_len || path_len < basedir_len) return HANDLER_GO_ON;
+ 
+     const uint32_t uri_len = path_len - basedir_len;
+-    const char * const uri_ptr = r->physical.path.ptr + basedir_len;
+    const char *uri_ptr = r->physical.path.ptr + basedir_len;
+     data_string * const ds = (data_string *)
+       (!r->conf.force_lowercase_filenames
+         ? array_match_key_prefix_klen(aliases, uri_ptr, uri_len)
+@@ -159,8 +159,10 @@ mod_alias_remap (request_st * const r, const array * const aliases)
+      * (though resulting r->physical.basedir would not be a dir))*/
+     if (vlen != basedir_len + alias_len) {
+         const uint32_t nlen = vlen + uri_len - alias_len;
+-        if (path_len + buffer_string_space(&r->physical.path) < nlen)
+        if (path_len + buffer_string_space(&r->physical.path) < nlen) {
+             buffer_string_prepare_append(&r->physical.path, nlen - path_len);
+            uri_ptr = r->physical.path.ptr + basedir_len;/*(refresh if alloc)*/
+        }
+         memmove(r->physical.path.ptr + vlen,
+                 uri_ptr + alias_len, uri_len - alias_len);
+         buffer_truncate(&r->physical.path, nlen);
--- a/updater/tos3to4/Makefile
+++ b/updater/tos3to4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tos3to4
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.3.1
 PKG_RELEASE:=1

 PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
@@ -36,7 +36,6 @@ endef
 define Package/tos3to4-earliest
  $(call Package/Common)
  TITLE+= installed earliest
-  DEPENDS+=+create_notification
 endef

 define Package/tos3to4/install

--- a/updater/tos3to4/files/localrepo
+++ b/updater/tos3to4/files/localrepo
@@ -7,6 +7,4 @@ COLLIDED="/usr/share/updater/collided$SOURCE"
 if [ -f "$SOURCE/localrepo.lua" ]; then
 	mkdir -p "${COLLIDED%/*}"
 	mv  "$SOURCE" "$COLLIDED"
-	create_notification -s error \
-		"Localrepo was preventively flushed because of binary compatibility. You can found your packages in: $COLLIDED"
 fi
No results found