Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-03 Thread Alejandro Colomar
Hi Sven,

On Wed, Apr 03, 2024 at 11:17:10PM +0200, Sven Joachim wrote:
> Those are not additional pages, but just symlinks.
> 
> ,
> | $ file $(dpkg -L glibc-doc | tail -n17)
> | /usr/share/man/man3/pthread_cond_broadcast.3.gz:   symbolic link to 
> pthread_cond_init.3.gz
> | /usr/share/man/man3/pthread_cond_destroy.3.gz: symbolic link to 
> pthread_cond_init.3.gz
> | /usr/share/man/man3/pthread_cond_signal.3.gz:  symbolic link to 
> pthread_cond_init.3.gz
> | /usr/share/man/man3/pthread_cond_timedwait.3.gz:   symbolic link to 
> pthread_cond_init.3.gz
> | /usr/share/man/man3/pthread_cond_wait.3.gz:symbolic link to 
> pthread_cond_init.3.gz
> | /usr/share/man/man3/pthread_condattr_destroy.3.gz: symbolic link to 
> pthread_condattr_init.3.gz
> | /usr/share/man/man3/pthread_getspecific.3.gz:  symbolic link to 
> pthread_key_create.3.gz
> | /usr/share/man/man3/pthread_key_delete.3.gz:   symbolic link to 
> pthread_key_create.3.gz
> | /usr/share/man/man3/pthread_mutex_destroy.3.gz:symbolic link to 
> pthread_mutex_init.3.gz
> | /usr/share/man/man3/pthread_mutex_lock.3.gz:   symbolic link to 
> pthread_mutex_init.3.gz
> | /usr/share/man/man3/pthread_mutex_trylock.3.gz:symbolic link to 
> pthread_mutex_init.3.gz
> | /usr/share/man/man3/pthread_mutex_unlock.3.gz: symbolic link to 
> pthread_mutex_init.3.gz
> | /usr/share/man/man3/pthread_mutexattr_destroy.3.gz:symbolic link to 
> pthread_mutexattr_init.3.gz
> | /usr/share/man/man3/pthread_mutexattr_getkind_np.3.gz: symbolic link to 
> pthread_mutexattr_setkind_np.3.gz
> | /usr/share/man/man3/pthread_mutexattr_gettype.3.gz:symbolic link to 
> pthread_mutexattr_init.3.gz
> | /usr/share/man/man3/pthread_mutexattr_settype.3.gz:symbolic link to 
> pthread_mutexattr_init.3.gz
> | /usr/share/man/man3/pthread_setspecific.3.gz:  symbolic link to 
> pthread_key_create.3.gz
> `
> 
> In the man-pages source such aliases are included as files just
> containing a .so directive, those should indeed be added.

Ahhh, good, then it will be easier; I don't need to import their
git histories, I guess.  Or maybe I do anyway, just for completeness.


> > I'll import those into the Linux man-pages in a week, when I get back
> > from vacation.
> 
> Have a nice vacation!

:-)

Cheers,
Alex

> Cheers,
>Sven

-- 



signature.asc
Description: PGP signature


Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-03 Thread Sven Joachim
On 2024-04-03 22:47 +0200, Alejandro Colomar wrote:

> On Wed, Apr 03, 2024 at 06:01:50PM +0200, Sven Joachim wrote:
>> Control: severity -1 normal
>>
>> On 2024-04-03 11:29 +0200, Alejandro Colomar wrote:
>>
>> > I now see that `apt-file show glibc-doc` shows several more pages.  I'll
>> > have a look at them and maybe I also import them into the Linux
>> > man-pages project.
>>
>> AFAICS all of them have already been added there, right?
>
> Nope; I added the ones that I found in upstream glibc, and then I
> upgraded them to the version they had in Debian.  But for some reason, I
> didn't notice that there were more in Debian.  Or maybe I thought they
> were already in the Linux man-pages.  Whatever the reason, they're not
> there.
>
> See:
>
> $ diff -u \
>   <(apt-file show glibc-doc \
>   | awk '{print $2}' \
>   | grep /man/ \
>   | sed 's,^/usr/share/man/,,' \
>   | sed 's/\.gz$//' \
>   | sort) \
>   <(find src/linux/man-pages/man-pages/master/man* -type f \
>   | sed 's,^src/linux/man-pages/man-pages/master/,,' \
>   | sort) \
>   | grep ^-;
> --- /dev/fd/632024-04-03 22:40:00.524652442 +0200
> -man3/pthread_cond_broadcast.3
> -man3/pthread_cond_destroy.3
> -man3/pthread_cond_signal.3
> -man3/pthread_cond_timedwait.3
> -man3/pthread_cond_wait.3
> -man3/pthread_condattr_destroy.3
> -man3/pthread_getspecific.3
> -man3/pthread_key_delete.3
> -man3/pthread_mutex_destroy.3
> -man3/pthread_mutex_lock.3
> -man3/pthread_mutex_trylock.3
> -man3/pthread_mutex_unlock.3
> -man3/pthread_mutexattr_getkind_np.3
> -man3/pthread_mutexattr_gettype.3
> -man3/pthread_mutexattr_settype.3
> -man3/pthread_setspecific.3

Those are not additional pages, but just symlinks.

,
| $ file $(dpkg -L glibc-doc | tail -n17)
| /usr/share/man/man3/pthread_cond_broadcast.3.gz:   symbolic link to 
pthread_cond_init.3.gz
| /usr/share/man/man3/pthread_cond_destroy.3.gz: symbolic link to 
pthread_cond_init.3.gz
| /usr/share/man/man3/pthread_cond_signal.3.gz:  symbolic link to 
pthread_cond_init.3.gz
| /usr/share/man/man3/pthread_cond_timedwait.3.gz:   symbolic link to 
pthread_cond_init.3.gz
| /usr/share/man/man3/pthread_cond_wait.3.gz:symbolic link to 
pthread_cond_init.3.gz
| /usr/share/man/man3/pthread_condattr_destroy.3.gz: symbolic link to 
pthread_condattr_init.3.gz
| /usr/share/man/man3/pthread_getspecific.3.gz:  symbolic link to 
pthread_key_create.3.gz
| /usr/share/man/man3/pthread_key_delete.3.gz:   symbolic link to 
pthread_key_create.3.gz
| /usr/share/man/man3/pthread_mutex_destroy.3.gz:symbolic link to 
pthread_mutex_init.3.gz
| /usr/share/man/man3/pthread_mutex_lock.3.gz:   symbolic link to 
pthread_mutex_init.3.gz
| /usr/share/man/man3/pthread_mutex_trylock.3.gz:symbolic link to 
pthread_mutex_init.3.gz
| /usr/share/man/man3/pthread_mutex_unlock.3.gz: symbolic link to 
pthread_mutex_init.3.gz
| /usr/share/man/man3/pthread_mutexattr_destroy.3.gz:symbolic link to 
pthread_mutexattr_init.3.gz
| /usr/share/man/man3/pthread_mutexattr_getkind_np.3.gz: symbolic link to 
pthread_mutexattr_setkind_np.3.gz
| /usr/share/man/man3/pthread_mutexattr_gettype.3.gz:symbolic link to 
pthread_mutexattr_init.3.gz
| /usr/share/man/man3/pthread_mutexattr_settype.3.gz:symbolic link to 
pthread_mutexattr_init.3.gz
| /usr/share/man/man3/pthread_setspecific.3.gz:  symbolic link to 
pthread_key_create.3.gz
`

In the man-pages source such aliases are included as files just
containing a .so directive, those should indeed be added.

> I'll import those into the Linux man-pages in a week, when I get back
> from vacation.

Have a nice vacation!

Cheers,
   Sven



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-03 Thread Alejandro Colomar
Hi Sven,

On Wed, Apr 03, 2024 at 06:01:50PM +0200, Sven Joachim wrote:
> Control: severity -1 normal
> 
> On 2024-04-03 11:29 +0200, Alejandro Colomar wrote:
> 
> > Hi,
> >
> > On Tue, Apr 02, 2024 at 08:58:32PM +0200, Aurelien Jarno wrote:
> >> Thanks, that sounds great that we can finally get rid out of those in
> >> the debian package.
> >>
> >> >  $ git diff --stat b06cd070f..128a3ae35
> >> >   man3/pthread_cond_init.3| 264 
> >> >   man3/pthread_condattr_init.3|  48 
> >> >   man3/pthread_key_create.3   | 178 +
> >> >   man3/pthread_mutex_init.3   | 241 ++
> >> >   man3/pthread_mutexattr_setkind_np.3 |  52 
> >> >   man3/pthread_once.3 |  44 
> >> >   6 files changed, 827 insertions(+)
> >
> > I now see that `apt-file show glibc-doc` shows several more pages.  I'll
> > have a look at them and maybe I also import them into the Linux
> > man-pages project.
> 
> AFAICS all of them have already been added there, right?

