Re: Couple of gtk-doc glitches

2021-11-27 Thread Simon Josefsson via Discussion list for GNU Libtasn1
Just a quick reply, maybe this is related to the following?

https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/37
https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/67

I'm using gtk-doc from debian stable without patches.

/Simon



signature.asc
Description: This is a digitally signed message part


Re: [RFC] changes to rsyslog - default to RFC 5424 format

2021-11-23 Thread Simon Josefsson
Michael Biebl  writes:

> Hi,
>
> we are early in the bookworm release cycle, so I guess it's the
> perfect time to bring up this topic.

Sorry for hijacking the thread, but perhaps now is a good time to stop
using the legacy syslog time format and use the standardized RFC 5424
format?  It is the default format in upstream rsyslog, but the default
Debian config uses the legacy format.

Effectively, the change that I suggest is to stop putting this into
/etc/rsyslog.conf by default:

#
# Use traditional timestamp format.
# To enable high precision timestamps, comment out the following line.
#
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat

The legacy time format that is used today does not record year, timezone
or subsecond information.  Compare /var/log/syslog outputs like this:

Nov 23 21:47:31 latte jas: test

with

2021-11-23T21:47:49.082799+01:00 latte jas: test

/Simon


signature.asc
Description: PGP signature


Re: Couple of gtk-doc glitches

2021-11-23 Thread Simon Josefsson via Discussion list for GNU Libtasn1
Roman Bogorodskiy  writes:

> Hi,
>
> I was updating a FreeBSD port of libtasn1 to 4.18.0 and noticed the
> build fails with:

Hi Roman.  Thanks for the report!

> 1. Force using GNU make instead of a BSD make

BSD make should work, or it is a bug.  I wouldn't blame you for going
with the simple solution, though, but we should try to get this fixed...

> 2. Patch it with:
>
>  install  -m 0644 ./html/libtasn1.devhelp2
>  install  -m 0644 ./html/right-insensitive.png
> --- doc/reference/Makefile.in.orig  2021-11-13 05:59:58 UTC
> +++ doc/reference/Makefile.in
> @@ -1840,7 +1840,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
>   test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file 
> $(abs_builddir)/html; \
>   test -f $$file && cp $$file $(abs_builddir)/html; \
> done;
> -   $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) 
> --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
> +   cd "$(abs_srcdir)" && $(GTK_DOC_V_XREF)gtkdoc-fixxref 
> --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) 
> $(FIXXREF_OPTIONS)
> $(AM_V_at)touch html-build.stamp
>  
>  pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) 
> $(expand_content_files)
>
> Apparently, gtkdoc-fixxref needs to be executed from $(abs_srcdir),
> which is the case when building with GNU make, but with BSD make working
> directory is $(abs_srcdir)/html.

Interesting -- why is CWD in html/ here?  The previous command in the
makefile does 'cd html && ...' in the beginning, but that shouldn't
affect the CWD for the next command, should it?

> Patching Makefile.in is when building from a dist tarball, but a more
> general fix probably should go into gtk-doc.make, and here comes the
> second issue.

Thanks for working your way through this maze...

> When I try to build it from the git repo, I get:
>
>   DOC   Introspecting gobjects
>   DOC   Building XML
>   DOC   Building XML
> ../../lib/includes/libtasn1.h:24: warning: Section libtasn1 is not defined in 
> the libtasn1-sections.txt file.
> ../../lib/includes/libtasn1.h:24: warning: Section libtasn1 is not defined in 
> the libtasn1-sections.txt file.
> ./libtasn1-unused.txt:1: warning: 95 unused declarations. They should be 
> added to libtasn1-sections.txt in the appropriate place.
>   DOC   Building HTML
> warning: failed to load external entity "../xml/libtasn1.xml"
> ../libtasn1-docs.xml:34: element include: XInclude error : could not load 
> ../xml/libtasn1.xml, and no fallback was found
> gmake[3]: *** [Makefile:1824: html-build.stamp] Error 6
>
> Before that I can see that gtkdoc-scan is complaining about:
>
> ../../lib/includes/libtasn1.h:0: warning: partial declaration (struct) :   
> struct asn1_data_node_st
>
> However, I can see the same message when building from the dist tarball.
> Also, comparing the failing build from a git checkout and a successful
> build from the dist tarball, I can see that
> ./doc/reference/libtasn1-sections.txt is empty for the failing build,
> and the successful build has it populated.
>
> For the git checkout build I don't apply any patches and use GNU make.
>
> Any thoughts what's going on here?

I recall seeing this error too, and I think it was because of
objdir!=srcdir issues and it couldn't locate the libtasn1.h header file
properly for the scanning.  Just an idea.

Did you try git master?  I did some builddir!=srcdir fixes in git after
the 4.18.0 release since I probably ran into something similar that you
did.

I'll try to reproduce this... having a BSD system in the CI/CD test
framework would really help iron out more of the GNU/Linux idioms that
tends to be used.

/Simon


signature.asc
Description: PGP signature


Prefer AM_GNU_GETTEXT_REQUIRE_VERSION?

2021-11-23 Thread Simon Josefsson via Gnulib discussion list
Hi.  This may mostly be for Bruno, but I believe it is more relevent to
gnulib than gettext, even though it is gettext-related, and maybe others
on this list can provide feedback too.

I got a bug report that suggested using AM_GNU_GETTEXT_REQUIRE_VERSION:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999510

The suggestion boils down to:

-AM_GNU_GETTEXT_VERSION([0.19.3])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.19.6])

Libidn2 (and many other packages) contains:

AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.3])

Reading gettext NEWS suggests to me that 0.19.8 fixed something for
musl, and that this gettext fix is what is needed to build packages
using gettext on that platform.  Am I understanding correct?

If so, my usage of AM_GNU_GETTEXT_VERSION([0.19.3]) seems indeed
problematic because it leads to a too old gettext infrastructure being
pulled in.  It would be nice if my package used the latest available
gettext files during bootstrapping, so I should use this:

AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
AM_GNU_GETTEXT_VERSION([0.19.6])

Then assuming the person rebootstrapping libidn2 using a sufficiently
modern gettext (>=0.19.8) will get the acceptable fixes for musl.

Before fixing this, it occured to me that this seems like something that
should be generally true for any project using gettext.  Thoughts?  Why
wouldn't you want gettext to use the latest available infrastructure
files?  The situation seems similar to libtool's M4 handling.

Thus I would prefer to write a 'make syntax-check' rule to catch this,
and suggest that all packages should use AM_GNU_GETTEXT_REQUIRE_VERSION
to get latest gettext files included in them.  Thoughts?

/Simon


signature.asc
Description: PGP signature


libtasn1-4.18.0 released [stable]

2021-11-09 Thread Simon Josefsson via info-gnu
We are happy to announce the release 4.18.0 of libtasn1!

This is GNU Libtasn1, a small ASN.1 library.

Website:
  https://www.gnu.org/software/libtasn1/

Manual:
  https://www.gnu.org/software/libtasn1/manual/

Here are the compressed sources and a GPG detached signature[*]:
  https://ftpmirror.gnu.org/libtasn1/libtasn1-4.18.0.tar.gz
  https://ftpmirror.gnu.org/libtasn1/libtasn1-4.18.0.tar.gz.sig

Use a mirror for higher download bandwidth:
  https://www.gnu.org/order/ftp.html

Here are the SHA1 and SHA256 checksums:

1665249ce66e64958e8c61d5bdc6c1e9f3623888  libtasn1-4.18.0.tar.gz
Q2XBVJU1Y9ZMZ6AktgfR7nXG23bg0PZXCeqAozTNGJg  libtasn1-4.18.0.tar.gz

The SHA256 checksum is base64 encoded, instead of the
hexadecimal encoding that most checksum tools default to.

[*] Use a .sig file to verify that the corresponding file (without the
.sig suffix) is intact.  First, be sure to download both the .sig file
and the corresponding tarball.  Then, run a command like this:

  gpg --verify libtasn1-4.18.0.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys 51722B08FE4745A2

and rerun the 'gpg --verify' command.

This release was bootstrapped with the following tools:
  Gnulib v0.1-4958-ge20b35c91
  Autoconf 2.71
  Automake 1.16.5
  Libtoolize 2.4.6
  Make 4.3
  Makeinfo 6.7
  Bison 3.7.5
  Help2man 1.48.1
  Gtkdocize 1.33.1
  Tar 1.34
  Gzip 1.10

NEWS

* Noteworthy changes in release 4.18.0 (2021-11-09) [stable]
- Improve GTK-DOC manual.  Closes: #35.
- Improve --help and --version for tools with gnulib.  Closes: #37.
- Update gnulib files and various maintenance fixes.


signature.asc
Description: PGP signature
-- 
If you have a working or partly working program that you'd like
to offer to the GNU project as a GNU package,
see https://www.gnu.org/help/evaluation.html.


Re: [PATCH 01/11] Fix base64 module to work with grub codebase

2021-11-09 Thread Simon Josefsson via Gnulib discussion list
Robbie Harwood  writes:

> So I think our way forward is to move where we nerf _GL_ATTRIBUTE_CONST
> in grub2.  I've tested that this works and will submit to grub2.
>
> Longer-term, this problem could be avoided by dropping the const
> attribute from isbase64().  Since uchar_in_range is a macro, b64 is
> const, and to_uchar() doesn't do anything, the compiler should be able
> to infer this anyway.  (Adding an inline marker to to_uchar() might help
> with this.)  What do you think?

I'm not really sure what you suggest -- please post a patch for review
-- but I'm wondering if you are aware of how to use local patches for
gnulib sources?  Sometimes this is the best compromise when you can't
come up with something that is suitable for gnulib generally, and you
don't want to fix your code to use the existing gnulib API.

https://www.gnu.org/software/gnulib/manual/html_node/Extending-Gnulib.html

I sometimes use this when I disagree with something that is in gnulib
upstream, but still track all other changes from gnulib.

/Simon


signature.asc
Description: PGP signature


libtasn1-4.18.0 released [stable]

2021-11-09 Thread Simon Josefsson via Discussion list for GNU Libtasn1
We are happy to announce the release 4.18.0 of libtasn1!

This is GNU Libtasn1, a small ASN.1 library.

Website:
  https://www.gnu.org/software/libtasn1/

Manual:
  https://www.gnu.org/software/libtasn1/manual/

Here are the compressed sources and a GPG detached signature[*]:
  https://ftpmirror.gnu.org/libtasn1/libtasn1-4.18.0.tar.gz
  https://ftpmirror.gnu.org/libtasn1/libtasn1-4.18.0.tar.gz.sig

Use a mirror for higher download bandwidth:
  https://www.gnu.org/order/ftp.html

Here are the SHA1 and SHA256 checksums:

1665249ce66e64958e8c61d5bdc6c1e9f3623888  libtasn1-4.18.0.tar.gz
Q2XBVJU1Y9ZMZ6AktgfR7nXG23bg0PZXCeqAozTNGJg  libtasn1-4.18.0.tar.gz

The SHA256 checksum is base64 encoded, instead of the
hexadecimal encoding that most checksum tools default to.

[*] Use a .sig file to verify that the corresponding file (without the
.sig suffix) is intact.  First, be sure to download both the .sig file
and the corresponding tarball.  Then, run a command like this:

  gpg --verify libtasn1-4.18.0.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys 51722B08FE4745A2

and rerun the 'gpg --verify' command.

This release was bootstrapped with the following tools:
  Gnulib v0.1-4958-ge20b35c91
  Autoconf 2.71
  Automake 1.16.5
  Libtoolize 2.4.6
  Make 4.3
  Makeinfo 6.7
  Bison 3.7.5
  Help2man 1.48.1
  Gtkdocize 1.33.1
  Tar 1.34
  Gzip 1.10

NEWS

* Noteworthy changes in release 4.18.0 (2021-11-09) [stable]
- Improve GTK-DOC manual.  Closes: #35.
- Improve --help and --version for tools with gnulib.  Closes: #37.
- Update gnulib files and various maintenance fixes.


signature.asc
Description: PGP signature


Re: [TLS] Fwd: Last Call: (Channel Bindings for TLS 1.3) to Proposed Standard

2021-11-08 Thread Simon Josefsson
Jonathan Hoyland  writes:

> When someone tries to copy a message from a SCRAM handshake into some
> GSS-API run on a single TLS connection I want to be sure that it will be
> rejected, without having to understand exactly how every version of SCRAM
> and GSS-API ever (including ones that will be drafted in the future) works
> (not to mention every other protocol past, present, and future that uses
> the same string.)

If I understand you correctly, this behaviour was a design choice of
SCRAM (and indirectly GS2) -- it was designed so that SCRAM native in
SASL would produce the same tokens as SCRAM used via GSS-API, for the
same TLS session.  Whether that was a wise decision remains to be seen,
but I don't think it will come as a surprise for anyone, nor is there
any publicly documented attack based on this property that I am aware
of.

/Simon


signature.asc
Description: PGP signature
___
TLS mailing list
TLS@ietf.org
https://www.ietf.org/mailman/listinfo/tls


Re: [PATCH] bootstrap: When a commit hash is specified, do a shallow fetch if possible

2021-10-27 Thread Simon Josefsson via Gnulib discussion list
Bruno Haible  writes:

>> > Also, I would expect that the GNULIB_REVISION environment variable is not
>> > so frequently used, and that the more frequent use is with git submodules.
>> > Is it possible to apply the same trick to the git submodules case? Or does
>> > the use of submodules always require a deep clone?
>> 
>> Honestly, I don't have much experience with or knowledge of submodules,
>> so I don't feel I can provide a good answer. I suspect that the answer
>> is that this trick can be used. I've not looked in to it because the
>> project that I'm working on does not use gnulib as a git submodule.
>
> OK, then let's leave that part to the next person who actually observes
> the issue in a context with submodules.

I have noticed that fetching the gnulib git submodule is painfully slow
via ./bootstrap on GitLab CI/CD builds -- but I've recently realized
that I can ask GitLab CI/CD to check out submodules for me by using the
following in .gitlab-ci.yml:

variables:
  GIT_SUBMODULE_STRATEGY: normal

Then ./bootstrap does not have to check out the gnulib submodule, and
things are fast again.

So I've observed the issue, but I prefer the GitLab-specific workaround
as it appears better than even doing a shallow clone in ./bootstrap.
Other CI/CD environments may not have this feature though, so maybe
someone else is bitten by this problem too eventually.

/Simon


signature.asc
Description: PGP signature


Re: [PATCH 01/11] Fix base64 module to work with grub codebase

2021-10-27 Thread Simon Josefsson via Gnulib discussion list
Robbie Harwood  writes:

> The gnulib module makes use of booleans via the  header. As
> GRUB does not provide any POSIX wrapper header for this, but instead
> implements support for bool in , we need to patch
> base64.h to not use  anymore. We unfortunately cannot include
>  instead, as it would then use gnulib's internal header
> while compiling the gnulib object but our own  when
> including it in a GRUB module. Because of this, the patch replaces the
> include with a direct typedef.

Thanks for trying to upstream diverged gnulib code!

I think this patch is wrong -- gnulib includes a stdbool.h replacement
you can you use, and the base64 module depends on the stdbool module
already.  Is there a problem with the stdbool module?  If so, let's fix
that.

> A second fix is required to make available _GL_ATTRIBUTE_CONST, which
> is provided by the configure script. As base64.h does not include
> , it is thus not available and results in a compile error.
> This is fixed by adding an include of .

I think I agree that this is a problem, but your solutions seems wrong.
There are plenty of header files in gnulib that relies on definitions in
config.h created by the m4 macro that came with the hader file, yet the
header file do not #include config.h as usually that is supposed to be
done by the .c file that include the (say) base64.h header file.  I'm
not sure assumption is documented anywhere, and if so we should document
it.  I think this is how it is supposed to work, but if it isn't, we
should try to come up with a solution for it and document that.

/Simon


signature.asc
Description: PGP signature


Bug#997850: Apply upstreamed patch to not use deprecated gsasl symbols

2021-10-25 Thread Simon Josefsson
Package: libvmime
Version: 0.9.2-6

Hi!  Would you mind merging the following patch, to allow libvmime to
be built against gsasl in experimental?  Soon I hope to upload gsasl to
unstable and do a shared library transition, and I believe libvmime is
the only reverse dependency (in testing) that do not build against the
new gsasl release.

https://github.com/kisli/vmime/pull/248/commits/c750e899b8b3a76379167148468e164b7e52f6e2

It has been added into upstream git:

https://salsa.debian.org/giraffe-team/libvmime/-/merge_requests/1

Thanks,
Simon



signature.asc
Description: This is a digitally signed message part


Re: Raptor Talos boot issues with Debian image

2021-10-17 Thread Simon Josefsson
Simon Josefsson  writes:

> Hi.  I'm having trouble booting the Debian netinst ISO images on a Talos
> II Lite mainboard.  It shows up in petitboot, but selecting 'Default
> install' results in the usual output 'SIGTERM received, booting...'
> (from petitboot?) output and then nothing happens.  Both Ubuntu 20.04
> and Fedora 34 images works fine.  Any ideas on how to debug this
> further?

Following up to myself: the issue was that the Debian netinst image only
output things to the serial port, and not to the VGA port that I used.
Both Ubuntu and Fedora output to VGA, so I was surprised to see
different behaviour with Debian.  Could Debian be made to output to both
serial and VGA by default?  Just an idea.

/Simon


signature.asc
Description: PGP signature


Re: [exim] How to use DKIM with Ed25519 - Dual DKIM signing

2021-10-16 Thread Simon Josefsson via Exim-users
Evgeniy Berdnikov via Exim-users  writes:

> On Thu, Oct 14, 2021 at 05:50:23PM +0300, Odhiambo Washington via Exim-users 
> wrote:
>> On Thu, Oct 14, 2021 at 4:25 PM Evgeniy Berdnikov via Exim-users <
>> exim-users@exim.org> wrote:
>> > |  dkim_selectorUse: smtp   Type: string list†  Default:
>> > unset
>> > |
>> > |  This sets the key selector string. After expansion, which can use
>> > |  $dkim_domain, this can be a list. Each element in turn is put in the
>> > |  expansion variable $dkim_selector which may be used in the
>> > |  dkim_private_key option along with $dkim_domain.
>> >
>> >  Does the assignment dkim_selector="key1:key2" work?
>> >
>> 
>> I don't think that would work, because I have to then match a selector to a
>> key.
>
>  The last sentense in the cited paragraph explains how this match works.
>  Read it again carefully. Description of dkim_private_key repeats it:
>
> |  dkim_private_key   Use: smtp   Type: string†   Default: unset
> |
> |  This sets the private key to use. You can use the $dkim_domain and
> |  $dkim_selector expansion variables to determine the private key to use.

Indeed, but getting it to work took a while for me too.  I'm now using
the following (Debian-esque config but you should see how it works):

DKIM_CANON = relaxed
DKIM_SELECTOR = ed2110 : rsa2110
DKIM_DOMAIN = ${sender_address_domain}
DKIM_PRIVATE_KEY = ${lookup {${sender_address_domain}} \
dsearch,ret=full {/etc/exim4/dkim} \
{$value/privkey-$dkim_selector.pem} {false}}
DKIM_TIMESTAMPS = 1209600

/Simon


signature.asc
Description: PGP signature
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-users
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/


[exim] PIPE_CONNECT

2021-10-16 Thread Simon Josefsson via Exim-users
Hi.  I noticed that Dovecot SMTP submission agent complains about Exim's
PIPE_CONNECT:

Oct 16 10:32:32 pippi dovecot: 
submission(simon)<111236><8poyJ3TOeNEgAQmxQaz/ANGknOU4qRZw>: Warning: 
smtp-client: conn pippi.sjd.se:25 (127.0.1.1:25) [1]: Received invalid EHLO 
response line: Unexpected character in EHLO keyword

It was discussed on the dovecot list before:

https://dovecot.org/pipermail/dovecot/2020-September/119854.html

Should the specification and Exim be fixed here?  It seems '_' is not
permitted by RFC 5321.

/Simon


signature.asc
Description: PGP signature
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-users
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/


Raptor Talos boot issues with Debian image

2021-10-16 Thread Simon Josefsson
Hi.  I'm having trouble booting the Debian netinst ISO images on a Talos
II Lite mainboard.  It shows up in petitboot, but selecting 'Default
install' results in the usual output 'SIGTERM received, booting...'
(from petitboot?) output and then nothing happens.  Both Ubuntu 20.04
and Fedora 34 images works fine.  Any ideas on how to debug this
further?

I'm using
https://cdimage.debian.org/debian-cd/current/ppc64el/iso-cd/debian-11.1.0-ppc64el-netinst.iso
and have verified SHA256 checksum, and tested several USB sticks as well
as OpenBMC virtual media.  I have tried the 11.0 and some 10.x images
too.

/Simon


signature.asc
Description: PGP signature


Bug#993294: RM: libidn11-java [all] -- NBS; needs manual cruft removal

2021-10-13 Thread Simon Josefsson
Hi.  What is the progress on this?  As far as I can tell, it is
blocking the 'libidn' package from ever entering testing:
https://tracker.debian.org/pkg/libidn

"Issues preventing migration:
missing build on all"

/Simon



signature.asc
Description: This is a digitally signed message part


Re: Freesh cloud images?

2021-09-28 Thread Simon Josefsson
Jason Self  writes:

> On Mon, 27 Sep 2021 20:46:52 +0200
> Simon Josefsson  wrote:
>
>> Hi.  I'm using debian (bullseye) on several machines, including some
>> virtual machines that use the 'linux-image-cloud' kernel image.  Could
>> Freesh provide such cloud images, based on linux-libre?  Or is that
>> irrelevant or out of scope for of Freesh for some reason?  I could
>> probably use the linux-libre *.deb's, but my understanding is that the
>> linux-image-cloud images provided by Debian provide some advantage
>> when running inside a virtual machine.
>
> I don't know that it's irrelevant or out of scope. Linux-libre should
> be available where people need it although the current kernels in
> Freesh work quite well in virtual machines. Give me a few days to look
> in to this and think about it. I don't want to use "cloud" in the name
> though.

Okay.  Where is the debian/ source code for the Freesh packages?  Source
debs or git repository would be useful, I couldn't find links on the
homepage but I'm probably missing something.  I'd like to compare your
images differ from vanilla Debian images, and also compare how Debian
cloud images differ from non-cloud images.

/Simon



signature.asc
Description: PGP signature
___
linux-libre mailing list
linux-libre@fsfla.org
http://www.fsfla.org/cgi-bin/mailman/listinfo/linux-libre


Freesh cloud images?

2021-09-27 Thread Simon Josefsson
Hi.  I'm using debian (bullseye) on several machines, including some
virtual machines that use the 'linux-image-cloud' kernel image.  Could
Freesh provide such cloud images, based on linux-libre?  Or is that
irrelevant or out of scope for of Freesh for some reason?  I could
probably use the linux-libre *.deb's, but my understanding is that the
linux-image-cloud images provided by Debian provide some advantage when
running inside a virtual machine.

/Simon


signature.asc
Description: PGP signature
___
linux-libre mailing list
linux-libre@fsfla.org
http://www.fsfla.org/cgi-bin/mailman/listinfo/linux-libre


Re: [PATCH] string, wchar: avoid some namespace pollution

2021-09-23 Thread Simon Josefsson via Gnulib discussion list
Bruno Haible  writes:

> Thanks for the heads-up, Simon. I debugged it, and indeed the cause is
> in gnulib, not in libidn. The patch below fixes it.

Thanks for debugging this Bruno!

/Simon


signature.asc
Description: PGP signature


Re: [PATCH] maint: Avoid syntax-check failure for empty gnulib submodule.

