diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch deleted file mode 100644 index aa55c0989150..000000000000 --- a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 7 May 2023 11:02:26 +0200 -Subject: [PATCH] 3rdparty/heimdal: Use perl module JSON:PP, part of core, instead - of JSON package - -Downloaded from -https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch - -Signed-off-by: Bernd Kuhls -Signed-off-by: Yann E. MORIN -Upstream: https://github.com/heimdal/heimdal/pull/1176 ---- - third_party/heimdal/cf/make-proto.pl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/third_party/heimdal/cf/make-proto.pl b/third_party/heimdal/cf/make-proto.pl -index 36a040ce6c0..ad21dbad9e1 100644 ---- a/third_party/heimdal/cf/make-proto.pl -+++ b/third_party/heimdal/cf/make-proto.pl -@@ -4,7 +4,7 @@ - use Getopt::Std; - use File::Compare; - --use JSON; -+use JSON::PP; - - my $comment = 0; - my $doxygen = 0; -@@ -70,7 +70,7 @@ if($opt_x) { - my $EXP; - local $/; - open(EXP, '<', $opt_x) || die "open ${opt_x}"; -- my $obj = JSON->new->utf8->decode(); -+ my $obj = JSON::PP->new->utf8->decode(); - close $EXP; - - foreach my $x (keys %$obj) { --- -2.25.1 - diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 9843d419f09d..5e65295e4c7c 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.8.tar.asc -sha256 4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1 samba-4.18.8.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.1.tar.asc +sha256 ce3b7f0d18bf91aa5fd646e8bb385a3b35375b703c6e5123b02b85a1abc81879 samba-4.19.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 9cf7a59d9b8d..124ce564d2e9 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.8 +SAMBA4_VERSION = 4.19.1 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES