From d1a3f1fc9bb9f18883a60d70e519fa0d469ad122 Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Mon, 11 Jun 2007 09:23:41 +0000 Subject: [PATCH] - update to 2.55 --- .cvsignore | 2 +- man-pages-2.51-epoll_pwait.patch | 10 ----- ...gkill.patch => man-pages-2.55-tgkill.patch | 38 ++++++++----------- man-pages.spec | 11 +++--- sources | 2 +- 5 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 man-pages-2.51-epoll_pwait.patch rename man-pages-2.51-tgkill.patch => man-pages-2.55-tgkill.patch (58%) diff --git a/.cvsignore b/.cvsignore index 7e18384..73a0b84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ man-pages-extralocale.tar.bz2 man2.tar.gz man2_sys2.1.tar.gz -man-pages-2.51.tar.bz2 +man-pages-2.55.tar.bz2 diff --git a/man-pages-2.51-epoll_pwait.patch b/man-pages-2.51-epoll_pwait.patch deleted file mode 100644 index 0d9f7bb..0000000 --- a/man-pages-2.51-epoll_pwait.patch +++ /dev/null @@ -1,10 +0,0 @@ -We don't need no circular links! - -I hereby state that I wrote this patch in its entirety. - --Stepan Kasal - ---- man-pages-2.51.orig/man2/epoll_pwait.2 2007-04-30 18:06:33.000000000 +0200 -+++ man-pages-2.51/man2/epoll_pwait.2 2007-06-05 19:01:48.000000000 +0200 -@@ -1 +1 @@ --.so man2/epoll_pwait.2 -+.so man2/epoll_wait.2 diff --git a/man-pages-2.51-tgkill.patch b/man-pages-2.55-tgkill.patch similarity index 58% rename from man-pages-2.51-tgkill.patch rename to man-pages-2.55-tgkill.patch index 8820842..980ac76 100644 --- a/man-pages-2.51-tgkill.patch +++ b/man-pages-2.55-tgkill.patch @@ -1,26 +1,20 @@ ---- man-pages-2.51/man2/tkill.2.pom 2007-05-29 15:49:18.000000000 +0200 -+++ man-pages-2.51/man2/tkill.2 2007-05-29 16:05:31.000000000 +0200 -@@ -25,7 +25,7 @@ +--- man-pages-2.55/man2/tkill.2.pom 2007-05-26 17:22:28.000000000 +0200 ++++ man-pages-2.55/man2/tkill.2 2007-06-11 11:06:12.000000000 +0200 +@@ -25,12 +25,10 @@ .\" - .TH TKILL 2 "2004-05-31" "Linux 2.6.6" "Linux Programmer's Manual" + .TH TKILL 2 2007-06-01 "Linux 2.6.6" "Linux Programmer's Manual" .SH NAME -tkill, tgkill \- send a signal to a single process +tkill \- send a signal to a single process .SH SYNOPSIS .nf - .B #include -@@ -39,10 +39,6 @@ - .sp - .B int tkill(int tid, int sig); - .sp --.B "_syscall3(int, tgkill, int, tgid, int, tid, int, sig)" -- /* Using \fBsyscall\fP(2) may be preferable; see \fBintro\fP(2) */ + .BI "int tkill(int " tid ", int " sig ); -.sp --.B int tgkill(int tgid, int tid, int sig); +-.BI "int tgkill(int " tgid ", int " tid ", int " sig ); .fi .SH DESCRIPTION The -@@ -59,19 +55,6 @@ +@@ -47,19 +45,6 @@ however, one can address each process by its unique TID. .PP @@ -40,8 +34,12 @@ These are the raw system call interfaces, meant for internal thread library use. .SH "RETURN VALUE" -@@ -92,15 +75,11 @@ - No process with the specified thread ID (and thread group ID) exists. +@@ -81,13 +66,9 @@ + .SH VERSIONS + .BR tkill () + is supported since Linux 2.4.19 / 2.5.4. +-.BR tgkill () +-was added in Linux 2.5.75. .SH "CONFORMING TO" .BR tkill () -and @@ -49,11 +47,5 @@ -are Linux specific and should not be used +is Linux specific and should not be used in programs that are intended to be portable. - .SH VERSIONS - .BR tkill () - is supported since Linux 2.4.19 / 2.5.4. --.BR tgkill () --was added in Linux 2.5.75. - .SH "SEE ALSO" - .BR gettid (2), - .BR kill (2) + .SH NOTES + Glibc does not provide wrapper for these system calls; call them using diff --git a/man-pages.spec b/man-pages.spec index 92716c0..9b0be0f 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,7 +1,7 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 2.51 -Release: 4%{?dist} +Version: 2.55 +Release: 1%{?dist} License: distributable Group: Documentation URL: http://www.kernel.org/pub/linux/docs/manpages/ @@ -22,7 +22,7 @@ Patch28: man-pages-2.46-nscd.patch Patch30: man-pages-2.51-libaio-includes.patch Patch36: man-pages-2.39-unimplemented.patch Patch37: man-pages-2.51-mmap.patch -Patch39: man-pages-2.51-tgkill.patch +Patch39: man-pages-2.55-tgkill.patch Patch40: man-pages-2.39-mmap2.patch Patch41: man-pages-2.43-rt_spm.patch Patch42: man-pages-2.43-swapon.patch @@ -31,7 +31,6 @@ Patch44: man-pages-2.43-fadvise.patch Patch45: man-pages-2.48-passwd.patch Patch46: man-pages-2.51-nscd-conf.patch Patch47: man-pages-2.51-typos.patch -Patch48: man-pages-2.51-epoll_pwait.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Autoreq: false @@ -69,7 +68,6 @@ tar xzf %{SOURCE11} %patch45 -p1 %patch46 -p1 %patch47 -p1 -%patch48 -p1 ### And now remove those we are not going to use: @@ -179,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man* %changelog +* Mon Jun 11 2007 Ivana Varekova - 2.55-1 +- update to 2.55 + * Mon Jun 4 2007 Stepan Kasal - 2.51-4 - Simplified the build and installed phases; pages are now recoded during the install. diff --git a/sources b/sources index d572e6f..a757031 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz fbc03fdbc665e24961d30dad3ed8596d man2_sys2.1.tar.gz -b20a1252aa4edb300d6f3b75b2c3428c man-pages-2.51.tar.bz2 +33cfe1ef34a60af835457610468086d7 man-pages-2.55.tar.bz2