[pax-utils] update to 1.0

Wed Mar 4 12:31:05 UTC 2015

commit 3a42bdc03be43ee8b5488293499d166488c220a4
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Wed Mar 4 13:30:55 2015 +0100

    update to 1.0
    
    - re-enable building manpages

 pax-utils-man.patch | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 pax-utils.spec      |  10 +++-
 2 files changed, 172 insertions(+), 1 deletion(-)
---

diff --git a/pax-utils-man.patch b/pax-utils-man.patch
new file mode 100644
index 0000000..0f91ee3
--- /dev/null
+++ b/pax-utils-man.patch
@@ -0,0 +1,163 @@
+diff -up pax-utils-1.0/Makefile.am.man pax-utils-1.0/Makefile.am
+--- pax-utils-1.0/Makefile.am.man	2015-03-02 10:44:16.000000000 +0100
++++ pax-utils-1.0/Makefile.am	2015-03-04 13:15:29.301689587 +0100
+@@ -43,6 +43,11 @@ EXTRA_DIST = autotools/m4/gnulib-cache.m
+ 
+ # @@@ GEN START @@@ #
+ dist_man_MANS += 
++dist_man_MANS += \
++	man/dumpelf.1 \
++	man/pspax.1 \
++	man/scanelf.1 \
++	man/scanmacho.1
+ EXTRA_DIST += \
+ 	./.depend \
+ 	./.gitignore \
+diff -up pax-utils-1.0/Makefile.in.man pax-utils-1.0/Makefile.in
+--- pax-utils-1.0/Makefile.in.man	2015-03-02 10:45:08.000000000 +0100
++++ pax-utils-1.0/Makefile.in	2015-03-04 13:25:12.503972631 +0100
+@@ -253,7 +253,7 @@ libpaxutils_la_LINK = $(LIBTOOL) $(AM_V_
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(AM_CFLAGS) $(CFLAGS) $(libpaxutils_la_LDFLAGS) $(LDFLAGS) -o \
+ 	$@
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ dumpelf_SOURCES = dumpelf.c
+ dumpelf_OBJECTS = dumpelf.$(OBJEXT)
+@@ -350,6 +350,9 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
++man1dir = $(mandir)/man1
++NROFF = nroff
++MANS = $(dist_man_MANS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -1480,8 +1483,8 @@ TMAKE = \
+ # Start off with base values which we append below
+ 
+ # @@@ GEN START @@@ #
+-dist_man_MANS =
+-EXTRA_DIST = autotools/m4/gnulib-cache.m4 ./.depend ./.gitignore \
++dist_man_MANS = man/dumpelf.1 man/pspax.1 man/scanelf.1 man/scanmacho.1
++EXTRA_DIST = autotools/m4/gnulib-cache.m4 ./.depend /.gitignore \
+ 	./BUGS ./COPYING ./Makefile ./Makefile.am ./README ./TODO \
+ 	./autogen.sh ./configure.ac ./dumpelf.c ./elf.h ./lddtree.py \
+ 	./lddtree.sh ./macho.h ./make-tarball.sh ./man/.cvsignore \
+@@ -1490,6 +1493,7 @@ EXTRA_DIST = autotools/m4/gnulib-cache.m
+ 	./man/fragment/version ./man/pax-utils.docbook \
+ 	./man/pspax.docbook ./man/scanelf.docbook \
+ 	./man/scanmacho.docbook ./paxelf.c ./paxelf.h ./paxinc.c \
++	./man/dumpelf.1 ./man/pspax.1 ./man/scanelf.1 ./man/scanmacho.1 \
+ 	./paxinc.h ./paxmacho.c ./paxmacho.h ./porting.h ./pspax.c \
+ 	./scanelf.c ./scanmacho.c ./symtree.sh ./tests/Makefile \
+ 	./tests/lddtree/Makefile ./tests/lddtree/dotest.cmp \
+@@ -1712,6 +1716,49 @@ clean-libtool:
+ 
+ distclean-libtool:
+ 	-rm -f libtool config.lt
++install-man1: $(dist_man_MANS)
++	@$(NORMAL_INSTALL)
++	@list1=''; \
++	list2='$(dist_man_MANS)'; \
++	test -n "$(man1dir)" \
++	  && test -n "`echo $$list1$$list2`" \
++	  || exit 0; \
++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
++	{ for i in $$list1; do echo "$$i"; done;  \
++	if test -n "$$list2"; then \
++	  for i in $$list2; do echo "$$i"; done \
++	    | sed -n '/\.1[a-z]*$$/p'; \
++	fi; \
++	} | while read p; do \
++	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; echo "$$p"; \
++	done | \
++	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
++	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++	sed 'N;N;s,\n, ,g' | { \
++	list=; while read file base inst; do \
++	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
++	  fi; \
++	done; \
++	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++	while read files; do \
++	  test -z "$$files" || { \
++	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
++	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
++	done; }
++
++uninstall-man1:
++	@$(NORMAL_UNINSTALL)
++	@list=''; test -n "$(man1dir)" || exit 0; \
++	files=`{ for i in $$list; do echo "$$i"; done; \
++	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++	  sed -n '/\.1[a-z]*$$/p'; \
++	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
++	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run 'make' without going through this Makefile.
+@@ -2008,10 +2055,10 @@ distcleancheck: distclean
+ 	       exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) config.h
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -2068,7 +2115,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am:
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -2084,7 +2131,7 @@ install-info: install-info-recursive
+ 
+ install-info-am:
+ 
+-install-man:
++install-man: install-man1
+ 
+ install-pdf: install-pdf-recursive
+ 
+@@ -2116,7 +2163,9 @@ ps: ps-recursive
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
++uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man
++
++uninstall-man: uninstall-man1
+ 
+ .MAKE: $(am__recursive_targets) all install-am install-strip
+ 
+@@ -2133,12 +2182,13 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	install-data install-data-am install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man install-pdf \
++	install-man1 \
+ 	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-binSCRIPTS
++	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man uninstall-man1
+ 
+ 
+ @USE_PYTHON_TRUE at lddtree: lddtree.py
diff --git a/pax-utils.spec b/pax-utils.spec
index 7e24f12..ae7a73f 100644
--- a/pax-utils.spec
+++ b/pax-utils.spec
@@ -1,11 +1,14 @@
 Summary: PaX aware and related utilities for ELF binaries
 Name: pax-utils
-Version: 0.9.2
+Version: 1.0
 Release: 1%{?dist}
 # http://packages.gentoo.org/package/app-misc/pax-utils
 URL: http://hardened.gentoo.org/pax-utils.xml
 Source0: http://distfiles.gentoo.org/distfiles/%{name}-%{version}.tar.xz
+# fix lddtree to search for ld.so in more locations (patch by Jakub Čajka)
 Patch0: %{name}-lddtree-ld.so-path.patch
+# re-enable building manpages
+Patch1: %{name}-man.patch
 License: GPLv2
 BuildRequires: libcap-devel
 # required for testsuite
@@ -19,6 +22,7 @@ used on any distro.
 %prep
 %setup -q
 %patch0 -p1 -b .ld.so-path
+%patch1 -p1 -b .man
 
 %build
 %configure --with-caps
@@ -45,6 +49,10 @@ make check
 %{_mandir}/man1/scanmacho.1*
 
 %changelog
+* Wed Mar 04 2015 Dominik Mierzejewski <rpm at greysector.net> - 1.0-1
+- update to 1.0
+- re-enable building manpages
+
 * Tue Dec 02 2014 Dominik Mierzejewski <rpm at greysector.net> - 0.9.2-1
 - update to 0.9.2
 - fix lddtree to search for ld.so in more locations (patch by Jakub Čajka)