Nope; I added the ones that I found in upstream glibc, and then I
upgraded them to the version they had in Debian.  But for some reason, I
didn't notice that there were more in Debian.  Or maybe I thought they
were already in the Linux man-pages.  Whatever the reason, they're not
there.

See:

$ diff -u \
<(apt-file show glibc-doc \
| awk '{print $2}' \
| grep /man/ \
| sed 's,^/usr/share/man/,,' \
| sed 's/\.gz$//' \
| sort) \
<(find src/linux/man-pages/man-pages/master/man* -type f \
| sed 's,^src/linux/man-pages/man-pages/master/,,' \
| sort) \
| grep ^-;
--- /dev/fd/63  2024-04-03 22:40:00.524652442 +0200
-man3/pthread_cond_broadcast.3
-man3/pthread_cond_destroy.3
-man3/pthread_cond_signal.3
-man3/pthread_cond_timedwait.3
-man3/pthread_cond_wait.3
-man3/pthread_condattr_destroy.3
-man3/pthread_getspecific.3
-man3/pthread_key_delete.3
-man3/pthread_mutex_destroy.3
-man3/pthread_mutex_lock.3
-man3/pthread_mutex_trylock.3
-man3/pthread_mutex_unlock.3
-man3/pthread_mutexattr_getkind_np.3
-man3/pthread_mutexattr_gettype.3
-man3/pthread_mutexattr_settype.3
-man3/pthread_setspecific.3


I'll import those into the Linux man-pages in a week, when I get back
from vacation.

> >> Noted. However following the time_t transition, the glibc package does
> >> not build anymore on 32-bit architectures (i have just opened #1059937
> >> to make people aware of that), so uploading a new glibc now is probably
> >> not the best idea.
> >
> > Hmm, maybe you can drop the manual pages, but not upload yet, and wait
> > for that bug to be fixed to do an upload without the pages.
> 
> Note that manpages-dev 6.7-2 has dropped the clashing files for the time
> being.  I do not think there is any need to hurry, so I am downgrading
> the severity of this bug.  Whenever the glibc-doc package in unstable
> drops the manpages, we should file a bug against manpages-dev to include
> them again.

Sure; no problem.  Also, since I plan to also add the remaining pages,
you will be able to drop them all at once after that happens.  Maybe for
man-pages-6.8 we can do that.  How much time do you expect this
pseudo-freeze to last?  I can adapt to that.

Have a lovely night!
Alex

-- 



signature.asc
Description: PGP signature


Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-03 Thread Sven Joachim
Control: severity -1 normal

On 2024-04-03 11:29 +0200, Alejandro Colomar wrote:

> Hi,
>
> On Tue, Apr 02, 2024 at 08:58:32PM +0200, Aurelien Jarno wrote:
>> Thanks, that sounds great that we can finally get rid out of those in
>> the debian package.
>>
>> >$ git diff --stat b06cd070f..128a3ae35
>> > man3/pthread_cond_init.3| 264 
>> > man3/pthread_condattr_init.3|  48 
>> > man3/pthread_key_create.3   | 178 +
>> > man3/pthread_mutex_init.3   | 241 ++
>> > man3/pthread_mutexattr_setkind_np.3 |  52 
>> > man3/pthread_once.3 |  44 
>> > 6 files changed, 827 insertions(+)
>
> I now see that `apt-file show glibc-doc` shows several more pages.  I'll
> have a look at them and maybe I also import them into the Linux
> man-pages project.

AFAICS all of them have already been added there, right?

>> > Debian's manpages-dev_6.7-1_all.deb has been the first package since
>> > that happened, and I've noticed that dpkg(1) (via apt-get(8)) refuses to
>> > upgrade manpages-dev due to a conflict with glibc-doc.
>> >
>> >$ sudo apt-get upgrade -V;
>> >[...]
>> >Do you want to continue? [Y/n] y
>> >Reading changelogs... Done
>> >(Reading database ... 404853 files and directories currently installed.)
>> >Preparing to unpack .../manpages-dev_6.7-1_all.deb ...
>> >Unpacking manpages-dev (6.7-1) over (6.05.01-1) ...
>> >dpkg: error processing archive 
>> > /var/cache/apt/archives/manpages-dev_6.7-1_all.deb (--unpack):
>> > trying to overwrite '/usr/share/man/man3/pthread_cond_init.3.gz', 
>> > which is also in package glibc-doc 2.38-6
>> >Errors were encountered while processing:
>> > /var/cache/apt/archives/manpages-dev_6.7-1_all.deb
>> >needrestart is being skipped since dpkg has failed
>> >E: Sub-process /usr/bin/dpkg returned an error code (1)
>>
>> I think this is actually not specific to the experimental version, those
>> manpages are also in the unstable version.
>
> Right.  I only installed the experimental one to see if the bug had
> been fixed (as reportbug(1) suggested trying it).
>
>> > Please, remove from glibc-doc those manual pages that conflict with
>> > manpages-dev.
>>
>> Noted. However following the time_t transition, the glibc package does
>> not build anymore on 32-bit architectures (i have just opened #1059937
>> to make people aware of that), so uploading a new glibc now is probably
>> not the best idea.
>
> Hmm, maybe you can drop the manual pages, but not upload yet, and wait
> for that bug to be fixed to do an upload without the pages.

Note that manpages-dev 6.7-2 has dropped the clashing files for the time
being.  I do not think there is any need to hurry, so I am downgrading
the severity of this bug.  Whenever the glibc-doc package in unstable
drops the manpages, we should file a bug against manpages-dev to include
them again.

Cheers,
   Sven



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-03 Thread Alejandro Colomar
Hi,

On Tue, Apr 02, 2024 at 08:58:32PM +0200, Aurelien Jarno wrote:
> Thanks, that sounds great that we can finally get rid out of those in
> the debian package.
> 
> > $ git diff --stat b06cd070f..128a3ae35
> >  man3/pthread_cond_init.3| 264 
> >  man3/pthread_condattr_init.3|  48 
> >  man3/pthread_key_create.3   | 178 +
> >  man3/pthread_mutex_init.3   | 241 ++
> >  man3/pthread_mutexattr_setkind_np.3 |  52 
> >  man3/pthread_once.3 |  44 
> >  6 files changed, 827 insertions(+)

I now see that `apt-file show glibc-doc` shows several more pages.  I'll
have a look at them and maybe I also import them into the Linux
man-pages project.

> > Debian's manpages-dev_6.7-1_all.deb has been the first package since
> > that happened, and I've noticed that dpkg(1) (via apt-get(8)) refuses to
> > upgrade manpages-dev due to a conflict with glibc-doc.
> > 
> > $ sudo apt-get upgrade -V;
> > [...]
> > Do you want to continue? [Y/n] y
> > Reading changelogs... Done
> > (Reading database ... 404853 files and directories currently installed.)
> > Preparing to unpack .../manpages-dev_6.7-1_all.deb ...
> > Unpacking manpages-dev (6.7-1) over (6.05.01-1) ...
> > dpkg: error processing archive 
> > /var/cache/apt/archives/manpages-dev_6.7-1_all.deb (--unpack):
> >  trying to overwrite '/usr/share/man/man3/pthread_cond_init.3.gz', 
> > which is also in package glibc-doc 2.38-6
> > Errors were encountered while processing:
> >  /var/cache/apt/archives/manpages-dev_6.7-1_all.deb
> > needrestart is being skipped since dpkg has failed
> > E: Sub-process /usr/bin/dpkg returned an error code (1)
> 
> I think this is actually not specific to the experimental version, those
> manpages are also in the unstable version.

Right.  I only installed the experimental one to see if the bug had
been fixed (as reportbug(1) suggested trying it).