2021-09-20 Thread Simon Josefsson via Gnulib discussion list
mån 2021-09-20 klockan 07:36 -0700 skrev Jim Meyering:
> On Mon, Sep 20, 2021 at 12:49 AM Simon Josefsson via Gnulib
> discussion
> list  wrote:
> > Hi,
> > 
> > Some syntax-check rules have a really poor failure mode (it prints
> > all
> > source code files to stdout) when the 'gnulib_dir' points to an
> > empty
> > git submodule checkout, see for example:
> > 
> > https://storage.googleapis.com/gitlab-gprd-artifacts/08/35/08352f7ac0f5a870c92aa01ca17d0b44be10aff8451893987ed8dbf48231/2021_09_19/1602830917/1729528459/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8=inline=gitlab-object-storage-...@gitlab-production.iam.gserviceaccount.com=fGIerRoWfE1woQD7hzvDst%2FPa67Kg9u9PjJxMB8vLpFD4DZIPDZNRBcqHQZV%0ARtRNSa2k2Er1W59wYe%2F%2FKY9C95YkIhMCftS5zBXfqsEPkRbU8CwcoG5clQoL%0A4Mpqy6OY1Kx7JUB86qBpYWFKlHLPosw0sscOolAGxcel2oZP1soxHLzxcgo%2B%0A66whawET8QK%2Bkj8FOElVzwVz93T8Qp0uZgvfoT7UVF2O9JGlEofYw7%2BrQm%2Ff%0AXOutkumck4OR17dGXSNaoWPO48Z7tDJLeAjWjnSUm%2F9ZPkYd%2B8IfxaEzACg%2B%0Av%2FS%2ByQpyp6eS1kdiliBmJFmL0Y7JJu7HgZiU21kkyw%3D%3D=1632123408
> > 
> > The patch below is not ideal -- consider if you did ./bootstrap --
> > no-git
> > with the goal of using GNULIB_SRCDIR but for some reason ALSO did
> > 'git
> > submodule update --init', then the syntax-check rules will use the
> > submodule checkout instead of the GNULIB_SRCDIR content -- but I
> > believe
> > things are better with the patch than without it.
> ...
> > -gnulib_dir ?= $(shell if test -d $(srcdir)/gnulib; then \
> > +gnulib_dir ?= $(shell if test -f $(srcdir)/gnulib/gnulib-tool;
> > then \
> >     echo $(srcdir)/gnulib; \
> >     else \
> >     echo ${GNULIB_SRCDIR}; \
> 
> Hi Simon,
> 
> Maybe I'm misunderstanding the scenario, but if the gnulib dir is in
> an inconsistent state, isn't it more appropriate that syntax-check
> rules fail (even if noisily), than maybe-succeed because we pointed
> them at another dir that's not even being used yet?

Hi!  I don't know and I'm open for any behaviour, if it is consistently
applied.  Looking at the current state, it seems like 'make syntax-
check' fail silently when some pre-requirements (like missing tools)
are not met.  Having a properly setup gnulib directory is only a
requirement for very few rules (I think <5).  I think it makes sense to
run 'make syntax-check' from a tarball build, but then the tests that
require a gnulib directory cannot work obviously (and could fail
silently or with a warning).

Further, it is not really that the gnulib dir is in an inconsistent
state, it is that maint.mk does not really know what ./bootstrap used 
as the gnulib directory.  Idealy, the decision made by ./bootstrap
about which gnulib_dir it used should be preserved somehow, and then
the same value should used by 'make syntax-check'.  Achieving this
seems complicated.  Maybe it is sufficient that both scripts use
similar enough logic to derive the value that it isn't a problem in
practice.

> Does it make sense to run "make syntax-check" without first having
> run "make"? That latter requires a proper gnulib setup, in my
> experience.

Sure, but in the example above, there is a gnulib directory setup
correctly (through the GNULIB_SRCDIR environment variable set in the
docker image environment that ./bootstrap picks up) but 'make syntax-
check' doesn't use it, but prefer the local non-populated gnulib/ git
submodule.

/Simon



signature.asc
Description: This is a digitally signed message part


Re: FTP client arbitrary code execution

2021-09-20 Thread Simon Josefsson via Bug reports for the GNU Internet utilities
John Zhau  writes:

> After some further testing, I've found that I'm still able to get a shell
> with the aforementioned payload even with other files in the same
> directory. I've also found that I can also get a shell with the following
> file name:
>
> ```
> |nc 127.0.0.1 1337 -e sh
> ```
>
> As a result, I believe code execution is caused by having a `|` (pipe) at
> the beginning of the file name.

Hi.  Thanks for the report.  Are you sure this isn't intended behaviour?
There seems to be globbing support in the ftp client, to support
redirects like | and > from within the client.

/Simon

>
> Also, the version information is as follows.
>
> ```
> $ ftp --version
> ftp (GNU inetutils) 2.1
> Copyright (C) 2021 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later <
> https://gnu.org/licenses/gpl.html>.
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.
>
> Written by many authors.
> ```
>
> On Sun, Sep 19, 2021 at 7:04 PM John Zhau  wrote:
>
>> I've found that with a certain file name, `ftp` executes code in the file
>> name. The file is created with the following command
>>
>> ```
>> touch "|python3 -c 'import
>> os,pty,socket;s=socket.socket();s.connect((\"YOUR_IP\",YOUR_PORT));[os.dup2(s.fileno(),f)for
>> f in(0,1,2)];pty.spawn(\"sh\")';echo .csv"
>> ```
>>
>> To get code to execute, simply have the file in the current directory
>> (haven't tested with multiple files in the directory) and run `put *` to
>> upload everything.
>>
>> This bug was found while I was doing a CTF (capture the flag) challenge
>> and I haven't been able to connect to the same server since for further
>> testing.
>>


signature.asc
Description: PGP signature


Re: [exim] GnuTLS vs OpenSSL

2021-09-20 Thread Simon Josefsson via Exim-users
Viktor Dukhovni via Exim-users  writes:

> On Sat, Sep 18, 2021 at 09:45:28PM +0100, Andrew C Aitchison via
> Exim-users wrote:
>
>> > Besides this: About 85% of the incoming traffic is still unencrypted
>> > (for my statistics, mainly because some high volume mailing list
>> > servers do not use TLS), about 10% uses TLS1.3, 5% still uses TLS1.2
>> > (I log TLS ciphers via +tls_cipher in Exim).
>> 
>> It looks as though you do not allow TLSv1.1 - I suspect that a 
>> substantial faction of that 85% would use it if you allowed it.
>> For email it is probably better to allow TLSv1.1 than reject it
>> and end up receiving the message in plain.
>
> Make that TLS 1.0, almost nobody uses TLS 1.1, the sites that don't
> support at least TLS 1.2 almost invariably only support TLS 1.0.

FWIW, I have used standard Debian exim (heavy, with GnuTLS) for my
personal email server for a couple of years, and I don't recall any
TLS-related problem.  FWIW, it seems TLS1.2 and TLS 1.3 is in wide use,
see statistics from the last couple of days on my server:

root@uggla:~# zgrep ' <= ' /var/log/exim4/mainlog*|grep -v ' P=local '|grep 
X=TLS1.0|wc -l
3
root@uggla:~# zgrep ' <= ' /var/log/exim4/mainlog*|grep -v ' P=local '|grep 
X=TLS1.1|wc -l
1
root@uggla:~# zgrep ' <= ' /var/log/exim4/mainlog*|grep -v ' P=local '|grep 
X=TLS1.2|wc -l
640
root@uggla:~# zgrep ' <= ' /var/log/exim4/mainlog*|grep -v ' P=local '|grep 
X=TLS1.3|wc -l
657
root@uggla:~# zgrep ' <= ' /var/log/exim4/mainlog*|grep -v ' P=local '|grep -v 
X=TLS|wc -l
46
root@uggla:~# 

/Simon


signature.asc
Description: PGP signature
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-users
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/


[PATCH] maint: Avoid syntax-check failure for empty gnulib submodule.

2021-09-20 Thread Simon Josefsson via Gnulib discussion list
Hi,

Some syntax-check rules have a really poor failure mode (it prints all
source code files to stdout) when the 'gnulib_dir' points to an empty
git submodule checkout, see for example:

https://storage.googleapis.com/gitlab-gprd-artifacts/08/35/08352f7ac0f5a870c92aa01ca17d0b44be10aff8451893987ed8dbf48231/2021_09_19/1602830917/1729528459/job.log?response-content-type=text%2Fplain%3B%20charset%3Dutf-8=inline=gitlab-object-storage-...@gitlab-production.iam.gserviceaccount.com=fGIerRoWfE1woQD7hzvDst%2FPa67Kg9u9PjJxMB8vLpFD4DZIPDZNRBcqHQZV%0ARtRNSa2k2Er1W59wYe%2F%2FKY9C95YkIhMCftS5zBXfqsEPkRbU8CwcoG5clQoL%0A4Mpqy6OY1Kx7JUB86qBpYWFKlHLPosw0sscOolAGxcel2oZP1soxHLzxcgo%2B%0A66whawET8QK%2Bkj8FOElVzwVz93T8Qp0uZgvfoT7UVF2O9JGlEofYw7%2BrQm%2Ff%0AXOutkumck4OR17dGXSNaoWPO48Z7tDJLeAjWjnSUm%2F9ZPkYd%2B8IfxaEzACg%2B%0Av%2FS%2ByQpyp6eS1kdiliBmJFmL0Y7JJu7HgZiU21kkyw%3D%3D=1632123408

The patch below is not ideal -- consider if you did ./bootstrap --no-git
with the goal of using GNULIB_SRCDIR but for some reason ALSO did 'git
submodule update --init', then the syntax-check rules will use the
submodule checkout instead of the GNULIB_SRCDIR content -- but I believe
things are better with the patch than without it.

/Simon

* top/maint.mk (gnulib_dir): Fall back to GNULIB_SRCDIR if
submodule is not checked out.
---
 ChangeLog| 6 ++
 top/maint.mk | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ddc28ddc2..6d5ba0854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-09-20  Simon Josefsson  
+
+   maint: Avoid syntax-check failure for empty gnulib submodule.
+   * top/maint.mk (gnulib_dir): Fall back to GNULIB_SRCDIR if
+   submodule is not checked out.
+
 2021-09-19  Bruno Haible  
 
Relicense qemu.h under LGPLv2+.
diff --git a/top/maint.mk b/top/maint.mk
index 0aa63773c..a03bc2e21 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -64,7 +64,7 @@ VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir)
 
 # You can override this variable in cfg.mk if your gnulib submodule lives
 # in a different location.
-gnulib_dir ?= $(shell if test -d $(srcdir)/gnulib; then \
+gnulib_dir ?= $(shell if test -f $(srcdir)/gnulib/gnulib-tool; then \
echo $(srcdir)/gnulib; \
else \
echo ${GNULIB_SRCDIR}; \
-- 
2.30.2



signature.asc
Description: PGP signature


Re: /etc/network/if-pre-up.d/cloud_inet6: 12: IF_TRY_DHCP: parameter not set

2021-09-14 Thread Simon Josefsson
Thomas Goirand  writes:

>> https://cloud.debian.org/images/cloud/bullseye/20210814-734/debian-11-genericcloud-amd64-20210814-734.qcow2
>
> Hi,
>
> Do not use that image, it's known to be broken. Please use something
> newer than this one, where the commit was reverted.

Okay.  I tried daily 0914 and then I'm back to the 1 minute DHCP delay
timeout that I reported earlier:

https://lists.debian.org/debian-cloud/2021/05/msg00045.html

Is there any mechanism (that works..) to disable DHCP?

/Simon


signature.asc
Description: PGP signature


/etc/network/if-pre-up.d/cloud_inet6: 12: IF_TRY_DHCP: parameter not set

2021-09-14 Thread Simon Josefsson
Hi,

I get the following in syslog on first startup with localds config with
static network:

Sep 14 07:54:11 foo systemd[1]: Starting Raise network interfaces...
Sep 14 07:54:11 foo ifup[332]: ifup: waiting for lock on 
/run/network/ifstate.enp1s0
Sep 14 07:54:11 foo sh[409]: /etc/network/if-pre-up.d/cloud_inet6: 12: 
IF_TRY_DHCP: parameter not set
Sep 14 07:54:11 foo sh[408]: run-parts: /etc/network/if-pre-up.d/cloud_inet6 
exited with return code 2
Sep 14 07:54:11 foo systemd[1]: ifup@enp1s0.service: Main process exited, 
code=exited, status=1/FAILURE
Sep 14 07:54:11 foo sh[333]: ifup: failed to bring up enp1s0
Sep 14 07:54:11 foo systemd[1]: ifup@enp1s0.service: Failed with result 
'exit-code'.
Sep 14 07:54:11 foo ifup[416]: RTNETLINK answers: File exists
Sep 14 07:54:11 foo ifup[332]: ifup: failed to bring up enp1s0
Sep 14 07:54:11 foo systemd[1]: networking.service: Main process exited, 
code=exited, status=1/FAILURE
Sep 14 07:54:11 foo systemd[1]: networking.service: Failed with result 
'exit-code'.

As a result, IPv6 is not setup correctly.

Below is how to reproduce it (VM host is a Debian buster machine -- but
that should not matter).

root@bull:~# wget -q -O foo.qcow2 
https://cloud.debian.org/images/cloud/bullseye/20210814-734/debian-11-genericcloud-amd64-20210814-734.qcow2
root@bull:~# cat> cloud_init.cfg
#cloud-config
fqdn: foo.sjd.se
manage_etc_hosts: true
password: r00tme
chpasswd: { expire: False }
root@bull:~# cat>network_config_static.cfg
version: 2
ethernets:
  enp1s0:
dhcp4: false
dhcp6: false
addresses: [ 178.174.241.109/26, 2001:9b1:8633::109/48 ]
gateway4: 178.174.241.65
gateway6: 2001:9b1:8633::1
nameservers:
  addresses: [ 213.80.98.2, 2001:9b0::53:1, 213.80.101.3, 2001:9b0::53:2 ]
root@bull:~# cloud-localds -v --network-config=network_config_static.cfg 
seed-foo.iso cloud_init.cfg
wrote /var/lib/libvirt/images/seed-foo.iso with filesystem=iso9660 and 
diskformat=raw
root@bull:~# virt-install --name foo --import --os-variant debian10 --memory 
1024 --disk foo.qcow2 --disk seed-foo.iso,readonly=on --noreboot --noautoconsole

Starting install...
Domain creation completed.
You can restart your domain by running:
  virsh --connect qemu:///system start foo
root@bull:~# virsh start --console foo
...
[  OK  ] Started ifup for enp1s0.
 Starting Raise network interfaces...
[FAILED] Failed to start Raise network interfaces.
See 'systemctl status networking.service' for details.
[  OK  ] Reached target Network.
 Starting Initial cloud-ini… (metadata service crawler)...
[4.535051] cloud-init[438]: Cloud-init v. 20.4.1 running 'init' at Tue, 14 
Sep 2021 07:58:04 +. Up 4.51 seconds.
[4.551574] cloud-init[438]: ci-info: 
++Net device 
info+++
[4.553864] cloud-init[438]: ci-info: 
++--+---+-++---+
[4.559719] cloud-init[438]: ci-info: | Device |  Up  |  Address 
 |   Mask  | Scope  | Hw-Address|
[4.563556] cloud-init[438]: ci-info: 
++--+---+-++---+
[4.567555] cloud-init[438]: ci-info: | enp1s0 | True |  178.174.241.109 
 | 255.255.255.192 | global | 52:54:00:78:0e:03 |
[4.575577] cloud-init[438]: ci-info: | enp1s0 | True | 
fe80::5054:ff:fe78:e03/64 |.|  link  | 52:54:00:78:0e:03 |
[4.577905] cloud-init[438]: ci-info: |   lo   | True | 127.0.0.1
 |255.0.0.0|  host  | . |
[4.583751] cloud-init[438]: ci-info: |   lo   | True |  ::1/128 
 |.|  host  | . |
[4.586024] cloud-init[438]: ci-info: 
++--+---+-++---+


signature.asc
Description: PGP signature


Re: inetutils-2.2 released [stable]

2021-09-10 Thread Simon Josefsson via Bug reports for the GNU Internet utilities
Michael Brunnbauer  writes:

> hi
>
> On Sun, Sep 05, 2021 at 11:24:34AM +0200, Simon Josefsson wrote:
>> Thanks -- interesting, which operating system is this?  Knowing that
>> would make it easier for me to reproduce it.
>
> I compile everything myself - sorry. Maybe the problem has to do with me
> using the latest glibc.

Could you try to reproduce the problem standalone?  The file regexp.m4
contains the C code to trigger the bug, could you extract it and build
it separately and run it under gdb and get a 'bt full' backtrace?  The
code looks quite complex...

/Simon


signature.asc
Description: PGP signature


Re: [PATCH] declare free() in lib/free.c

2021-09-10 Thread Simon Josefsson via Gnulib discussion list
Bruno Haible  writes:

> What exactly is the problem that you were seeing? (Commands to reproduce,
> and compiler output, please.)

I haven't had time to debug it, but since a few days libidn fails to
build with a reference to rpl_free, that looks related to this thread
and the recent gnulib changes for the free module:

https://oss-fuzz-build-logs.storage.googleapis.com/log-002189ee-3c98-45b8-9bde-3bfb20317e9a.txt

/Simon


signature.asc
Description: PGP signature


test-driver patch?

2021-09-05 Thread Simon Josefsson via Gnulib discussion list
Hi.  I'm trying to debug a regexp segfault [1] in latest inetutils
release, but the following fails:

jas@latte:~/src/gnulib$ ./gnulib-tool --create-testdir --dir m regex
...
executing autoheader
executing touch config.h.in
executing automake --add-missing --copy
parallel-tests: installing '../build-aux/test-driver'
patching file build-aux/test-driver
Hunk #1 FAILED at 109.
1 out of 1 hunk FAILED -- saving rejects to file build-aux/test-driver.rej
patching file build-aux/test-driver
jas@latte:~/src/gnulib$ 

This is on a Debian bullseye with Debian's automake 1.16.3.  The
test-driver patching stuff seems a bit fragile, I'm not sure how to best
fix this.  Ideas?

/Simon

[1] https://lists.gnu.org/archive/html/bug-inetutils/2021-09/msg1.html


signature.asc
Description: PGP signature


Re: inetutils-2.2 released [stable]

2021-09-05 Thread Simon Josefsson via Bug reports for the GNU Internet utilities
Michael Brunnbauer  writes:

> From syslog:
>
> conftest[30264]: segfault at 0 ip 7f2bfdf50ce7 sp 7fffd3380918
> error 4 in libc.so.6[7f2bfdec9000+167000]
>
> From config.log:
>
> configure:37718: checking for working re_compile_pattern
> configure:38031: gcc -o conftest -g -O2   conftest.c  >&5
> configure:38031: $? = 0
> configure:38031: ./conftest
> ./configure: line 3032: 15415 Segmentation fault  ./conftest$ac_exeext
> configure:38031: $? = 139
> configure: program exited with status 139
>
> Linux kernel 4.9.276
> Glibc 2.34
> GCC 7.5.0
>
> Need more info?

Thanks -- interesting, which operating system is this?  Knowing that
would make it easier for me to reproduce it.

What does 'make check' output?

/Simon


signature.asc
Description: PGP signature


[PATCH] doc: Improve help related to bootstrap script.

2021-09-04 Thread Simon Josefsson via Gnulib discussion list
Hi.  It seems a lot of projects that use gnulib is using our bootstrap
script, but documentation is fairly hidden in the manual.  This is just
a small improvement to the current section.

/Simon

* doc/gnulib-tool.texi (VCS Issues): Make title more positive,
s/Issues/Integration/.  Some more bootstrap-related hints,
including changing suggested submodule path from .gnulib to gnulib
as this seems to be more wide-spread.
---
 ChangeLog|  8 
 doc/gnulib-tool.texi | 43 ++-
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9e398602..015f20b1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-04  Simon Josefsson  
+
+   doc: Improve help related to bootstrap script.
+   * doc/gnulib-tool.texi (VCS Issues): Make title more positive,
+   s/Issues/Integration/.  Some more bootstrap-related hints,
+   including changing suggested submodule path from .gnulib to gnulib
+   as this seems to be more wide-spread.
+
 2021-09-04  Paul Eggert  
 
intprops: fix minor doc glitches
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index b35c71366..7f66c4248 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -875,7 +875,7 @@ functions will not be affected.
 
 
 @node VCS Issues
-@section Issues with Version Control Systems
+@section Integration with Version Control Systems
 
 If a project stores its source files in a version control system (VCS),
 such as CVS, Subversion, or Git, one needs to decide which files to commit.
@@ -938,36 +938,45 @@ add because they were missing.
 @end itemize
 
 Gnulib includes the file @file{build-aux/bootstrap} to aid a developer
-in using this setup.  Furthermore, in projects that use git for
-version control, it is possible to use a git submodule containing the
-precise commit of the gnulib repository, so that each developer
-running @file{bootstrap} will get the same version of all
-gnulib-provided files.  The location of the submodule can be chosen to
-fit the package's needs; here's how to initially create the submodule
-in the directory @file{.gnulib}:
+in using this setup.  You would copy this file and add it to your
+project's VCS.  It can be customized using @file{bootstrap.conf} which
+is also put under VCS in your project.  Read the script for further
+information, and look at how other projects are using it (see links in
+@url{https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=users.txt;hb=HEAD}).
+
+In projects that use git for version control, it is possible to use a
+git submodule containing the precise commit of the gnulib repository, so
+that each developer running @file{bootstrap} will get the same version
+of all gnulib-provided files.  The location of the submodule can be
+chosen to fit the package's needs; here's how to initially create the
+submodule in the directory @file{gnulib}:
 
 @smallexample
-$ dir=.gnulib
-$ git submodule add -- https://git.savannah.gnu.org/git/gnulib.git $dir
-$ git config alias.syncsub "submodule foreach git pull origin master"
+$ git submodule add -- https://git.savannah.gnu.org/git/gnulib.git gnulib
 @end smallexample
 
 @noindent
-Thereafter, @file{bootstrap} can run this command to update the
+Thereafter, @file{bootstrap} will run this command to update the
 submodule to the recorded checkout level:
 
 @smallexample
-git submodule update --init $dir
+$ git submodule update --init gnulib
 @end smallexample
 
 @noindent
-and a developer can use this sequence to update to a newer version of
-gnulib:
+Use this sequence to update to a newer version of gnulib:
+
+@smallexample
+$ git submodule update --remote gnulib
+$ git add gnulib
+$ ./bootstrap --bootstrap-sync
+@end smallexample
+
+If multiple submodules are used, the following may be useful:
 
 @smallexample
+$ git config alias.syncsub "submodule foreach git pull origin master"
 $ git syncsub
-$ git add $dir
-$ ./bootstrap
 @end smallexample
 
 @item
-- 
2.30.2



signature.asc
Description: PGP signature


[PATCH] doc: Add suggestions on FDL texinfo usage.

2021-09-04 Thread Simon Josefsson via Gnulib discussion list
Hi.  This doc change encourages consistent use of FDL in manuals;
several packages I looked at (e.g., coreutils) already follow this
pattern.

/Simon
From 6b8032a320a75053c6607fcd37d2d67ffe61fd77 Mon Sep 17 00:00:00 2001
From: Simon Josefsson 
Date: Sat, 4 Sep 2021 09:19:37 +0200
Subject: [PATCH] doc: Add suggestions on FDL texinfo usage.

* doc/licenses-texi.texi (License Texinfo sources): Add texinfo
examples.
---
 ChangeLog  |  6 ++
 doc/licenses-texi.texi | 38 --
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51d1f3d37..e762c210d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-09-04  Simon Josefsson  
+
+	doc: Add suggestions on FDL texinfo usage.
+	* doc/licenses-texi.texi (License Texinfo sources): Add texinfo
+	examples.
+
 2021-09-03  Simon Josefsson  
 
 	maintainer-makefile: Add indentation syntax-check rule.
diff --git a/doc/licenses-texi.texi b/doc/licenses-texi.texi
index 630272c98..aebeb462d 100644
--- a/doc/licenses-texi.texi
+++ b/doc/licenses-texi.texi
@@ -8,8 +8,8 @@ have any node names and structures built into them; for your manual,
 you should @code{@@include} them in an appropriate @code{@@node}.
 
 The conventional name for the GPL node is @samp{Copying} and for the FDL
-@samp{GNU Free Documentation License}.  The LGPL doesn't seem to have
-a conventional node name.
+@samp{GNU Free Documentation License}.  The LGPL doesn't seem to have a
+conventional node name.
 
 Of course the license texts themselves should not be changed at all.
 
@@ -37,8 +37,34 @@ you use the GNU FDL, you need to specify the Invariant Sections, the
 Front-Cover Texts, and the Back-Cover Texts.
 
 To make use of this documentation license, copy the relevant Texinfo
-file into your VCS repository.  This makes sure that anyone who receives
-a copy of your VCS repository has also received a copy of the
-documentation license.  In the documentation, also state what are the
-Invariant Sections, the Front-Cover Texts, and the Back-Cover Texts.
+file (@code{doc/fdl-1.3.texi}) into your VCS repository.  This makes
+sure that anyone who receives a copy of your VCS repository has also
+received a copy of the documentation license.  In the documentation,
+also state what are the Invariant Sections, the Front-Cover Texts, and
+the Back-Cover Texts.
 @end itemize
+
+We recommend to place the licenses as appendices at the end of the
+manual, right before any indices.  For the FDL, we suggest the following
+@code{@@menu} entry:
+
+@smallexample
+* GNU Free Documentation License::  License for copying this manual
+@end smallexample
+
+For any @code{@@detailmenu} entries, we suggest the following:
+
+@smallexample
+Copying This Manual
+
+* GNU Free Documentation License:: Copying and sharing this manual
+@end smallexample
+
+And for actual inclusion of the FDL itself, we suggest the following:
+
+@smallexample
+@@node GNU Free Documentation License
+@@appendix GNU Free Documentation License
+
+@@include fdl.texi
+@end smallexample
-- 
2.30.2



signature.asc
Description: PGP signature


gnulib manual on www.gnu.org has been updated

2021-09-04 Thread Simon Josefsson via Gnulib discussion list
Hi.  I followed doc/README to update
https://www.gnu.org/software/gnulib/manual/ -- let me know if anything
looks odd.  Eventually it would be nice to use gnu-web-doc-update for
this.

/Simon


signature.asc
Description: PGP signature


[SCM] GNU Inetutils branch, master, updated. v2.2-16-gcf09130

2021-09-03 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  cf091304a3218efa3bc267b483cad71b6f65c24e (commit)
  from  a30199f8fb5a4e836a4a10f23ad23509255cee69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=cf091304a3218efa3bc267b483cad71b6f65c24e


commit cf091304a3218efa3bc267b483cad71b6f65c24e
Author: Simon Josefsson 
Date:   Fri Sep 3 23:07:30 2021 +0200

maint: Improve syntax-checks.

* cfg.mk (local-checks-to-skip): Enable sc_immutable_NEWS.  Disable 
sc_indent.

diff --git a/cfg.mk b/cfg.mk
index 0ae4b4f..550063b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -47,7 +47,7 @@ local-checks-to-skip = \
sc_prohibit_xalloc_without_use \
sc_error_message_period \
sc_error_message_uppercase \
-   sc_immutable_NEWS \
+   sc_indent \
sc_m4_quote_check \
sc_prohibit_atoi_atof \
sc_prohibit_stat_st_blocks \

---

Summary of changes:
 cfg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.2-15-ga30199f

2021-09-03 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  a30199f8fb5a4e836a4a10f23ad23509255cee69 (commit)
  from  1d5c9235286db76a2e41e62636e831945a848fa1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a30199f8fb5a4e836a4a10f23ad23509255cee69


commit a30199f8fb5a4e836a4a10f23ad23509255cee69
Author: Simon Josefsson 
Date:   Fri Sep 3 22:58:34 2021 +0200

doc: Improve README-release.

* gl/top/README-release.diff: Update.

diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
index 9547441..2380372 100644
--- a/gl/top/README-release.diff
+++ b/gl/top/README-release.diff
@@ -1,11 +1,11 @@
 README-release.orig2021-07-24 15:01:40.637006120 +0200
-+++ README-release 2021-07-24 15:05:35.687402132 +0200
+--- README-release.orig2021-09-03 22:57:19.292207913 +0200
 README-release 2021-09-03 22:57:45.732425524 +0200
 @@ -21,7 +21,7 @@
  
  * Check that the NixOS/Hydra autobuilder is reporting all is well:
  
 -https://hydra.nixos.org/project/gnu/@PACKAGE@-master
-+https://hydra.nixos.org/project/gnu/inetutils-master
++https://hydra.nixos.org/jobset/gnu/inetutils-master
  
  * Run the following command to download any new translations:
  
@@ -28,34 +28,36 @@
that was just created by that "make" command.
  
  Once all the builds and tests have passed,
-@@ -73,22 +72,22 @@
- 
-   Go to the news-submission form:
- 
+@@ -68,28 +67,6 @@
+ v=$(cat .prev-version)
+ git push origin master tag v$v
+ 
+-* Announce it on Savannah first, so you can include the savannah.org
+-  announcement link in the email message.
+-
+-  Go to the news-submission form:
+-
 -https://savannah.gnu.org/news/submit.php?group=@PACKAGE@
-+https://savannah.gnu.org/news/submit.php?group=inetutils
- 
-   If it does not work, then enable "News" for the project via this link:
- 
+-
+-  If it does not work, then enable "News" for the project via this link:
+-
 -
https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=@PACKAGE@
-+
https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=inetutils
- 
-   Write something like the following:
- 
+-
+-  Write something like the following:
+-
 -Subject: @PACKAGE@-X.Y released [stable]
-+Subject: inetutils-X.Y released [stable]
- +verbatim+
- ...paste the announcement here...
- -verbatim-
- 
-   Then go here to approve it:
- 
+-+verbatim+
+-...paste the announcement here...
+--verbatim-
+-
+-  Then go here to approve it:
+-
 -https://savannah.gnu.org/news/approve.php?group=@PACKAGE@
-+https://savannah.gnu.org/news/approve.php?group=inetutils
- 
+-
  * Send the announcement email message.
  
-@@ -98,4 +97,4 @@
+ * After each non-alpha release, run
+@@ -98,4 +75,4 @@
  
to update the on-line manual accessible at
  

---

Summary of changes:
 gl/top/README-release.diff | 52 --
 1 file changed, 27 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[PATCH] maintainer-makefile: Add indentation syntax-check rule.

2021-09-03 Thread Simon Josefsson via Gnulib discussion list
Hi.  I realized the main reason I don't consistenly enforce code
indentation in the projects I work on is that it isn't tested before
releases (or via CICD builds).  The syntax-check framework to the
rescue!  Not everyone will like this, but as usual it is simple to
disable on a per-project basis, and I do think it is a generally good
rule to always have indented code in projects to avoid slow detoriation
of code style.  Thoughts?  I'm enabling this for a couple of projects
now, and it catched some newly added code with poor indentation.

Btw, I think one of the really big advantages with gnulib's
maintainer-makefile are the automatic syntax-checks -- but have we
documented or promoted this feature anywhere?

/Simon
From 8f043c699535cdb0ffa0dee8d624ca38aada2deb Mon Sep 17 00:00:00 2001
From: Simon Josefsson 
Date: Fri, 3 Sep 2021 21:59:43 +0200
Subject: [PATCH] maintainer-makefile: Add indentation syntax-check rule.

* top/maint.mk (indent): Use AM_V_GEN and indent_args.
(sc_indent): New rule.
(indent_args): New variable.
(C_SOURCES): New variable, initialized to reasonable C files.
(exclude_file_name_regexp--indent): New variable.
---
 ChangeLog|  9 +
 top/maint.mk | 28 
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b1372cb7..51d1f3d37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-09-03  Simon Josefsson  
+
+	maintainer-makefile: Add indentation syntax-check rule.
+	* top/maint.mk (indent): Use AM_V_GEN and indent_args.
+	(sc_indent): New rule.
+	(indent_args): New variable.
+	(C_SOURCES): New variable, initialized to reasonable C files.
+	(exclude_file_name_regexp--indent): New variable.
+
 2021-08-30  Paul Eggert  
 
 	idx: add commentary
diff --git a/top/maint.mk b/top/maint.mk
index 6a3ea9606..72070a7b0 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1631,12 +1631,32 @@ refresh-po:
 	ls $(PODIR)/*.po | $(SED) 's/\.po//;s,$(PODIR)/,,' | \
 	  sort >> $(PODIR)/LINGUAS
 
- # Running indent once is not idempotent, but running it twice is.
+# Indentation
+
+indent_args ?= -ppi 1
+C_SOURCES ?= $$($(VC_LIST_EXCEPT) | grep '\.[ch]\(.in\)\?$$')
 INDENT_SOURCES ?= $(C_SOURCES)
+exclude_file_name_regexp--indent ?= $(exclude_file_name_regexp--sc_indent)
+
 .PHONY: indent
-indent:
-	indent $(INDENT_SOURCES)
-	indent $(INDENT_SOURCES)
+indent: # Running indent once is not idempotent, but running it twice is.
+	$(AM_V_GEN)indent $(indent_args) $(INDENT_SOURCES) && \
+	indent $(indent_args) $(INDENT_SOURCES)
+
+sc_indent:
+	@if ! command -v indent > /dev/null; then			\
+	echo 1>&2 '$(ME): sc_indent: indent is missing';		\
+	else\
+	  fail=0; files="$(INDENT_SOURCES)";\
+	  for f in $$files; do		\
+	indent $(indent_args) -st $$f\
+		| indent $(indent_args) -st -\
+		| diff -u $$f - || fail=1;\
+	  done;\
+	  test $$fail = 1 &&		\
+	{ echo 1>&2 '$(ME): code format error, try "make indent"';	\
+	  exit 1; } || :;		\
+	fi
 
 # If you want to set UPDATE_COPYRIGHT_* environment variables,
 # put the assignments in this variable.
-- 
2.30.2



signature.asc
Description: PGP signature


Re: telnet crash

2021-09-03 Thread Simon Josefsson
Following up, I found the following solution to address the same
problem:

https://github.com/NetBSD/src/commit/36b8cfb2e28f691beae12da0c207086e1df0c8c4#diff-38b7213f9c6c21245fbeb4fad9520a27239d712a6dd0fea20dd6b77203b5737c

This solves the infloop, but it seems it is mostly masquerading the
real issue, and it has to side-effect of making Exit() and ExitString()
behave inconsistent -- and ExitString() is used on every successful
exit of telnet, so it seems this could cause data loss if there are
pending data to read in the ring buffer, and/or flush data in the
buffert to standard output.

I'm inclined to use the NetBSD solution in GNU InetUtils, in particular
if you decide to do the same in OpenBSD telnet too.  If someone wants
to wrap their head around the code and clean things up properly, I'm
all for it, but I prefer to not be the one to blame for future bugs.

/Simon



signature.asc
Description: This is a digitally signed message part


[SCM] GNU Inetutils branch, master, updated. v2.2-13-ga1b4cb8

2021-09-03 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  a1b4cb859f13d0fce6bc0221c5a28a279be28850 (commit)
  from  040efca40e5e252ba861ede88ae0896eeec84465 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a1b4cb859f13d0fce6bc0221c5a28a279be28850


commit a1b4cb859f13d0fce6bc0221c5a28a279be28850
Author: Simon Josefsson 
Date:   Fri Sep 3 17:43:26 2021 +0200

doc: Fix typos, inspired by tiny BSD patches.

diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 5e0167e..8066055 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -48,7 +48,7 @@
 
 /* Return the name corresponding to the interface flag FLAG.
If FLAG is unknown, return NULL.
-   AVOID contains a ':' surrounded and seperated list of flag names
+   AVOID contains a ':' surrounded and separated list of flag names
that should be avoided if alternative names with the same flag value
exists.  The first unavoided match is returned, or the first avoided
match if no better is available.  */
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index c9d0c31..54518fc 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -37,7 +37,7 @@ struct system_ifconfig
 
 /* Output format support.  */
 
-/* Set this to a comma seperated, comma terminated list of struct
+/* Set this to a comma separated, comma terminated list of struct
format_handler entries.  They are inserted at the beginning of the
default list, so they override generic implementations if they have
the same name.  For example:
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 9dd2ec4..157e038 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1274,7 +1274,7 @@ process_rings (int netin, int netout, int netex, int 
ttyin, int ttyout,
  /*
   * Bogosity.  We have to do the read
   * to clear the atmark to get out of
-  * an infinate loop.
+  * an infinite loop.
   */
  i = read (net, netiring.supply + c, canread - c);
  if (i > 0)
diff --git a/telnet/telnet.c b/telnet/telnet.c
index a1633bb..afeeb99 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -2113,12 +2113,12 @@ telrcv (void)
  /*
   * This is an error.  We only expect to get
   * "IAC IAC" or "IAC SE".  Several things may
-  * have happend.  An IAC was not doubled, the
+  * have happened.  An IAC was not doubled, the
   * IAC SE was left off, or another option got
   * inserted into the suboption are all possibilities.
   * If we assume that the IAC was not doubled,
   * and really the IAC SE was left off, we could
-  * get into an infinate loop here.  So, instead,
+  * get into an infinite loop here.  So, instead,
   * we terminate the suboption, and process the
   * partial suboption if we can.
   */
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 4d5876c..bf8cce6 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -164,7 +164,7 @@ typedef struct
 /*
  * Tricky code here.  What we want to know is if the MY_STATE_WILL
  * and MY_WANT_STATE_WILL bits have the same value.  Since the two
- * bits are adjacent, a little arithmatic will show that by adding
+ * bits are adjacent, a little arithmetic will show that by adding
  * in the lower bit, the upper bit will be set if the two bits were
  * different, and clear if they were the same.
  */
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 753b0c7..aaf9ef6 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -628,7 +628,7 @@ clientstat (register int code, register int parm1, register 
int parm2)
/*
 * Change terminal speed as requested by client.
 * We set the receive speed first, so that if we can't
-* store seperate receive and transmit speeds, the transmit
+* store separate receive and transmit speeds, the transmit
 * speed will take precedence.
 */
tty_rspeed (parm2);

---

Summary of changes:
 ifconfig/flags.h  | 2 +-
 ifconfig/system/generic.h | 2 +-
 telnet/sys_bsd.c  | 2 +-
 telnet/telnet.c   | 4 ++--
 telnetd/telnetd.h | 2 +-
 telnetd/termstat.c| 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


hoo

[SCM] GNU Inetutils branch, master, updated. v2.2-12-g040efca

2021-09-03 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  040efca40e5e252ba861ede88ae0896eeec84465 (commit)
   via  035fc188a35ac56bcc6551368db970d3f527c945 (commit)
  from  09a2242bb5c70d956bf8d13547210d83e0d98bcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=040efca40e5e252ba861ede88ae0896eeec84465


commit 040efca40e5e252ba861ede88ae0896eeec84465
Author: Simon Josefsson 
Date:   Fri Sep 3 17:23:04 2021 +0200

doc: Update TODO.

diff --git a/TODO b/TODO
index 7a61a2e..f1168f1 100644
--- a/TODO
+++ b/TODO
@@ -118,20 +118,17 @@ Add more utilities:
 Add internationalization, read: gettext support, and provide
 translations, especially for the clients.
 
-3.0 will be a release that tries to put as much as possible into
-libraries (startup code, etc).  We would also like to try and write
-(or convince someone else to write) a gopher and gopherd pair.
+Try to put as much as possible into libraries (startup code, etc).
+
+gopher and gopherd?
 
 Make src/hostname.c handle missing 'sethostname' functions on
 platforms that doesn't have them (it could just print an error
 message).
 
-Fix all warnings with autoconf 2.71+
-
 enhance man pages so they fully supersede NetKit and BSD man pages
 
 generally use gnulib for portability more than we use today:
-  - gnulib has fts.c that we have a custom libls/ for
   - getaddrinfo/getnameinfo with IDN support to simplify IDN complexity
   - more system header files replacements
   - ruserok/wtmp stuff

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=035fc188a35ac56bcc6551368db970d3f527c945


commit 035fc188a35ac56bcc6551368db970d3f527c945
Author: Simon Josefsson 
Date:   Fri Sep 3 17:08:07 2021 +0200

maint: Autoupdate for autoconf 2.71.

* configure.ac: Don't use AC_TRY_LINK or AC_TRY_COMPILE.
* am/libcurses.m4: Ditto.
* am/krb5.m4: Ditto.

diff --git a/am/krb5.m4 b/am/krb5.m4
index 676ffec..76c0893 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -67,17 +67,15 @@ AC_DEFUN([IU_CHECK_KRB5],
 
 ## Check for new MIT kerberos V support
 LIBS="$saved_LIBS -lkrb5 -lk5crypto -lcom_err"
-AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-  [KRB5_IMPL="MIT"
-   KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lk5crypto -lcom_err"], )
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void *) 
0); ]])],[KRB5_IMPL="MIT"
+   KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lk5crypto -lcom_err"],[])
 
 ## Heimdal kerberos V support
 if test "$KRB5_IMPL" = "none"; then
   LIBS="$saved_LIBS -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err"
-  AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-[KRB5_IMPL="Heimdal"
- KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -ldes -lasn1 -lroken -lcrypt 
-lcom_err"]
- , )
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void 
*) 0); ]])],[KRB5_IMPL="Heimdal"
+ KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -ldes -lasn1 -lroken -lcrypt 
-lcom_err"
+ ],[])
 fi
 
 ### FIXME: Implement a robust distinction between
@@ -88,10 +86,9 @@ AC_DEFUN([IU_CHECK_KRB5],
 ## OpenBSD variant of Heimdal
 if test "$KRB5_IMPL" = "none"; then
   LIBS="$saved_LIBS -lkrb5 -lcrypto"
-  AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-[KRB5_IMPL="OpenBSD-Heimdal"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void 
*) 0); ]])],[KRB5_IMPL="OpenBSD-Heimdal"
 KRB5_CFLAGS="-I/usr/include/kerberosV"
- KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lcrypto -lasn1 -ldes"], )
+ KRB5_LIBS="$KRB5_LDFLAGS -lkrb5 -lcrypto -lasn1 -ldes"],[])
 fi
 
 ## Old MIT Kerberos V
@@ -99,9 +96,8 @@ AC_DEFUN([IU_CHECK_KRB5],
 ## -lk5crypto. This may conflict with OpenSSL.
 if test "$KRB5_IMPL" = "none"; then
   LIBS="$saved_LIBS -lkrb5 -lcrypto -lcom_err"
-  AC_TRY_LINK([], [return krb5_init_context((void *) 0); ],
-[KRB5_IMPL="OldMIT"
- KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lcrypto -lcom_err"], )
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return krb5_init_context((void 
*) 0); ]])],[KRB5_IMPL="OldMIT"
+ KRB5_LIBS="$KRB5_LDFLAGS $KRB4_LIBS -lkrb5 -lcrypto -lcom_err"],[])
 fi
 
 LDFLAGS="$saved_LDFLAGS"
diff --git a/am/libcurses.m4 b/am/libcurses.m4

telnet crash

2021-09-03 Thread Simon Josefsson
Hi!  I am helping maintaining GNU InetUtils which include 'telnet' and
we found a problem that appears to exist in OpenBSD telnet too. 
Instead of us fixing something and causing further code differences,
I'd like to collaborate so we understand the problem and the fix in th
same way between these different forks.  Could someone help me debug
this and confirm whether my proposed patch seems like a good solution?

Steps to reproduce:
1) Download
https://raw.githubusercontent.com/hackerhouse-opensource/exploits/master/telnet_term_0day.py
2) Modify 23 to 2323 in the code, so no root is required
3) Run it like this:

gcc220$ python3 ./telnet_term_0day.py &
gcc220$ telnet localhost 2323
Trying 127.0.0.1...
Connected to localhost.
Escape character is '^]'.
[-] connected, corrupting client heap
[-] done. merry haxmas.
Segmentation fault (core dumped) 
gcc220$ 

The original security problem that this exploit was written for was
probably (hopefully) fixed long time ago, but the crash remains and
looks to me like a normal bug.

Looking at the code, my take is that the call in telnet.c to ExitString
in suboptions() is problematic, and differ from how all other similar
errors are resolved in that function.  My take on fixing this, is the
patch below.  It will result in the client simply looping printing this
error as long as the malicious server keeps sending the bogus data, but
^] is operational and the client appears not to corrupt memory or crash
any more.

What do you think?  It would be great if anyone with knowledge around
this code could take a look.

diff --git a/telnet/telnet.c b/telnet/telnet.c
index a1633bbe..5ef7371f 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -873,9 +873,7 @@ suboption (void)
  printsub ('>', [2], len - 2);
}
  else
-   {
- ExitString ("No room in buffer for terminal type.\n", 1);
-   }
+   printf ("lm_will: not enough room in buffer\n");
}
   break;
 case TELOPT_TSPEED:



signature.asc
Description: This is a digitally signed message part


[SCM] GNU Inetutils branch, master, updated. v2.2-10-g09a2242

2021-09-03 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  09a2242bb5c70d956bf8d13547210d83e0d98bcd (commit)
   via  3fcebb9b38b8b01e528d158656af863f98a3c751 (commit)
   via  215de12d09eb6c0bf5de9d16a4a601e1da768b33 (commit)
   via  0412baa8d4ce84c4f9fe9df056731291f3521c95 (commit)
  from  880dbcf7effb86373b011108f6cf9d250342420b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=09a2242bb5c70d956bf8d13547210d83e0d98bcd


commit 09a2242bb5c70d956bf8d13547210d83e0d98bcd
Author: Simon Josefsson 
Date:   Fri Sep 3 16:08:06 2021 +0200

doc: Mention maintenance fixes.

* NEWS: Add.

diff --git a/NEWS b/NEWS
index 0187d49..db6c069 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,11 @@ GNU inetutils NEWS -- history of user-visible changes.
 Don't infloop when (malicious) server sends too large terminal value,
 see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945861
 
+** Various bugs fixes, internal improvements and clean ups.
+
+Further cleanup of configure.ac, updates to modern autoconf releases,
+and improved gnulib usage.
+
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3fcebb9b38b8b01e528d158656af863f98a3c751


commit 3fcebb9b38b8b01e528d158656af863f98a3c751
Author: Simon Josefsson 
Date:   Fri Sep 3 15:59:45 2021 +0200

telnet: Don't infloop for malicious server.

See https://bugs.debian.org/945861 and the tiny patch used by NetBSD:

https://github.com/NetBSD/src/commit/36b8cfb2e28f691beae12da0c207086e1df0c8c4#diff-38b7213f9c6c21245fbeb4fad9520a27239d712a6dd0fea20dd6b77203b5737c

* NEWS: Mention fix.
* telnet/utilities.c (ExitString): Don't call SetForExit().

diff --git a/NEWS b/NEWS
index 2077110..0187d49 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (-??-??) [?]
 
+** telnet
+
+Don't infloop when (malicious) server sends too large terminal value,
+see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945861
 
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 85fd476..08571cd 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1063,7 +1063,6 @@ Exit (int returnCode)
 void
 ExitString (char *string, int returnCode)
 {
-  SetForExit ();
   fwrite (string, 1, strlen (string), stderr);
   exit (returnCode);
 }

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=215de12d09eb6c0bf5de9d16a4a601e1da768b33


commit 215de12d09eb6c0bf5de9d16a4a601e1da768b33
Author: Simon Josefsson 
Date:   Thu Sep 2 10:33:19 2021 +0200

maint: Include license text FDL as suggested by bootstrap.

* doc/fdl-1.3.texi: New file, from gnulib.
* bootstrap.conf (gnulib_modules): Remove fdl-1.3.

diff --git a/bootstrap.conf b/bootstrap.conf
index f347d47..d04facc 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -49,7 +49,6 @@ errno
 error
 exitfail
 extensions
-fdl-1.3
 filemode
 forkpty
 fts
diff --git a/doc/.gitignore b/doc/.gitignore
index 6bf83eb..b9a0e41 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,7 +1,5 @@
-/fdl-1.3.texi
 /gendocs_template
 /gendocs_template_min
-fdl-1.3.texi
 gendocs_template
 inetutils.info*
 stamp-vti
