Accepting request 386394 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/386394
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=94

README-KEYRING

@@ -1,10 +1,13 @@
-How to update the systemtap keyring:
+How to update the systemtap keyring
+===================================
+1. update systemtap version in specfile to new version
+2. run 'osc service localrun download_files' to download the new tarball and signatrure files (the signature file may be .sig or .asc, it varies depending on who
+made the release)
+3. run 'gpg systemtap-${ver}.tar.gz.{sig,asc}' -- look for "gpg: Signature made {date} using RSA key ID {key}" in output
+4. run 'gpg --keyserver pgp.mit.edu --recv-key $key' to obtain the key from the public keyserver
+5. run 'gpg --export --armor --output systemtap.keyring $key'.   Select 'y' to
+   overwrite existing file (previous is backed up in .osc)
 
-update systemtap version in specfile to new version
+How to verify against the keyring
-run 'osc service localrun download_files' to download the new tarball and signatrure files
+=================================
-run 'gpg systemtap-${ver}.tar.gz.sig' -- look for "gpg: Signature made {date} using RSA key ID {key}" in output
+1. run 'gpg --keyring systemtap.keyring systemtap-${ver}.tar.gz.sig'
-run 'gpg --recv-key $key' to obtain the key from the public keyserver
-run 'gpg --export --armor --output systemtap.keyring $key'
-
-How to verify against the keyring:
-run 'gpg --keyring systemtap.keyring systemtap-${ver}.tar.gz.sig'

systemtap-2.9.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353
-size 3258026

systemtap-2.9.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJWGDGlAAoJECWLbvoPIJ0kaxUP+gP7VQKVSYXiU+PkRii7Vim6
-SNjZF4+25B6WjrDWMJzh7aqWJoqDkg7143JDnI+bONbLkpU/TJRl5ih8yURYAbQe
-2q8h3xmTe+6ptRquGp5nKN4ZIODiVkrW8o/2ElL5DdjCi8RrXazfecu/u3H6Xwwy
-2++MqzC88H/dPBvZymG/n3+BWUp1NIrK6TgfcVeod6G+oMP43W8aiVTU9ee8/A+1
-sMfyN0FbEz52SgGjOylNh7hxZFt7t3LleuYQuwwmuBV133ODBVas7v9iJ2Y5aaWP
-Yhm38SPHKsfg2+GLc2KQo322ZHbBnObLG6CRjC4BxudUE1m3LkahAgCRLSNY/tG4
-F4ZIvQzmzFp2/C54HRc/7VX+Pr6lDFbU0wu1ZOCrJKZ9RBCCHdeNNAH0xofDvlmB
-h0TRabtuuU++bAlLx1j0TSZtcqte455yhwHufHerfy0zGfsoXSlmE6O9cHcKl59P
-wFcA3kd3aakpQpPdcmmJ06JSsO5RKN0hMAUTScHXqKQ3A6EdcGU7Pum2BTQ2roXT
-WJKCPNn+FT6vcF4JJnCVQgS606CRVkNT2v08+ZnA8tsTO4Ry692viqDhwLR2f3/a
-bFSSygcjqxzwiGuQnKFjGhd4Ti17elf00HSMLYsqyNwzzUQj21nNolxTp/gHPndH
-E2snnd0q2HTlfMSUWC1q
-=wM/f
------END PGP SIGNATURE-----

systemtap-3.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1c9dc2f63a1d619f41c4af1b757743c5ffaeb802b4b1b79db41567599f72294
+size 4618239