> > Please, remove from glibc-doc those manual pages that conflict with
> > manpages-dev.
> 
> Noted. However following the time_t transition, the glibc package does
> not build anymore on 32-bit architectures (i have just opened #1059937
> to make people aware of that), so uploading a new glibc now is probably
> not the best idea.

Hmm, maybe you can drop the manual pages, but not upload yet, and wait
for that bug to be fixed to do an upload without the pages.

Have a lovely day!
Alex

-- 



signature.asc
Description: PGP signature


Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-02 Thread Aurelien Jarno
control: found -1 glibc/2.37-15.1

Hi,

On 2024-04-01 16:23, Alejandro Colomar wrote:
> Package: glibc-doc
> Version: 2.38-6
> Severity: serious
> Justification: Policy 7.4
> X-Debbugs-Cc: a...@kernel.org, mar...@debian.org
> 
> Dear Maintainer,
> 
> The Linux man-pages project has recently added the pthread_*(3) manual
> pages that were provided by glibc-doc.  The first upstream version of
> the Linux man-pages that includes these pages is man-pages-6.06.  Here's
> what was added:

Thanks, that sounds great that we can finally get rid out of those in
the debian package.

>   $ git diff --stat b06cd070f..128a3ae35
>man3/pthread_cond_init.3| 264 
>man3/pthread_condattr_init.3|  48 
>man3/pthread_key_create.3   | 178 +
>man3/pthread_mutex_init.3   | 241 ++
>man3/pthread_mutexattr_setkind_np.3 |  52 
>man3/pthread_once.3 |  44 
>6 files changed, 827 insertions(+)
> 
> Debian's manpages-dev_6.7-1_all.deb has been the first package since
> that happened, and I've noticed that dpkg(1) (via apt-get(8)) refuses to
> upgrade manpages-dev due to a conflict with glibc-doc.
> 
>   $ sudo apt-get upgrade -V;
>   [...]
>   Do you want to continue? [Y/n] y
>   Reading changelogs... Done
>   (Reading database ... 404853 files and directories currently installed.)
>   Preparing to unpack .../manpages-dev_6.7-1_all.deb ...
>   Unpacking manpages-dev (6.7-1) over (6.05.01-1) ...
>   dpkg: error processing archive 
> /var/cache/apt/archives/manpages-dev_6.7-1_all.deb (--unpack):
>trying to overwrite '/usr/share/man/man3/pthread_cond_init.3.gz', 
> which is also in package glibc-doc 2.38-6
>   Errors were encountered while processing:
>/var/cache/apt/archives/manpages-dev_6.7-1_all.deb
>   needrestart is being skipped since dpkg has failed
>   E: Sub-process /usr/bin/dpkg returned an error code (1)

I think this is actually not specific to the experimental version, those
manpages are also in the unstable version.

> Please, remove from glibc-doc those manual pages that conflict with
> manpages-dev.

Noted. However following the time_t transition, the glibc package does
not build anymore on 32-bit architectures (i have just opened #1059937
to make people aware of that), so uploading a new glibc now is probably
not the best idea.

Regards
Aurelien

-- 
Aurelien Jarno  GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://aurel32.net



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Sven Joachim
On 2024-04-01 19:02 +0200, Alejandro Colomar wrote:

> Hi Sven,
>
> On Mon, Apr 01, 2024 at 06:38:52PM +0200, Sven Joachim wrote:
>> Makes perfect sense, but at the moment it can only be uploaded to
>> experimental.
>>
>> > We're not in a freeze, so I guess that's fair game.
>>
>> We're not in a freeze but in the middle of the largest transition in
>> Debian history[1], and during that a new major glibc version in unstable is
>> out of the question.
>>
>> >> files for now and re-include either when glibc 2.38 is in unstable or
>> >> when it is in testing.
>> >
>> > Why do we need to wait to ask for a glibc-doc_2.38-7 with the patch
>> > dropped?  Does 2.38 have any freeze at the moment?
>>
>> Yes.  Every new major glibc version requires a transition (requiring
>> rebuilds of all packages which use @GLIBC_PRIVATE symbols, among other
>> things), and the one for glibc 2.38[2] has been pending for three
>> months[3].
>
> Hmmm, I understand.  If you want to temporarily drop these pages from
> manpages-dev, go ahead.  Please undrop them when glibc-doc can make a
> new release.  BTW, I guess glibc-doc must match libc6 version?