diff --git a/doc/fdl-1.3.texi b/doc/fdl-1.3.texi
new file mode 100644
index 000..eaf3da0
--- /dev/null
+++ b/doc/fdl-1.3.texi
@@ -0,0 +1,505 @@
+@c The GNU Free Documentation License.
+@center Version 1.3, 3 November 2008
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
+@display
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, 
Inc.
+@uref{https://fsf.org/}
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+
+@enumerate 0
+@item
+PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document @dfn{free} in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of ``copyleft'', which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is 

Bug#986997: ITA: netkit-telnet

2021-09-03 Thread Simon Josefsson
fre 2021-09-03 klockan 08:47 +0200 skrev Christoph Biedl:
> Simon Josefsson wrote...
> 
> > I'm considering to adopt this package, as it has been orphaned for
> > around five years in Debian.  I wanted to reach out to some people
> > (cc'd) that appear to have been involved in the discussions around
> > it to
> > make sure I'm not missing anything that should be considered.
> 
> My contribution is completely a thing to the past, and should be
> recorded in the related bug reports: This is an entire suite of
> packages
> which - besides being faily old - all suffered from a missing build
> system so I ported it to cmake for the buster release. That was a
> huge
> amount of work and I'm not really proud of the result. Activities
> included contacting upstream, and he eventually provided a copy of
> the
> configuration tool but I stronly doubt it's worth to revive it.
> 
> Long story short, good ride with this package. In case you want some
> more old stories or additional insight, just ping me. Odds are my
> reaction will be "Oh, you're right, I missed that bit".

Thanks for providing some background -- I was a bit surprised to see a
debian-specific cmake build system!  I think it doesn't make a lot of
sense to do any major changes (at least I'm not planning to) until
there is a reasonable upstream, so I have no plans to touch this part
of the package -- but if any future upstream release builds fine, I
would be inclined to drop as many of our patches as possible.

/Simon



signature.asc
Description: This is a digitally signed message part


Bug#986997: ITA: netkit-telnet

2021-09-03 Thread Simon Josefsson
fre 2021-09-03 klockan 08:47 +0200 skrev Christoph Biedl:
> Simon Josefsson wrote...
> 
> > I'm considering to adopt this package, as it has been orphaned for
> > around five years in Debian.  I wanted to reach out to some people
> > (cc'd) that appear to have been involved in the discussions around
> > it to
> > make sure I'm not missing anything that should be considered.
> 
> My contribution is completely a thing to the past, and should be
> recorded in the related bug reports: This is an entire suite of
> packages
> which - besides being faily old - all suffered from a missing build
> system so I ported it to cmake for the buster release. That was a
> huge
> amount of work and I'm not really proud of the result. Activities
> included contacting upstream, and he eventually provided a copy of
> the
> configuration tool but I stronly doubt it's worth to revive it.
> 
> Long story short, good ride with this package. In case you want some
> more old stories or additional insight, just ping me. Odds are my
> reaction will be "Oh, you're right, I missed that bit".

Thanks for providing some background -- I was a bit surprised to see a
debian-specific cmake build system!  I think it doesn't make a lot of
sense to do any major changes (at least I'm not planning to) until
there is a reasonable upstream, so I have no plans to touch this part
of the package -- but if any future upstream release builds fine, I
would be inclined to drop as many of our patches as possible.

/Simon



signature.asc
Description: This is a digitally signed message part


Bug#986997: ITA: netkit-telnet

2021-09-02 Thread Simon Josefsson
All,

I'm considering to adopt this package, as it has been orphaned for
around five years in Debian.  I wanted to reach out to some people
(cc'd) that appear to have been involved in the discussions around it to
make sure I'm not missing anything that should be considered.

My aim is to 1) refresh the packaging including hopefully some
autopkgtests, 2) figure out if there is a better upstream for this
package, and 3) prepare to smooth out any issues preventing migrating
towards inetutils in Debian.

I have create a Salsa project and imported unstable debian/ and fixed
some minor issues:

https://salsa.debian.org/jas/netkit-telnet
https://salsa.debian.org/jas/netkit-telnet/-/pipelines

What do you think?

/Simon


signature.asc
Description: PGP signature


Bug#986997: ITA: netkit-telnet

2021-09-02 Thread Simon Josefsson
All,

I'm considering to adopt this package, as it has been orphaned for
around five years in Debian.  I wanted to reach out to some people
(cc'd) that appear to have been involved in the discussions around it to
make sure I'm not missing anything that should be considered.

My aim is to 1) refresh the packaging including hopefully some
autopkgtests, 2) figure out if there is a better upstream for this
package, and 3) prepare to smooth out any issues preventing migrating
towards inetutils in Debian.

I have create a Salsa project and imported unstable debian/ and fixed
some minor issues:

https://salsa.debian.org/jas/netkit-telnet
https://salsa.debian.org/jas/netkit-telnet/-/pipelines

What do you think?

/Simon


signature.asc
Description: PGP signature


Bug#993476: inetutils: security bug in ftp client

2021-09-01 Thread Simon Josefsson
Package: inetutils-ftp

Hi!  Just to let you know that inetutils 2.2 contains a fix for
long-standing security bug, a patch that should apply to earlier
versions:

https://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=58cb043b190fd04effdaea7c9403416b436e50dd

See bug report with plenty of links to earlier similar issues in other
ftp clients:

https://lists.gnu.org/archive/html/bug-inetutils/2021-06/msg2.html

/Simon


signature.asc
Description: PGP signature


[SCM] GNU Inetutils branch, master, updated. v2.2-6-g880dbcf

2021-09-01 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  880dbcf7effb86373b011108f6cf9d250342420b (commit)
   via  a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed (commit)
  from  fc310f059c59884a2217606df62b444887c86f84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=880dbcf7effb86373b011108f6cf9d250342420b


commit 880dbcf7effb86373b011108f6cf9d250342420b
Author: Simon Josefsson 
Date:   Wed Sep 1 23:31:44 2021 +0200

Drop obsolete/unused AC_HEADER_DIRENT, AC_FUNC_CLOSEDIR_VOID and 
AC_FUNC_STRCOLL.

* configure.ac: Remove calls.

diff --git a/configure.ac b/configure.ac
index 81783e8..692858e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,9 +611,6 @@ AC_CHECK_FUNCS([setlocale])
 IU_CHECK_LIBIDN([$with_libidn_prefix], [$with_idn])
 
 ### Checks for header files.
-
-AC_HEADER_DIRENT
-
 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \
  glob.h memory.h netinet/ether.h netinet/in_systm.h \
  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
@@ -746,9 +743,7 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
  #include ])
 
 ### Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_FORK
-AC_FUNC_STRCOLL
 AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(cfsetspeed cgetent dirfd flock \

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed


commit a23230a6ff0eb0c2bc1158e154a6ee68afc5d1ed
Author: Simon Josefsson 
Date:   Wed Sep 1 23:11:52 2021 +0200

Drop unused IU_CHECK_WEAK_REFS.

* configure.ac: Remove IU_CHECK_WEAK_REFS.
* am/check_weak_refs.m4: Remove file.

diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
deleted file mode 100644
index 6256acd..000
--- a/am/check_weak_refs.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-dnl 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Inetutils.
-dnl
-dnl GNU Inetutils is free software: you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation, either version 3 of the License, or (at
-dnl your option) any later version.
-dnl
-dnl GNU Inetutils is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-dnl Written by Miles Bader.
-
-dnl IU_CHECK_WEAK_REFS -- See if any of a variety of `weak reference'
-dnl mechanisms works.  If so, this defines HAVE_WEAK_REFS, and one of
-dnl HAVE_ATTR_WEAK_REFS, HAVE_PRAGMA_WEAK_REFS, or HAVE_ASM_WEAK_REFS to
-dnl indicate which sort.
-dnl
-dnl This can't just be a compile-check, as gcc somtimes accepts the syntax even
-dnl feature isn't actually supported.
-dnl
-AC_DEFUN([IU_CHECK_WEAK_REFS], [
-  AH_TEMPLATE(HAVE_WEAK_REFS, 1, [Define if you have weak references])
-  AC_CACHE_CHECK(whether gcc weak references work,
-inetutils_cv_attr_weak_refs,
-AC_TRY_LINK([],
-  [extern char *not_defined (char *, char *) __attribute__ ((weak));
-   if (not_defined) puts ("yes"); ],
-  [inetutils_cv_attr_weak_refs=yes],
-  [inetutils_cv_attr_weak_refs=no]))
-  if test "$inetutils_cv_weak_refs" = yes; then
-AC_DEFINE([HAVE_WEAK_REFS])
-AC_DEFINE([HAVE_ATTR_WEAK_REFS], 1,
-  [Define if you have weak "attribute" references])
-  else
-AC_CACHE_CHECK(whether pragma weak references work,
-  inetutils_cv_pragma_weak_refs,
-  AC_TRY_LINK([],
-   [extern char *not_defined (char *, char *);
-#pragma weak not_defined
-if (not_defined) puts ("yes"); ],
-   [inetutils_cv_pragma_weak_refs=yes],
-   [inetutils_cv_pragma_weak_refs=no]))
-if test "$inetutils_cv_pragma_weak_refs" = yes; then
-  AC_DEFINE([HAVE_WEAK_REFS])
-  AC_DEFINE([HAVE_PRAGMA_WEAK_REFS], 1,
-[Define if you have weak "pragma" references])
-else
-  AC_CACHE_CHECK(whether asm weak references work,
-inetutils_cv_asm_weak_refs,
-   AC_TRY_LINK([],
- [extern char *not_defined (char *, char *);
- 

[SCM] GNU Inetutils branch, master, updated. v2.2-4-gfc310f0

2021-09-01 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  fc310f059c59884a2217606df62b444887c86f84 (commit)
   via  0ceee232623b2ed93bdf96bad6e0f4e4834f31aa (commit)
   via  0e4832e73a93ecd3f3365b540242839ac99343dc (commit)
  from  8780b47a7fd029c8ffadb54841863964cde00f18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=fc310f059c59884a2217606df62b444887c86f84


commit fc310f059c59884a2217606df62b444887c86f84
Author: Simon Josefsson 
Date:   Wed Sep 1 22:51:24 2021 +0200

Don't use obsolete AC_TYPE_SIGNAL.

* configure.ac: Remove call to AC_TYPE_SIGNAL.

diff --git a/configure.ac b/configure.ac
index 5e16c3a..dd1d762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,9 +650,6 @@ fi
 
 ### Checks for types.
 
-# Checks return type of signal handlers
-AC_TYPE_SIGNAL
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include 
  #include 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0ceee232623b2ed93bdf96bad6e0f4e4834f31aa


commit 0ceee232623b2ed93bdf96bad6e0f4e4834f31aa
Author: Simon Josefsson 
Date:   Wed Sep 1 22:49:18 2021 +0200

Use gnulib module 'attribute' instead of obsolete 
'snippets/unused-parameters'.

* */*.c: Use MAYBE_UNUSED instead of _GL_UNUSED_PARAMETER.
* */*.c: Include attribute.h instead of unused-parameters.h.

diff --git a/bootstrap.conf b/bootstrap.conf
index ed51c93..f347d47 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,7 @@ alloca
 alloca-opt
 argp
 argp-version-etc
+attribute
 autobuild
 dirfd
 dirname-lgpl
@@ -84,7 +85,6 @@ setenv
 sethostname
 signal
 size_max
-snippet/unused-parameter
 snprintf
 socklen
 stdarg
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 780abc8..559a121 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -91,7 +91,7 @@
 #endif
 
 #include "ftp_var.h"
-#include "unused-parameter.h"
+#include "attribute.h"
 #include "xalloc.h"
 #include "xgetcwd.h"
 
@@ -481,7 +481,7 @@ char *stype[] = {
  * Set binary transfer type.
  */
 void
-setbinary (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbinary (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "binary";
@@ -492,7 +492,7 @@ setbinary (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set ascii transfer type.
  */
 void
-setascii (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setascii (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "ascii";
@@ -503,7 +503,7 @@ setascii (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set tenex transfer type.
  */
 void
-settenex (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+settenex (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   stype[1] = "tenex";
@@ -514,7 +514,7 @@ settenex (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set file transfer mode.
  */
 void
-setftmode (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setftmode (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s mode, sorry.\n", modename);
@@ -525,7 +525,7 @@ setftmode (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set file transfer format.
  */
 void
-setform (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setform (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s format, sorry.\n", formname);
@@ -536,7 +536,7 @@ setform (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set file transfer structure.
  */
 void
-setstruct (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setstruct (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
   printf ("We only support %s structure, sorry.\n", structname);
@@ -914,7 +914,7 @@ getit (int argc, char **argv, int restartit, char *mode)
 }
 
 void
-mabort (int signo _GL_UNUSED_PARAMETER)
+mabort (int signo MAYBE_UNUSED)
 {
   int ointer;
 
@@ -1127,7 +1127,7 @@ onoff (int bool)
  * Show status.
  */
 void
-status (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+status (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
   int i;
 
@@ -1192,7 +1192,7 @@ status (int argc _GL_UNUSED_PARAMETER, char **argv 
_GL_UNUSED_PARAMETER)
  * Set beep on cmd completed mode.
  */
 void
-setbell (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbell (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
 {
 
  

inetutils-2.2 released [stable]

2021-09-01 Thread Simon Josefsson via info-gnu
We are pleased to announce version 2.2 of The GNU Networking Utilities.

GNU Networking Utilities contain traditional networking utilities,
clients and servers, including ftp, telnet, inetd, rsh/rlogin, tftp,
talk, syslogd, ping, traceroute, whois, hostname, dnsdomainname,
ifconfig, and logger.

Happy hacking,
Simon

Here are the compressed sources:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.gz   (2.6MB)
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.xz   (1.5MB)

Here are the GPG detached signatures[*]:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.gz.sig
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.xz.sig

Use a mirror for higher download bandwidth:
  https://www.gnu.org/order/ftp.html

Here are the SHA1 and SHA256 checksums:

bd12fa98020cd2764e5fefbe90518f86e7874202  inetutils-2.2.tar.gz
CGEbzdz3PpqLlnuPC/kq1NNZbY8+don58ua7xM+n4+M  inetutils-2.2.tar.gz
a6b0783d315657e51a09ee281af1210cc5293b9f  inetutils-2.2.tar.xz
1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA  inetutils-2.2.tar.xz

The SHA256 checksum is base64 encoded, instead of the
hexadecimal encoding that most checksum tools default to.

[*] Use a .sig file to verify that the corresponding file (without the
.sig suffix) is intact.  First, be sure to download both the .sig file
and the corresponding tarball.  Then, run a command like this:

  gpg --verify inetutils-2.2.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys 0664A76954265E8C

and rerun the 'gpg --verify' command.

This release was bootstrapped with the following tools:
  Gnulib v0.1-4897-ga4e28bb23
  Autoconf 2.69
  Automake 1.16.3
  Bison 3.7.5
  M4 1.4.18
  Makeinfo 6.7
  Help2man 1.48.1
  Make 4.3
  Gzip 1.10
  Tar 1.34

NEWS

* Noteworthy changes in release 2.2 (2021-09-01) [stable]

** ftp

The ftp client now validate addresses returned by PASV/LSPV responses,
to make sure they match the server address.  Reported by ZeddYu Lu in
.

Thanks to Luke Mewburn  for discussion and fix to
NetBSD code, we used a similar solution.

** logger
** rlogind

Code for non-getaddrinfo removed, since we are using gnulib to provide
getaddrinfo on any platform that lacks it.  This may have resulted in
logger not using getaddrinfo on platforms that didn't have the
getaddrinfo prototype, even though we use the gnulib module.

** Various bugs fixes, internal improvements and clean ups.

A lot of configure.ac checks were removed that are no longer needed
since we rely on gnulib for portability.

The tests/ftp-localhost.sh self-test no longer fails on platforms
where sysctl is missing.


signature.asc
Description: PGP signature
-- 
If you have a working or partly working program that you'd like
to offer to the GNU project as a GNU package,
see https://www.gnu.org/help/evaluation.html.

inetutils-2.2 released [stable]

2021-09-01 Thread Simon Josefsson via Bug reports for the GNU Internet utilities
We are pleased to announce version 2.2 of The GNU Networking Utilities.

GNU Networking Utilities contain traditional networking utilities,
clients and servers, including ftp, telnet, inetd, rsh/rlogin, tftp,
talk, syslogd, ping, traceroute, whois, hostname, dnsdomainname,
ifconfig, and logger.

Happy hacking,
Simon

Here are the compressed sources:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.gz   (2.6MB)
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.xz   (1.5MB)

Here are the GPG detached signatures[*]:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.gz.sig
  https://ftpmirror.gnu.org/inetutils/inetutils-2.2.tar.xz.sig

Use a mirror for higher download bandwidth:
  https://www.gnu.org/order/ftp.html

Here are the SHA1 and SHA256 checksums:

bd12fa98020cd2764e5fefbe90518f86e7874202  inetutils-2.2.tar.gz
CGEbzdz3PpqLlnuPC/kq1NNZbY8+don58ua7xM+n4+M  inetutils-2.2.tar.gz
a6b0783d315657e51a09ee281af1210cc5293b9f  inetutils-2.2.tar.xz
1Uf2kXLfc6/vaRoPeIYoD9eBrOoo3vT/S0shIIaonYA  inetutils-2.2.tar.xz

The SHA256 checksum is base64 encoded, instead of the
hexadecimal encoding that most checksum tools default to.

[*] Use a .sig file to verify that the corresponding file (without the
.sig suffix) is intact.  First, be sure to download both the .sig file
and the corresponding tarball.  Then, run a command like this:

  gpg --verify inetutils-2.2.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys 0664A76954265E8C

and rerun the 'gpg --verify' command.

This release was bootstrapped with the following tools:
  Gnulib v0.1-4897-ga4e28bb23
  Autoconf 2.69
  Automake 1.16.3
  Bison 3.7.5
  M4 1.4.18
  Makeinfo 6.7
  Help2man 1.48.1
  Make 4.3
  Gzip 1.10
  Tar 1.34

NEWS

* Noteworthy changes in release 2.2 (2021-09-01) [stable]

** ftp

The ftp client now validate addresses returned by PASV/LSPV responses,
to make sure they match the server address.  Reported by ZeddYu Lu in
.

Thanks to Luke Mewburn  for discussion and fix to
NetBSD code, we used a similar solution.

** logger
** rlogind

Code for non-getaddrinfo removed, since we are using gnulib to provide
getaddrinfo on any platform that lacks it.  This may have resulted in
logger not using getaddrinfo on platforms that didn't have the
getaddrinfo prototype, even though we use the gnulib module.

** Various bugs fixes, internal improvements and clean ups.

A lot of configure.ac checks were removed that are no longer needed
since we rely on gnulib for portability.

The tests/ftp-localhost.sh self-test no longer fails on platforms
where sysctl is missing.


signature.asc
Description: PGP signature


[SCM] GNU Inetutils annotated tag, v2.2, created. v2.2

2021-09-01 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The annotated tag, v2.2 has been created
at  c8bbc909797973332ed9d6c98aa5525b7a7df618 (tag)
   tagging  2697f45cc5adf62637c20a854459450c2c5e82c5 (commit)
  replaces  v2.1
 tagged by  Simon Josefsson
on  Wed Sep 1 21:41:08 2021 +0200

- Log -
inetutils 2.2
-BEGIN PGP SIGNATURE-

iHUEABYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCYS/XVQAKCRBRcisI/kdF
oiukAPwNL8kBGHrpdr9zelAcd4dl2KmiovtIEqtHpnbp9Oe6CwEAvqD/CaPoPmts
novLwIgGlLI0PhRVp65faJmWy3u9Dgk=
=PZwg
-END PGP SIGNATURE-----

Simon Josefsson (17):
  maint: post-release administrivia
  Refresh some release-related build rules.
  Use gnulib getpeername module.
  Use gnulib errno module.
  Use gnulib environ module.
  Use gnulib modules stdarg, stdlib and string.
  Use gnulib module socklen.
  Drop AC_C_CONST (obsolete).
  Don't check for memcmp, memcpy, memmove, memset and strdup (no gnulib 
module needed).
  Don't check for getpass, getusershell, and poll (gnulib modules already 
imported).
  Don't check for getopt_long, no longer used anywhere.
  tests: Don't fail ftp-localhost.sh when sysctl is missing.
  doc: Document recent fixes.
  logger: Code for non-getaddrinfo removed.
  rlogind: Code for non-getaddrinfo removed.
  ftp: check that PASV/LSPV addresses match.
  version 2.2

---


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.2-1-g8780b47

2021-09-01 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  8780b47a7fd029c8ffadb54841863964cde00f18 (commit)
   via  2697f45cc5adf62637c20a854459450c2c5e82c5 (commit)
  from  58cb043b190fd04effdaea7c9403416b436e50dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8780b47a7fd029c8ffadb54841863964cde00f18


commit 8780b47a7fd029c8ffadb54841863964cde00f18
Author: Simon Josefsson 
Date:   Wed Sep 1 21:46:29 2021 +0200

maint: post-release administrivia

* NEWS: Add header line for next release.
* .prev-version: Record previous version.
* cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 879b416..8bbe6cf 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.1
+2.2
diff --git a/NEWS b/NEWS
index be4e5dd..2077110 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
+* Noteworthy changes in release ?.? (-??-??) [?]
+
+
 * Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp
diff --git a/cfg.mk b/cfg.mk
index a79240c..a0e234e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -21,7 +21,7 @@ manual_title = GNU Network Utilities
 
 bootstrap-tools = 
gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,tar
 
-old_NEWS_hash = 201ce074704595e403c6614987d484e4
+old_NEWS_hash = 9e58290a292044bd6de634f52f6ed940
 
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2697f45cc5adf62637c20a854459450c2c5e82c5


commit 2697f45cc5adf62637c20a854459450c2c5e82c5
Author: Simon Josefsson 
Date:   Wed Sep 1 21:41:08 2021 +0200

version 2.2

* NEWS: Record release date.

diff --git a/NEWS b/NEWS
index 9cc42c0..be4e5dd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
-* Noteworthy changes in release ?.? (-??-??) [?]
+* Noteworthy changes in release 2.2 (2021-09-01) [stable]
 
 ** ftp
 

---

Summary of changes:
 .prev-version | 2 +-
 NEWS  | 3 +++
 cfg.mk| 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.1-16-g58cb043

2021-09-01 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  58cb043b190fd04effdaea7c9403416b436e50dd (commit)
  from  8586a5b3fe3302320b923ee31f9994e75708566e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=58cb043b190fd04effdaea7c9403416b436e50dd


commit 58cb043b190fd04effdaea7c9403416b436e50dd
Author: Simon Josefsson 
Date:   Wed Sep 1 09:09:50 2021 +0200

ftp: check that PASV/LSPV addresses match.

* NEWS: Mention change.
* ftp/ftp.c (initconn): Validate returned addresses.

diff --git a/NEWS b/NEWS
index f2ac9ea..9cc42c0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (-??-??) [?]
 
+** ftp
+
+The ftp client now validate addresses returned by PASV/LSPV responses,
+to make sure they match the server address.  Reported by ZeddYu Lu in
+<https://lists.gnu.org/archive/html/bug-inetutils/2021-06/msg2.html>.
+
+Thanks to Luke Mewburn  for discussion and fix to
+NetBSD code, we used a similar solution.
+
 ** logger
 ** rlogind
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index d21dbdd..7513539 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1365,6 +1365,13 @@ initconn (void)
  uint32_t *pu32 = (uint32_t *) _addr_sa4->sin_addr.s_addr;
  pu32[0] = htonl ( (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | 
h[3]);
}
+   if (data_addr_sa4->sin_addr.s_addr
+   != ((struct sockaddr_in *) )->sin_addr.s_addr)
+ {
+   printf ("Passive mode address mismatch.\n");
+   (void) command ("ABOR");/* Cancel any open connection.  
*/
+   goto bad;
+ }
} /* LPSV IPv4 */
  else /* IPv6 */
{
@@ -1395,6 +1402,13 @@ initconn (void)
  pu32[2] = htonl ( (h[8] << 24) | (h[9] << 16) | (h[10] << 8) 
| h[11]);
  pu32[3] = htonl ( (h[12] << 24) | (h[13] << 16) | (h[14] << 
8) | h[15]);
}
+   if (data_addr_sa6->sin6_addr.s6_addr
+   != ((struct sockaddr_in6 *) )->sin6_addr.s6_addr)
+ {
+   printf ("Passive mode address mismatch.\n");
+   (void) command ("ABOR");/* Cancel any open connection.  
*/
+   goto bad;
+ }
} /* LPSV IPv6 */
}
   else /* !EPSV && !LPSV */
@@ -1415,6 +1429,13 @@ initconn (void)
 | ((a2 & 0xff) << 8) | (a3 & 0xff) );
  data_addr_sa4->sin_port =
  htons (((p0 & 0xff) << 8) | (p1 & 0xff));
+ if (data_addr_sa4->sin_addr.s_addr
+ != ((struct sockaddr_in *) )->sin_addr.s_addr)
+   {
+ printf ("Passive mode address mismatch.\n");
+ (void) command ("ABOR");  /* Cancel any open connection.  
*/
+ goto bad;
+   }
} /* PASV */
  else
{

---

Summary of changes:
 NEWS  |  9 +
 ftp/ftp.c | 21 +
 2 files changed, 30 insertions(+)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
> That knowledge from observing how the archive and testing migration 
> software is working right now, in theory what we are seeing is a bug.

Great -- I thought it was something I was supposed to know about and
already should have done as part of dropping the binary package and/or
the transition.  I'm happy to not learn any more than this now :)

/Simon



Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
> That knowledge from observing how the archive and testing migration 
> software is working right now, in theory what we are seeing is a bug.

Great -- I thought it was something I was supposed to know about and
already should have done as part of dropping the binary package and/or
the transition.  I'm happy to not learn any more than this now :)

/Simon



Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
Adrian Bunk  writes:

> On Mon, Aug 30, 2021 at 04:03:36PM +0200, Simon Josefsson wrote:
>>...
>> Also, there is an arch:all missing build of libidn, is that a real
>> problem?  Should I do a binary upload to correct it?  I thought
>> source-only uploads was sufficient now.
>
> There are no packages you could upload, see #993294.

Thanks -- for my learning, is there anywhere I could read about that?
Is it always required when removing arch:all packages?

/Simon


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
Adrian Bunk  writes:

> On Mon, Aug 30, 2021 at 04:03:36PM +0200, Simon Josefsson wrote:
>>...
>> Also, there is an arch:all missing build of libidn, is that a real
>> problem?  Should I do a binary upload to correct it?  I thought
>> source-only uploads was sufficient now.
>
> There are no packages you could upload, see #993294.

Thanks -- for my learning, is there anywhere I could read about that?
Is it always required when removing arch:all packages?

/Simon


signature.asc
Description: PGP signature


Re: [PATCH] base32, base64: prefer signed to unsigned integers

2021-08-30 Thread Simon Josefsson via Gnulib discussion list
Paul Eggert  writes:

> Good question. Addressed in the attached patch, which I pushed.

Thanks for improving this -- it addresses my concerns.

/Simon


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
Hi!  With my ui-utilcpp NMU I think the libidn transition should be
complete, please compare:

https://release.debian.org/transitions/html/auto-libidn.html

but the ben rule is wrong so it matches some packages incorrectly.  I'm
not sure about is the clamv reverse dependency, does it have to be
fixed?  If so I can raise the severity and prepare a NMU of it, but on
IRC someone told me the clamav issue is not preventing completion.

Also, there is an arch:all missing build of libidn, is that a real
problem?  Should I do a binary upload to correct it?  I thought
source-only uploads was sufficient now.

/Simon


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-30 Thread Simon Josefsson
Hi!  With my ui-utilcpp NMU I think the libidn transition should be
complete, please compare:

https://release.debian.org/transitions/html/auto-libidn.html

but the ben rule is wrong so it matches some packages incorrectly.  I'm
not sure about is the clamv reverse dependency, does it have to be
fixed?  If so I can raise the severity and prepare a NMU of it, but on
IRC someone told me the clamav issue is not preventing completion.

Also, there is an arch:all missing build of libidn, is that a real
problem?  Should I do a binary upload to correct it?  I thought
source-only uploads was sufficient now.

/Simon


signature.asc
Description: PGP signature


Re: [PATCH] base32, base64: prefer signed to unsigned integers

2021-08-30 Thread Simon Josefsson via Gnulib discussion list
Bruno Haible  writes:

> Hi Simon,
>
>> I'm not sure I understand why idx_t is better than size_t
>> here, can you elaborate?  Why not ssize_t?
>
> You find a detailed explanation in the comments of idx.h.

Thanks for the pointer -- it doesn't say anything about why ssize_t
can't be used though?  As a signed variant of size_t, it seems relevant
to consider.

>> Maybe a compromise is to
>> keep the old API but add new APIs with idx_t types and the
>> implementation of the old functions uses the new one.
>
> The objective is to eliminate bugs due to the use of unsigned types
> for numerical values.

Is that a realistic goal with C using the unsigned type size_t for
low-level functions like strlen()?  It seems like an un-idiomatic goal.

> We can achieve it only by increasing the use of signed types such as
> 'idx_t'. If we keep the old function, it needs to be marked with
> __attribute__ ((__deprecated__)), otherwise existing code will
> continue to use the old function forever.

My idea was that both APIs would be supported indefinitely.

/Simon


signature.asc
Description: PGP signature


Re: [PATCH] base32, base64: prefer signed to unsigned integers

2021-08-29 Thread Simon Josefsson via Gnulib discussion list
Paul Eggert  writes:

> -extern void base64_encode (const char *restrict in, size_t inlen,
> -   char *restrict out, size_t outlen);
> +extern void base64_encode (const char *restrict in, idx_t inlen,
> +   char *restrict out, idx_t outlen);

Thanks for improving the code -- however, the API is quite wide spread
already, and size_t (or unsigned int) is widely used for many other
base64 APIs so this change causes friction at the API level.  What do
you think?  I'm not sure I understand why idx_t is better than size_t
here, can you elaborate?  Why not ssize_t?  Maybe a compromise is to
keep the old API but add new APIs with idx_t types and the
implementation of the old functions uses the new one.

/Simon


signature.asc
Description: PGP signature


[SCM] GNU Inetutils branch, master, updated. v2.1-15-g8586a5b

2021-08-26 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  8586a5b3fe3302320b923ee31f9994e75708566e (commit)
  from  1965afb227ff00db56d822c4848bbb3f16f10c44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8586a5b3fe3302320b923ee31f9994e75708566e


commit 8586a5b3fe3302320b923ee31f9994e75708566e
Author: Simon Josefsson 
Date:   Thu Aug 26 09:11:44 2021 +0200

rlogind: Code for non-getaddrinfo removed.

* NEWS: Mention change.
* src/rlogind.c [!HAVE_DECL_GETADDRINFO]: Remove.

diff --git a/NEWS b/NEWS
index 4b930dc..f2ac9ea 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ GNU inetutils NEWS -- history of user-visible changes.
 * Noteworthy changes in release ?.? (-??-??) [?]
 
 ** logger
+** rlogind
 
 Code for non-getaddrinfo removed, since we are using gnulib to provide
 getaddrinfo on any platform that lacks it.  This may have resulted in
diff --git a/src/rlogind.c b/src/rlogind.c
index 2a469e7..345b9b6 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -632,20 +632,11 @@ find_listenfd (int family, int port)
 {
   int fd, on = 1;
   socklen_t size;
-#if HAVE_DECL_GETADDRINFO
   int rc;
   struct sockaddr_storage saddr;
   struct addrinfo hints, *ai, *res;
   char portstr[16];
-#else /* !HAVE_DECL_GETADDRINFO */
-  struct sockaddr_in saddr;
 
-  /* Enforce IPv4, lacking getaddrinfo().  */
-  if (family != AF_INET)
-return -1;
-#endif
-
-#if HAVE_DECL_GETADDRINFO
   memset (, 0, sizeof hints);
   hints.ai_family = family;
   hints.ai_flags = AI_PASSIVE;
@@ -675,17 +666,6 @@ find_listenfd (int family, int port)
   memcpy (, ai->ai_addr, ai->ai_addrlen);
   freeaddrinfo (res);
 
-#else /* !HAVE_DECL_GETADDRINFO */
-  size = sizeof saddr;
-  memset (, 0, size);
-  saddr.sin_family = family;
-# ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-  saddr.sin_len = sizeof (struct sockaddr_in);
-# endif
-  saddr.sin_addr.s_addr = htonl (INADDR_ANY);
-  saddr.sin_port = htons (port);
-#endif
-
   fd = socket (family, SOCK_STREAM, 0);
   if (fd < 0)
 return -1;
@@ -815,11 +795,7 @@ rlogin_daemon (int maxchildren, int port)
{
  pid_t pid;
  socklen_t size;
-#if HAVE_DECL_GETADDRINFO
  struct sockaddr_storage saddr;
-#else /* !HAVE_DECL_GETADDRINFO */
- struct sockaddr_in saddr;
-#endif
 
  if (!FD_ISSET (listenfd[j], ))
continue;
@@ -860,13 +836,8 @@ rlogin_daemon (int maxchildren, int port)
 int
 rlogind_auth (int fd, struct auth_data *ap)
 {
-#if HAVE_DECL_GETNAMEINFO && HAVE_DECL_GETADDRINFO
   int rc;
   char hoststr[NI_MAXHOST];
-#else
-  struct hostent *hp;
-  void *addrp;
-#endif
   char *hostname = "";
   int authenticated = 0;
   int port;
@@ -878,43 +849,20 @@ rlogind_auth (int fd, struct auth_data *ap)
   switch (ap->from.ss_family)
 {
 case AF_INET6:
-#if !HAVE_DECL_GETADDRINFO || !HAVE_DECL_GETNAMEINFO
-  addrp = (void *) &((struct sockaddr_in6 *) >from)->sin6_addr;
-#endif
   port = ntohs (((struct sockaddr_in6 *) >from)->sin6_port);
   break;
 case AF_INET:
 default:
-#if !HAVE_DECL_GETADDRINFO || !HAVE_DECL_GETNAMEINFO
-  addrp = (void *) &((struct sockaddr_in *) >from)->sin_addr;
-#endif
   port = ntohs (((struct sockaddr_in *) >from)->sin_port);
 }
 
   confirmed = 0;
 
   /* Check the remote host name */
-#if HAVE_DECL_GETNAMEINFO
   rc = getnameinfo ((struct sockaddr *) >from, ap->fromlen,
hoststr, sizeof (hoststr), NULL, 0, NI_NAMEREQD);
   if (!rc)
 hostname = hoststr;
-#else /* !HAVE_DECL_GETNAMEINFO */
-  switch (ap->from.ss_family)
-{
-case AF_INET6:
-  hp = gethostbyaddr (addrp, sizeof (struct in6_addr),
- ap->from.ss_family);
-  break;
-case AF_INET:
-default:
-  hp = gethostbyaddr (addrp, sizeof (struct in_addr),
- ap->from.ss_family);
-}
-  if (hp)
-hostname = hp->h_name;
-#endif /* !HAVE_DECL_GETNAMEINFO */
-
   else if (reverse_required)
 {
   syslog (LOG_NOTICE, "can't resolve remote IP address");
@@ -928,7 +876,6 @@ rlogind_auth (int fd, struct auth_data *ap)
   if (verify_hostname || in_local_domain (ap->hostname))
 {
   int match = 0;
-#if HAVE_DECL_GETADDRINFO && HAVE_DECL_GETNAMEINFO
   struct addrinfo hints, *ai, *res;
   char astr[INET6_ADDRSTRLEN];
 
@@ -952,14 +899,6 @@ rlogind_auth (int fd, struct auth_data *ap)
}
  freeaddrinfo (res);
}
-#else /* !HAVE_DECL_GETADDRINFO */
-  for

Bug#991448: ui-utilcpp: diff for NMU version 1.10.0-1.1

2021-08-25 Thread Simon Josefsson
Control: tags 991448 + patch
Control: tags 991448 + pending

I've prepared an NMU for ui-utilcpp (versioned as 1.10.0-1.1) and
uploaded it to DELAYED/5.  Please feel free to tell me if I should delay
it longer.

MR at https://salsa.debian.org/debian/ui-utilcpp/-/merge_requests/1 if
you want to integrate this that way.

/Simon
diff --git a/debian/changelog b/debian/changelog
index e38ae11..4996f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ui-utilcpp (1.10.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add FTBFS patch from Steve Langasek.  Closes: #991448.
+
+ -- Simon Josefsson   Wed, 25 Aug 2021 10:23:30 +0200
+
 ui-utilcpp (1.10.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/control b/debian/control
index 48b4461..3964b68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 12),
libidn11-dev,
libcap-dev,
libboost-all-dev (>= 1.35),
+   libtirpc-dev,
xfslibs-dev,
doxygen (>= 1.5.6),
graphviz (>= 2.20.2)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..6a0390d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tirpc.patch
diff --git a/debian/patches/tirpc.patch b/debian/patches/tirpc.patch
new file mode 100644
index 000..9c8a1d6
--- /dev/null
+++ b/debian/patches/tirpc.patch
@@ -0,0 +1,35 @@
+Description: Port from deprecated glibc rpcsvc to libtirpc-dev
+Author: Steve Langasek 
+Forwarded: no
+Last-Update: 2021-07-23
+
+Index: ui-utilcpp-1.10.0/configure.ac
+===
+--- ui-utilcpp-1.10.0.orig/configure.ac
 ui-utilcpp-1.10.0/configure.ac
+@@ -83,8 +83,8 @@
+ AC_CHECK_FUNCS(cap_clear_flag)
+ 
+ # Push generic flags
+-AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src"])
+-AC_SUBST(AM_CXXFLAGS, ["-pthread -lrpcsvc $(ucommon-config --cflags)"])
++AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src -I/usr/include/tirpc"])
++AC_SUBST(AM_CXXFLAGS, ["-pthread -ltirpc $(ucommon-config --cflags)"])
+ AC_SUBST(AM_LDFLAGS, ["-pthread"])
+ AC_SUBST(AM_LIBADD, $(ucommon-config --libs))
+ AC_SUBST(AM_LDADD, $(ucommon-config --libs))
+Index: ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+===
+--- ui-utilcpp-1.10.0.orig/src/ui-utilcpp/Makefile.am
 ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+@@ -45,3 +45,10 @@
+ libui_utilcpp_la_CXXFLAGS = @AM_CXXFLAGS@ -fvisibility=default
+ libui_utilcpp_la_LDFLAGS = @AM_LDFLAGS@ -version-info @SO_VERSION@
+ libui_utilcpp_la_LIBADD = http/libui-utilcpp-http.la
++
++nodist_libui_utilcpp_la_SOURCES = xdr_rquota.c
++CLEANFILES = xdr_rquota.c
++
++xdr_rquota.c:
++	rpcgen -c /usr/include/rpcsvc/rquota.x > $@
++


signature.asc
Description: PGP signature


Bug#991448: ui-utilcpp: diff for NMU version 1.10.0-1.1

2021-08-25 Thread Simon Josefsson
Control: tags 991448 + patch
Control: tags 991448 + pending

I've prepared an NMU for ui-utilcpp (versioned as 1.10.0-1.1) and
uploaded it to DELAYED/5.  Please feel free to tell me if I should delay
it longer.

MR at https://salsa.debian.org/debian/ui-utilcpp/-/merge_requests/1 if
you want to integrate this that way.

/Simon
diff --git a/debian/changelog b/debian/changelog
index e38ae11..4996f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ui-utilcpp (1.10.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add FTBFS patch from Steve Langasek.  Closes: #991448.
+
+ -- Simon Josefsson   Wed, 25 Aug 2021 10:23:30 +0200
+
 ui-utilcpp (1.10.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/control b/debian/control
index 48b4461..3964b68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 12),
libidn11-dev,
libcap-dev,
libboost-all-dev (>= 1.35),
+   libtirpc-dev,
xfslibs-dev,
doxygen (>= 1.5.6),
graphviz (>= 2.20.2)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..6a0390d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tirpc.patch
diff --git a/debian/patches/tirpc.patch b/debian/patches/tirpc.patch
new file mode 100644
index 000..9c8a1d6
--- /dev/null
+++ b/debian/patches/tirpc.patch
@@ -0,0 +1,35 @@
+Description: Port from deprecated glibc rpcsvc to libtirpc-dev
+Author: Steve Langasek 
+Forwarded: no
+Last-Update: 2021-07-23
+
+Index: ui-utilcpp-1.10.0/configure.ac
+===
+--- ui-utilcpp-1.10.0.orig/configure.ac
 ui-utilcpp-1.10.0/configure.ac
+@@ -83,8 +83,8 @@
+ AC_CHECK_FUNCS(cap_clear_flag)
+ 
+ # Push generic flags
+-AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src"])
+-AC_SUBST(AM_CXXFLAGS, ["-pthread -lrpcsvc $(ucommon-config --cflags)"])
++AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src -I/usr/include/tirpc"])
++AC_SUBST(AM_CXXFLAGS, ["-pthread -ltirpc $(ucommon-config --cflags)"])
+ AC_SUBST(AM_LDFLAGS, ["-pthread"])
+ AC_SUBST(AM_LIBADD, $(ucommon-config --libs))
+ AC_SUBST(AM_LDADD, $(ucommon-config --libs))
+Index: ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+===
+--- ui-utilcpp-1.10.0.orig/src/ui-utilcpp/Makefile.am
 ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+@@ -45,3 +45,10 @@
+ libui_utilcpp_la_CXXFLAGS = @AM_CXXFLAGS@ -fvisibility=default
+ libui_utilcpp_la_LDFLAGS = @AM_LDFLAGS@ -version-info @SO_VERSION@
+ libui_utilcpp_la_LIBADD = http/libui-utilcpp-http.la
++
++nodist_libui_utilcpp_la_SOURCES = xdr_rquota.c
++CLEANFILES = xdr_rquota.c
++
++xdr_rquota.c:
++	rpcgen -c /usr/include/rpcsvc/rquota.x > $@
++


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-23 Thread Simon Josefsson
sön 2021-08-22 klockan 17:53 +0200 skrev Sebastian Ramacher:
> On 2021-08-22 15:47:43 +0200, Simon Josefsson wrote:
> > > Please go ahead
> > 
> > Thank you -- I have uploaded it now.  When it is a good time to
> > close
> > this bug?  I don't see anything on
> > https://wiki.debian.org/Teams/ReleaseTeam/Transitions - should I
> > keep
> > it open until the entire transition has been completed?
> 
> We will close the bug once the transition is done from the release
> team's point of view, i.e. after libidn11 was removed from testing.

Thanks -- I mentioned this on the wiki page, in case anyone else
wonders about this.

/Simon



Bug#992028: transition: libidn

2021-08-23 Thread Simon Josefsson
sön 2021-08-22 klockan 17:53 +0200 skrev Sebastian Ramacher:
> On 2021-08-22 15:47:43 +0200, Simon Josefsson wrote:
> > > Please go ahead
> > 
> > Thank you -- I have uploaded it now.  When it is a good time to
> > close
> > this bug?  I don't see anything on
> > https://wiki.debian.org/Teams/ReleaseTeam/Transitions - should I
> > keep
> > it open until the entire transition has been completed?
> 
> We will close the bug once the transition is done from the release
> team's point of view, i.e. after libidn11 was removed from testing.

Thanks -- I mentioned this on the wiki page, in case anyone else
wonders about this.

/Simon



Bug#992028: transition: libidn

2021-08-22 Thread Simon Josefsson
> Please go ahead

Thank you -- I have uploaded it now.  When it is a good time to close
this bug?  I don't see anything on
https://wiki.debian.org/Teams/ReleaseTeam/Transitions - should I keep
it open until the entire transition has been completed?

/Simon



Bug#992028: transition: libidn

2021-08-22 Thread Simon Josefsson
> Please go ahead

Thank you -- I have uploaded it now.  When it is a good time to close
this bug?  I don't see anything on
https://wiki.debian.org/Teams/ReleaseTeam/Transitions - should I keep
it open until the entire transition has been completed?

/Simon



Bug#992573: libgpg-error relocation R_X86_64_PC32 against symbol `stderr@@GLIBC_2.2.5'

2021-08-20 Thread Simon Josefsson
Package: libgpg-error
Version: 1.42-2

Hi!  I got a build error referencing libgpg-error, and when I rebuilt
the same package in testing, without the latest libgpg-error, it worked.
This might be triggered by some other problem, and I'll debug things
further, but I thought I'd report it in case others are noticing this or
the error message makes sense to you.

https://salsa.debian.org/auth-team/shishi/-/jobs/1835930

/usr/bin/ld: 
/usr/lib/x86_64-linux-gnu/libgpg-error.a(libgpg_error_la-estream.o): warning: 
relocation against `stdin@@GLIBC_2.2.5' in read-only section `.text'
/usr/bin/ld: /usr/lib/x86_64-linux-gnu/libgpg-error.a(libgpg_error_la-init.o): 
relocation R_X86_64_PC32 against symbol `stderr@@GLIBC_2.2.5' can not be used 
when making a shared object; recompile with -fPIC

/Simon


signature.asc
Description: PGP signature


Bug#988172: libgss3: please add Breaks+Replaces: libgss0

2021-08-20 Thread Simon Josefsson
Hi, and thanks for the report, and I'm sorry I failed to fix this
before bullseye.  I believe the proper fix is to build with --with-po-
suffix so that the po files are called gss3.po in libgss-dev, instead
of gss.po which caused the conflict you noticed.  The --with-po-suffix
parameter was mistakenly dropped in 1.0.3-5 which also explains why
this happened now rather many years ago.

I'm fixing this for unstable/testing with a new upload.  I'm thinking
whether we also want to fix this in bullseye?  Maybe a propsed-update
upload?  I have never done an upload like that, so I don't know what
the requirements and restrictions are for fixes to a stable release. 
It does seem to make sense though, since it helps to fix multi-release
upgrade paths.

My upload now doesn't resolve why libgss0 is installed after a long-
time upgrade cycle like yours.  I'm not sure that is incorrect: having
libgss0 installed (even when libgss3 is installed) is fine and
shouldn't cause problems.  Are packages required to make sure old
obsolete packages are removed?  If so, is a Replaces: libgss0 on
libgss3 sufficient?  What do you think?

/Simon



Bug#988172: libgss3: please add Breaks+Replaces: libgss0

2021-08-20 Thread Simon Josefsson via Discussion list for GNU Generic Security Service
Hi, and thanks for the report, and I'm sorry I failed to fix this
before bullseye.  I believe the proper fix is to build with --with-po-
suffix so that the po files are called gss3.po in libgss-dev, instead
of gss.po which caused the conflict you noticed.  The --with-po-suffix
parameter was mistakenly dropped in 1.0.3-5 which also explains why
this happened now rather many years ago.

I'm fixing this for unstable/testing with a new upload.  I'm thinking
whether we also want to fix this in bullseye?  Maybe a propsed-update
upload?  I have never done an upload like that, so I don't know what
the requirements and restrictions are for fixes to a stable release. 
It does seem to make sense though, since it helps to fix multi-release
upgrade paths.

My upload now doesn't resolve why libgss0 is installed after a long-
time upgrade cycle like yours.  I'm not sure that is incorrect: having
libgss0 installed (even when libgss3 is installed) is fine and
shouldn't cause problems.  Are packages required to make sure old
obsolete packages are removed?  If so, is a Replaces: libgss0 on
libgss3 sufficient?  What do you think?

/Simon



Re: Debian choice of upstream tarballs for packaging

2021-08-18 Thread Simon Josefsson
Paul Wise  writes:

> Hi all,
>
> I noticed that sometimes Debian's choice of upstream source for
> packaging can be suboptimal. This is especially apparent for the
> different per-language upstream packaging ecosystems[1], where the
> upstream packaging differs from the upstream VCS in some significant
> ways, including missing files, prebuilt files, embedded copies etc.
>
> While the upstream VCS also sometimes has these issues, it is often
> much less problematic than the upstream packaging ecosystems.

While I agree with the points you raise, and think I agree with your
overall goal, I see some problems with using upstream VCS as a source
for Debian packaging:

1) Trust paths.  Some upstreams sign release tarballs with an OpenPGP
release key that Debian trust for making releases.  Not all upstream
uses the same key to sign VCS tags/commits, and not all upstreams sign
VCS tags/commits at all.  While Debian can encourage and promote new
policies for upstream here, I don't think we are in a position to
require any uniform set of rules.  Signing tarballs is the current
established best practice -- moving to VCS builds needs a set of new
schemes to be established and deployed, and I don't see any single
universal solution today.

2) Bootstrapping projects from VCS is complex and requires additional
tools, and I think the Debian packaging process is well suited for this.
Two examples that I have run into:

  2a) Gnulib.  Several GNU-related projects import files from gnulib
  during VCS bootstrapping, and the way this happens is different for
  different projects.  The correct version of the files must be imported
  in the right way for things to work, and knowledge of which gnulib
  version is used is not always present in VCS but only in a released
  tarball.  How would this work when packaged in Debian?  A debian
  package containing the gnulib git repository could be added, to allow
  source packages to checkout the right version during build.

  2b) Cross-compilation and dependency cycles.  Bootstrapping from VCS
  may require a lot of tools that are optional when building from
  tarball, and in my experience the complete set of tools to bootstrap a
  project is rarely added as Build-Dep to Debian packages.  I feel some
  additional package build dependency mechanism would help here: maybe a
  Build-Bootstrap-Dep header to list the tools needed to generate a
  Debian source package?  And Build-Dep could list the tools needed to
  build Debian binary packages from the Debian source package.  I admit
  my understanding of the Debian packaging system is quite limited
  though.

3) Bootstrappable builds.  I think the underlying goal when it comes to
building from VCS may be to achieve bootstrappable builds -- see
https://www.bootstrappable.org/ -- however it seems to me that a lot of
care has to be taken when moving from tarball builds to VCS builds so we
don't make it harder to re-bootstrap the entire toolchain.  For example,
building GNU Coreutils from a tarball works fine in extremely old
environments, but building GNU Coreutils from VCS requires modern tools,
and perhaps some of them doesn't support older environments any more.

/Simon


signature.asc
Description: PGP signature


bug#50025: Strange? grep behaviour

2021-08-15 Thread Simon Josefsson via Bug reports for GNU grep
Daniel Forsberg  writes:

> Hello fellow Grepers!
>
> the following line:
>
> echo -n ":egov" | sha256sum | grep -E "[0-9a-f]+" -o | xxd -r -p |
> base32 | grep -E "[0-9A-Z]+" -o
>
> produces the following output
>
> LCBSPBBX6BY6
> VZX6P6TZMMRETTCSPXZU7GJTAPPZCPKF2UJEYDA

This is because W is not part of the Swedish collate class, so A-Z does
not match W, for some strange reason -- I think this has been changed in
recent glibc though.

jas@latte:~$ LANG=sv_SE.UTF-8
jas@latte:~$ echo -n ":egov" | sha256sum | grep -E "[0-9a-f]+" -o | xxd -r 
-p | base32 | grep -E "[0-9A-Z]+" -o
LCBSPBBX6BY6
VZX6P6TZMMRETTCSPXZU7GJTAPPZCPKF2UJEYDA
jas@latte:~$ LANG=C
jas@latte:~$ echo -n ":egov" | sha256sum | grep -E "[0-9a-f]+" -o | xxd -r 
-p | base32 | grep -E "[0-9A-Z]+" -o
LCBSPBBX6BY6WVZX6P6TZMMRETTCSPXZU7GJTAPPZCPKF2UJEYDA
jas@latte:~$ 

/Simon


signature.asc
Description: PGP signature


Re: [exim] DKIM signing and header choices?

2021-08-15 Thread Simon Josefsson via Exim-users
Evgeniy Berdnikov via Exim-users  writes:

>  The built-in value could be changed with dkim_sign_headers, but
>  this patch gives much more reasonable default, IMHO.

I'm now running with this local config instead:

DKIM_SIGN_HEADERS = 
From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:=Resent-Date:=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:=In-Reply-To:=References:=List-Id:=List-Help:=List-Unsubscribe:=List-Subscribe:=List-Post:=List-Owner:=List-Archive

Reviewing modern exim source makes me suggest the patch below.  This
makes DKIM signature not cover any non-existing List-* headers in the
message to be signed, which seems reasonable to me, and consistent with
RFC 4871:

   The following header fields SHOULD be included in the signature, if
   they are present in the message being signed:
...
   o  List-Id, List-Help, List-Unsubscribe, List-Subscribe, List-Post,
  List-Owner, List-Archive

RFC 6376 does not contain the same wording, so maybe this is a complex
area.  Perhaps a review of what other DKIM signing software is using
would be useful?  In case there is any established best practice out
there.

/Simon
From 203f6e74ef669080afbc9f1adc45f64269fba3a0 Mon Sep 17 00:00:00 2001
From: Simon Josefsson 
Date: Fri, 13 Aug 2021 17:38:47 +0200
Subject: [PATCH] DKIM: Make List-* headers optional in
 PDKIM_DEFAULT_SIGN_HEADERS.

---
 src/src/pdkim/pdkim.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/src/pdkim/pdkim.h b/src/src/pdkim/pdkim.h
index f6ff78251..4a6ff820a 100644
--- a/src/src/pdkim/pdkim.h
+++ b/src/src/pdkim/pdkim.h
@@ -32,8 +32,8 @@
  "Content-Description:Resent-Date:Resent-From:"\
  "Resent-Sender:Resent-To:Resent-Cc:"\
  "Resent-Message-ID:In-Reply-To:References:"\
- "List-Id:List-Help:List-Unsubscribe:"\
- "List-Subscribe:List-Post:List-Owner:List-Archive"
+ "=List-Id:=List-Help:=List-Unsubscribe:"\
+ "=List-Subscribe:=List-Post:=List-Owner:=List-Archive"
 
 #define PDKIM_OVERSIGN_HEADERS "+From:+Sender:+Reply-To:+Subject:+Date:"\
  "+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:"\
-- 
2.30.2



signature.asc
Description: PGP signature
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-users
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/


[exim] DKIM signing and header choices?

2021-08-12 Thread Simon Josefsson via Exim-users
Hi!  I think I have ran into this problem:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939808

My outgoing e-mails (like this one) is DKIM signed by Exim, and the
signature covers (on sending, the non-existing) List-Id header, which a
mailing list software inserts, breaking the DKIM signature for
recipients.  I'm getting some DMARC reports about failures due to
invalid signatures, and these usually comes when I post something to a
mailing list.  Is my analysis correct?

What do you think about the patch posted in the link above?  See below.

/Simon

--- a/src/pdkim/pdkim.h
+++ b/src/pdkim/pdkim.h
@@ -26,14 +26,14 @@
 #include "../blob.h"
 #include "../hash.h"
 
-#define PDKIM_DEFAULT_SIGN_HEADERS "From:Sender:Reply-To:Subject:Date:"\
- "Message-ID:To:Cc:MIME-Version:Content-Type:"\
- "Content-Transfer-Encoding:Content-ID:"\
- "Content-Description:Resent-Date:Resent-From:"\
- "Resent-Sender:Resent-To:Resent-Cc:"\
- "Resent-Message-ID:In-Reply-To:References:"\
- "List-Id:List-Help:List-Unsubscribe:"\
- "List-Subscribe:List-Post:List-Owner:List-Archive"
+#define PDKIM_DEFAULT_SIGN_HEADERS \
+  "From:From:=Sender:Reply-To:Subject:Subject:Date:To:Cc:"\
+  "Message-ID:In-Reply-To:References:MIME-Version:"\
+  "Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:"\
+  "=Resent-Date:=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:"\
+  "=Resent-Message-ID:"\
+  "=List-Id:=List-Help:=List-Unsubscribe:=List-Subscribe:=List-Post:"\
+  "=List-Owner:=List-Archive"


signature.asc
Description: PGP signature
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-users
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/


Bug#992123: exim4: core dump: handle_smtp_call smtp_setup_msg acl_check acl_check_condition acl_verify verify_address do_callout

2021-08-12 Thread Simon Josefsson
Package: exim4-daemon-heavy
Version: 4.92-8+deb10u6

Hi!  Exim crashed after an incoming connection, from an IP address that
has never talked to my server before.  Similar IP adresses have been
trying to send spam in the last few days though, triggering sender
verify failures.

Is there a good way to make exim log complete sessions?  Tcpdump or
similar is not that useful if TLS is used (which don't appear to be the
case here though).

/Simon

2021-08-12 02:25:52.379 [5519] SMTP connection from [112.255.137.213]:1915 
I=[178.174.241.107]:25 (TCP/IP connection count = 1)
2021-08-12 02:25:52.385 [9590] no host name found for IP address 112.255.137.213

Aug 12 02:27:28 uggla kernel: [1419962.206702] traps: exim4[9590] general 
protection ip:56058da25505 sp:748b3c60 error:0 in exim4[56058d9b3000+bf000]
Aug 12 02:27:28 uggla systemd[1]: Created slice 
system-systemd\x2dcoredump.slice.
Aug 12 02:27:28 uggla systemd[1]: Started Process Core Dump (PID 9610/UID 0).
Aug 12 02:27:28 uggla systemd-coredump[9611]: Process 9590 (exim4) of user 107 
dumped core.#012#012Stack trace of thread 9590:#012#0  0x56058da25505 n/a 
(exim4)#012#1  0x56058da2586d n/a (exim4)#012#2  0x56058da39808 n/a 
(exim4)#012#3  0x56058da3b314 n/a (exim4)#012#4  0x56058d9be70e n/a 
(exim4)#012#5  0x56058d9bf81b n/a (exim4)#012#6  0x56058d9c25c0 n/a 
(exim4)#012#7  0x56058da2156f n/a (exim4)#012#8  0x56058d9c5c22 n/a 
(exim4)#012#9  0x56058d9b8f52 n/a (exim4)#012#10 0x7f232405709b 
__libc_start_main (libc.so.6)#012#11 0x56058d9bc29a _start (exim4)
Aug 12 02:27:28 uggla systemd[1]: systemd-coredump@0-9610-0.service: Succeeded.

root@uggla:~# coredumpctl gdb -1
   PID: 9590 (exim4)
   UID: 107 (Debian-exim)
   GID: 113 (Debian-exim)
Signal: 11 (SEGV)
 Timestamp: Thu 2021-08-12 02:27:28 UTC (4h 48min ago)
  Command Line: /usr/sbin/exim4 -bd -q30m
Executable: /usr/sbin/exim4
 Control Group: /system.slice/exim4.service
  Unit: exim4.service
 Slice: system.slice
   Boot ID: 621de42992dc46cfb7bfad54b5dbb056
Machine ID: 91d76afe2fc543e49fa0c766b415c23c
  Hostname: uggla
   Storage: 
/var/lib/systemd/coredump/core.exim4.107.621de42992dc46cfb7bfad54b5dbb056.9590.162873524800.lz4
   Message: Process 9590 (exim4) of user 107 dumped core.

Stack trace of thread 9590:
#0  0x56058da25505 n/a (exim4)
#1  0x56058da2586d n/a (exim4)
#2  0x56058da39808 n/a (exim4)
#3  0x56058da3b314 n/a (exim4)
#4  0x56058d9be70e n/a (exim4)
#5  0x56058d9bf81b n/a (exim4)
#6  0x56058d9c25c0 n/a (exim4)
#7  0x56058da2156f n/a (exim4)
#8  0x56058d9c5c22 n/a (exim4)
#9  0x56058d9b8f52 n/a (exim4)
#10 0x7f232405709b __libc_start_main (libc.so.6)
#11 0x56058d9bc29a _start (exim4)

GNU gdb (Debian 8.2.1-2+b3) 8.2.1
Copyright (C) 2018 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.

For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /usr/sbin/exim4...Reading symbols from 
/usr/lib/debug/.build-id/63/46165145c764b379a38bd05ec49b6a4bef7b1c.debug...done.
done.
[New LWP 9590]
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/sbin/exim4 -bd -q30m'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x56058da25505 in flush_buffer (outblock=outblock@entry=0x748b3f50, 
mode=mode@entry=0) at smtp_out.c:446
446 smtp_out.c: No such file or directory.
(gdb) bt
#0  0x56058da25505 in flush_buffer (outblock=outblock@entry=0x748b3f50, 
mode=mode@entry=0) at smtp_out.c:446
#1  0x56058da2586d in smtp_write_command (sx=sx@entry=0x748b3ea0, 
mode=mode@entry=0, format=format@entry=0x56058da97915 "QUIT\r\n") at 
smtp_out.c:568
#2  0x56058da39808 in do_callout (addr=addr@entry=0x56058e170ac0, 
host_list=, tf=tf@entry=0x748b70a0, 
callout=callout@entry=120, callout_overall=, 
callout_overall@entry=-1, 
callout_connect=, callout_connect@entry=-1, 
options=, se_mailfrom=, pm_mailfrom=) at verify.c:1118
#3  0x56058da3b314 in verify_address (vaddr=vaddr@entry=0x56058e170ac0, 

bug#49996: egrep and fgrep?

2021-08-11 Thread Simon Josefsson via Bug reports for GNU grep
Hi!  A long standing pet issue of mine are the "deprecated" (since
2005?) tools fgrep and egrep.  If there is any meaning to the term
"deprecated", maybe they should be dropped at some point, or the
deprecation-status escalated (stderr warning? syslog output?).  What do
you think?

Maybe now is an acceptable time to drop them, I recall seeing some more
recent distributions that do not provide them, and things appears to
work for them except for the rare bug here and there.

Alternatively, how about un-deprecating them, for compatibility with BSD
and deployed popular usage.  I must admint I use egrep quite often.  I
think un-deprecating tools/APIs is an acceptable thing to do in some
cases.

Maybe a middle-ground could exist, that they won't be installed (or
work?) in some "POSIX"-mode -- I think the main reason for deprecating
them was that POSIX dropped a requirement for them?  That doesn't
necessarily mean things must be deprecated.

/Simon


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-09 Thread Simon Josefsson
Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: transition

Hello,

I want to transition libidn to a newer upstream version, and they
API/ABI bumped.  This is my first transition in many years, so I'm
looking for guidance here.

I have uploaded 1.38-1 to experimental, and it builds everywhere.  The
binary package libidn11 is replaced with libidn12; libidn11-dev renamed
to libidn-dev (adding a dummy package with the old name); and
libidn11-java is removed (not setup for java usage properly and <10
popcon).

Speaking as upstream of the package, I expect everything to build with
the new version, doing the API/ABI bump was a mistake but it is several
years old by now.

Reverse dependencies have been built here:
https://salsa.debian.org/debian/libidn/-/pipelines/273580

Some comments:

- clamav: libclamav-dev depends on libidn11-dev needessly:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991976
- echoping: ftbfs otherwise too, not related to this
- clickhouse: ftbfs due to 2h build timeout on salsa, otherwise should
  be okay.

Is there anything more I should do now?  Let me know when I can upload
to unstable.

Ben file (based on auto-generated output on the webpage -- not sure this
is correct -- why doesn't it output something in the right format?):

title = "libidn";
is_affected = .depends ~ "/\b(libidn\-dev|libidn12|libidn11|libidn11\-java)\b/";
is_good = .depends ~ "/\b(libidn\-dev|libidn12)\b/";
is_bad = .depends ~ "/\b(libidn11|libidn11\-java)\b/";

/Simon


signature.asc
Description: PGP signature


Bug#992028: transition: libidn

2021-08-09 Thread Simon Josefsson
Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: transition

Hello,

I want to transition libidn to a newer upstream version, and they
API/ABI bumped.  This is my first transition in many years, so I'm
looking for guidance here.

I have uploaded 1.38-1 to experimental, and it builds everywhere.  The
binary package libidn11 is replaced with libidn12; libidn11-dev renamed
to libidn-dev (adding a dummy package with the old name); and
libidn11-java is removed (not setup for java usage properly and <10
popcon).

Speaking as upstream of the package, I expect everything to build with
the new version, doing the API/ABI bump was a mistake but it is several
years old by now.

Reverse dependencies have been built here:
https://salsa.debian.org/debian/libidn/-/pipelines/273580

Some comments:

- clamav: libclamav-dev depends on libidn11-dev needessly:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991976
- echoping: ftbfs otherwise too, not related to this
- clickhouse: ftbfs due to 2h build timeout on salsa, otherwise should
  be okay.

Is there anything more I should do now?  Let me know when I can upload
to unstable.

Ben file (based on auto-generated output on the webpage -- not sure this
is correct -- why doesn't it output something in the right format?):

title = "libidn";
is_affected = .depends ~ "/\b(libidn\-dev|libidn12|libidn11|libidn11\-java)\b/";
is_good = .depends ~ "/\b(libidn\-dev|libidn12)\b/";
is_bad = .depends ~ "/\b(libidn11|libidn11\-java)\b/";

/Simon


signature.asc
Description: PGP signature


Bug#991976: libclamav-dev: remove unnecessary dependency on libidn11-dev

2021-08-07 Thread Simon Josefsson
Package: libclamav-dev
Tags: patch

Hi!  I'm doing a shared library transition of libidn, and noticed a
strange dependency on libidn11-dev in the libclamav-dev package, and it
has been there since the beginning of (salsa git) times.  As far as I
can tell, nothing in clamav depends on libidn, so the dependency is
useless.  Can you confirm that?  If so, please drop the dependency.

/Simon

diff --git a/debian/control b/debian/control
index a20898d4..59f5f4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -109,7 +109,6 @@ Architecture: any
 Depends: libbz2-dev,
  libc6-dev | libc-dev,
  libclamav9 (= ${binary:Version}),
- libidn11-dev,
  libssl-dev,
  libtommath-dev,
  zlib1g-dev,


signature.asc
Description: PGP signature


[Pkg-clamav-devel] Bug#991976: libclamav-dev: remove unnecessary dependency on libidn11-dev

2021-08-07 Thread Simon Josefsson
Package: libclamav-dev
Tags: patch

Hi!  I'm doing a shared library transition of libidn, and noticed a
strange dependency on libidn11-dev in the libclamav-dev package, and it
has been there since the beginning of (salsa git) times.  As far as I
can tell, nothing in clamav depends on libidn, so the dependency is
useless.  Can you confirm that?  If so, please drop the dependency.

/Simon

diff --git a/debian/control b/debian/control
index a20898d4..59f5f4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -109,7 +109,6 @@ Architecture: any
 Depends: libbz2-dev,
  libc6-dev | libc-dev,
  libclamav9 (= ${binary:Version}),
- libidn11-dev,
  libssl-dev,
  libtommath-dev,
  zlib1g-dev,


signature.asc
Description: PGP signature
___
Pkg-clamav-devel mailing list
Pkg-clamav-devel@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-clamav-devel


Re: announce-gen and OpenPGP key servers

2021-08-04 Thread Simon Josefsson via Gnulib discussion list
tis 2021-08-03 klockan 16:51 -0700 skrev Jim Meyering:
> On Tue, Aug 3, 2021 at 12:25 PM Paul Eggert 
> wrote:
> > On 8/3/21 12:20 PM, Simon Josefsson via Gnulib discussion list
> > wrote:
> > > +  print "\nThe SHA256 checksum is base64 encoded and not
> > > hexadecimal,\n";
> > > +  print "which is the default for most checksum tools.\n\n";
> > 
> > Perhaps this?
> > 
> >    print "\nThe SHA256 checksum is base64 encoded, instead of
> > the\n";
> >    print "hexadecimal encoding that most checksum tools default
> > to.\n\n";
> 
> Thanks. That is clearer, indeed.

Pushed, thanks.

/Simon





Re: announce-gen and OpenPGP key servers

2021-08-03 Thread Simon Josefsson via Gnulib discussion list
Jim Meyering  writes:

> Thanks, Simon! I too am all for B64-formatted checksums.

Good, it is a trade-off between output readability and code complexity.
Aligning 'sha*sum' with OpenBSD's 'sha*' tools would be nice, and base64
support is one missing piece.

> You may want to coordinate with Pádraig.
> I think he is planning a unification of the checksum-generating tools.

Okay!

> Your patches look fine. One nit: please drop the "Please" here :-)
>
> +  print "\nPlease note that the SHA256 checksum is base64 encoded and not\n";

Thanks, I reworded it a bit further, but I'm not a native speaker so I
appreciate improvements from others.

+  print "\nThe SHA256 checksum is base64 encoded and not hexadecimal,\n";
+  print "which is the default for most checksum tools.\n\n";


/Simon


signature.asc
Description: PGP signature


Re: announce-gen and OpenPGP key servers

2021-08-03 Thread Simon Josefsson via Gnulib discussion list
Jim Meyering  writes:

> Feel free to make the script generate a full fingerprint and even
> (though it feels a little like giving up) add a checksum or two.

I think checksums still serve a purpose.

Many announcement e-mails are OpenPGP signed (and sometimes with a
different key than the release tarballs, thus creating another way to
verify tarballs).

Checksums also makes it harder to replace the tarball on the server with
a fake (or, after a key compromise, a genuine) signature.

I don't think it is a either-or situation, but rather a
belt-and-suspender case.  Ideally, people downloading a release should
verify both the signature (to know it comes from a trusted origin) and
checksum (to know it is the intended release, in case multiple signed
versions co-exists).

The patches below make the maintainer-makefile announcements contain
SHA1 and B64(SHA256) checksums by default.  The MD5 checksums are
dropped; they are completely insecure now.  The B64(SHA256) output is
inspired by OpenSSH which started this practice with release 6.5 in 2014
and still today prints similar outputs, see:

https://www.openssh.com/txt/release-6.5
https://www.openssh.com/txt/release-8.6

Unfortunately, 'sha256sum' can't verify these outputs, but I recall
earlier discussions around 'sha256sum --base64' so I will resume work on
that.

We could opt to simply use the "standard" sha256sum output instead, if
people here don't like the base64 output format.

/Simon
From 4adae938b8dbe01750698109bcbf5f1c9eb045b1 Mon Sep 17 00:00:00 2001
From: Simon Josefsson 
Date: Tue, 3 Aug 2021 17:15:16 +0200
Subject: [PATCH 1/2] announce-gen: Print SHA1/B64(SHA256) instead of MD5/SHA1.

* build-aux/announce-gen (%digest_classes): Removed.
(usage): Doc fix.
(print_checksums): Instead of MD5/SHA1, print SHA1 and
B64(SHA256), inspired by OpenSSH announcements.
---
 ChangeLog  |  8 
 build-aux/announce-gen | 33 +++--
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06f139a54..079a5b71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-03  Simon Josefsson  
+
+	announce-gen: Print SHA1/B64(SHA256) instead of MD5/SHA1.
+	* build-aux/announce-gen (%digest_classes): Removed.
+	(usage): Doc fix.
+	(print_checksums): Instead of MD5/SHA1, print SHA1 and
+	B64(SHA256), inspired by OpenSSH announcements.
+
 2021-08-02  Paul Eggert  
 
 	manywarnings: enable some malloc warnings
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index daa478c8e..b07cbd742 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -35,7 +35,7 @@
 eval 'exec perl -wSx "$0" "$@"'
  if 0;
 
-my $VERSION = '2021-04-11 8:42'; # UTC
+my $VERSION = '2021-08-03 15:13'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -51,12 +51,6 @@ use POSIX qw(strftime);
 
 my %valid_release_types = map {$_ => 1} qw (alpha beta stable);
 my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz);
-my %digest_classes =
-  (
-   'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'),
-   'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA')
-  or (eval { require Digest::SHA1; } and 'Digest::SHA1'))
-  );
 my $srcdir = '.';
 
 sub usage ($)
@@ -96,7 +90,7 @@ The following are optional:
 VERSION is the result of running git describe
 in the gnulib source directory.
 required if gnulib is in TOOL_LIST.
-   --no-print-checksums do not emit MD5 or SHA1 checksums
+   --no-print-checksums do not emit SHA1 or SHA256 checksums
--archive-suffix=SUF add SUF to the list of archive suffixes
--mail-headers=HEADERS   a space-separated list of mail headers, e.g.,
 To: x\@example.com Cc: y-announce\@example.com,...
@@ -163,7 +157,7 @@ sub print_locations ($\@\%@)
 
 =item C.
+Print the SHA1 and SHA256 signature section for each C<@file>.
 
 =cut
 
@@ -171,23 +165,18 @@ sub print_checksums (@)
 {
   my (@file) = @_;
 
-  print "Here are the MD5 and SHA1 checksums:\n";
+  print "Here are the SHA1 and SHA256 checksums:\n";
   print "\n";
 
-  foreach my $meth (qw (md5 sha1))
+  use Digest::file qw(digest_file_hex digest_file_base64);
+
+  foreach my $f (@file)
 {
-  my $class = $digest_classes{$meth} or next;
-  foreach my $f (@file)
-{
-  open IN, '<', $f
-or die "$ME: $f: cannot open for reading: $!\n";
-  binmode IN;
-  my $dig = $class->new->addfile(*IN)->hexdigest;
-  close IN;
-  print "$dig  $f\n";
-}
+  print digest_file_hex($f, "SHA-

Re: announce-gen and OpenPGP key servers

2021-08-02 Thread Simon Josefsson via Gnulib discussion list
sön 2021-08-01 klockan 17:47 +0200 skrev Bernhard Voelker:
> On 7/27/21 11:38 AM, Simon Josefsson via Gnulib discussion list
> wrote:
> > Let's discuss and see what we can do.
> Isn't this what the "release GPG keys" on Savannah are for?
> 
> Each project maintainer can set them up correctly under "Edit public
> info":
>   "
> https://savannah.gnu.org/project/admin/editgroupinfo.php?group=${PROJECT}
> "
> 
> The result can be downloaded by users for verification:
>   "
> https://savannah.gnu.org/project/release-gpgkeys.php?group=${PROJECT}=1
> "
> e.g. coreutils':
>   "
> https://savannah.gnu.org/project/release-gpgkeys.php?group=coreutils=1
> "
> 
> Downstream sometimes use them, e.g. SUSE and openSUSE are verifying
> the keys on their Open Build Service.

Right, thanks for pointing that out.  It can be used in some
situations.  One concern is that the set of keys trusted for uploads to
ftp.gnu.org is a a different set of keys, and not all GNU projects use
Savannah.

/Simon





Re: fts in gnulib behave different than glibc

2021-07-29 Thread Simon Josefsson via Gnulib discussion list
Jim Meyering  writes:

> On Wed, Jul 28, 2021 at 1:08 AM Simon Josefsson via Gnulib discussion
> list  wrote:
>> Hi.  I replaced GNU InetUtils' old custom fts implementation with the
>> one from gnulib, but self-tests started failing.  Looking at the code,
>> it seems gnulib's fts implementation has diverged compared to glibc, and
>> has some optimizations that (I think) change the API (wrt stat and
>> chdir).  Also, gnulib's fts module is always enabled, even on modern
>> glibc systems.  InetUtils's usage of fts works fine with modern glibc,
>> but it didn't work with gnulib's version (it needed a FTS_NOCHDIR).  The
>> gnulib manual for the fts replacement module isn't terribly clear about
>> this.  Is there a reason for this behaviour?
>>
>> I would prefer if there were two fts modules in gnulib:
>>
>> 1) One module 'fts' based on glibc's code, that is only enabled in on
>> systems that doesn't have fts, or where fts is known to be buggy.
>>
>> 2) One 'fts-faster' that is the current code, which can be used when you
>> always wants to pull in the optimized implementation.
>>
>> Then InetUtils would use system fts on glibc platforms, and not always
>> have to pull in a replacement copy.
>>
>> What do you think?
>>
>> I could live with a new module 'fts-optional' that only pulls in the
>> current 'fts' module when the system is lacking it.  That doesn't fix
>> the API confusion, but is probably sufficient for InetUtils.
>
> There are fundamental flaws in the ABI of glibc's fts that make it
> unsuitable for use in any tool I care about.

Ouch -- is there disagreement from the glibc people on fixing glibc fts?
Maybe the reaction will be different now.

Are the problems inherent with the glibc ABI, or can they be fixed?  If
it isn't possible to fix, maybe the entire API should be declared
deprecated and eventually removed.

The glibc manual doesn't seem to document fts?!

> Those flaws make it easy to hit silly limits or to provoke inordinate
> resource usage/DoS.

It would be nice to document these problems in more detail in the gnulib
manual.

Is there any known behavioural difference between glibc fts and gnulib
fts?  Documenting that too would be useful.

InetUtils' required a FTS_NOCHDIR flag in order to continue behave as
before (a simple command like 'ls foo' where foo is a directory failed).
I don't see any self-tests in gnulib without that flag, so maybe this
suggests there is some API/ABI difference.

> Is it ok for InetUtil's fts to be unable to do these things? (each of
> which afflicts glibc fts, from what I recall)
> - process files in a tree more than 2^16 levels deep
> - detect certain cycles efficiently
> - delete (in reasonable time) a hierarchy with too many entries in a
> single directory.

InetUtils only uses fts for "DIR" in ftpd, when it emulate /bin/ls
internally (based on some old BSD implementation of /bin/ls that uses
fts).  The first two applies, but not the third, I think, but it sounds
like corner-cases.

/Simon


signature.asc
Description: PGP signature


Bug#991603: isenkram-autoinstall-firmware installs firmware-realtek due to iwl-debug-yoyo.bin?

2021-07-28 Thread Simon Josefsson
Package: isenkram
Version: 0.48

Hi!  As far as I know, my Lenovo X201 does not have any realtek-related
hardware in it, but isenkram-autoinstall-firmware still installs the
'firmware-realtek' for me.  Is it because of the iwl-debug-yoyo.bin
(which sounds like a firmware-iwlwifi thing)?  This seems like a bug?

/Simon

root@latte:~# isenkram-autoinstall-firmware 
info: looking for firmware file iwl-debug-yoyo.bin requested by kernel
info: some kernel driver requested extra firmware files: 
iwlwifi-ma-a0-gf-a0-59.ucode iwlwifi-ma-a0-mr-a0-59.ucode 
iwlwifi-QuQnj-b0-hr-b0-59.ucode iwlwifi-QuQnj-b0-jf-b0-59.ucode 
iwlwifi-so-a0-gf-a0-59.ucode iwlwifi-so-a0-hr-b0-59.ucode 
iwlwifi-so-a0-jf-b0-59.ucode iwlwifi-SoSnj-a0-gf4-a0-59.ucode 
iwlwifi-SoSnj-a0-gf-a0-59.ucode iwlwifi-SoSnj-a0-hr-b0-59.ucode 
iwlwifi-SoSnj-a0-mr-a0-59.ucode rtl_bt/rtl8723a_fw.bin 
rtl_bt/rtl8723b_config.bin rtl_bt/rtl8723b_fw.bin rtl_bt/rtl8723bs_config.bin 
rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723ds_config.bin rtl_bt/rtl8723ds_fw.bin 
rtl_bt/rtl8761a_config.bin rtl_bt/rtl8761a_fw.bin rtl_bt/rtl8821a_config.bin 
rtl_bt/rtl8821a_fw.bin rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin 
iwl-debug-yoyo.bin
info: locating packages with the requested firmware files
info: determining whether enabling other components is required
info: trying to install firmware-realtek
Väljer tidigare ej valt paket firmware-realtek.
(Läser databasen ... 349599 filer och kataloger installerade.)
Förbereder att packa upp .../firmware-realtek_20210315-3_all.deb ...
Packar upp firmware-realtek (20210315-3) ...
Ställer in firmware-realtek (20210315-3) ...
Hanterar utlösare för initramfs-tools (0.140) ...
update-initramfs: Generating /boot/initrd.img-5.10.0-8-amd64
root@latte:~# 

root@latte:~# lspci
00:00.0 Host bridge: Intel Corporation Core Processor DRAM Controller (rev 02)
00:02.0 VGA compatible controller: Intel Corporation Core Processor Integrated 
Graphics Controller (rev 02)
00:16.0 Communication controller: Intel Corporation 5 Series/3400 Series 
Chipset HECI Controller (rev 06)
00:19.0 Ethernet controller: Intel Corporation 82577LM Gigabit Network 
Connection (rev 06)
00:1a.0 USB controller: Intel Corporation 5 Series/3400 Series Chipset USB2 
Enhanced Host Controller (rev 06)
00:1b.0 Audio device: Intel Corporation 5 Series/3400 Series Chipset High 
Definition Audio (rev 06)
00:1c.0 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI Express 
Root Port 1 (rev 06)
00:1c.3 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI Express 
Root Port 4 (rev 06)
00:1c.4 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI Express 
Root Port 5 (rev 06)
00:1d.0 USB controller: Intel Corporation 5 Series/3400 Series Chipset USB2 
Enhanced Host Controller (rev 06)
00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev a6)
00:1f.0 ISA bridge: Intel Corporation QM57 Chipset LPC Interface Controller 
(rev 06)
00:1f.2 SATA controller: Intel Corporation 5 Series/3400 Series Chipset 6 port 
SATA AHCI Controller (rev 06)
00:1f.3 SMBus: Intel Corporation 5 Series/3400 Series Chipset SMBus Controller 
(rev 06)
00:1f.6 Signal processing controller: Intel Corporation 5 Series/3400 Series 
Chipset Thermal Subsystem (rev 06)
02:00.0 Network controller: Intel Corporation Centrino Ultimate-N 6300 (rev 35)
ff:00.0 Host bridge: Intel Corporation Core Processor QuickPath Architecture 
Generic Non-core Registers (rev 02)
ff:00.1 Host bridge: Intel Corporation Core Processor QuickPath Architecture 
System Address Decoder (rev 02)
ff:02.0 Host bridge: Intel Corporation Core Processor QPI Link 0 (rev 02)
ff:02.1 Host bridge: Intel Corporation 1st Generation Core i3/5/7 Processor QPI 
Physical 0 (rev 02)
ff:02.2 Host bridge: Intel Corporation 1st Generation Core i3/5/7 Processor 
Reserved (rev 02)
ff:02.3 Host bridge: Intel Corporation 1st Generation Core i3/5/7 Processor 
Reserved (rev 02)
root@latte:~# 

root@latte:~# dmesg|grep -i firm
[0.105328] Spectre V2 : Enabling Restricted Speculation for firmware calls
[0.420446] ACPI: [Firmware Bug]: BIOS _OSI(Linux) query ignored
[3.597202] psmouse serio2: trackpoint: IBM TrackPoint firmware: 0x0e, 
buttons: 3/3
[5.422690] platform regulatory.0: firmware: direct-loading firmware 
regulatory.db
[5.422861] platform regulatory.0: firmware: direct-loading firmware 
regulatory.db.p7s
[5.632171] iwlwifi :02:00.0: firmware: direct-loading firmware 
iwlwifi-6000-4.ucode
[5.632380] iwlwifi :02:00.0: loaded firmware version 9.221.4.1 build 
25532 6000-4.ucode op_mode iwldvm
[5.632410] iwlwifi :02:00.0: firmware: failed to load 
iwl-debug-yoyo.bin (-2)
[5.632411] firmware_class: See https://wiki.debian.org/Firmware for 
information about missing firmware
root@latte:~# dmesg|grep -i real
[0.082278] NR_IRQS: 524544, nr_irqs: 456, preallocated irqs: 16
root@latte:~# dmesg|grep -i rtl
root@latte:~# 



signature.asc
Description: PGP signature


Re: [PATCH] maintainer-makefile: Fix announcement mail CC's.

2021-07-28 Thread Simon Josefsson via Gnulib discussion list
Simon Josefsson via Gnulib discussion list  writes:

> Hi.  I noticed some typos causing the Cc line in mail announcements to
> be empy where that (most likely) wasn't the intention.

It seems some packages (coreutils, grep, ...) set 'announcement_Cc_' in
cfg.mk manually, thus hiding the problem I noticed with the default
behaviour.  I reverted most of my patch (see attachment), ending up with
a total change of only this:

-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_Cc_ ?= $(announcement_Cc_$(release-type))

/Simon
From 804ac808a9b17d7ee7cf49f7c713c4a4e4d6423f Mon Sep 17 00:00:00 2001
From: Simon Josefsson 
Date: Wed, 28 Jul 2021 10:37:57 +0200
Subject: [PATCH] maintainer-makefile: Respect cfg.mk setting announcement_Cc_,
 reverting most of the previous patch.

* top/maint.mk (announcement_mail_Cc_stable): Rename back to
announcement_Cc_stable.
(announcement_Cc_alpha): Rename back to
announcement_mail_Cc_alpha.
(announcement_Cc_): Renamed from announcement_mail_Cc_.
(announcement_mail_headers_stable)
(announcement_mail_headers_alpha): Use announcement_Cc_ again.
---
 ChangeLog| 12 
 top/maint.mk | 10 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 931036755..d8a9bb1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2021-07-28  Simon Josefsson  
+
+	maintainer-makefile: Respect cfg.mk setting announcement_Cc_,
+	reverting most of the previous patch.
+	* top/maint.mk (announcement_mail_Cc_stable): Rename back to
+	announcement_Cc_stable.
+	(announcement_Cc_alpha): Rename back to
+	announcement_mail_Cc_alpha.
+	(announcement_Cc_): Renamed from announcement_mail_Cc_.
+	(announcement_mail_headers_stable)
+	(announcement_mail_headers_alpha): Use announcement_Cc_ again.
+
 2021-07-28  Simon Josefsson  
 
 	maintainer-makefile: Fix announcement mail CC's.
diff --git a/top/maint.mk b/top/maint.mk
index 533591ff9..044254bdc 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1395,21 +1395,21 @@ gpg_key_ID ?=\
 translation_project_ ?= coordina...@translationproject.org
 
 # Make info-gnu the default only for a stable release.
-announcement_mail_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
 announcement_mail_headers_stable =		\
   To: info-...@gnu.org\
-  Cc: $(announcement_mail_Cc_)			\
+  Cc: $(announcement_Cc_)			\
   Mail-Followup-To: $(PACKAGE_BUGREPORT)
 
-announcement_mail_Cc_alpha = $(translation_project_)
+announcement_Cc_alpha = $(translation_project_)
 announcement_mail_headers_alpha =		\
   To: $(PACKAGE_BUGREPORT)			\
-  Cc: $(announcement_mail_Cc_)
+  Cc: $(announcement_Cc_)
 
 announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
 announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
 
-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_Cc_ ?= $(announcement_Cc_$(release-type))
 announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
 announcement: NEWS ChangeLog $(rel-files)
 # Not $(AM_V_GEN) since the output of this command serves as
-- 
2.30.2



signature.asc
Description: PGP signature


[PATCH] maintainer-makefile: Fix announcement mail CC's.

2021-07-28 Thread Simon Josefsson via Gnulib discussion list
Hi.  I noticed some typos causing the Cc line in mail announcements to
be empy where that (most likely) wasn't the intention.

/Simon

* top/maint.mk (announcement_Cc_stable): Rename to
announcement_mail_Cc_stable.
(announcement_Cc_alpha): Rename to announcement_mail_Cc_alpha.
(announcement_mail_headers_stable)
(announcement_mail_headers_alpha): Use announcement_mail_Cc_
instead of announcement_Cc_.
---
 ChangeLog| 10 ++
 top/maint.mk |  8 
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a99bf47c..931036755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-07-28  Simon Josefsson  
+
+   maintainer-makefile: Fix announcement mail CC's.
+   * top/maint.mk (announcement_Cc_stable): Rename to
+   announcement_mail_Cc_stable.
+   (announcement_Cc_alpha): Rename to announcement_mail_Cc_alpha.
+   (announcement_mail_headers_stable)
+   (announcement_mail_headers_alpha): Use announcement_mail_Cc_
+   instead of announcement_Cc_.
+
 2021-07-25  Bruno Haible  
 
Assume GNU gettext >= 0.17.
diff --git a/top/maint.mk b/top/maint.mk
index ae3a8170a..533591ff9 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1395,16 +1395,16 @@ gpg_key_ID ?=   
\
 translation_project_ ?= coordina...@translationproject.org
 
 # Make info-gnu the default only for a stable release.
-announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_mail_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
 announcement_mail_headers_stable = \
   To: info-...@gnu.org \
-  Cc: $(announcement_Cc_)  \
+  Cc: $(announcement_mail_Cc_) \
   Mail-Followup-To: $(PACKAGE_BUGREPORT)
 
-announcement_Cc_alpha = $(translation_project_)
+announcement_mail_Cc_alpha = $(translation_project_)
 announcement_mail_headers_alpha =  \
   To: $(PACKAGE_BUGREPORT) \
-  Cc: $(announcement_Cc_)
+  Cc: $(announcement_mail_Cc_)
 
 announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
 announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
-- 
2.30.2



signature.asc
Description: PGP signature


fts in gnulib behave different than glibc

2021-07-28 Thread Simon Josefsson via Gnulib discussion list
Hi.  I replaced GNU InetUtils' old custom fts implementation with the
one from gnulib, but self-tests started failing.  Looking at the code,
it seems gnulib's fts implementation has diverged compared to glibc, and
has some optimizations that (I think) change the API (wrt stat and
chdir).  Also, gnulib's fts module is always enabled, even on modern
glibc systems.  InetUtils's usage of fts works fine with modern glibc,
but it didn't work with gnulib's version (it needed a FTS_NOCHDIR).  The
gnulib manual for the fts replacement module isn't terribly clear about
this.  Is there a reason for this behaviour?

I would prefer if there were two fts modules in gnulib:

1) One module 'fts' based on glibc's code, that is only enabled in on
systems that doesn't have fts, or where fts is known to be buggy.

2) One 'fts-faster' that is the current code, which can be used when you
always wants to pull in the optimized implementation.

Then InetUtils would use system fts on glibc platforms, and not always
have to pull in a replacement copy.

What do you think?

I could live with a new module 'fts-optional' that only pulls in the
current 'fts' module when the system is lacking it.  That doesn't fix
the API confusion, but is probably sufficient for InetUtils.

/Simon


signature.asc
Description: PGP signature


Re: Planning for libidn shared library version transition

2021-07-27 Thread Simon Josefsson
Hi!  I'm now resuming work on the libidn shared library transition, and
I'm ready for the upload to experimental.  I wanted to ping back here to
get more review.  I'm following Andreas Metzler's outline, but included
some tweaks suggested by Simon McVittie.  I decided to do some more
changes that are unrelated here (e.g., drop the would-be poorly named
libidn11-java package which nobody appears to use, and drop the no
longer working Emacs libraries).

The old package (1.33-3, in bullseye) looks like the following (yeah,
the 'Replaces: libidn11-dev' on the 'libidn11' package is confusing, and
could potentially cause problems here):

Package: libidn11
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: libidn9-dev
Replaces: libidn11-dev
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: GNU Libidn library, implementation of IETF IDN specifications

Package: libidn11-dev
Section: libdevel
Architecture: any
Depends: libidn11 (= ${binary:Version}), pkg-config, ${misc:Depends}
Conflicts: libidn9-dev
Multi-Arch: same
Description: Development files for GNU Libidn, an IDN library

The new package (1.38-1) that I'm planning to upload has this:

Package: libidn12
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: GNU Libidn library, implementation of IETF IDN specifications

Package: libidn-dev
Section: libdevel
Architecture: any
Depends: libidn12 (= ${binary:Version}), pkg-config, ${misc:Depends}
Breaks: libidn11-dev (<< 1.38-1~)
Replaces: libidn11-dev (<< 1.38-1~)
Suggests: idn
Multi-Arch: same
Description: Development files for GNU Libidn, an IDN library

Package: libidn11-dev
Section: oldlibs
Architecture: any
Depends: libidn-dev (>= 1.38-1~), ${misc:Depends}
Multi-Arch: same
Description: Transitional development package for GNU Libidn

Libidn11-dev's '>= 1.38-1~' dependency, and the '<< 1.38-1~' in
libidn12, came as a suggestion from Simon McVittie.

It builds fine, and reverse dependencies builds too (the two failures
are not libidn-issues):
https://salsa.debian.org/debian/libidn/-/pipelines/270968

I'm including more complete debdiff below.

What do you think?

I'm not only looking to catch fatal mistakes, but also want ideas on how
to improve this further, so all feedback is welcome.

Thanks,
/Simon

jas@latte:~/dpkg$ debdiff --show-moved libidn_1.33-3_amd64.changes 
libidn_1.38-1_amd64.changes 
Warning: these package names were in the second list but not in the first:
--
libidn-dev
libidn12
libidn12-dbgsym


Warning: these package names were in the first list but not in the second:
--
libidn11
libidn11-dbgsym
libidn11-java

[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files only in first set of .debs, found in package idn
--
-rw-r--r--  root/root   /usr/share/doc/idn/AUTHORS.gz
-rw-r--r--  root/root   /usr/share/doc/idn/TODO
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/idna.el
-rw-r--r--  root/root   /usr/share/emacs/site-lisp/punycode.el

Files only in first set of .debs, found in package idn-dbgsym
-
-rw-r--r--  root/root   
/usr/lib/debug/.build-id/b8/51518b886fad3ef49ddda44ba667ac043e60c0.debug

Files only in first set of .debs, found in package libidn11
---
-rw-r--r--  root/root   /lib/x86_64-linux-gnu/libidn.so.11.6.16
-rw-r--r--  root/root   /usr/share/doc/libidn11/changelog.Debian.gz
-rw-r--r--  root/root   /usr/share/doc/libidn11/changelog.gz
-rw-r--r--  root/root   /usr/share/doc/libidn11/copyright
lrwxrwxrwx  root/root   /lib/x86_64-linux-gnu/libidn.so.11 -> libidn.so.11.6.16

Files moved from package libidn11 to package libidn12
-
-rw-r--r--  root/root   DEBIAN/shlibs
-rw-r--r--  root/root   DEBIAN/symbols
-rw-r--r--  root/root   DEBIAN/triggers

Files only in first set of .debs, found in package libidn11-dbgsym
--
-rw-r--r--  root/root   
/usr/lib/debug/.build-id/14/d4bc0771a40445c675c5c4682d56465463ccc8.debug
lrwxrwxrwx  root/root   /usr/share/doc/libidn11-dbgsym -> libidn11

Files only in first set of .debs, found in package libidn11-dev
---
-rw-r--r--  root/root   /usr/share/doc-base/libidn11
-rw-r--r--  root/root   /usr/share/doc/libidn11-dev/examples/README
-rw-r--r--  root/root   /usr/share/doc/libidn11-dev/examples/example.c
-rw-r--r--  root/root   /usr/share/doc/libidn11-dev/examples/example2.c
-rw-r--r--  root/root   /usr/share/doc/libidn11-dev/examples/example3.c
-rw-r--r--  root/root   

announce-gen and OpenPGP key servers

2021-07-27 Thread Simon Josefsson via Gnulib discussion list
Hi.  Our announce-gen contains:

  If that command fails because you don't have the required public key,
  then run this command to import it:
  gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id

Given recent OpenPGP key server issues, that doesn't work reliably any
more, and behave different for different GnuPG versions.  What should we
recommend instead?  Werner Koch said:

https://lists.gnupg.org/pipermail/gnupg-devel/2021-July/034937.html

I like WKD, but not all of us has published their OpenPGP key there, and
some may never be able to (it requires that you can put a file on your
e-mail domains' https server).  Still, I think it is the best long-term
solution.

How about the patch below?  It is not meant to be commited, but to start
discussion.

I think we should do more than the patch.  The OpenPGP web of trust
seems to be under attack and is not as usable any more.

Our announcements doesn't contain the full OpenPGP key fingerprint,
which they should.

The release announcement could include hash checksums of the files too.

Some of us publish our OpenPGP keys at a https URL, and including that
link in the announcement would also help.  That could point to the
Savannah PGP page, but I think few of us keep that maintained and the
URL looks horrible.

Maybe we should involve the ftp-upl...@gnu.org people.  Having the
OpenPGP key database they use be published on gnu.org would help.

Let's discuss and see what we can do.

/Simon

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index daa478c8e..a696bff89 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -549,7 +549,12 @@ then run this command to import it:
 
   gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id
 
-and rerun the 'gpg --verify' command.
+You may also try other key servers such as keyserver.ubuntu.com or
+pgp.mit.edu.  With newer GnuPG versions you may use the following
+command to download and refresh any expired key:
+
+  gpg --auto-key-locate=clear,wkd,nodefault --locate-key si...@josefsson.org
+
 EOF
 
   my @tool_versions = get_tool_versions (\@tool_list, $gnulib_version);


signature.asc
Description: PGP signature


[SCM] GNU Inetutils branch, master, updated. v2.1-14-g1965afb

2021-07-25 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  1965afb227ff00db56d822c4848bbb3f16f10c44 (commit)
   via  6bdf6b485c381d7c9472f8c2ce4642eeb2266bf9 (commit)
  from  71c80e612f38e3f497cf7104577e3e281bc4f825 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1965afb227ff00db56d822c4848bbb3f16f10c44


commit 1965afb227ff00db56d822c4848bbb3f16f10c44
Author: Simon Josefsson 
Date:   Mon Jul 26 07:19:35 2021 +0200

logger: Code for non-getaddrinfo removed.

* NEWS: Mention change.
* src/logger.c [!HAVE_DECL_GETADDRINFO]: Remove.

diff --git a/NEWS b/NEWS
index b7d35c3..4b930dc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (-??-??) [?]
 
+** logger
+
+Code for non-getaddrinfo removed, since we are using gnulib to provide
+getaddrinfo on any platform that lacks it.  This may have resulted in
+logger not using getaddrinfo on platforms that didn't have the
+getaddrinfo prototype, even though we use the gnulib module.
+
 ** Various bugs fixes, internal improvements and clean ups.
 
 A lot of configure.ac checks were removed that are no longer needed
diff --git a/src/logger.c b/src/logger.c
index 7f62cff..1228a1e 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -61,14 +61,12 @@ static char *unixsock = NULL;
 static char *source;
 static char *pidstr;
 
-#if HAVE_DECL_GETADDRINFO
-# if HAVE_IPV6
+#if HAVE_IPV6
 static int host_family = AF_UNSPEC;
-# else
+#else
 /* Fall back to only IPv4.  */
 static int host_family = AF_INET;
-# endif /* !HAVE_IPV6 */
-#endif /* HAVE_DECL_GETADDRINFO */
+#endif /* !HAVE_IPV6 */
 
 
 
@@ -141,9 +139,7 @@ open_socket (void)
   union logger_sockaddr sockaddr;
   socklen_t socklen;
   int family;
-#if HAVE_DECL_GETADDRINFO
   int ret;
-#endif
 
   /* A UNIX socket name can be specified in two ways.
* Zero length of `unixsock' is handled automatically.  */
@@ -165,13 +161,7 @@ open_socket (void)
 }
   else
 {
-#if HAVE_DECL_GETADDRINFO
   struct addrinfo hints, *ai, *res;
-#else
-  struct hostent *hp;
-  struct servent *sp;
-  unsigned short port;
-#endif /* !HAVE_DECL_GETADDRINFO */
   char *p;
 
 #if HAVE_IPV6
@@ -209,7 +199,6 @@ open_socket (void)
   if (!p)
p = "syslog";
 
-#if HAVE_DECL_GETADDRINFO
   memset (, 0, sizeof (hints));
   hints.ai_socktype = SOCK_DGRAM;
 
@@ -275,43 +264,13 @@ open_socket (void)
error (EXIT_FAILURE, EADDRNOTAVAIL, "%s:%s", host, p);
 
   /* Existing socket can be returned now.
-   * This handles AF_INET and AF_INET6 in case
-   * HAVE_DECL_GETADDRINFO is true.  */
+   * This handles AF_INET and AF_INET6.  */
   return;
 
-#else /* !HAVE_DECL_GETADDRINFO */
-
-  sockaddr.sinet.sin_family = AF_INET;
-  family = PF_INET;
-
-  hp = gethostbyname (host);
-  if (hp)
-   sockaddr.sinet.sin_addr.s_addr = *(unsigned long*) hp->h_addr_list[0];
-  else if (inet_aton (host, (struct in_addr *) _addr)
-  != 1)
-   error (EXIT_FAILURE, 0, "unknown host name");
-
-  if (isdigit (*p))
-   {
- char *end;
- unsigned long n = strtoul (p, , 10);
- if (*end || (port = n) != n)
-   error (EXIT_FAILURE, 0, "%s: invalid port number", p);
- port = htons (port);
-   }
-  else if ((sp = getservbyname (p, "udp")) != NULL)
-   port = sp->s_port;
-  else
-   error (EXIT_FAILURE, 0, "%s: unknown service name", p);
-
-  sockaddr.sinet.sin_port = port;
-#endif /* !HAVE_DECL_GETADDRINFO */
-
   socklen = sizeof (sockaddr.sinet);
 }
 
-  /* Execution arrives here for AF_UNIX and for
-   * situations with !HAVE_DECL_GETADDRINFO.  */
+  /* Execution arrives here for AF_UNIX.  */
 
   fd = socket (family, SOCK_DGRAM, 0);
   if (fd < 0)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=6bdf6b485c381d7c9472f8c2ce4642eeb2266bf9


commit 6bdf6b485c381d7c9472f8c2ce4642eeb2266bf9
Author: Simon Josefsson 
Date:   Mon Jul 26 07:16:42 2021 +0200

doc: Document recent fixes.

* NEWS: Add.

diff --git a/NEWS b/NEWS
index 4b6ee48..b7d35c3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (-??-??) [?]
 
+** Various bugs fixes, internal improvements and clean ups.
+
+A lot of configure.ac checks were removed that are no longer needed
+since we rely on gnulib for portability.
+
+The tests/f

[SCM] GNU Inetutils branch, master, updated. v2.1-12-g71c80e6

2021-07-25 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  71c80e612f38e3f497cf7104577e3e281bc4f825 (commit)
  from  c42e1472ee87521ee0c15d6dec01abe033653dfb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=71c80e612f38e3f497cf7104577e3e281bc4f825


commit 71c80e612f38e3f497cf7104577e3e281bc4f825
Author: Simon Josefsson 
Date:   Sun Jul 25 09:20:33 2021 +0200

tests: Don't fail ftp-localhost.sh when sysctl is missing.

* tests/ftp-localhost.sh: Silent fail.

diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 2d94317..974e948 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -610,7 +610,7 @@ else
 # Do we have sysctl(8) available?
 # It need not be present with the default search path,
 # so locally augment PATH!
-SYSCTL=`PATH="$PATH":/usr/sbin:/sbin command -v sysctl`
+SYSCTL=`PATH="$PATH":/usr/sbin:/sbin command -v sysctl || true`
 
 if test -n "$SYSCTL"; then
have_sysctl=true

---

Summary of changes:
 tests/ftp-localhost.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


inetutils-2.1 released [stable]

2021-07-24 Thread Simon Josefsson via info-gnu
We are pleased to announce stable release 2.1 of Inetutils.

Here are the compressed sources:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.1.tar.gz   (2.6MB)
  https://ftpmirror.gnu.org/inetutils/inetutils-2.1.tar.xz   (1.5MB)

Here are the GPG detached signatures[*]:
  https://ftpmirror.gnu.org/inetutils/inetutils-2.1.tar.gz.sig
  https://ftpmirror.gnu.org/inetutils/inetutils-2.1.tar.xz.sig

Use a mirror for higher download bandwidth:
  https://www.gnu.org/order/ftp.html

[*] Use a .sig file to verify that the corresponding file (without the
.sig suffix) is intact.  First, be sure to download both the .sig file
and the corresponding tarball.  Then, run a command like this:

  gpg --verify inetutils-2.1.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

  gpg --keyserver keys.gnupg.net --recv-keys 0664A76954265E8C

and rerun the 'gpg --verify' command.

This release was bootstrapped with the following tools:
  Autoconf 2.69
  Automake 1.16.3
  Gnulib v0.1-4745-gc567dcac2

NEWS

* Noteworthy changes in release 2.1 (2021-07-24) [stable]

** ftp

Disable use of readline when environment variable TERM is unset or set
to "dumb" (caused problems with Emacs AngeFTP on MacOS).  Thanks to
Alex Bochannek for report, debugging and patch.

** ftpd

Our libls now uses gnulib's fts instead of our own custom version.

** telnet

*** Implement --bind (-b).

This is used to bind to a particular local socket, for compatibility
with NetKit's telnet.

** whois

Updated whois servers for .ORG and .IN.

** Various bugs fixes, internal improvements and clean ups.

ChangeLog is now automatically generated from version controlled logs.
Historical information is preserved as ChangeLog.0 and ChangeLog.1.

On behalf of the Inetutils maintainers,
Happy Hacking,
Simon


signature.asc
Description: PGP signature
-- 
If you have a working or partly working program that you'd like
to offer to the GNU project as a GNU package,
see https://www.gnu.org/help/evaluation.html.

[SCM] GNU Inetutils branch, master, updated. v2.1-11-gc42e147

2021-07-24 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  c42e1472ee87521ee0c15d6dec01abe033653dfb (commit)
   via  1631c62b77dcd4d96c9c6f759adaa8ecde836726 (commit)
   via  f4ae6d889110a0b9732f8335eb5d7be861bf9a1e (commit)
  from  0b8e380b707be207960d07fa8a066771839462e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c42e1472ee87521ee0c15d6dec01abe033653dfb


commit c42e1472ee87521ee0c15d6dec01abe033653dfb
Author: Simon Josefsson 
Date:   Sat Jul 24 22:44:27 2021 +0200

Don't check for getopt_long, no longer used anywhere.

* configure.ac: Remove check.

diff --git a/configure.ac b/configure.ac
index 4062e08..5e16c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -794,10 +794,6 @@ AC_CHECK_FUNC(_obstack_free)
 AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
   [Define to `setpgrp' if you don't have `setpgid'.]))
 
-# We use our own version of getopt (including our own header file) if
-# the system one doesn't have getopt_long.
-AC_CHECK_FUNC(getopt_long)
-
 # See if the system has hstrerror, and replace it if not
 save_LIBS=$LIBS
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1631c62b77dcd4d96c9c6f759adaa8ecde836726


commit 1631c62b77dcd4d96c9c6f759adaa8ecde836726
Author: Simon Josefsson 
Date:   Sat Jul 24 22:40:11 2021 +0200

Don't check for getpass, getusershell, and poll (gnulib modules already 
imported).

* configure.ac: Remove checks.

diff --git a/configure.ac b/configure.ac
index 830edb6..4062e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -782,9 +782,6 @@ LIBS="$LIBS $LIBUTIL"
 AC_CHECK_FUNCS(login loginx logout logoutx logwtmp logwtmpx)
 LIBS="$_SAVE_LIBS"
 
-# Functions that we will define if necessary.
-AC_REPLACE_FUNCS(getpass getusershell poll)
-
 # Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"
 LIBS="$LIBCRYPT $LIBS"

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=f4ae6d889110a0b9732f8335eb5d7be861bf9a1e


commit f4ae6d889110a0b9732f8335eb5d7be861bf9a1e
Author: Simon Josefsson 
Date:   Sat Jul 24 22:35:52 2021 +0200

Don't check for memcmp, memcpy, memmove, memset and strdup (no gnulib 
module needed).

