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

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

[Bernd Kuhls]

From: Bernd Kuhls <bernd.kuhls@t-online.de>

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

This patch ports the existing patch for the samba4 package:
https://git.busybox.net/buildroot/tree/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
v2: Fix typo in title, add upstream URL (Yann)

 ...JSON-PP-part-of-core-instead-of-JSON.patch | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch

diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch
new file mode 100644
index 0000000000..7323ac70df
--- /dev/null
+++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch
@@ -0,0 +1,57 @@
+From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001
+From: Andrew Sim <andrewsimz@gmail.com>
+Date: Sat, 10 Jun 2023 09:00:24 +0200
+Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON
+ package
+
+This patch removes the need for an external package.
+
+Ported from
+https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
+https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b
+
+Upstream: https://github.com/heimdal/heimdal/pull/1176
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ 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 cedb4c01f..cecd030e6 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

[Buildroot] [PATCH 2/2] package/samba4: update patch 0004

[Bernd Kuhls]

Fix typo in title, add upstream URL

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...dparty-heindal-Use-perl-module-JSON-part-of-core-i.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
index 7eb31e5d07..aa55c09891 100644
--- 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
@@ -1,15 +1,15 @@
 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
+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 <bernd.kuhls@t-online.de>
 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-Upstream: unknown
+Upstream: https://github.com/heimdal/heimdal/pull/1176
 ---
  third_party/heimdal/cf/make-proto.pl | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
-- 
2.39.2

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

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

[Yann E. MORIN]

Bernd, All,

On 2023-06-24 16:18 +0200, Bernd Kuhls spake thusly:
> From: Bernd Kuhls <bernd.kuhls@t-online.de>
> 
> Fixes:
> http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/
> 
> This patch ports the existing patch for the samba4 package:
> https://git.busybox.net/buildroot/tree/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

I know first-hand how multiple personalities can be hard to handle. ;-)

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> v2: Fix typo in title, add upstream URL (Yann)
> 
>  ...JSON-PP-part-of-core-instead-of-JSON.patch | 57 +++++++++++++++++++
>  1 file changed, 57 insertions(+)
>  create mode 100644 package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch
> 
> diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch
> new file mode 100644
> index 0000000000..7323ac70df
> --- /dev/null
> +++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch
> @@ -0,0 +1,57 @@
> +From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001
> +From: Andrew Sim <andrewsimz@gmail.com>
> +Date: Sat, 10 Jun 2023 09:00:24 +0200
> +Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON
> + package
> +
> +This patch removes the need for an external package.
> +
> +Ported from
> +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch
> +https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b
> +
> +Upstream: https://github.com/heimdal/heimdal/pull/1176
> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> +---
> + 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 cedb4c01f..cecd030e6 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

Re: [Buildroot] [PATCH 2/2] package/samba4: update patch 0004

[Yann E. MORIN]

Bernd, All,

On 2023-06-24 16:18 +0200, Bernd Kuhls spake thusly:
> Fix typo in title, add upstream URL

Ah, I knew I had already seen something similar recently...

> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...dparty-heindal-Use-perl-module-JSON-part-of-core-i.patch | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> 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
> index 7eb31e5d07..aa55c09891 100644
> --- 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
> @@ -1,15 +1,15 @@
>  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
> +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 <bernd.kuhls@t-online.de>
>  Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> -Upstream: unknown
> +Upstream: https://github.com/heimdal/heimdal/pull/1176
>  ---
>   third_party/heimdal/cf/make-proto.pl | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> -- 
> 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

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

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > From: Bernd Kuhls <bernd.kuhls@t-online.de>
 > Fixes:
 > http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/

 > This patch ports the existing patch for the samba4 package:
 > https://git.busybox.net/buildroot/tree/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 > ---
 > v2: Fix typo in title, add upstream URL (Yann)

Committed to 2023.02.x and 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot