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

[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

[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

[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

[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

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

[Debian Bug Tracking System]

Processing control commands:

> severity -1 normal
Bug #1068188 [glibc-doc] pthread_cond_init.3.gz: conflict with manpages-dev 
6.7-1
Severity set to 'normal' from 'serious'

-- 
1068188: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068188
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

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

[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