From 13509be5c6e7da686daf52bbbcaefab4d22d818d Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Fri, 22 May 2015 10:23:56 +0200
Subject: [PATCH] rtld-audit.7: use the correct format character - resolves:
 #1222719

---
 man-pages.spec                                |  8 +-
 ...t.7-use-the-correct-format-character.patch | 79 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 rtld-audit.7-use-the-correct-format-character.patch

diff --git a/man-pages.spec b/man-pages.spec
index 92d2544..6cb4e38 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -7,7 +7,7 @@
 Summary: Linux kernel and C library user-space interface documentation
 Name: man-pages
 Version: 4.00
-Release: 1%{?dist}
+Release: 2%{?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,6 +29,7 @@ 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).
@@ -37,6 +38,7 @@ 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
@@ -73,6 +75,10 @@ popd
 %{_mandir}/man*/*
 
 %changelog
+* Fri May 22 2015 jchaloup <jchaloup@redhat.com> - 4.00-2
+- rtld-audit.7: use the correct format character
+  resolves: #1222719
+
 * Thu May 07 2015 jchaloup <jchaloup@redhat.com> - 4.00-1
 - updated to 4.00
   resolves: #1219478
diff --git a/rtld-audit.7-use-the-correct-format-character.patch b/rtld-audit.7-use-the-correct-format-character.patch
new file mode 100644
index 0000000..ad38197
--- /dev/null
+++ b/rtld-audit.7-use-the-correct-format-character.patch
@@ -0,0 +1,79 @@
+From ccafc7c5ea8c1f8483aa23514ba882f6f65edcdb Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+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
+