[Buildroot] [PATCH 1/1] package/heimdal: Use perl module JSON, part of core, instead of JSON:PP package

[Buildroot] [PATCH 1/1] package/heimdal: Use perl module JSON, part of core, instead of JSON:PP package

[Bernd Kuhls]

Fixes:
http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...JSON-part-of-core-instead-of-JSON-PP.patch | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch

diff --git a/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch b/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch
new file mode 100644
index 0000000000..a7d8777a78
--- /dev/null
+++ b/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch
@@ -0,0 +1,54 @@
+From f77b0d16ace70d93c018241e25826611f3124604 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 10 Jun 2023 09:00:24 +0200
+Subject: [PATCH] Use perl module JSON, part of core, instead of
+ JSON:PP package
+
+Ported from
+https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
+
+Upstream: Not applicable
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ cf/make-proto.pl | 4 ++--
+ configure.ac     | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/cf/make-proto.pl b/cf/make-proto.pl
+index 36a040ce6..4af21916b 100644
+--- a/cf/make-proto.pl
++++ b/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) {
+diff --git a/configure.ac b/configure.ac
+index b946dfff4..c08cb24dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" ||
+     AC_KRB_PROG_PERL
+     AC_KRB_PERL_MOD(Getopt::Std)
+     AC_KRB_PERL_MOD(File::Compare)
+-    AC_KRB_PERL_MOD(JSON)
+ fi
+ 
+ AC_KRB_PROG_YACC
+-- 
+2.39.2
+
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/heimdal: Use perl module JSON, part of core, instead of JSON:PP package

[Yann E. MORIN]

Bernd, A;;,

On 2023-06-10 09:06 +0200, Bernd Kuhls spake thusly:
> Fixes:
> http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...JSON-part-of-core-instead-of-JSON-PP.patch | 54 +++++++++++++++++++
>  1 file changed, 54 insertions(+)
>  create mode 100644 package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch
> 
> diff --git a/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch b/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch
> new file mode 100644
> index 0000000000..a7d8777a78
> --- /dev/null
> +++ b/package/heimdal/0001-Use-perl-module-JSON-part-of-core-instead-of-JSON-PP.patch
> @@ -0,0 +1,54 @@
> +From f77b0d16ace70d93c018241e25826611f3124604 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
> +Date: Sat, 10 Jun 2023 09:00:24 +0200
> +Subject: [PATCH] Use perl module JSON, part of core, instead of
> + JSON:PP package
> +
> +Ported from
> +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
> +
> +Upstream: Not applicable

When a patch is not applicable upstream, this must be motivated.

> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + cf/make-proto.pl | 4 ++--
> + configure.ac     | 1 -
> + 2 files changed, 2 insertions(+), 3 deletions(-)
> +
> +diff --git a/cf/make-proto.pl b/cf/make-proto.pl
> +index 36a040ce6..4af21916b 100644
> +--- a/cf/make-proto.pl
> ++++ b/cf/make-proto.pl
> +@@ -4,7 +4,7 @@
> + use Getopt::Std;
> + use File::Compare;
> + 
> +-use JSON;
> ++use JSON::PP

I don't understand this change in relation to the commit title: the
change switches over from using JSON to using JSON::PP, but the title
says we are doing the opposite...

Would you care to clarify, please?

Regards,
Yann E. MORIN.

> + 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) {
> +diff --git a/configure.ac b/configure.ac
> +index b946dfff4..c08cb24dc 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" ||
> +     AC_KRB_PROG_PERL
> +     AC_KRB_PERL_MOD(Getopt::Std)
> +     AC_KRB_PERL_MOD(File::Compare)
> +-    AC_KRB_PERL_MOD(JSON)
> + fi
> + 
> + AC_KRB_PROG_YACC
> +-- 
> +2.39.2
> +
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot