package/dante: remove --without-pam
PATCH 1/3 package/dante: remove --without-pam
--without-pam was wrongly put back by commit6d8abc7c1aca00a8ee514b38d88744ccd9ec194f
--- package/dante/dante.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/dante/dante.mk +1 -1
@@ -12,7 +12,7 @@ DANTE_LICENSE_FILES = LICENSE # 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file DANTE_AUTORECONF = YES -DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam +DANTE_CONF_OPTS += --disable-client --disable-preload ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DANTE_DEPENDENCIES += linux-pam
Signature · 1 line
2.24.0
PATCH 2/3 package/dante: add optional libminiupnpc dependency
--- package/dante/dante.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/dante/dante.mk +7 -0
@@ -14,6 +14,13 @@ DANTE_AUTORECONF = YES DANTE_CONF_OPTS += --disable-client --disable-preload +ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) +DANTE_DEPENDENCIES += libminiupnpc +DANTE_CONF_OPTS += --with-upnp +else +DANTE_CONF_OPTS += --without-upnp +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DANTE_DEPENDENCIES += linux-pam DANTE_CONF_OPTS += --with-pam
Signature · 1 line
2.24.0
PATCH 2/3 package/dante: add optional libminiupnpc dependency
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package/dante: bump to version 1.4.2
In reply to Fabrice Fontaine- Add hash for license file
- Refresh second patch
- Add third patch
- This bump fixes the build failure with latest libminiupnpc
Fixes:
- http://autobuild.buildroot.org/results/8a92d5257ba3e6fd0ad56ddb0afad8b6edd40ae3
--- ...002-compiler.m4-do-not-remove-g-flag.patch | 12 ++++--- ...m4-Remove-getaddrinfo-too-low-checks.patch | 35 +++++++++++++++++++ package/dante/dante.hash | 7 ++-- package/dante/dante.mk | 2 +- 4 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch
package/dante/0002-compiler.m4-do-not-remove-g-flag.patch +7 -5
@@ -13,6 +13,8 @@ after -g negates the -g, and having -ggdb after -g is enough to produce debugging information for GDB. Signed-off-by: Thomas Petazzoni <[email protected]> +[Fabrice: update for 1.4.2] +Signed-off-by: Fabrice Fontaine <[email protected]> --- compiler.m4 | 6 ------ 1 file changed, 6 deletions(-)
@@ -21,18 +23,18 @@ diff --git a/compiler.m4 b/compiler.m4 index 3a23406..621372c 100644 --- a/compiler.m4 +++ b/compiler.m4 -@@ -378,15 +378,9 @@ else +@@ -443,15 +443,9 @@ else gcc) if test x"$aixldbug" != x; then #disable debug info -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" +- if echo $CFLAGS | grep -- "-g " >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`" - fi CFLAGS="$CFLAGS${CFLAGS:+ }-g0" else #use -ggdb also when not debugging -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" +- if echo $CFLAGS | grep -- "-g " >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g //g'`" - fi CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" fi
package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch new file +35 -0
@@ -0,0 +1,35 @@ +osdep.m4: Remove getaddrinfo() too low checks + +dante runs AC_PREPROC_IFELSE then it fills $ERRVALFILE by running the +following command: + +cat conftest.i | grep gaierrval: >>$2 + +As a result, $ERRVALFILE does not contain the expected values because +the expected value is not on the same line than gaierrval: + + gaierrval: + # 130 "conftest.c" 3 4 + -3 + +So drop these checks + +Signed-off-by: Fabrice Fontaine <[email protected]> + +diff -Nuar dante-1.4.2-orig/osdep.m4 dante-1.4.2/osdep.m4 +--- dante-1.4.2-orig/osdep.m4 2019-12-09 21:28:38.936003218 +0100 ++++ dante-1.4.2/osdep.m4 2019-12-09 21:49:48.764019371 +0100 +@@ -956,13 +956,7 @@ + unset UNIQUEVALS UNIQUESYMBOLS + if test -s $ERRVALFILE; then + UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'` +- if test $UNIQUEVALS -le 1; then +- AC_MSG_FAILURE([error: getaddrinfo() error value count too low]) +- fi + UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'` +- if test $UNIQUESYMBOLS -le 1; then +- AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low]) +- fi + + if test $ERRNOCNT -ne $UNIQUESYMBOLS; then + AC_MSG_FAILURE([internal error: errno symbol count mismatch])
package/dante/dante.hash +5 -2
@@ -1,2 +1,5 @@ -# Locally computed -sha256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 dante-1.4.1.tar.gz +# From https://www.inet.no/dante/download.html +sha256 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 dante-1.4.2.tar.gz + +# Hash for license file +sha256 954ab6dbcf994711e28e603d8657d6eceef333cd6f9ca6705f0e9d118ab7d69a LICENSE
package/dante/dante.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DANTE_VERSION = 1.4.1 +DANTE_VERSION = 1.4.2 DANTE_SITE = http://www.inet.no/dante/files DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
PATCH 3/3 package/dante: bump to version 1.4.2
Hello Fabrice,
package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch line 13
Quoted 6 lines · On Mon, 9 Dec 2019 23:27:46 +0100 Fabrice Fontaine…
package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch new file +6
-0+As a result, $ERRVALFILE does not contain the expected values because +the expected value is not on the same line than gaierrval: + + gaierrval: + # 130 "conftest.c" 3 4 + -3
I am not seeing this issue here, the relevant part of the .i file looks like this:
# 129 "conftest.c" 2
int
main ()
{
gaierrval: -11
;
return 0;
}
It's quite odd that you get this # 130 conftest.c line in the middle of the .c file dump. What are we doing differently ? Is it a compiler version issue ?
Which toolchain are you using when you're having the issue ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/dante: bump to version 1.4.2
Hello Thomas,
Le sam. 14 d?c. 2019 ? 22:55, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 30 lines
Hello Fabrice,
package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch line 13
Quoted 6 lines · On Mon, 9 Dec 2019 23:27:46 +0100 Fabrice Fontaine…
package/dante/0003-osdep-m4-Remove-getaddrinfo-too-low-checks.patch new file +6
-0+As a result, $ERRVALFILE does not contain the expected values because +the expected value is not on the same line than gaierrval: + + gaierrval: + # 130 "conftest.c" 3 4 + -3I am not seeing this issue here, the relevant part of the .i file looks like this:
# 129 "
conftest.c" 2
int
main ()
{gaierrval: -11
;
return 0;
}
Quoted 5 lines
It's quite odd that you get this # 130
conftest.cline in the middle of the .c file dump. What are we doing differently ? Is it a compiler version issue ?Which toolchain are you using when you're having the issue ?
I got this build failure with the defconfig that I put in the "Fixes:" statement (i.e. toolchain-external-linaro-aarch64 from
http://autobuild.buildroot.org/results/8a9/8a92d5257ba3e6fd0ad56ddb0afad8b6edd40ae3/defconfig).
I have the same error with br-x86-64-musl-2019.05.1.tar.bz2 from
http://autobuild.buildroot.org/results/434/434393662f73118efb4b7113a48aaf40e9484a3c/defconfig.
So I don't really understand what's going on.
If you want, I can send a v2 without this patch and we'll see if build failures are raised on the autobuilders.
Quoted 8 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice
PATCH 1/3 package/dante: remove --without-pam
In reply to Fabrice FontaineQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
--without-pam was wrongly put back by commit
6d8abc7c1aca00a8ee514b38d88744ccd9ec194f
I was a bit confused about that, as that commit is fine. What instead happened was that I made a mistake when I merged next into master for the 2019.02 cycle.
So I have updated the commit message to mention this and applied, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/dante: remove --without-pam
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
--without-pam was wrongly put back by commit
6d8abc7c1aca00a8ee514b38d88744ccd9ec194fSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard