From 217be436d252491af18417f75644c844a129fb5a899cdae189a25d79eabd5e41 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Mon, 4 Apr 2016 23:30:37 +0000 Subject: [PATCH] Accepting request 384300 from home:jones_tony:branches:devel:tools OBS-URL: https://build.opensuse.org/request/show/384300 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=83 --- README-KEYRING | 21 ++++++++++++--------- systemtap-2.9.tar.gz | 3 --- systemtap-2.9.tar.gz.asc | 17 ----------------- systemtap-3.0.tar.gz | 3 +++ systemtap-3.0.tar.gz.asc | 17 +++++++++++++++++ systemtap-build-source-dir.patch | 8 ++++---- systemtap-docdir-fix.diff | 6 +++--- systemtap-docs.changes | 6 ++++++ systemtap-docs.spec | 9 +++++---- systemtap-xmlto-fop.diff | 17 ----------------- systemtap.changes | 9 +++++++++ systemtap.spec | 10 +++++++--- 12 files changed, 66 insertions(+), 60 deletions(-) delete mode 100644 systemtap-2.9.tar.gz delete mode 100644 systemtap-2.9.tar.gz.asc create mode 100644 systemtap-3.0.tar.gz create mode 100644 systemtap-3.0.tar.gz.asc delete mode 100644 systemtap-xmlto-fop.diff diff --git a/README-KEYRING b/README-KEYRING index 97982fb..d4d8a70 100644 --- a/README-KEYRING +++ b/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 -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 -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' +How to verify against the keyring +================================= +1. run 'gpg --keyring systemtap.keyring systemtap-${ver}.tar.gz.sig' diff --git a/systemtap-2.9.tar.gz b/systemtap-2.9.tar.gz deleted file mode 100644 index f7f95bc..0000000 --- a/systemtap-2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 -size 3258026 diff --git a/systemtap-2.9.tar.gz.asc b/systemtap-2.9.tar.gz.asc deleted file mode 100644 index 77dd8ed..0000000 --- a/systemtap-2.9.tar.gz.asc +++ /dev/null @@ -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----- diff --git a/systemtap-3.0.tar.gz b/systemtap-3.0.tar.gz new file mode 100644 index 0000000..f89850c --- /dev/null +++ b/systemtap-3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1c9dc2f63a1d619f41c4af1b757743c5ffaeb802b4b1b79db41567599f72294 +size 4618239 diff --git a/systemtap-3.0.tar.gz.asc b/systemtap-3.0.tar.gz.asc new file mode 100644 index 0000000..604c943 --- /dev/null +++ b/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----- diff --git a/systemtap-build-source-dir.patch b/systemtap-build-source-dir.patch index 66f54ff..16fe03d 100644 --- a/systemtap-build-source-dir.patch +++ b/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() -@@ -1734,21 +1736,39 @@ systemtap_session::setup_kernel_release +@@ -2027,21 +2029,39 @@ systemtap_session::setup_kernel_release // normal search in tapsets.cxx. Without CONFIG_DEBUG_INFO, we'd // need heuristics such as this one: diff --git a/systemtap-docdir-fix.diff b/systemtap-docdir-fix.diff index fcbd329..e75d60e 100644 --- a/systemtap-docdir-fix.diff +++ b/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 @@ diff --git a/systemtap-docs.changes b/systemtap-docs.changes index f8243e9..0baa137 100644 --- a/systemtap-docs.changes +++ b/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 diff --git a/systemtap-docs.spec b/systemtap-docs.spec index 9ded780..cbf0f30 100644 --- a/systemtap-docs.spec +++ b/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 @@ -37,6 +36,7 @@ BuildRequires: fop BuildRequires: gcc-c++ BuildRequires: latex2html BuildRequires: libebl-devel +BuildRequires: libfreetype6 BuildRequires: pkg-config BuildRequires: texlive-amsfonts BuildRequires: texlive-babel-english @@ -59,7 +59,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 +79,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 diff --git a/systemtap-xmlto-fop.diff b/systemtap-xmlto-fop.diff deleted file mode 100644 index b7ecb5f..0000000 --- a/systemtap-xmlto-fop.diff +++ /dev/null @@ -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 diff --git a/systemtap.changes b/systemtap.changes index abdee2a..778dc55 100644 --- a/systemtap.changes +++ b/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 diff --git a/systemtap.spec b/systemtap.spec index b96f604..74edbbc 100644 --- a/systemtap.spec +++ b/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