[ptxdist] [PATCH] mosquitto: version bump 1.6.4 -> 1.6.7
>From official ChangeLog.txt: 1.6.7 - 20190925 Broker: - Add workaround for working with libwebsockets 3.2.0. - Fix potential crash when reloading config. Closes #1424, #1425. Client library: - Don't use `/` in autogenerated client ids, to avoid confusing with topics. - Fix `mosquitto_max_inflight_messages_set()` and `mosquitto_int_option(..., MOSQ_OPT_*_MAX, ...)` behaviour. Closes #1417. - Fix regression on use of `mosquitto_connect_async()` not working. Closes #1415 and #1422. Clients: - mosquitto_sub: Fix `-E` incorrectly not working unless `-d` was also specified. Closes #1418. - Updated documentation around automatic client ids. 1.6.6 - 20190917 Security: - Restrict topic hierarchy to 200 levels to prevent possible stack overflow. Closes #1412. Broker: - Restrict topic hierarchy to 200 levels to prevent possible stack overflow. Closes #1412. - mosquitto_passwd now returns 1 when attempting to update a user that does not exist. Closes #1414. 1.6.5 - 20190912 Broker: - Fix v5 DISCONNECT packets with remaining length == 2 being treated as a protocol error. Closes #1367. - Fix support for libwebsockets 3.x. - Fix slow websockets performance when sending large messages. Closes #1390. - Fix bridges potentially not connecting on Windows. Closes #478. - Fix clients authorised using `use_identity_as_username` or `use_subject_as_username` being disconnected on SIGHUP. Closes #1402. - Improve error messages in some situations when clients disconnect. Reduces the number of "Socket error on client X, disconnecting" messages. - Fix Will for v5 clients not being sent if will delay interval was greater than the session expiry interval. Closes #1401. - Fix CRL file not being reloaded on HUP. Closes #35. - Fix repeated "Error in poll" messages on Windows when only websockets listeners are defined. Closes #1391. Client library: - Fix reconnect backoff for the situation where connections are dropped rather than refused. Closes #737. - Fix missing locks on `mosq->state`. Closes #1374. Documentation: - Improve details on global/per listener options in the mosquitto.conf man page. Closes #274. - Clarify behaviour when clients exceed the `message_size_limit`. Closes #448. - Improve documentation for `max_inflight_bytes`, `max_inflight_messages`, and `max_queued_messages`. Build: - Fix missing function warnings on NetBSD. - Fix WITH_STATIC_LIBRARIES using CMake on Windows. Closes #1369. - Guard ssize_t definition on Windows. Closes #522. Signed-off-by: Andreas Pretzsch --- No tests beside compile test done. rules/mosquitto.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 8a4967606..3f3f967ce 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto # # Paths and names # -MOSQUITTO_VERSION := 1.6.4 -MOSQUITTO_MD5 := c89df444afb121d795f8af5b4fd97d78 +MOSQUITTO_VERSION := 1.6.7 +MOSQUITTO_MD5 := ec9074c4f337f64eaa9a4320c6dab020 MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION) MOSQUITTO_SUFFIX := tar.gz MOSQUITTO_URL := https://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mesalib: version bump 19.2.0 -> 19.2.1
Signed-off-by: Philipp Zabel --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 2e191128c744..757152437265 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 19.2.0 -MESALIB_MD5:= 4346581ded5d554cc873e2efbb8ce9c3 +MESALIB_VERSION:= 19.2.1 +MESALIB_MD5:= 8f9c05cfbf7b357c60a5345bb87a92c7 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
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] libnl3: fix license information
On Thu, 2019-10-10 at 11:25 +0200, Michael Olbrich wrote: > Let's stick with the GPL-2.0-only for the tools that still have this > in the > header but make it clear that this does not apply to the library by > making > it conditional. > Also add the missing BSD-3-Clause identifiery and file. > > Signed-off-by: Michael Olbrich > --- Acked-by: Andreas Pretzsch > So if had forgotten about the old discussion when I applied the > patch. How > about this patch. I don't really care about the kernel headers. It > makes no > difference if they are shipped with the package or the toolchain. The > result is the same. > And with the condition below, we still mention the GPL-2.0-only but > make it > more obvious that this does not apply to libnl itself. Looks good, and esp. the conditional. Thanks for the fix ! Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] bluez: version bump 5.50 -> 5.51
Hi, I used btmon, bluetoothd, bluetoothctl and btattach to perform a scan. This works as well. Another quick test ;-) Regards Denis Am Mittwoch, den 09.10.2019, 02:11 +0200 schrieb Andreas Pretzsch: > Update BlueZ 5.50 (Jun 2018) to BlueZ 5.51 (Sep 2019). > > Quoting the announcement: "There are too many fixes to cover them in > the release announcement, but feature-wise the two notable things are > improved Bluetooth Mesh support as well as support for the GATT > Database Hash feature." > > There are no relevant new configure options. > Explicitly set the new configure option "external-ell" to disabled. > It is connected to mesh and/or btpclient, which are already both > explicitly disabled. In this context, order them together. > The now settable "runstatedir" (default LOCALSTATEDIR/run) should be fine. > > There are new test programs "test-mesh" and "agent.py". > Install them like the rest, if enabled. Both python with shebang. > While at it, fix the double-install of the python scripts, with and > without executable permissions. The change e6c2932 "bluez: the python > tests have no shebang so don't make them executable" was not fully > minded in caa56e6 "bluez: version bump 5.30 -> 5.50". > > There are no bluez patches, so nothing to merge. > > Signed-off-by: Andreas Pretzsch > --- > Quick test with scanning and l2ping (still) works. No further tests. Tested-by: Denis Osterland Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315 ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/ The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. - For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/ ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnl3: fix license information
Hei hei, Am Donnerstag, 10. Oktober 2019, 11:25:46 CEST schrieb Michael Olbrich: > Let's stick with the GPL-2.0-only for the tools that still have this in the > header but make it clear that this does not apply to the library by making > it conditional. > Also add the missing BSD-3-Clause identifiery and file. > > Signed-off-by: Michael Olbrich > --- > > So if had forgotten about the old discussion when I applied the patch. How > about this patch. I don't really care about the kernel headers. It makes no > difference if they are shipped with the package or the toolchain. The > result is the same. > And with the condition below, we still mention the GPL-2.0-only but make it > more obvious that this does not apply to libnl itself. Acked-by: Alexander Dahl > > Michael > > rules/libnl3.make | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/rules/libnl3.make b/rules/libnl3.make > index 5b3af00659c6..191e00126831 100644 > --- a/rules/libnl3.make > +++ b/rules/libnl3.make > @@ -22,7 +22,14 @@ LIBNL3_SUFFIX := tar.gz > LIBNL3_URL := > https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBN > L3).$(LIBNL3_SUFFIX) LIBNL3_SOURCE:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) > LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) > -LIBNL3_LICENSE := LGPL-2.1-only > +LIBNL3_LICENSE := LGPL-2.1-only AND BSD-3-Clause > +LIBNL3_LICENSE_FILES := \ > + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ > + > file://lib/xfrm/ae.c;startline=3;endline=32;md5=6813917a92b539b07534e1a79f > 5a6aca + > +ifdef PTXCONF_LIBNL3_ENABLE_CLI > +LIBNL3_LICENSE += AND GPL-2.0-only > +endif > > # > # autoconf Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnl3: fix license information
On Thu, Oct 10, 2019 at 11:25:46AM +0200, Michael Olbrich wrote: > Let's stick with the GPL-2.0-only for the tools that still have this in the > header but make it clear that this does not apply to the library by making > it conditional. > Also add the missing BSD-3-Clause identifiery and file. > > Signed-off-by: Michael Olbrich > --- Acked-by: Roland Hieber > > So if had forgotten about the old discussion when I applied the patch. How > about this patch. I don't really care about the kernel headers. It makes no > difference if they are shipped with the package or the toolchain. The > result is the same. > And with the condition below, we still mention the GPL-2.0-only but make it > more obvious that this does not apply to libnl itself. > > Michael > > rules/libnl3.make | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/rules/libnl3.make b/rules/libnl3.make > index 5b3af00659c6..191e00126831 100644 > --- a/rules/libnl3.make > +++ b/rules/libnl3.make > @@ -22,7 +22,14 @@ LIBNL3_SUFFIX := tar.gz > LIBNL3_URL := > https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX) > LIBNL3_SOURCE:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) > LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) > -LIBNL3_LICENSE := LGPL-2.1-only > +LIBNL3_LICENSE := LGPL-2.1-only AND BSD-3-Clause > +LIBNL3_LICENSE_FILES := \ > + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ > + > file://lib/xfrm/ae.c;startline=3;endline=32;md5=6813917a92b539b07534e1a79f5a6aca > + > +ifdef PTXCONF_LIBNL3_ENABLE_CLI > +LIBNL3_LICENSE += AND GPL-2.0-only > +endif > > # > # autoconf > -- > 2.20.1 > > > ___ > 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
[ptxdist] [PATCH] libnl3: fix license information
Let's stick with the GPL-2.0-only for the tools that still have this in the header but make it clear that this does not apply to the library by making it conditional. Also add the missing BSD-3-Clause identifiery and file. Signed-off-by: Michael Olbrich --- So if had forgotten about the old discussion when I applied the patch. How about this patch. I don't really care about the kernel headers. It makes no difference if they are shipped with the package or the toolchain. The result is the same. And with the condition below, we still mention the GPL-2.0-only but make it more obvious that this does not apply to libnl itself. Michael rules/libnl3.make | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rules/libnl3.make b/rules/libnl3.make index 5b3af00659c6..191e00126831 100644 --- a/rules/libnl3.make +++ b/rules/libnl3.make @@ -22,7 +22,14 @@ LIBNL3_SUFFIX:= tar.gz LIBNL3_URL := https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_SOURCE := $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) -LIBNL3_LICENSE := LGPL-2.1-only +LIBNL3_LICENSE := LGPL-2.1-only AND BSD-3-Clause +LIBNL3_LICENSE_FILES := \ + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://lib/xfrm/ae.c;startline=3;endline=32;md5=6813917a92b539b07534e1a79f5a6aca + +ifdef PTXCONF_LIBNL3_ENABLE_CLI +LIBNL3_LICENSE += AND GPL-2.0-only +endif # # autoconf -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] perl: Add patch for compatibility with recent libcrypt implementations.
Signed-off-by: Björn Esser
---
ChangeLog:
* v1 --> v2: Revised as pointed out by ukk.
.../0001-It-s-lpthread-not-lpthreads.patch| 2 +-
...-fix-build-failure-with-recent-glibc.patch | 34 +++
patches/perl-5.18.2/series| 3 +-
3 files changed, 37 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..ecdcd0aee 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
@@ -9,7 +9,7 @@ with -Dusethreads
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..358c8439f
--- /dev/null
+++ b/patches/perl-5.18.2/0002-fix-build-failure-with-recent-glibc.patch
@@ -0,0 +1,34 @@
+From: David Mitchell
+Date: Fri, 11 May 2018 08:03:42 +0100
+Subject: [PATCH] fix build failure with recent glibc
+
+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.
+---
+ 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
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