It is built from the same source package, so yes.

Cheers,
   Sven



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Alejandro Colomar
Hi Sven,

On Mon, Apr 01, 2024 at 06:38:52PM +0200, Sven Joachim wrote:
> Makes perfect sense, but at the moment it can only be uploaded to
> experimental.
> 
> > We're not in a freeze, so I guess that's fair game.
> 
> We're not in a freeze but in the middle of the largest transition in
> Debian history[1], and during that a new major glibc version in unstable is
> out of the question.
> 
> >> files for now and re-include either when glibc 2.38 is in unstable or
> >> when it is in testing.
> >
> > Why do we need to wait to ask for a glibc-doc_2.38-7 with the patch
> > dropped?  Does 2.38 have any freeze at the moment?
> 
> Yes.  Every new major glibc version requires a transition (requiring
> rebuilds of all packages which use @GLIBC_PRIVATE symbols, among other
> things), and the one for glibc 2.38[2] has been pending for three
> months[3].

Hmmm, I understand.  If you want to temporarily drop these pages from
manpages-dev, go ahead.  Please undrop them when glibc-doc can make a
new release.  BTW, I guess glibc-doc must match libc6 version?
Otherwise, you could have a more recent glibc-doc that drops these pages
without upgrading libc6.  Are documentation changes frozen in such a
transition?

> 
> >> There is also the problem that some derivatives (most notably Ubuntu)
> >> are already shipping glibc 2.39 and will have to adjust Breaks/Replaces
> >> versions in manpages-dev accordingly.
> >
> > Hmmm.  I suggest they patch glibc-doc to remove those manual pages.
> > They have been unsupported for a long time.  The last change in
> > glibc-doc is from 2013.
> 
> I guess Ubuntu can then drop the glibc-doc package entirely, as they do
> not ship the upstream changelogs in it, and after dropping the pthread_*
> manpages the package would be empty.  TBH, I do not see much value in
> these changelogs and will probably uninstall glibc-doc from my systems.

Good.

Have a lovely day!
Alex

> 
> Cheers,
>Sven
> 
> 
> 1. https://lists.debian.org/debian-devel-announce/2024/02/msg5.html
> 2. https://release.debian.org/transitions/html/glibc-2.38.html
> 3. https://bugs.debian.org/1059852

-- 

Looking for a remote C programming job at the moment.


signature.asc
Description: PGP signature


Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Sven Joachim
On 2024-04-01 18:00 +0200, Alejandro Colomar wrote:

> Hi Sven,
>
> On Mon, Apr 01, 2024 at 05:35:18PM +0200, Sven Joachim wrote:
>> Obviously the manpages-dev package should not have shipped these files
>> as long as there are in glibc-doc; this is tracked in #1068166.
>
> I CCed back in 2023-10 the debian-glibc@ list notifying that these pages
> were absorbed into the Linux man-pages project.  They didn't respond.

Thanks.  That might have fallen through the cracks.

>> Adding a Breaks on glibc-doc (<= 2.38-6) to manpages-dev is no good,
>> because that version is only in experimental and will remain there for
>> several weeks if not months.  I think manpages-dev should drop these
>
> Why not add glibc-doc 2.38-7 dropping the patch that adds these pages?

Makes perfect sense, but at the moment it can only be uploaded to
experimental.

> We're not in a freeze, so I guess that's fair game.

We're not in a freeze but in the middle of the largest transition in
Debian history[1], and during that a new major glibc version in unstable is
out of the question.

>> files for now and re-include either when glibc 2.38 is in unstable or
>> when it is in testing.
>
> Why do we need to wait to ask for a glibc-doc_2.38-7 with the patch
> dropped?  Does 2.38 have any freeze at the moment?

Yes.  Every new major glibc version requires a transition (requiring
rebuilds of all packages which use @GLIBC_PRIVATE symbols, among other
things), and the one for glibc 2.38[2] has been pending for three
months[3].

>> There is also the problem that some derivatives (most notably Ubuntu)
>> are already shipping glibc 2.39 and will have to adjust Breaks/Replaces
>> versions in manpages-dev accordingly.
>
> Hmmm.  I suggest they patch glibc-doc to remove those manual pages.
> They have been unsupported for a long time.  The last change in
> glibc-doc is from 2013.