systemtap-3.0.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJW+I0xAAoJECWLbvoPIJ0kQfMP/RfmklfBHh0Y8zTei9u7pxVP
+qUYj4TmpXdbzyhh/Puql3sq+rSypNr+2RGpnd1ExUUp4uQKDdIh0LH6BwzCpq2ED
+CNmhOxPDZCAKDMER8t/lfCepgipJ1OT5J69qjB7TTUorfZxJxTjps8YwyYw7KrpT
+dLKzgtRFLWguMWFcq3ymMgY4aCbEwsNxW6iW4ZBlOpmLc8JypaqzP2J8/4R/fBsS
+6No3+4Ef9dBR+7iAzN6MR0upOMr31z3yj2z1aOdSoSflYsPwigCMfQD25DHUYrto
+51j/w+i3GV/Ev5Q4a60gI/4kJwIJcno29YU9sRqO/kxMA+Vhpf/6w9ariN0hnDSH
+rR/lA5HsuHRwZ/G66t6x1PNVl0S4A+4KZZDtleWcMUkNgR8/ZPVfcBoVnKmA+dRD
+QRp2bMPSGJmNqdkNWEk+O4I0g6CNIujk1jjNus4wSNml/yfIBhU43JB40E3IWZH/
+LwhUlfga9r5zltxPTRbd5Xxpnt3QsK2fBR3xroCj1u8nIlLjDE6we7umnHJmks/M
+7WMl15FVsZow8E7jGNm6nyGXxGSH0iQDyWWIwNmbIkz7mgzfUrhSQjaq/tA4PHL9
+MhxosAWR6j1a6mZYkbZNyxmF6u4AgW/2+vTG5C2WcGnLcZsPO2le6iaSZGmGSQZY
+SYyQBV+/dmYh5f71bvbE
+=ScTw
+-----END PGP SIGNATURE-----

systemtap-build-source-dir.patch

@@ -26,7 +26,7 @@ necessary headers.
 
 --- a/session.cxx
 +++ b/session.cxx
-@@ -100,6 +100,7 @@ systemtap_session::systemtap_session ():
+@@ -105,6 +105,7 @@ systemtap_session::systemtap_session ():
    kernel_release = string (buf.release);
    release = kernel_release;
    kernel_build_tree = "/lib/modules/" + kernel_release + "/build";
@@ -34,15 +34,15 @@ necessary headers.
    architecture = machine = normalize_machine(buf.machine);
  
    for (unsigned i=0; i<5; i++) perpass_verbose[i]=0;
