From c7c7e8006384a9dd817756f32bd7fec72de1d2e9dec7c2656f39caa806bd6835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Sep 2024 16:05:02 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main man-pages revision 95e3653954e431f2be3797ac190f8284 --- man-pages-6.05.01.tar.sign | 16 ------ man-pages-6.05.01.tar.xz | 3 -- man-pages-6.9.1.tar.sign | 16 ++++++ man-pages-6.9.1.tar.xz | 3 ++ man-pages-tcp_fack.patch | 9 ++-- man-pages.changes | 84 ++++++++++++++++++++++++++++++ man-pages.eal3.diff | 16 +++--- man-pages.spec | 35 +++++-------- man-pages_gai.conf-reference.patch | 8 +-- 9 files changed, 134 insertions(+), 56 deletions(-) delete mode 100644 man-pages-6.05.01.tar.sign delete mode 100644 man-pages-6.05.01.tar.xz create mode 100644 man-pages-6.9.1.tar.sign create mode 100644 man-pages-6.9.1.tar.xz diff --git a/man-pages-6.05.01.tar.sign b/man-pages-6.05.01.tar.sign deleted file mode 100644 index 28040b9..0000000 --- a/man-pages-6.05.01.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmTK1ykACgkQnowa+77/ -2zLi4A//R/8CNTUCuXD/Xbha3/pyXdqI3yi8J3uG5tEoyrLF8RnZIe3HotobnxtF -WpCwrc8Ma84cCi+TDU2G4eX+7AhmS/n4aI0uka4Fh39uOAFzkP8zbzFMUDqJu/SF -5FZqlmCO+NZdIyB5++Mf6Gm76xB7EuPLe52/ZInSrePR8FAyt0Lg7JSG2gJrIeJA -Wt/5GqR4fBNAx3HDVfSLp2Z2QmMD58UP3ydkuFrVI3t9dR8t1i4tlrTFevclUl7V -y7PL2paWANvCR1ydQadnIS8U47Icsc4+X/hEc0fTTSvXB2Lhk13+1AYvfPxFxzQ6 -5fAimXCPaNduqRxbyK4gtqSYxUkoxKRrHi4TdEOrp7xC0KL/E1zNosLezFuLuym1 -KUnjhHzPoFUcgPVkFOYdcz5Fx6gXSLPsnidTW1AtFqMnYpEFB42rCJWqVA3vBscH -0wQdXOZq8613/QusTemlbLyjdJtSEHuMS5Sj/HbfDjwj7efj0Xwu2U83IKfj1okN -2Go2OkuMZApiDvlMPKHhA1rFFmpfe4qW99hp02MpKlpIp9gmTcQsEhnv/u5aahQm -kcjXTCFqXNCqdsHoZ9uJEV+1hG6D3ItowLpUhvNZblhHzxn06Sdg4pQQKv8A7om0 -hzoXeogZMu03G2+apvpoBOD3RJRLYp2p9wdSvfvq51gmC+zuBBY= -=ytpu ------END PGP SIGNATURE----- diff --git a/man-pages-6.05.01.tar.xz b/man-pages-6.05.01.tar.xz deleted file mode 100644 index c164dd7..0000000 --- a/man-pages-6.05.01.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b96ab6b44a688c91d1b572e52fece519e1cfd2bb4c33fe7014fc3fd1ef3f9cae -size 2194472 diff --git a/man-pages-6.9.1.tar.sign b/man-pages-6.9.1.tar.sign new file mode 100644 index 0000000..c8c8ac5 --- /dev/null +++ b/man-pages-6.9.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmZwHiAACgkQnowa+77/ +2zLLcQ/+PAtWKz3VGoUzp5iSqArwsDSElm1B1JvQX9krtiwQiYczGGKI1/IOz6DX +3YsUePYsulXMC8hHUP+5bu+jKWd4B5ueCHZFnaE3B8x0RVy+A6vRvSqVmcaSNEgc +t8S5L3rnVQMUAsZXaDi4bPJVA7krLnIjLlBR43muWs63oIlL2an5juwY0+L/vuHY +QFEXy1BHbO3Ki5zBlCv2QNu6AwqwJMcsIftvMYZ1nbqmujPGRcjPnToedqPgdARv +USjf8zr4dS2mg3UvRrdqIQDtbHFrTSp4+JBaKqaNtiEVN+QISMUrnlA2ia9wxEpl +1byZ53CIUXIzVWGCF5ultFwtCWiPPDFDrVrlj82wZFwhHvikxtHDNv5x+c6QOWUS +W0Umn6RzLhTI35Py8hT6SvmagxXgWgQVy4iJohFt1uu7j2e7JTWYFHFu5V8oL/G2 +bvendUa4FGUAM1LKZMwkX25tsrClZIUG7AXXLQPuOarURKJ4fmKa8LbhINPOclDe +h8mKO6XV3FMDyXl2y8BAIHhj0e9jAvkv/2rwbm8kd08pOY2WfU5QxtahjwRHfpvj +L6PPfGpRRlCyScMigkmmQwjyoYckfUs7W/j8tJMWk8SEmvdAMMiGi6jl6Xpfc7TU +4eYktVgvDcGUIJ4EB14wV+KpYZapJXtt1eA4gi0hqqkt4piiNoU= +=RcaO +-----END PGP SIGNATURE----- diff --git a/man-pages-6.9.1.tar.xz b/man-pages-6.9.1.tar.xz new file mode 100644 index 0000000..64c2c89 --- /dev/null +++ b/man-pages-6.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e23cbac29f110ba571f0da8523e79d373691466ed7f2a31301721817d34530bd +size 1864500 diff --git a/man-pages-tcp_fack.patch b/man-pages-tcp_fack.patch index 74917e1..f6f893e 100644 --- a/man-pages-tcp_fack.patch +++ b/man-pages-tcp_fack.patch @@ -1,7 +1,8 @@ -diff -Nur man-pages-6.02/man7/tcp.7 new/man7/tcp.7 ---- man-pages-6.02/man7/tcp.7 2022-12-22 20:25:12.000000000 +0100 -+++ new/man7/tcp.7 2022-12-28 00:46:39.396907119 +0100 -@@ -491,9 +491,31 @@ +Index: man-pages-6.05.01/man7/tcp.7 +=================================================================== +--- man-pages-6.05.01.orig/man7/tcp.7 ++++ man-pages-6.05.01/man7/tcp.7 +@@ -486,9 +486,31 @@ When enabled, outgoing ECN-setup SYNs th normal SYN retransmission timeout will be resent with CWR and ECE cleared. .TP diff --git a/man-pages.changes b/man-pages.changes index 2b13c63..5b2348a 100644 --- a/man-pages.changes +++ b/man-pages.changes @@ -1,3 +1,87 @@ +------------------------------------------------------------------- +Tue Jun 18 09:28:18 UTC 2024 - pgajdos@suse.com + +- version update to 6.9.1 + * remove broken .so link + +------------------------------------------------------------------- +Mon Jun 17 10:24:06 UTC 2024 - pgajdos@suse.com + +- version update to 6.9 + * Split several huge pages into smaller pages. + * Rename some ioctl_*(2) pages for consistency. + * new dir man2const/ + +------------------------------------------------------------------- +Mon May 20 07:13:02 UTC 2024 - pgajdos@suse.com + +- version update to 6.8 + New and rewritten pages + ----------------------- + man3type/ + locale_t.3type + mbstate_t.3type + wchar_t.3type + wint_t.3type + Newly documented interfaces in existing pages + --------------------------------------------- + man2/ + init_module.2 + MODULE_INIT_COMPRESS_FILE + + get_mempolicy.2 + mbind.2 + set_mempolicy.2 + MPOL_WEIGHTED_INTERLEAVE + + mount_setattr.2 + squashfs + tmpfs + cephfs + hugetlbfs + man5/ + man8/ + proc.5 + subset + + elf.5 + ld.so.8 + Updeprecate and explain DT_RPATH + man7/ + string_copying.7 + strndup() + +------------------------------------------------------------------- +Wed Mar 20 09:11:23 UTC 2024 - pgajdos@suse.com + +- version update to 6.7 + New and rewritten pages + ----------------------- + man3/ + TIMEVAL_TO_TIMESPEC.3 + Newly documented interfaces in existing pages + --------------------------------------------- + man2/ + process_madvise.2 + process_madvise() glibc wrapper + New and changed links + --------------------- + man3/ + TIMESPEC_TO_TIMEVAL.3 (TIMEVAL_TO_TIMESPEC(3)) +- modified patches + % man-pages_gai.conf-reference.patch (refreshed) + +------------------------------------------------------------------- +Fri Feb 23 11:18:05 UTC 2024 - pgajdos@suse.com + +- use %autosetup macro + +------------------------------------------------------------------- +Tue Jan 9 12:29:35 UTC 2024 - Anthony Iliopoulos + +- Do not remove bpf-helpers.7, as this is not provided by the bpftool + package any more. + ------------------------------------------------------------------- Thu Nov 9 09:07:11 UTC 2023 - Dirk Müller diff --git a/man-pages.eal3.diff b/man-pages.eal3.diff index 0bf13d0..0a19bf5 100644 --- a/man-pages.eal3.diff +++ b/man-pages.eal3.diff @@ -1,5 +1,5 @@ ---- BUILD/man-pages-1.69/man2/getcwd.2 -+++ BUILD/man-pages-1.69/man2/getcwd.2 +--- a/man2/getcwd.2 ++++ b/man2/getcwd.2 @@ -0,0 +1,85 @@ +.\" (c) 1993 by Thomas Koenig (ig25@rz.uni-karlsruhe.de) +.\" (c) 2003 by International Business Machines Corportion @@ -185,16 +185,16 @@ +.BR sigwait (3), +.BR signal (7), +.BR sigqueue (2) ---- BUILD/man-pages-1.69/man2/rt_sigreturn.2 -+++ BUILD/man-pages-1.69/man2/rt_sigreturn.2 +--- a/man2/rt_sigreturn.2 ++++ b/man2/rt_sigreturn.2 @@ -0,0 +1 @@ +.so man2/sigreturn.2 ---- BUILD/man-pages-1.69/man2/rt_sigsuspend.2 -+++ BUILD/man-pages-1.69/man2/rt_sigsuspend.2 +--- a/man2/rt_sigsuspend.2 ++++ b/man2/rt_sigsuspend.2 @@ -0,0 +1 @@ +.so man2/sigaction.2 ---- BUILD/man-pages-1.69/man2/rt_sigtimedwait.2 -+++ BUILD/man-pages-1.69/man2/rt_sigtimedwait.2 +--- a/man2/rt_sigtimedwait.2 ++++ b/man2/rt_sigtimedwait.2 @@ -0,0 +1,113 @@ +.\" Copyright (c) 2002 Michael kerrisk +.\" diff --git a/man-pages.spec b/man-pages.spec index 100d0bb..8a13e9d 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,7 +1,7 @@ # # spec file for package man-pages # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: man-pages -Version: 6.05.01 +Version: 6.9.1 Release: 0 -Summary: Linux Manual Pages +Summary: Linux Manual Pages License: BSD-3-Clause AND GPL-2.0-or-later AND MIT Group: Documentation/Man -URL: https://www.kernel.org/doc/man-pages/download.html +URL: https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/ #Git-Clone: git://git.kernel.org/pub/scm/docs/man-pages/man-pages #Git-Web: http://git.kernel.org/cgit/docs/man-pages/man-pages.git/ Source0: https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz @@ -48,24 +48,18 @@ etc. (e.g., nroff, ascii); and Section 8, system administration (intro only). %prep -%setup -q -%patch0 -p2 -%patch1 -%patch2 -p1 -find -name "*.orig" | xargs rm -fv +%autosetup -p1 %build # glibc rm man3/{getifaddrs.3,freeifaddrs.3,crypt.3,crypt_r.3} # remove .so link to bzero.3, conflicts with libbsd rm man3/explicit_bzero.3 -# already in bpftool package -rm man7/bpf-helpers.7 # bsc#1188724 rm man5/motd.5 -# conflicts with mandoc -mkdir man7mp -mv man7/man.7 man7mp/man.7mp +# conflicts with mandoc; man.7 is not so link on groff_man.7, +# which is part of groff-full +rm man7/man.7 %install for i in man[0-9]*; do @@ -76,17 +70,16 @@ cd "%{buildroot}/%{_mandir}/" RETVAL=0 ARE_MISSING="" for i in */* ; do - FOUND=0 - grep "^.so man" "$i" && FOUND=1 - if [ "$FOUND" == 1 ] ; then - if [ ! -f `grep "^.so man" "$i" | awk '{print $2}'` ]; then - ARE_MISSING="$i $ARE_MISSING" + so_ref="$(grep '^.so man' $i | awk '{print $2}')" + if [ -n $so_ref ] ; then + if [ ! -f $so_ref ]; then + ARE_MISSING="$i $ARE_MISSING ($so_ref missing)" RETVAL=1 fi fi done echo "" -echo "The following manual pages are now missing (for .so reference):" +echo "The following manual pages have wrong .so reference:" echo "$ARE_MISSING" echo "" if [ "$RETVAL" -ne 0 ] ; then @@ -100,11 +93,11 @@ fi %defattr(644,root,root,755) %doc README Changes Changes.old CONTRIBUTING lsm %license LICENSES/*.txt -%dir %{_mandir}/man7mp %dir %{_mandir}/man2type %dir %{_mandir}/man3const %dir %{_mandir}/man3head %dir %{_mandir}/man3type +%dir %{_mandir}/man2const %{_mandir}/man*/*.gz %changelog diff --git a/man-pages_gai.conf-reference.patch b/man-pages_gai.conf-reference.patch index 7775f45..68fc62d 100644 --- a/man-pages_gai.conf-reference.patch +++ b/man-pages_gai.conf-reference.patch @@ -1,8 +1,8 @@ -Index: man3/getaddrinfo.3 +Index: man-pages-6.7/man3/getaddrinfo.3 =================================================================== ---- man3/getaddrinfo.3.orig -+++ man3/getaddrinfo.3 -@@ -818,6 +818,7 @@ main(int argc, char *argv[]) +--- man-pages-6.7.orig/man3/getaddrinfo.3 ++++ man-pages-6.7/man3/getaddrinfo.3 +@@ -848,6 +848,7 @@ main(int argc, char *argv[]) .BR getaddrinfo_a (3), .BR gethostbyname (3), .BR getnameinfo (3),