I guess Ubuntu can then drop the glibc-doc package entirely, as they do
not ship the upstream changelogs in it, and after dropping the pthread_*
manpages the package would be empty.  TBH, I do not see much value in
these changelogs and will probably uninstall glibc-doc from my systems.

Cheers,
   Sven


1. https://lists.debian.org/debian-devel-announce/2024/02/msg5.html
2. https://release.debian.org/transitions/html/glibc-2.38.html
3. https://bugs.debian.org/1059852



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Alejandro Colomar
Hi Sven,

On Mon, Apr 01, 2024 at 05:35:18PM +0200, Sven Joachim wrote:
> Obviously the manpages-dev package should not have shipped these files
> as long as there are in glibc-doc; this is tracked in #1068166.

I CCed back in 2023-10 the debian-glibc@ list notifying that these pages
were absorbed into the Linux man-pages project.  They didn't respond.



However, the original author of the pages talked to me, agreeing to
that.  Other glibc upstream maintainers also participated in the thread.

> 
> > Please, remove from glibc-doc those manual pages that conflict with
> > manpages-dev.
> 
> Considering that the manpages in glibc-doc are not included upstream and

The history is a bit more complex than that.  They were originally
written upstream.  Then glibc removed them.  A decade later, Debian
added them back via a patch, with some modifications.  I noted down the
history in the discussion linked above.

> created via a Debian patch, that makes a lot of sense.  I was not aware
> of that fact.
> 
> > Marcos, you'll also need to specify a breaks with glibc-doc versions
> > up to (and including) 6.38-6 in the next revision of manpages-dev, and
> > drop 6.7-1.
> 
> Adding a Breaks on glibc-doc (<= 2.38-6) to manpages-dev is no good,
> because that version is only in experimental and will remain there for
> several weeks if not months.  I think manpages-dev should drop these

Why not add glibc-doc 2.38-7 dropping the patch that adds these pages?
We're not in a freeze, so I guess that's fair game.

> files for now and re-include either when glibc 2.38 is in unstable or
> when it is in testing.

Why do we need to wait to ask for a glibc-doc_2.38-7 with the patch
dropped?  Does 2.38 have any freeze at the moment?

> There is also the problem that some derivatives (most notably Ubuntu)
> are already shipping glibc 2.39 and will have to adjust Breaks/Replaces
> versions in manpages-dev accordingly.

Hmmm.  I suggest they patch glibc-doc to remove those manual pages.
They have been unsupported for a long time.  The last change in
glibc-doc is from 2013.

> Thoughts?
> 
> Cheers,
>Sven

Have a lovely day!
Alex

-- 

Looking for a remote C programming job at the moment.


signature.asc
Description: PGP signature


Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Sven Joachim
On 2024-04-01 16:23 +0200, Alejandro Colomar wrote:

> Package: glibc-doc
> Version: 2.38-6
> Severity: serious
> Justification: Policy 7.4
> X-Debbugs-Cc: a...@kernel.org, mar...@debian.org
>
> Dear Maintainer,
>
> The Linux man-pages project has recently added the pthread_*(3) manual
> pages that were provided by glibc-doc.  The first upstream version of
> the Linux man-pages that includes these pages is man-pages-6.06.  Here's
> what was added:
>
>   $ git diff --stat b06cd070f..128a3ae35
>man3/pthread_cond_init.3| 264 
>man3/pthread_condattr_init.3|  48 
>man3/pthread_key_create.3   | 178 +
>man3/pthread_mutex_init.3   | 241 ++
>man3/pthread_mutexattr_setkind_np.3 |  52 
>man3/pthread_once.3 |  44 
>6 files changed, 827 insertions(+)
>
> Debian's manpages-dev_6.7-1_all.deb has been the first package since
> that happened, and I've noticed that dpkg(1) (via apt-get(8)) refuses to
> upgrade manpages-dev due to a conflict with glibc-doc.

