55ceaef8f6
Removed patches which were applied upstream, rebased remaining patches. Added patch 0004 to avoid dependency to perl package JSON:PP. This bump depends on bumping heimdal, see previous patch of this series. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [yann.morin.1998@free.fr: - make new patch git-formatted - add upstream status to new patch - update .checkpackageignore wth removed patches ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001
|
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Date: Sun, 7 May 2023 11:02:26 +0200
|
|
Subject: [PATCH] 3rdparty/heindal: Use perl module JSON, part of core, instead
|
|
of JSON:PP package
|
|
|
|
Downloaded from
|
|
https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
Upstream: unknown
|
|
---
|
|
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(<EXP>);
|
|
+ my $obj = JSON::PP->new->utf8->decode(<EXP>);
|
|
close $EXP;
|
|
|
|
foreach my $x (keys %$obj) {
|
|
--
|
|
2.25.1
|
|
|