-@@ -277,6 +278,7 @@ systemtap_session::systemtap_session (co
+@@ -291,6 +292,7 @@ systemtap_session::systemtap_session (co
  {
    release = kernel_release = kern;
    kernel_build_tree = "/lib/modules/" + kernel_release + "/build";
 +  kernel_source_tree = "/lib/modules/" + kernel_release + "/source";
+   kernel_extra_cflags = other.kernel_extra_cflags;
    architecture = machine = normalize_machine(arch);
    setup_kernel_release(kern.c_str());
-   native_build = false; // assumed; XXX: could be computed as in check_options()
+@@ -2027,21 +2029,39 @@ systemtap_session::setup_kernel_release
-@@ -1734,21 +1736,39 @@ systemtap_session::setup_kernel_release
        // normal search in tapsets.cxx.  Without CONFIG_DEBUG_INFO, we'd
        // need heuristics such as this one:
  

systemtap-docdir-fix.diff

@@ -37,17 +37,17 @@ SuSE %{_docdir} is /usr/share/doc/packages. Change install locations to match.
 --- a/doc/SystemTap_Tapset_Reference/Makefile.am
 +++ b/doc/SystemTap_Tapset_Reference/Makefile.am
 @@ -1,9 +1,9 @@
- # Makefile.am --- automake input file for systemtap tapset reference manual
  ## process this file with automake to produce Makefile.in
  
+
 -DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
 +DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap
  MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3
 -HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
 +HTML_INSTALL_DIR = $(DOC_INSTALL_DIR)/tapsets
  
- 
+ if XMLTO_STRINGPARAM
- ###
+ XMLTOHTMLPARAMS=--stringparam use.id.as.filename=1 -m $(abs_srcdir)/generate-toc.xml
 --- a/doc/beginners/Makefile.am
 +++ b/doc/beginners/Makefile.am
 @@ -2,7 +2,7 @@

systemtap-docs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  1 17:29:31 UTC 2016 - tonyj@suse.com
+
+- Update to version 3.0. See systemtap.spec for changelog
+  Drop patch: systemtap-xmlto-fop.diff
+
 -------------------------------------------------------------------
 Tue Nov 10 00:40:17 UTC 2015 - tonyj@suse.com
 

systemtap-docs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap-docs
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           systemtap-docs
-Version:        2.9
+Version:        3.0
 Release:        0
 Summary:        Documents and examples for systemtap
 License:        GPL-2.0+
@@ -29,7 +29,6 @@ Source2:        systemtap.keyring
 Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
 Patch1:         systemtap-docdir-fix.diff
-Patch2:         systemtap-xmlto-fop.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 # for documents
@@ -59,7 +58,6 @@ This package contains the documents and examples for systemtap.
 %prep
 %setup -q -n systemtap-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 # fix interpreter
@@ -80,10 +78,12 @@ rm -rf %{buildroot}%{_datadir}/systemtap
 rm -rf %{buildroot}%{_includedir}
 # these man pages are in each sub package
 rm -rf %{buildroot}%{_mandir}/man[178]
+rm -rf %{buildroot}%{_mandir}/cs/man[178]
 
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/systemtap
 %{_mandir}/man3/*
+%{_mandir}/cs/man3/*
 
 %changelog

systemtap-xmlto-fop.diff

@@ -1,17 +0,0 @@
----
- doc/SystemTap_Tapset_Reference/Makefile.am |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/doc/SystemTap_Tapset_Reference/Makefile.am
-+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
-@@ -56,7 +56,9 @@ stamp-htmldocs: tapsets.xml
- 
- # bump up the allocated space so "xmlto pdf" works
- tapsets.pdf: tapsets.xml
--	env pool_size=6000000 hash_extra=6000000 xmlto $(XMLTOPDF_FOP) $(XMLTOPDFPARAMS) pdf tapsets.xml
-+#	env pool_size=6000000 hash_extra=6000000 xmlto $(XMLTOPDF_FOP) $(XMLTOPDFPARAMS) pdf tapsets.xml
-+	xmlto fo tapsets.xml
-+	fop tapsets.fo tapsets.pdf
- 
- stamp-mandocs: tapsets.xml
- 	xmlto $(XMLTOMANPARAMS) man -o man3 tapsets.xml

systemtap.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr  1 19:28:53 CEST 2016 - tonyj@suse.de
+
+- Update to version 3.0 
+  Update keyring with new key
+  Update info in README-KEYRING
+  Changelog:
+  https://sourceware.org/ml/systemtap/2016-q1/msg00179.html
+
 -------------------------------------------------------------------
 Tue Nov 10 00:32:54 UTC 2015 - tonyj@suse.com
 

systemtap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define _rundir %{_localstatedir}/run
 %endif
 Name:           systemtap
-Version:        2.9
+Version:        3.0
 Release:        0
 Summary:        Instrumentation System
 License:        GPL-2.0+
@@ -104,7 +104,7 @@ rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request
 # README, AUTHORS, NEWS, man3 and all examples packaged by systemtap-docs
 # COPYING needs to stay in main for GPL
 rm -rf %{buildroot}%{_docdir}/systemtap/
-rm -rf %{buildroot}%{_mandir}/man3
+rm -rf %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/cs/man3
 mkdir -p %{buildroot}%{_docdir}/systemtap/
 cp COPYING %{buildroot}%{_docdir}/systemtap/
 mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap
@@ -124,6 +124,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
 %defattr(-,root,root)
 %{_bindir}/stap
 %{_mandir}/man[17]/*
+%{_mandir}/cs/man[17]/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/runtime
 %{_datadir}/%{name}/tapset
@@ -143,7 +144,9 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
 %{_libexecdir}/%{name}/stap-authorize-cert
 %{_mandir}/man8/staprun.8*
 %{_mandir}/man8/systemtap.8*
+%{_mandir}/cs/man8/systemtap.8*
 %{_mandir}/man8/stapsh.8*
+%{_mandir}/cs/man8/stapsh.8*
 
 %files server
 %defattr(-,root,root)
@@ -156,6 +159,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
 %{_libexecdir}/%{name}/stap-start-server
 %{_libexecdir}/%{name}/stap-stop-server
 %{_mandir}/man8/stap-server.8*
+%{_mandir}/cs/man8/stap-server.8*
 %ghost %{_localstatedir}/log/stap-server.log
 %ghost %dir %{_rundir}/stap-server