* configure.ac: Remove checks.

diff --git a/configure.ac b/configure.ac
index 167bec1..830edb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,8 +783,7 @@ AC_CHECK_FUNCS(login loginx logout logoutx logwtmp logwtmpx)
 LIBS="$_SAVE_LIBS"
 
 # Functions that we will define if necessary.
-AC_REPLACE_FUNCS(getpass getusershell memcmp memcpy memmove memset \
-strdup poll)
+AC_REPLACE_FUNCS(getpass getusershell poll)
 
 # Look for the crypt function itself (in libcrypt if possible)
 _SAVE_LIBS="$LIBS"

---

Summary of changes:
 configure.ac | 8 
 1 file changed, 8 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.1-8-g0b8e380

2021-07-24 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  0b8e380b707be207960d07fa8a066771839462e4 (commit)
   via  ec7169ac6363982c5b04df4b4f23c0490f119250 (commit)
   via  75efa1973f9f7cae43920c2b826f6e55ffa80889 (commit)
   via  7476bb2b9ac1c1b9b8ccada9aa873e1d8c215e2d (commit)
   via  c32b2c42805a6c44f061121367cce623f58e520b (commit)
   via  80b12181a4bea17b4a3d1ced4a84803a8a9446f9 (commit)
   via  dc6c830ed9ba7440682015b07dab01681e94724d (commit)
  from  df1e2c1fe1da12274a065fd4760231781ad9eded (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0b8e380b707be207960d07fa8a066771839462e4


commit 0b8e380b707be207960d07fa8a066771839462e4
Author: Simon Josefsson 
Date:   Sat Jul 24 22:25:12 2021 +0200

Drop AC_C_CONST (obsolete).

* configure.ac: Remove it.

diff --git a/configure.ac b/configure.ac
index 92e1327..167bec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -749,7 +749,6 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
  #include ])
 
 ### Checks for compiler characteristics.
-AC_C_CONST
 
 # See if `weak refs' are possible; these make it possible (with shared
 # libraries) to check for the existance of a standard function at

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=ec7169ac6363982c5b04df4b4f23c0490f119250


commit ec7169ac6363982c5b04df4b4f23c0490f119250
Author: Simon Josefsson 
Date:   Sat Jul 24 22:21:15 2021 +0200

Use gnulib module socklen.

* bootstrap.conf (gnulib_modules): Add it.
* configure.ac: Don't look for it.

diff --git a/bootstrap.conf b/bootstrap.conf
index 2894e5a..ed51c93 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -86,6 +86,7 @@ signal
 size_max
 snippet/unused-parameter
 snprintf
+socklen
 stdarg
 stdbool
 stdint
diff --git a/configure.ac b/configure.ac
index 7851fd4..92e1327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -653,12 +653,6 @@ fi
 # Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
-AC_CHECK_TYPE(socklen_t, ,
-  [AC_DEFINE([socklen_t], int,
-[Define to int if  does not define])],
-  [IU_FLUSHLEFT([#include 
- #include ])])
-
 AC_CHECK_TYPES(struct if_nameindex, , ,
   [IU_FLUSHLEFT([#include 
  #include 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=75efa1973f9f7cae43920c2b826f6e55ffa80889


commit 75efa1973f9f7cae43920c2b826f6e55ffa80889
Author: Simon Josefsson 
Date:   Sat Jul 24 22:19:31 2021 +0200

Use gnulib modules stdarg, stdlib and string.

* bootstrap.conf (gnulib_modules): Add them.
* configure.ac: Don't look for them.

diff --git a/bootstrap.conf b/bootstrap.conf
index aed2beb..2894e5a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -86,10 +86,13 @@ signal
 size_max
 snippet/unused-parameter
 snprintf
+stdarg
 stdbool
 stdint
+stdlib
 strchrnul
 strerror
+string
 strndup
 strnlen
 sys_types
diff --git a/configure.ac b/configure.ac
index 8d24170..7851fd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,7 +618,7 @@ AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h 
features.h \
  glob.h memory.h netinet/ether.h netinet/in_systm.h \
  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
  security/pam_appl.h shadow.h \
- stdarg.h stdlib.h string.h stropts.h sys/tty.h \
+ stropts.h sys/tty.h \
  sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
  sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
  sys/sockio.h sys/sysmacros.h sys/param.h sys/file.h \

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=7476bb2b9ac1c1b9b8ccada9aa873e1d8c215e2d


commit 7476bb2b9ac1c1b9b8ccada9aa873e1d8c215e2d
Author: Simon Josefsson 
Date:   Sat Jul 24 22:14:15 2021 +0200

Use gnulib environ module.

* bootstrap.conf (gnulib_modules): Add environ.
* configure.ac: Don't look for environ.

diff --git a/bootstrap.conf b/bootstrap.conf
index cfe4be8..aed2beb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -43,8 +43,9 @@ argp-version-etc
 autobuild
 dirfd
 dirname-lgpl
-error
+environ
 errno
+error
 exitfail
 extensions
 fdl-1.3
diff --git a/configure.ac b/configure.ac
index edcc2cf..8d24170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -909,11 +909,6 @@ AC_CHECK_DECLS(htons, , ,
  #endif
  #include  ])])
 
-# Our home-grown version of setenv needs to use ENVIRON
-AC_CHECK_DECLS(environ, , ,
-  [IU_FLUSHLEFT([#include 
- #include ])])
-
 # See if we have h_errno (the test is here

[SCM] GNU Inetutils branch, master, updated. v2.0-22-gb36ba18

2021-07-24 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  b36ba1847966e296457df9802aaf1fd4ba655d74 (commit)
  from  3dcdf66cd654154adc2786e2ce77cba6234f5c66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b36ba1847966e296457df9802aaf1fd4ba655d74


commit b36ba1847966e296457df9802aaf1fd4ba655d74
Author: Simon Josefsson 
Date:   Sat Jul 24 20:28:04 2021 +0200

Really try to fix gnulib fts usage.

* libls/ls.c (ls_main): Use FTS_NOCHDIR.

diff --git a/libls/ls.c b/libls/ls.c
index bdd7866..ee779c3 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -153,7 +153,7 @@ ls_main (int argc, char **argv)
 
   optind = 1;  /* Reset for reentrant scanning.  */
 
-  fts_options = FTS_PHYSICAL;
+  fts_options = FTS_PHYSICAL | FTS_NOCHDIR;
   while ((ch = getopt (argc, argv, "1ACFLRSTWacdfgiklmnopqrstux")) != -1)
 {
   switch (ch)

---

Summary of changes:
 libls/ls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.0-21-g3dcdf66

2021-07-24 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  3dcdf66cd654154adc2786e2ce77cba6234f5c66 (commit)
  from  353812a5d9dfc77e9f70d278b611c6110404b510 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3dcdf66cd654154adc2786e2ce77cba6234f5c66


commit 3dcdf66cd654154adc2786e2ce77cba6234f5c66
Author: Simon Josefsson 
Date:   Sat Jul 24 18:12:40 2021 +0200

Fix gnulib fts usage.

* libls/cmp.c: Include fts_.h instead of fts.h.
* libls/ls.c: Likewise.
* libls/print.c: Likewise.
* libls/util.c: Likewise.

diff --git a/libls/cmp.c b/libls/cmp.c
index e7d1ee7..65fe9e4 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-#include "fts.h"
+#include 
 #include 
 
 #include "ls.h"
diff --git a/libls/ls.c b/libls/ls.c
index 11cd33a..bdd7866 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -57,7 +57,7 @@
 #include 
 
 #include 
-#include "fts.h"
+#include 
 #include 
 #include 
 #include 
diff --git a/libls/print.c b/libls/print.c
index c7a9c47..f28e827 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -56,7 +56,7 @@
 #include 
 
 #include 
-#include "fts.h"
+#include 
 #include 
 #include 
 #include 
diff --git a/libls/util.c b/libls/util.c
index 115599f..ae7bc3f 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -55,7 +55,7 @@
 #include 
 
 #include 
-#include "fts.h"
+#include 
 #include 
 #include 
 #include 

---

Summary of changes:
 libls/cmp.c   | 2 +-
 libls/ls.c| 2 +-
 libls/print.c | 2 +-
 libls/util.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 

___
Commit-inetutils mailing list
Commit-inetutils@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-inetutils


[SCM] GNU Inetutils branch, master, updated. v2.0-18-g23065b1

2021-07-24 Thread Simon Josefsson via Commit-inetutils
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
   via  23065b1faf77a10957574d78b6321d875e60304d (commit)
   via  bd972a39953e1a3e090174431e37fa45aa9824de (commit)
   via  01047ced3acb4930997102b8d695848ca0b447b1 (commit)
   via  686b1c287f38a3956acb4bd8d134554ff32101ee (commit)
  from  08f9b29654e935b43eac9984df40ed8c9f69f005 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=23065b1faf77a10957574d78b6321d875e60304d


commit 23065b1faf77a10957574d78b6321d875e60304d
Author: Simon Josefsson 
Date:   Sat Jul 24 15:14:27 2021 +0200

Drop old or unnecessary build rules.

* Makefile.am (DISTCLEANFILES): Remove inetutils*.tar*.
(snapshot): Remove rule.
* bootstrap.conf (bootstrap_sync): Remove, causes unnecessary *-dirty
version number if bootstrap changes in gnulib.
(.bootstrap): Remove custom code.
* configure.ac: Remove no-op comments about old systems.

diff --git a/Makefile.am b/Makefile.am
index a9d9889..c299364 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,7 @@ SUBDIRS = lib \
doc man \
tests
 
-DISTCLEANFILES = pathdefs.make paths.defs \
-   $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION).tar.xz
+DISTCLEANFILES = pathdefs.make paths.defs
 
 # git-version-gen
 EXTRA_DIST += $(top_srcdir)/.version
@@ -39,9 +38,6 @@ $(top_srcdir)/.version:
 dist-hook: gen-ChangeLog
echo $(VERSION) > $(distdir)/.tarball-version
 
-snapshot:
-   $(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
-
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
$(AM_V_GEN)if test -d .git; then\
diff --git a/bootstrap.conf b/bootstrap.conf
index 54acf87..b6d1382 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -29,9 +29,6 @@ gzip -
 xz-
 "
 
-# Sync. bootstrap from checked out gnulib sources.
-bootstrap_sync=true
-
 ACLOCAL_FLAGS="-I am -I m4"
 
 # gnulib library name
@@ -108,12 +105,6 @@ xsize
 xvasprintf
 "
 
-# Read local configuration file
-if [ -r .bootstrap ]; then
-  echo "$0: Reading configuration file .bootstrap"
-  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
-fi
-
 bootstrap_post_import_hook ()
 {
   # Automake requires that ChangeLog exist.
diff --git a/configure.ac b/configure.ac
index 43ce616..07a02ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,16 +1014,6 @@ AH_BOTTOM(
 # entry in utmpx.  Also for some OS they are better handled with
 # STREAMS.
 case "$host" in
-*-freebsd9* | *-freebsd10* )
-  # FreeBSD 9.0 has implemented a non-standard and singular
-  # UTMPX interface.  The readutmp module from GNUlib does
-  # not support it, but we can fall back to getutxuser() for
-  # use in syslogd and talkd.  For ftpd, rlogind, telnetd,
-  # and uucpd the use of pututxent() should suffice, but
-  # this needs continued observations.
-  #
-  # Other issues?
-  ;;
 *olaris* )
   case "$host" in
   *olaris*10 | *olaris*11 )
@@ -1037,9 +1027,6 @@ case "$host" in
   AC_DEFINE([HAVE_STREAMSPTY], 1,
 [Define to 1 for a system using streams for ptys])
   ;;
-*irix* | *hpux* )
-  # Known and needed work-arounds?
-  ;;
 esac
 
 # Typically the loopback addresses, but can be set otherwise.

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=bd972a39953e1a3e090174431e37fa45aa9824de


commit bd972a39953e1a3e090174431e37fa45aa9824de
Author: Simon Josefsson 
Date:   Sat Jul 24 15:06:24 2021 +0200

doc: Improve README-release.

* bootstrap.conf (bootstrap_epilogue): Remove.
* gl/top/README-release.diff: Update.

diff --git a/bootstrap.conf b/bootstrap.conf
index 6f480a8..54acf87 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -119,8 +119,3 @@ bootstrap_post_import_hook ()
   # Automake requires that ChangeLog exist.
   touch ChangeLog || return 1
 }
-
-bootstrap_epilogue() {
-  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
-  perl -pi -e "s/X.Y/X.Y.Z/g" README-release
-}
diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
index 234a696..9547441 100644
--- a/gl/top/README-release.diff
+++ b/gl/top/README-release.diff
@@ -1,13 +1,63 @@
 README-release.orig2021-01-25 14:53:16.617112508 +0100
-+++ README-release 2021-01-25 14:53:48.201386387 +0100
-@@ -19,10 +19,6 @@
+--- README-release.orig2021-07-24 15:01:40.637006120 +0200
 README-release 2021-07-24 15:05:35.687402132 +0200
+@@ -21,7 +21,7 @@
  
- git push origin master
+ * Check that the NixOS/Hydra autobuilder is reporting all 

<    3   4   5   6   7   8   9   10   11   12   >