From 4124f27efed565a5be302d8ff584557a6f2248a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 24 Jul 2015 14:17:25 +0200 Subject: [PATCH] updated to 4.01 - resolves #1246298 --- .gitignore | 2 +- man-pages.spec | 10 ++- ...t.7-use-the-correct-format-character.patch | 79 ------------------- sources | 2 +- 4 files changed, 8 insertions(+), 85 deletions(-) delete mode 100644 rtld-audit.7-use-the-correct-format-character.patch diff --git a/.gitignore b/.gitignore index 61ae8d0..e1fd45c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2013-a.tar.xz /man-pages-additional-20140218.tar.xz -/man-pages-4.00.tar.xz +/man-pages-4.01.tar.xz diff --git a/man-pages.spec b/man-pages.spec index 7b93419..0c26798 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -6,8 +6,8 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages -Version: 4.00 -Release: 3%{?dist} +Version: 4.01 +Release: 1%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://www.kernel.org/doc/man-pages/ @@ -29,7 +29,6 @@ BuildArch: noarch # resolves: #650985 # https://bugzilla.kernel.org/show_bug.cgi?id=53781 Patch21: man-pages-3.42-close.patch -Patch22: rtld-audit.7-use-the-correct-format-character.patch %description A large collection of manual pages from the Linux Documentation Project (LDP). @@ -38,7 +37,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %setup -q -a 1 -a 2 %patch21 -p1 -%patch22 -p1 # rename posix README so we don't have conflict %{__mv} %{posix_name}/README %{posix_name}/%{posix_name}.README @@ -75,6 +73,10 @@ popd %{_mandir}/man*/* %changelog +* Fri Jul 24 2015 Nikola Forró - 4.01-1 +- updated to 4.01 + resolves #1246298 + * Wed Jun 17 2015 Fedora Release Engineering - 4.00-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/rtld-audit.7-use-the-correct-format-character.patch b/rtld-audit.7-use-the-correct-format-character.patch deleted file mode 100644 index ad38197..0000000 --- a/rtld-audit.7-use-the-correct-format-character.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ccafc7c5ea8c1f8483aa23514ba882f6f65edcdb Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Fri, 22 May 2015 10:21:36 +0200 -Subject: [PATCH] rtld-audit.7: use the correct format character - ---- - man7/rtld-audit.7 | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/man7/rtld-audit.7 b/man7/rtld-audit.7 -index b87103c..a63445e 100644 ---- a/man7/rtld-audit.7 -+++ b/man7/rtld-audit.7 -@@ -515,7 +515,7 @@ la_version(unsigned int version) - char * - la_objsearch(const char *name, uintptr_t *cookie, unsigned int flag) - { -- printf("la_objsearch(): name = %s; cookie = %x", name, cookie); -+ printf("la_objsearch(): name = %s; cookie = %p", name, cookie); - printf("; flag = %s\\n", - (flag == LA_SER_ORIG) ? "LA_SER_ORIG" : - (flag == LA_SER_LIBPATH) ? "LA_SER_LIBPATH" : -@@ -531,7 +531,7 @@ la_objsearch(const char *name, uintptr_t *cookie, unsigned int flag) - void - la_activity (uintptr_t *cookie, unsigned int flag) - { -- printf("la_activity(): cookie = %x; flag = %s\\n", cookie, -+ printf("la_activity(): cookie = %p; flag = %s\\n", cookie, - (flag == LA_ACT_CONSISTENT) ? "LA_ACT_CONSISTENT" : - (flag == LA_ACT_ADD) ? "LA_ACT_ADD" : - (flag == LA_ACT_DELETE) ? "LA_ACT_DELETE" : -@@ -541,7 +541,7 @@ la_activity (uintptr_t *cookie, unsigned int flag) - unsigned int - la_objopen(struct link_map *map, Lmid_t lmid, uintptr_t *cookie) - { -- printf("la_objopen(): loading \\"%s\\"; lmid = %s; cookie=%x\\n", -+ printf("la_objopen(): loading \\"%s\\"; lmid = %s; cookie=%p\\n", - map\->l_name, - (lmid == LM_ID_BASE) ? "LM_ID_BASE" : - (lmid == LM_ID_NEWLM) ? "LM_ID_NEWLM" : -@@ -554,7 +554,7 @@ la_objopen(struct link_map *map, Lmid_t lmid, uintptr_t *cookie) - unsigned int - la_objclose (uintptr_t *cookie) - { -- printf("la_objclose(): %x\\n", cookie); -+ printf("la_objclose(): %p\\n", cookie); - - return 0; - } -@@ -562,7 +562,7 @@ la_objclose (uintptr_t *cookie) - void - la_preinit(uintptr_t *cookie) - { -- printf("la_preinit(): %x\\n", cookie); -+ printf("la_preinit(): %p\\n", cookie); - } - - uintptr_t -@@ -572,7 +572,7 @@ la_symbind32(Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, - printf("la_symbind32(): symname = %s; sym\->st_value = %p\\n", - symname, sym\->st_value); - printf(" ndx = %d; flags = 0x%x", ndx, *flags); -- printf("; refcook = %x; defcook = %x\\n", refcook, defcook); -+ printf("; refcook = %p; defcook = %p\\n", refcook, defcook); - - return sym\->st_value; - } -@@ -584,7 +584,7 @@ la_symbind64(Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, - printf("la_symbind64(): symname = %s; sym\->st_value = %p\\n", - symname, sym\->st_value); - printf(" ndx = %d; flags = 0x%x", ndx, *flags); -- printf("; refcook = %x; defcook = %x\\n", refcook, defcook); -+ printf("; refcook = %p; defcook = %p\\n", refcook, defcook); - - return sym\->st_value; - } --- -1.9.3 - diff --git a/sources b/sources index bbb3f7f..e02fab6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 825fde78e6fddd02426ecdd50e2cbe0d man-pages-posix-2013-a.tar.xz dbd7fac6b9f9d39f0667138ad841c4b9 man-pages-additional-20140218.tar.xz -3401eb0020c56639070d199c3e59a4f8 man-pages-4.00.tar.xz +008422983c6ddd97d412ef4c301f3af9 man-pages-4.01.tar.xz