Re: [ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
Hei hei, this is slightly offtopic, but let me answer anyways … On Thu, Oct 10, 2019 at 02:45:03PM +0200, Björn Esser wrote: > On Do, 2019-10-10 at 14:39 +0200, Roland Hieber wrote: > > On Thu, Oct 10, 2019 at 10:44:45AM +0200, Björn Esser wrote: > > > Signed-off-by: Björn Esser > > > --- > > > .../0001-It-s-lpthread-not-lpthreads.patch| 7 +++- > > > ...-fix-build-failure-with-recent-glibc.patch | 39 > > > +++ > > > patches/perl-5.18.2/series| 3 +- > > > 3 files changed, 47 insertions(+), 2 deletions(-) > > > create mode 100644 patches/perl-5.18.2/0002-fix-build-failure- > > > with-recent-glibc.patch > > > > > > diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not- > > > lpthreads.patch b/patches/perl-5.18.2/0001-It-s-lpthread-not- > > > lpthreads.patch > > > index 319cefb2e..7a7bb1beb 100644 > > > --- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > > +++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > > @@ -1,15 +1,20 @@ > > > From: Michael Olbrich > > > Date: Wed, 23 Apr 2014 09:02:25 +0200 > > > Subject: [PATCH] It's -lpthread not -lpthreads > > > +MIME-Version: 1.0 > > > +Content-Type: text/plain; charset=UTF-8 > > > +Content-Transfer-Encoding: 8bit > > > > Hmm, I wonder how you got these additional headers? :-) > > > > - Roland > > > Git adds them, when you have signoff enabled globally in your > gitconfig… Not exactly. Git adds those on `git format-patch` if the commit message in your patch contains other characters than 7 bit us-ascii. In this case there's an 'ö' in the name in the s-o-b line. This is also what happens if you recreate a patch series in ptxdist with `git ptx-patches` and one of the commit messages contains stuff encoded in utf-8 which does not fit in us-ascii. You also get such lines if the content (not the commit message) of your patch contains 8-bit chars and you send it with `git send-email`. Git (2.20) does not add those lines to the patch on `git format-patch` though. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
On Do, 2019-10-10 at 14:39 +0200, Roland Hieber wrote: > On Thu, Oct 10, 2019 at 10:44:45AM +0200, Björn Esser wrote: > > Signed-off-by: Björn Esser > > --- > > .../0001-It-s-lpthread-not-lpthreads.patch| 7 +++- > > ...-fix-build-failure-with-recent-glibc.patch | 39 > > +++ > > patches/perl-5.18.2/series| 3 +- > > 3 files changed, 47 insertions(+), 2 deletions(-) > > create mode 100644 patches/perl-5.18.2/0002-fix-build-failure- > > with-recent-glibc.patch > > > > diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not- > > lpthreads.patch b/patches/perl-5.18.2/0001-It-s-lpthread-not- > > lpthreads.patch > > index 319cefb2e..7a7bb1beb 100644 > > --- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > +++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > @@ -1,15 +1,20 @@ > > From: Michael Olbrich > > Date: Wed, 23 Apr 2014 09:02:25 +0200 > > Subject: [PATCH] It's -lpthread not -lpthreads > > +MIME-Version: 1.0 > > +Content-Type: text/plain; charset=UTF-8 > > +Content-Transfer-Encoding: 8bit > > Hmm, I wonder how you got these additional headers? :-) > > - Roland Git adds them, when you have signoff enabled globally in your gitconfig… Björn ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
On Thu, Oct 10, 2019 at 10:44:45AM +0200, Björn Esser wrote:
> Signed-off-by: Björn Esser
> ---
> .../0001-It-s-lpthread-not-lpthreads.patch| 7 +++-
> ...-fix-build-failure-with-recent-glibc.patch | 39 +++
> patches/perl-5.18.2/series| 3 +-
> 3 files changed, 47 insertions(+), 2 deletions(-)
> create mode 100644
> patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
>
> diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
> b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
> index 319cefb2e..7a7bb1beb 100644
> --- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
> +++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
> @@ -1,15 +1,20 @@
> From: Michael Olbrich
> Date: Wed, 23 Apr 2014 09:02:25 +0200
> Subject: [PATCH] It's -lpthread not -lpthreads
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
Hmm, I wonder how you got these additional headers? :-)
- Roland
>
> Otherwise linking fails with missing pthread symbols when building with
> with -Dusethreads
> +
> +Signed-off-by: Björn Esser
> ---
> cnf/configure_libs.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cnf/configure_libs.sh b/cnf/configure_libs.sh
> -index f45d31c..cca73e5 100644
> +index f45d31cfc413..cca73e5004fb 100644
> --- a/cnf/configure_libs.sh
> +++ b/cnf/configure_libs.sh
> @@ -53,7 +53,7 @@ if not hinted 'perllibs'; then
> diff --git
> a/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
> b/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
> new file mode 100644
> index 0..5be0c0f1d
> --- /dev/null
> +++ b/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
> @@ -0,0 +1,39 @@
> +From: David Mitchell
> +Date: Fri, 11 May 2018 08:03:42 +0100
> +Subject: [PATCH] fix build failure with recent glibc
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +RT #133184
> +
> +pp_crypt() directly manipulates a field inside 'struct crypt_data' to work
> +around a bug in an ancient glibc version from circa 2002. New glibc
> +releases don't have this field so perl fails to compile. Make the hack
> +conditional on glibc version.
> +
> +Stolen from a patch to the Fedora 28 distribution.
> +
> +Signed-off-by: Björn Esser
> +---
> + pp.c | 6 +-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/pp.c b/pp.c
> +index 430cf857a628..d099af043995 100644
> +--- a/pp.c
> b/pp.c
> +@@ -3412,8 +3412,12 @@ PP(pp_crypt)
> + #if defined(__GLIBC__) || defined(__EMX__)
> + if (PL_reentrant_buffer->_crypt_struct_buffer) {
> + PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
> +-/* work around glibc-2.2.5 bug */
> ++#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
> ++(defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ <
> 4)
> ++/* work around glibc-2.2.5 bug, has been fixed at some
> ++ * time in glibc-2.3.X */
> + PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
> ++#endif
> + }
> + #endif
> + }
> diff --git a/patches/perl-5.18.2/series b/patches/perl-5.18.2/series
> index dbf4b587d..d504441ef 100644
> --- a/patches/perl-5.18.2/series
> +++ b/patches/perl-5.18.2/series
> @@ -1,4 +1,5 @@
> # generated by git-ptx-patches
> #tag:base --start-number 1
> 0001-It-s-lpthread-not-lpthreads.patch
> -# 82701174c686d625c466a538b4d64ece - git-ptx-patches magic
> +0002-fix-build-failure-with-recent-glibc.patch
> +# 1c17e4b9d62a94d4ee665ae8d0f4c9ff - git-ptx-patches magic
> --
> 2.23.0
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Roland Hieber | r.hie...@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
On Thu, Oct 10, 2019 at 10:44:45AM +0200, Björn Esser wrote: > Signed-off-by: Björn Esser > --- > .../0001-It-s-lpthread-not-lpthreads.patch| 7 +++- > ...-fix-build-failure-with-recent-glibc.patch | 39 +++ > patches/perl-5.18.2/series| 3 +- > 3 files changed, 47 insertions(+), 2 deletions(-) > create mode 100644 > patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch > > diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > index 319cefb2e..7a7bb1beb 100644 > --- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > +++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > @@ -1,15 +1,20 @@ > From: Michael Olbrich > Date: Wed, 23 Apr 2014 09:02:25 +0200 > Subject: [PATCH] It's -lpthread not -lpthreads > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > > Otherwise linking fails with missing pthread symbols when building with > with -Dusethreads > + > +Signed-off-by: Björn Esser This seems unrelated. Does Perl use the S-o-b at all? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
Signed-off-by: Björn Esser
---
.../0001-It-s-lpthread-not-lpthreads.patch| 7 +++-
...-fix-build-failure-with-recent-glibc.patch | 39 +++
patches/perl-5.18.2/series| 3 +-
3 files changed, 47 insertions(+), 2 deletions(-)
create mode 100644
patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
index 319cefb2e..7a7bb1beb 100644
--- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
+++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch
@@ -1,15 +1,20 @@
From: Michael Olbrich
Date: Wed, 23 Apr 2014 09:02:25 +0200
Subject: [PATCH] It's -lpthread not -lpthreads
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Otherwise linking fails with missing pthread symbols when building with
with -Dusethreads
+
+Signed-off-by: Björn Esser
---
cnf/configure_libs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cnf/configure_libs.sh b/cnf/configure_libs.sh
-index f45d31c..cca73e5 100644
+index f45d31cfc413..cca73e5004fb 100644
--- a/cnf/configure_libs.sh
+++ b/cnf/configure_libs.sh
@@ -53,7 +53,7 @@ if not hinted 'perllibs'; then
diff --git a/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
b/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
new file mode 100644
index 0..5be0c0f1d
--- /dev/null
+++ b/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
@@ -0,0 +1,39 @@
+From: David Mitchell
+Date: Fri, 11 May 2018 08:03:42 +0100
+Subject: [PATCH] fix build failure with recent glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RT #133184
+
+pp_crypt() directly manipulates a field inside 'struct crypt_data' to work
+around a bug in an ancient glibc version from circa 2002. New glibc
+releases don't have this field so perl fails to compile. Make the hack
+conditional on glibc version.
+
+Stolen from a patch to the Fedora 28 distribution.
+
+Signed-off-by: Björn Esser
+---
+ pp.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/pp.c b/pp.c
+index 430cf857a628..d099af043995 100644
+--- a/pp.c
b/pp.c
+@@ -3412,8 +3412,12 @@ PP(pp_crypt)
+ #if defined(__GLIBC__) || defined(__EMX__)
+ if (PL_reentrant_buffer->_crypt_struct_buffer) {
+ PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
+- /* work around glibc-2.2.5 bug */
++#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
++(defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
++ /* work around glibc-2.2.5 bug, has been fixed at some
++ * time in glibc-2.3.X */
+ PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
++#endif
+ }
+ #endif
+ }
diff --git a/patches/perl-5.18.2/series b/patches/perl-5.18.2/series
index dbf4b587d..d504441ef 100644
--- a/patches/perl-5.18.2/series
+++ b/patches/perl-5.18.2/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-It-s-lpthread-not-lpthreads.patch
-# 82701174c686d625c466a538b4d64ece - git-ptx-patches magic
+0002-fix-build-failure-with-recent-glibc.patch
+# 1c17e4b9d62a94d4ee665ae8d0f4c9ff - git-ptx-patches magic
--
2.23.0
___
ptxdist mailing list
ptxdist@pengutronix.de
