diff --git a/.cvsignore b/.cvsignore index 9410b23..6e4d96f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,6 @@ man-pages-extralocale.tar.bz2 man-suid-bins.tar.bz2 -man-pages-3.00.tar.bz2 man-pages-posix-2003-a.tar.bz2 man-pages_syscalls.tar.bz2 man-pages_add-01.tar.bz2 +man-pages-3.04.tar.bz2 diff --git a/man-pages-2.51-mmap.patch b/man-pages-2.51-mmap.patch deleted file mode 100644 index 7bf70e4..0000000 --- a/man-pages-2.51-mmap.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- man-pages-2.51/man2/mmap.2.pom 2007-05-12 01:07:02.000000000 +0200 -+++ man-pages-2.51/man2/mmap.2 2007-05-31 14:33:32.000000000 +0200 -@@ -197,6 +197,9 @@ - as a hint: place the mapping at exactly that address. - .I start - must be a multiple of the page size. -+In all other cases -+.I start -+address is rounded up to the next page size boundary. - If the memory region specified by - .I start - and diff --git a/man-pages-2.51-sched_setaffinity.patch b/man-pages-2.51-sched_setaffinity.patch deleted file mode 100644 index ca4b014..0000000 --- a/man-pages-2.51-sched_setaffinity.patch +++ /dev/null @@ -1,39 +0,0 @@ -2007-06-11 Stepan Kasal - - * man2/sched_setaffinity.2: Fix the type of cpusetsize. - -The evolution of the second parameter of sched_{set,get}affinity() can -be watched here: -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/sched.h?cvsroot=glibc - -When it was first introduced in glibc-2.3, it had type `unsigned long int' (rev 1.11.): -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/sched.h.diff?r1=1.10&r2=1.11&cvsroot=glibc - -For 2.3.2, the type was changed to `unsigned int' (rev 1.12): -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/sched.h.diff?r1=1.11&r2=1.12&cvsroot=glibc - -As the manual says, the parameter has disappeared in glibc-2.3.3 (rev. 1.13): -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/sched.h.diff?r1=1.12&r2=1.13&cvsroot=glibc - -When it was reintroduced in 2.3.4, it had type `size_t' (rev. 1.16): -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/sched.h.diff?r1=1.15&r2=1.16&cvsroot=glibc - -Since then (Mar 19, 2004), the interface has not changed. - - -diff -urpN man-pages-2.51.orig/man2/sched_setaffinity.2 man-pages-2.51/man2/sched_setaffinity.2 ---- man-pages-2.51.orig/man2/sched_setaffinity.2 2007-04-13 00:42:49.000000000 +0200 -+++ man-pages-2.51/man2/sched_setaffinity.2 2007-06-08 17:19:00.000000000 +0200 -@@ -38,10 +38,10 @@ sched_setaffinity, sched_getaffinity, CP - .nf - .B #include - .sp --.BI "int sched_setaffinity(pid_t " pid ", unsigned int " cpusetsize , -+.BI "int sched_setaffinity(pid_t " pid ", size_t " cpusetsize , - .BI " cpu_set_t *" mask ); - .sp --.BI "int sched_getaffinity(pid_t " pid ", unsigned int " cpusetsize , -+.BI "int sched_getaffinity(pid_t " pid ", size_t " cpusetsize , - .BI " cpu_set_t *" mask ); - .sp - .BI "void CPU_CLR(int " cpu ", cpu_set_t *" set ); diff --git a/man-pages-2.75-crypt.patch b/man-pages-2.75-crypt.patch deleted file mode 100644 index 2c10621..0000000 --- a/man-pages-2.75-crypt.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up man-pages-2.75/man3/crypt.3.pom man-pages-2.75/man3/crypt.3 ---- man-pages-2.75/man3/crypt.3.pom 2008-01-03 17:07:29.000000000 +0100 -+++ man-pages-2.75/man3/crypt.3 2008-01-14 11:04:42.000000000 +0100 -@@ -141,22 +141,59 @@ function was not implemented, probably b - SVr4, 4.3BSD, POSIX.1-2001 - .SH NOTES - .SS Glibc Notes --The glibc2 version of this function has the following additional features. -+The glibc2 version of this function has the following additional features: -+ - If - .I salt --is a character string starting with the three characters "$1$" --followed by at most eight characters, and optionally terminated by "$", --then instead of using the DES machine, the glibc crypt function --uses an MD5-based algorithm, and outputs up to 34 bytes, --namely "$1$$", where --"" stands for the up to 8 characters following "$1$" in the salt, --and "" is a further 22 characters. --The characters in "" and "" are drawn from the set -+is a character string starting with the three characters "$$" -+followed by a string terminated by "$", -+ -+$$$ -+ -+then instead of using the DES machine, ID identifies the method used and -+this then determines how the rest of the password string is -+interpreted. So far the following ID values are in use: -+ -+.TS -+l l. -+ID | Method -+_ -+1 | MD5 (Linux, BSD) -+2a | Blowfish (OpenBSD) -+md5 | Sun MD5 -+.TE -+ -+For the new SHA-256 and SHA-512 methods the following values are -+selected: -+ -+.TS -+l l. -+ID | Method -+_ -+5 | SHA-256 -+6 | SHA-512 -+.TE -+ -+So $5$$ is a SHA-256 encoded password and $6$$ is a -+SHA-512 encoded one. -+ -+"" stands for the up to 16 characters following "$ID$" in the salt. -+The pwd part of the password string is the actual computed password. -+The size of this string is fixed: -+ -+.TS -+l l. -+MD5 | 22 characters -+SHA-256 | 43 characters -+SHA-512 | 86 characters -+.TE -+ -+The characters in "" and "" are drawn from the set - [\fBa\fP\(en\fBzA\fP\(en\fBZ0\fP\(en\fB9./\fP]. --The entire -+In SHA implementation the entire - .I key - is significant here (instead of only the first --8 bytes). -+8 bytes in MD5). - .SH "SEE ALSO" - .BR login (1), - .BR passwd (1), diff --git a/man-pages-2.76-prctl.patch b/man-pages-2.76-prctl.patch deleted file mode 100644 index 61452bb..0000000 --- a/man-pages-2.76-prctl.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up man-pages-2.76/man2/prctl.2.pom man-pages-2.76/man2/prctl.2 ---- man-pages-2.76/man2/prctl.2.pom 2008-01-12 14:44:04.000000000 +0100 -+++ man-pages-2.76/man2/prctl.2 2008-01-29 15:12:54.000000000 +0100 -@@ -192,6 +192,16 @@ Pass \fBPR_FP_EXC_SW_ENABLE\fP to use FP - .B PR_GET_FPEXC - (Since Linux 2.4.21, 2.5.32, only on PowerPC) - Get floating-point exception mode from \fIarg2\fP. -+.TP -+.B PR_GET_SECCOMP -+(Since Linux 2.6.23) -+Return process secure computing mode. -+.TP -+.B PR_SET_SECCOMP -+(Since Linux 2.6.23) -+Set process secure computing mode to \fIarg2\fP, -+which should be either 0 or 1. -+It is possible to set the mode to even more secure (value 1) and only once. - .SH "RETURN VALUE" - .B PR_GET_DUMPABLE - and diff --git a/man-pages.spec b/man-pages.spec index c9e20a9..3c9abf8 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -3,7 +3,7 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 3.00 +Version: 3.04 Release: 1%{?dist} License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE Group: Documentation @@ -21,16 +21,12 @@ Source5: man-suid-bins.tar.bz2 Patch1: man-pages-1.51-iconv.patch Patch28: man-pages-2.46-nscd.patch Patch36: man-pages-2.63-unimplemented.patch -Patch37: man-pages-2.51-mmap.patch Patch41: man-pages-2.43-rt_spm.patch Patch44: man-pages-2.43-fadvise.patch Patch45: man-pages-2.48-passwd.patch Patch46: man-pages-2.51-nscd-conf.patch -Patch48: man-pages-2.51-sched_setaffinity.patch Patch49: man-pages-2.63-getent.patch Patch50: man-pages-2.63-iconv.patch -Patch51: man-pages-2.75-crypt.patch -Patch52: man-pages-2.76-prctl.patch Patch53: man-pages-2.78-stream.patch Patch54: man-pages-2.80-malloc_h.patch @@ -51,89 +47,34 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch1 -p1 %patch28 -p1 %patch36 -p1 -%patch37 -p1 %patch41 -p1 %patch44 -p1 %patch45 -p1 %patch46 -p1 -%patch48 -p1 %patch49 -p1 %patch50 -p1 -%patch51 -p1 -%patch52 -p1 %patch53 -p1 %patch54 -p1 ### And now remove those we are not going to use: -# These are parts of fileutils -rm -fv man1/{chgrp,chmod,chown,cp,dd,df,dircolors,du,install}.1 -rm -fv man1/{ln,ls,mkdir,mkfifo,mknod,mv,rm,rmdir,touch}.1 -rm -fv man1/{dir,vdir}.1 - -# Part of diffutils -rm -fv man1/diff.1 - # Part of quota -rm -fv man2/quotactl.2 - -## Part of modutils - now the man pages should be here -#rm -fv man2/get_kernel_syms.2 -#rm -fv man2/{create,query}_module.2 - -# Part of console-tools -rm -fv man4/console.4 - -# Part of shadow-utils -rm -fv man3/getspnam.3 - -# part of nfs-utils -rm -fv man5/exports.5 -rm -fv man5/nfs.5 - -# Part of bind-utils -#rm -fv man5/resolv.conf.5 # kept anyway, as it makes sense to have available - -# Obsolete -rm -f man3/infnan.3 - -# Part of mount -rm -fv man5/fstab.5 +rm -v man2/quotactl.2 # Only briefly part of a devel version of glibc -rm -f man3/getipnodeby{name,addr}.3 man3/freehostent.3 - -# Part of libcap -rm -fv man2/cap{get,set}.2 - -#Compress/Uncompress man pages -rm -f man1p/{,un}compress.1p - -#Part of util-linux -rm -f man1p/renice.1p +rm -v man3/getipnodeby{name,addr}.3 man3/freehostent.3 # Part of libattr-devel -rm -f man2/{,f,l}{get,list,remove,set}xattr.2* +rm -v man2/{,f,l}{get,list,remove,set}xattr.2 -# Part of numactl -rm -f man2/{mbind,set_mempolicy}.2 +# Problem with db x db4 (#198597) - man pages are obsolete +rm -v man3/{btree,dbopen,hash,mpool,recno}.3 -# Problem with db x db4 - man pages -rm -f man3/{btree,dbopen,hash,mpool,recno}.3 - -# Remove rpcinfo page -rm -f man8/rpcinfo.8 +# Remove rpcinfo page - obsolete +rm -v man8/rpcinfo.8 # Deprecated -rm -f man2/pciconfig_{write,read,iobase}.2 - -find . -name "*sudo*" | xargs --no-run-if-empty rm - -# We do not have sccs -rm -f man1p/{admin,delta,get,prs,rmdel,sact,sccs,unget,val,what}.1p - -# part of squid -rm -f man8/ncsa_auth.8 +rm -v man2/pciconfig_{write,read,iobase}.2 %build : Nothing to build. @@ -173,6 +114,12 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man* %changelog +* Tue Jul 22 2008 Ivana Varekova - 3.04-1 +- update to 3.04 +- remove mmap, sched_setaffinity, crypt and prctl patches +- remove -f from rm commands +- remove unnecessary/bogus rm commands + * Wed Jun 18 2008 Ivana Varekova - 3.00-1 - update to 3.00 - source files changes diff --git a/sources b/sources index 2726552..4377594 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 a9c6a14e5b34c18c3684a0b68322572f man-suid-bins.tar.bz2 -e33a7c2e5ae9e5d3b3ed71568a740e30 man-pages-3.00.tar.bz2 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 bf0d94a7faf6dc0db31325dbf576fd84 man-pages_syscalls.tar.bz2 4ae755c6caaa035cb7737bf4a3ec7927 man-pages_add-01.tar.bz2 +fbe6e709f71d639dcd07a22d297d89f5 man-pages-3.04.tar.bz2