Re: [PATCH] Distribute bootstrap and bootstrap.conf

2024-04-04 Thread Collin Funk
Hi Colin (nice name),

> I looked into what it would take for Debian's groff package to do a full
> rebootstrap from its packaged version of gnulib.  It seems relatively
> straightforward, but it requires including bootstrap and bootstrap.conf
> in tarballs so that we know what modules to use.

I'm testing gnulib-tool.py on packages at the moment and stumbled upon
this commit in groff. Another option worth considering is using the
gnulib-cache.m4 file.

It is pretty small for groff, so here it is minus the copyright header
and gnulib-tool invocation comment:


# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl])
gl_MODULES([
  attribute
  fprintf-posix
  git-version-gen
  havelib
  snprintf
  stdbool-c99
  stdint
  sys_wait
  vsnprintf
  wcwidth
])
gl_AVOID([])
gl_SOURCE_BASE([lib])
gl_M4_BASE([gnulib_m4])
gl_PO_BASE([])
gl_DOC_BASE([doc])
gl_TESTS_BASE([tests])
gl_LIB([libgnu])
gl_MAKEFILE_NAME([gnulib.mk])
gl_AUTOMAKE_SUBDIR
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
gl_WITNESS_C_MACRO([])


I'm not very familiar with Debian packaging, so I am not sure if there
is information you need that is missing there. Here is some links to
the relevant documentation which might help:

https://www.gnu.org/software/gnulib/manual/gnulib.html#Modified-imports
https://www.gnu.org/software/gnulib/manual/gnulib.html#VCS-Issues

Collin



Re: [PATCH] Distribute bootstrap and bootstrap.conf

2024-04-04 Thread Collin Funk
On 4/4/24 3:24 AM, Colin Watson wrote:
> Yeah, I know of gnulib-cache.m4.  However, IMO there's no reason to drop
> down to that level when the bootstrap script is in use, because
> bootstrap generates gnulib-cache.m4.  Also, ./bootstrap typically does a
> bit more, sometimes including extra package-specific hooks defined in
> bootstrap.conf that can't be expressed in gnulib-cache.m4.

Ah, you're right I forgot about the custom ./bootstrap hooks. In any
case, gnulib-tool should add gnulib-cache.m4 to EXTRA_DIST. So you
have it as a backup if you ever need it.

Collin



Re: [bug #64301] [troff] susceptible to integer overflow

2024-07-16 Thread Collin Funk


"G. Branden Robinson"  writes:

> Another Col(l)in to the rescue!  I think I will also update our
> "HACKING" file to document how to update the gnulib submodule and do the
> foregoing as well.

:). Sounds good. If I remember correctly Coreutils has instructions on
how to update Gnulib in README-hacking. I always use that since I never
use git submodules. Not sure if it mentions ./bootstrap --bootstrap-sync
though.


Colin Watson  writes:

> I must confess that I'd generally just been copying the file by hand
> from the gnulib checkout (build-aux/bootstrap).  I will try to remember
> that the --bootstrap-sync option exists!

That most likely works fine too. The build-aux/bootstrap script is
autogenerated from some files in top/* in Gnulib's Makefile. Packages
can copy all of the files from top/* into their sources or alternatively
just the single build-aux/bootstrap script.

The --bootstrap-sync option should work correctly in either of those
cases so I suppose there is less work if you decide to reorganize
things.

Collin



[PATCH] Update Gnulib module names.

2025-01-05 Thread Collin Funk
Hi Braden,

I saw you updated to the new Gnulib branch. This was created after some
modules were renamed for consistency [1]. The existing ones still work
but output some warnings like:

Notice from module sys_wait:
  This module is deprecated. Use the module 'sys_wait-h' instead.

I've attached a patch to update them to the new naming.

Collin

[1] https://lists.gnu.org/archive/html/bug-gnulib/2024-12/msg00192.html

>From f1538b68099600ee84809b5c73642bd0b98cc1c7 Mon Sep 17 00:00:00 2001
From: Collin Funk 
Date: Sun, 5 Jan 2025 17:21:37 -0800
Subject: [PATCH] Update Gnulib module names.

* bootstrap.conf (gnulib_modules): Adjust module names to recent
Gnulib renaming.
---
 ChangeLog  | 6 ++
 bootstrap.conf | 8 
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e8d5d2b7..995ed615a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-01-05  Collin Funk  
+
+	Update Gnulib module names.
+	* bootstrap.conf (gnulib_modules): Adjust module names to recent
+	Gnulib renaming.
+
 2025-01-05  G. Branden Robinson 
 
 	* tmac/an.tmac (SH): Restore closing brace escape sequence.
diff --git a/bootstrap.conf b/bootstrap.conf
index 24d6b0924..7bb194383 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -46,13 +46,13 @@ gnulib_modules="
 snprintf
 vsnprintf
 stat
-stdbool-c99
-stdckdint
-stdint
+stdbool-c99-h
+stdckdint-h
+stdint-h
 strcase
 strerror
 strsignal
-sys_wait
+sys_wait-h
 unlink
 "
 
-- 
2.47.1



Re: public inbox for groff

2025-04-05 Thread Collin Funk
Hi Alejandro,

Alejandro Colomar  writes:

> Who in GNU/FSF should we talk to?

Emailing savannah-hackers-pub...@gnu.org is probably a good place to
start [1]. They can contact relevant FSF people if needed.

Collin

[1] https://lists.gnu.org/mailman/listinfo/savannah-hackers-public