>   $ sudo apt-get upgrade -V;
>   [...]
>   Do you want to continue? [Y/n] y
>   Reading changelogs... Done
>   (Reading database ... 404853 files and directories currently installed.)
>   Preparing to unpack .../manpages-dev_6.7-1_all.deb ...
>   Unpacking manpages-dev (6.7-1) over (6.05.01-1) ...
>   dpkg: error processing archive 
> /var/cache/apt/archives/manpages-dev_6.7-1_all.deb (--unpack):
>trying to overwrite '/usr/share/man/man3/pthread_cond_init.3.gz', 
> which is also in package glibc-doc 2.38-6
>   Errors were encountered while processing:
>/var/cache/apt/archives/manpages-dev_6.7-1_all.deb
>   needrestart is being skipped since dpkg has failed
>   E: Sub-process /usr/bin/dpkg returned an error code (1)

Obviously the manpages-dev package should not have shipped these files
as long as there are in glibc-doc; this is tracked in #1068166.

> Please, remove from glibc-doc those manual pages that conflict with
> manpages-dev.

Considering that the manpages in glibc-doc are not included upstream and
created via a Debian patch, that makes a lot of sense.  I was not aware
of that fact.

> Marcos, you'll also need to specify a breaks with glibc-doc versions
> up to (and including) 6.38-6 in the next revision of manpages-dev, and
> drop 6.7-1.

Adding a Breaks on glibc-doc (<= 2.38-6) to manpages-dev is no good,
because that version is only in experimental and will remain there for
several weeks if not months.  I think manpages-dev should drop these
files for now and re-include either when glibc 2.38 is in unstable or
when it is in testing.

There is also the problem that some derivatives (most notably Ubuntu)
are already shipping glibc 2.39 and will have to adjust Breaks/Replaces
versions in manpages-dev accordingly.  Thoughts?

Cheers,
   Sven



Bug#1068188: pthread_cond_init.3.gz: conflict with manpages-dev 6.7-1

2024-04-01 Thread Alejandro Colomar
Package: glibc-doc
Version: 2.38-6
Severity: serious
Justification: Policy 7.4
X-Debbugs-Cc: a...@kernel.org, mar...@debian.org

Dear Maintainer,

The Linux man-pages project has recently added the pthread_*(3) manual
pages that were provided by glibc-doc.  The first upstream version of
the Linux man-pages that includes these pages is man-pages-6.06.  Here's
what was added:

$ git diff --stat b06cd070f..128a3ae35
 man3/pthread_cond_init.3| 264 
 man3/pthread_condattr_init.3|  48 
 man3/pthread_key_create.3   | 178 +
 man3/pthread_mutex_init.3   | 241 ++
 man3/pthread_mutexattr_setkind_np.3 |  52 
 man3/pthread_once.3 |  44 
 6 files changed, 827 insertions(+)

Debian's manpages-dev_6.7-1_all.deb has been the first package since
that happened, and I've noticed that dpkg(1) (via apt-get(8)) refuses to
upgrade manpages-dev due to a conflict with glibc-doc.

$ sudo apt-get upgrade -V;
[...]
Do you want to continue? [Y/n] y
Reading changelogs... Done
(Reading database ... 404853 files and directories currently installed.)
Preparing to unpack .../manpages-dev_6.7-1_all.deb ...
Unpacking manpages-dev (6.7-1) over (6.05.01-1) ...
dpkg: error processing archive 
/var/cache/apt/archives/manpages-dev_6.7-1_all.deb (--unpack):
 trying to overwrite '/usr/share/man/man3/pthread_cond_init.3.gz', 
which is also in package glibc-doc 2.38-6
Errors were encountered while processing:
 /var/cache/apt/archives/manpages-dev_6.7-1_all.deb
needrestart is being skipped since dpkg has failed
E: Sub-process /usr/bin/dpkg returned an error code (1)

Please, remove from glibc-doc those manual pages that conflict with
manpages-dev.

Marcos, you'll also need to specify a breaks with glibc-doc versions
up to (and including) 6.38-6 in the next revision of manpages-dev, and
drop 6.7-1.


Have a lovely day!
Alex


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.8.0-rc7-alx-dirty (SMP w/24 CPU threads; PREEMPT)
Locale: LANG=C.utf8, LC_CTYPE=C.utf8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

glibc-doc depends on no packages.

glibc-doc recommends no packages.

Versions of packages glibc-doc suggests:
ii  glibc-doc-reference  2.38-1

-- no debconf information