From 2a9b5aacd28ec19350282bd23c9e894da9ab5dba Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Fri, 10 Mar 2017 11:31:20 -0500 Subject: [PATCH 01/12] Rebuild for dyninst 9.3 --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 244fe64..e5a2afe 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -72,7 +72,7 @@ Name: systemtap Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} # for version, see also configure.ac @@ -1139,6 +1139,9 @@ done # PRERELEASE %changelog +* Fri Mar 10 2017 Stan Cox - 3.1-2 +- Rebuild for dyninst 9.3 + * Fri Feb 17 2017 Frank Ch. Eigler - 3.1-1 - Upstream release. From 3b4a925406a7ebfd903f550570f6ef404357141b Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 21 Mar 2017 18:21:44 -0400 Subject: [PATCH 02/12] Automated weekly systemtap rawhide release: 0.20170321git272146660f54 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b014d72..cecb597 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /systemtap-3.1.tar.gz +/systemtap-3.2-0.20170321git272146660f54.tar.gz diff --git a/sources b/sources index 9a80683..3a7310e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.1.tar.gz) = 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d +SHA512 (systemtap-3.2-0.20170321git272146660f54.tar.gz) = f1ecb7b1180120cf8239af4886f1ef61ae1f9d4d9a7c5cc3d27a38ebbe2fb8cef8db482b2fd39cbdc9d836a7853b2d336448970c19e6b4a0bbb8f170f0f91a01 diff --git a/systemtap.spec b/systemtap.spec index e5a2afe..43128e4 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,4 +1,4 @@ -%{!?with_sqlite: %global with_sqlite 1} +%{!?with_sqlite: %global with_sqlite 0%{?fedora} >= 17 || 0%{?rhel} >= 7} %{!?with_docs: %global with_docs 1} %{!?with_htmldocs: %global with_htmldocs 0} %{!?with_monitor: %global with_monitor 1} @@ -71,8 +71,8 @@ %endif Name: systemtap -Version: 3.1 -Release: 2%{?dist} +Version: 3.2 +Release: 0.20170321git272146660f54%{?dist} # for version, see also configure.ac @@ -107,7 +107,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz +Source: %{name}-%{version}-0.20170321git272146660f54.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -1139,6 +1139,10 @@ done # PRERELEASE %changelog +* Tue Mar 21 2017 Frank Ch. Eigler - 3.2-0.20170321git272146660f54 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Mar 10 2017 Stan Cox - 3.1-2 - Rebuild for dyninst 9.3 From 41b3c6304ba2a32621f4bda0556c1eacd227d1b8 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 6 Apr 2017 16:29:32 -0400 Subject: [PATCH 03/12] Automated weekly systemtap rawhide release: 0.20170406git83d186dc7f5c --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cecb597..4374fef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /systemtap-3.1.tar.gz /systemtap-3.2-0.20170321git272146660f54.tar.gz +/systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz diff --git a/sources b/sources index 3a7310e..46bf458 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2-0.20170321git272146660f54.tar.gz) = f1ecb7b1180120cf8239af4886f1ef61ae1f9d4d9a7c5cc3d27a38ebbe2fb8cef8db482b2fd39cbdc9d836a7853b2d336448970c19e6b4a0bbb8f170f0f91a01 +SHA512 (systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz) = 4e5e7e43a340e2a323f5c8a069166be7b5677638c2a9377b1a840ca87479c875f6ad596bdb7fa55fc8533471061c87d5c85b33cc9f16300d0c6bb399972fdeb5 diff --git a/systemtap.spec b/systemtap.spec index 43128e4..97843ea 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -72,7 +72,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170321git272146660f54%{?dist} +Release: 0.20170406git83d186dc7f5c%{?dist} # for version, see also configure.ac @@ -107,7 +107,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20170321git272146660f54.tar.gz +Source: %{name}-%{version}-0.20170406git83d186dc7f5c.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -1139,6 +1139,10 @@ done # PRERELEASE %changelog +* Thu Apr 06 2017 Frank Ch. Eigler - 3.2-0.20170406git83d186dc7f5c +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Mar 21 2017 Frank Ch. Eigler - 3.2-0.20170321git272146660f54 - Automated weekly rawhide release - Applied spec changes from upstream git From 8b5177d8e20a48c10a8741b1c040077242b34665 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 10 Apr 2017 14:01:28 -0400 Subject: [PATCH 04/12] Automated weekly systemtap rawhide release: 0.20170410gitcbf2583808d6 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4374fef..63f5f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /systemtap-3.1.tar.gz /systemtap-3.2-0.20170321git272146660f54.tar.gz /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz +/systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz diff --git a/sources b/sources index 46bf458..5de0e8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz) = 4e5e7e43a340e2a323f5c8a069166be7b5677638c2a9377b1a840ca87479c875f6ad596bdb7fa55fc8533471061c87d5c85b33cc9f16300d0c6bb399972fdeb5 +SHA512 (systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz) = 9b4f9d700d12a7ffef7f567127806db10a8dff1dbc7a23bcb844f28ad54e5fe2e7fd5de1dd69956d42b1767e5107962620ec53039db5d453df9b437cbdbe0b63 diff --git a/systemtap.spec b/systemtap.spec index 97843ea..0e3864c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -72,7 +72,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170406git83d186dc7f5c%{?dist} +Release: 0.20170410gitcbf2583808d6%{?dist} # for version, see also configure.ac @@ -107,7 +107,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20170406git83d186dc7f5c.tar.gz +Source: %{name}-%{version}-0.20170410gitcbf2583808d6.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -1139,6 +1139,10 @@ done # PRERELEASE %changelog +* Mon Apr 10 2017 Frank Ch. Eigler - 3.2-0.20170410gitcbf2583808d6 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Thu Apr 06 2017 Frank Ch. Eigler - 3.2-0.20170406git83d186dc7f5c - Automated weekly rawhide release - Applied spec changes from upstream git From 74698f24eb875ad22d164164ececb5541620686a Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 12 May 2017 20:44:46 -0400 Subject: [PATCH 05/12] Automated weekly systemtap rawhide release: 0.20170512gitc67d8f274b21 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 22 +++++++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63f5f0a..bef8415 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /systemtap-3.2-0.20170321git272146660f54.tar.gz /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz /systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz +/systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz diff --git a/sources b/sources index 5de0e8b..5584dff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz) = 9b4f9d700d12a7ffef7f567127806db10a8dff1dbc7a23bcb844f28ad54e5fe2e7fd5de1dd69956d42b1767e5107962620ec53039db5d453df9b437cbdbe0b63 +SHA512 (systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz) = 1fb2b892692958a63fd2ad0bf2a780ff1a9262686c0c4245f753b485acb63e19bf2fcfcd8aaba63c1dd0365d59dd62e718f0d31081f339f6c79a294847543756 diff --git a/systemtap.spec b/systemtap.spec index 0e3864c..d715b4e 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -35,6 +35,7 @@ %{!?with_python3: %global with_python3 0%{?fedora} >= 23} %{!?with_python2_probes: %global with_python2_probes 1} %{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23} +%{!?with_httpd: %global with_httpd 0} %ifarch ppc64le aarch64 %global with_virthost 0 @@ -72,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170410gitcbf2583808d6%{?dist} +Release: 0.20170512gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -107,7 +108,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20170410gitcbf2583808d6.tar.gz +Source: %{name}-%{version}-0.20170512gitc67d8f274b21.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -186,6 +187,11 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif +%if %{with_httpd} +BuildRequires: libmicrohttpd-devel +BuildRequires: libuuid-devel +%endif + # Install requirements Requires: systemtap-client = %{version}-%{release} Requires: systemtap-devel = %{version}-%{release} @@ -569,10 +575,16 @@ cd .. %global dracut_config %{nil} %endif +%if %{with_httpd} +%global httpd_config --enable-httpd +%else +%global httpd_config --disable-httpd +%endif + # We don't ship compileworthy python code, just oddball samples %global py_auto_byte_compile 0 -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -1139,6 +1151,10 @@ done # PRERELEASE %changelog +* Fri May 12 2017 Frank Ch. Eigler - 3.2-0.20170512gitc67d8f274b21 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Apr 10 2017 Frank Ch. Eigler - 3.2-0.20170410gitcbf2583808d6 - Automated weekly rawhide release - Applied spec changes from upstream git From ee7e145ad0eaf7329bed241d87396a8c4fcee74c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 19:52:58 +0000 Subject: [PATCH 06/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index d715b4e..2651bcc 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -73,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170512gitc67d8f274b21%{?dist} +Release: 0.20170513gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -1151,6 +1151,9 @@ done # PRERELEASE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.2-0.20170513gitc67d8f274b21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri May 12 2017 Frank Ch. Eigler - 3.2-0.20170512gitc67d8f274b21 - Automated weekly rawhide release - Applied spec changes from upstream git From cd2b39cbde3b89c841974c56ce9786d27fbb0df8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:07:15 +0000 Subject: [PATCH 07/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 2651bcc..6ecdb26 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -73,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170513gitc67d8f274b21%{?dist} +Release: 0.20170514gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -1151,6 +1151,9 @@ done # PRERELEASE %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.2-0.20170514gitc67d8f274b21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.2-0.20170513gitc67d8f274b21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0025ab533d1a6117cd214f274df939f7ffe9f392 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 10 Aug 2017 20:34:32 +0200 Subject: [PATCH 08/12] Rebuilt for RPM soname bump Signed-off-by: Igor Gnatenko --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 6ecdb26..ed100ad 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -73,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170514gitc67d8f274b21%{?dist} +Release: 0.20170515gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -1151,6 +1151,9 @@ done # PRERELEASE %changelog +* Thu Aug 10 2017 Igor Gnatenko - 3.2-0.20170515gitc67d8f274b21 +- Rebuilt for RPM soname bump + * Thu Aug 03 2017 Fedora Release Engineering - 3.2-0.20170514gitc67d8f274b21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 8d24c048f8721dd778aff718d77f0d4b3827dfc2 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 10 Aug 2017 22:18:54 +0300 Subject: [PATCH 09/12] Update systemtap to use modern (rpm >= 4.6) API --- systemtap-3.2-modern-rpm-api.patch | 33 ++++++++++++++++++++++++++++++ systemtap.spec | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 systemtap-3.2-modern-rpm-api.patch diff --git a/systemtap-3.2-modern-rpm-api.patch b/systemtap-3.2-modern-rpm-api.patch new file mode 100644 index 0000000..46eb6cc --- /dev/null +++ b/systemtap-3.2-modern-rpm-api.patch @@ -0,0 +1,33 @@ +diff -up systemtap-3.2/rpm_finder.cxx.newrpm systemtap-3.2/rpm_finder.cxx +--- systemtap-3.2/rpm_finder.cxx.newrpm 2017-08-10 22:13:10.283393224 +0300 ++++ systemtap-3.2/rpm_finder.cxx 2017-08-10 22:13:28.320385642 +0300 +@@ -22,7 +22,6 @@ using namespace std; + + extern "C" { + +-#define _RPM_4_4_COMPAT + #include + #include + #include +@@ -100,8 +99,7 @@ missing_rpm_enlist (systemtap_session& s + break; + /* Verify the kernel file is not already installed. */ + +- rpminfo = headerSprintf(h, header, +- rpmTagTable, rpmHeaderFormats, &err); ++ rpminfo = headerFormat(h, header, &err); + + if (!rpminfo) + { +@@ -154,9 +152,8 @@ missing_rpm_enlist (systemtap_session& s + /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ + if(strcmp(rpm_type,"-debuginfo")==0){ + xfree(rpminfo); +- rpminfo = headerSprintf(h, +- "%{name}-%{version}-%{release}.%{arch}", +- rpmTagTable, rpmHeaderFormats, &err); ++ rpminfo = headerFormat(h, ++ "%{name}-%{version}-%{release}.%{arch}", &err); + } + if (!rpminfo) + { diff --git a/systemtap.spec b/systemtap.spec index ed100ad..01ad915 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -153,6 +153,7 @@ BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) tex(graphicx.sty) %endif +Patch2: systemtap-3.2-modern-rpm-api.patch # For the html.sty mentioned in the .tex files, even though latex2html is # not run during the build, only during manual scripts/update-docs runs: BuildRequires: latex2html @@ -477,6 +478,7 @@ sleep 1 find . \( -name configure -o -name config.h.in \) -print | xargs touch cd .. %endif +%patch2 -p1 %build From cf55dd95b857a1e9de1d2e881f06633b626549e5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 11 Aug 2017 09:50:54 +0200 Subject: [PATCH 10/12] =?UTF-8?q?Rebuilt=20after=20RPM=20update=20(?= =?UTF-8?q?=E2=84=96=203)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 01ad915..453ae30 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -73,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170515gitc67d8f274b21%{?dist} +Release: 0.20170516gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -1153,6 +1153,9 @@ done # PRERELEASE %changelog +* Fri Aug 11 2017 Igor Gnatenko - 3.2-0.20170516gitc67d8f274b21 +- Rebuilt after RPM update (№ 3) + * Thu Aug 10 2017 Igor Gnatenko - 3.2-0.20170515gitc67d8f274b21 - Rebuilt for RPM soname bump From 3de19523e97a4091f0f8f153b58bffbf68610c85 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 18 Oct 2017 14:14:42 -0400 Subject: [PATCH 11/12] upstream release 3.2 --- .gitignore | 1 + sources | 2 +- systemtap-3.2-modern-rpm-api.patch | 33 --------------------- systemtap.spec | 47 ++++++++---------------------- 4 files changed, 14 insertions(+), 69 deletions(-) delete mode 100644 systemtap-3.2-modern-rpm-api.patch diff --git a/.gitignore b/.gitignore index bef8415..a3e101d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz /systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz /systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz +/systemtap-3.2.tar.gz diff --git a/sources b/sources index 5584dff..eabc5df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz) = 1fb2b892692958a63fd2ad0bf2a780ff1a9262686c0c4245f753b485acb63e19bf2fcfcd8aaba63c1dd0365d59dd62e718f0d31081f339f6c79a294847543756 +SHA512 (systemtap-3.2.tar.gz) = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 diff --git a/systemtap-3.2-modern-rpm-api.patch b/systemtap-3.2-modern-rpm-api.patch deleted file mode 100644 index 46eb6cc..0000000 --- a/systemtap-3.2-modern-rpm-api.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up systemtap-3.2/rpm_finder.cxx.newrpm systemtap-3.2/rpm_finder.cxx ---- systemtap-3.2/rpm_finder.cxx.newrpm 2017-08-10 22:13:10.283393224 +0300 -+++ systemtap-3.2/rpm_finder.cxx 2017-08-10 22:13:28.320385642 +0300 -@@ -22,7 +22,6 @@ using namespace std; - - extern "C" { - --#define _RPM_4_4_COMPAT - #include - #include - #include -@@ -100,8 +99,7 @@ missing_rpm_enlist (systemtap_session& s - break; - /* Verify the kernel file is not already installed. */ - -- rpminfo = headerSprintf(h, header, -- rpmTagTable, rpmHeaderFormats, &err); -+ rpminfo = headerFormat(h, header, &err); - - if (!rpminfo) - { -@@ -154,9 +152,8 @@ missing_rpm_enlist (systemtap_session& s - /* The allocated memory gets utilized below for MISSING_RPM_HASH. */ - if(strcmp(rpm_type,"-debuginfo")==0){ - xfree(rpminfo); -- rpminfo = headerSprintf(h, -- "%{name}-%{version}-%{release}.%{arch}", -- rpmTagTable, rpmHeaderFormats, &err); -+ rpminfo = headerFormat(h, -+ "%{name}-%{version}-%{release}.%{arch}", &err); - } - if (!rpminfo) - { diff --git a/systemtap.spec b/systemtap.spec index 453ae30..3f3d039 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -18,6 +18,7 @@ %else %{!?with_dyninst: %global with_dyninst 0} %endif +%{!?with_bpf: %global with_bpf 0%{?fedora} >= 22 || 0%{?rhel} >= 8} %{!?with_systemd: %global with_systemd 0%{?fedora} >= 19 || 0%{?rhel} >= 7} %{!?with_emacsvim: %global with_emacsvim 0%{?fedora} >= 19 || 0%{?rhel} >= 7} %{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7} @@ -73,7 +74,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170516gitc67d8f274b21%{?dist} +Release: 1%{?dist} # for version, see also configure.ac @@ -108,7 +109,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20170512gitc67d8f274b21.tar.gz +Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -121,7 +122,7 @@ BuildRequires: dyninst-devel >= 8.0 BuildRequires: pkgconfig(libselinux) %endif %if %{with_sqlite} -BuildRequires: sqlite-devel +BuildRequires: sqlite-devel > 3.7 %endif %if %{with_monitor} BuildRequires: pkgconfig(json-c) @@ -153,7 +154,6 @@ BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) tex(graphicx.sty) %endif -Patch2: systemtap-3.2-modern-rpm-api.patch # For the html.sty mentioned in the .tex files, even though latex2html is # not run during the build, only during manual scripts/update-docs runs: BuildRequires: latex2html @@ -478,7 +478,6 @@ sleep 1 find . \( -name configure -o -name config.h.in \) -print | xargs touch cd .. %endif -%patch2 -p1 %build @@ -1021,6 +1020,9 @@ done %if %{with_dyninst} %{_bindir}/stapdyn %endif +%if %{with_bpf} +%{_bindir}/stapbpf +%endif %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/stapio %{_libexecdir}/systemtap/stap-authorize-cert @@ -1037,6 +1039,9 @@ done %if %{with_dyninst} %{_mandir}/man8/stapdyn.8* %endif +%if %{with_bpf} +%{_mandir}/man8/stapbpf.8* +%endif %doc README README.security AUTHORS NEWS %{!?_licensedir:%global license %%doc} %license COPYING @@ -1153,36 +1158,8 @@ done # PRERELEASE %changelog -* Fri Aug 11 2017 Igor Gnatenko - 3.2-0.20170516gitc67d8f274b21 -- Rebuilt after RPM update (№ 3) - -* Thu Aug 10 2017 Igor Gnatenko - 3.2-0.20170515gitc67d8f274b21 -- Rebuilt for RPM soname bump - -* Thu Aug 03 2017 Fedora Release Engineering - 3.2-0.20170514gitc67d8f274b21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.2-0.20170513gitc67d8f274b21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri May 12 2017 Frank Ch. Eigler - 3.2-0.20170512gitc67d8f274b21 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Mon Apr 10 2017 Frank Ch. Eigler - 3.2-0.20170410gitcbf2583808d6 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Thu Apr 06 2017 Frank Ch. Eigler - 3.2-0.20170406git83d186dc7f5c -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Tue Mar 21 2017 Frank Ch. Eigler - 3.2-0.20170321git272146660f54 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Mar 10 2017 Stan Cox - 3.1-2 -- Rebuild for dyninst 9.3 +* Wed Oct 18 2017 Frank Ch. Eigler - 3.2-1 +- Upstream release. * Fri Feb 17 2017 Frank Ch. Eigler - 3.1-1 - Upstream release. From fae7c9498b31ca1ca23d562d384c91768703a258 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 20 Oct 2017 10:07:40 -0400 Subject: [PATCH 12/12] rhbz1504009 - python2 ftbfs --- rhbz1504009.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++ systemtap.spec | 8 +++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 rhbz1504009.patch diff --git a/rhbz1504009.patch b/rhbz1504009.patch new file mode 100644 index 0000000..7643891 --- /dev/null +++ b/rhbz1504009.patch @@ -0,0 +1,49 @@ +commit 9f81f10b0caf6dfc49c4b7ceb7902f45d37b532a (HEAD -> master, origin/master, origin/HEAD) +Author: Frank Ch. Eigler +Date: Fri Oct 20 10:01:58 2017 -0400 + + rhbz1504009: let dtrace -G -o /dev/null run, as in autoconf + + commit c245153ca193c471a8c broke the ability of dtrace to be tested in + autoconf "-G -o /dev/null" usage, because its output file name was too + simple a function of the input name, and normal users can't write to + /dev/null.dtrace-temp.c . Now we back down to mkstemp, like before, + upon a failure of the simple concatenated name. + +diff --git a/dtrace.in b/dtrace.in +index 2e2e002a5c56..25efc253b708 100644 +--- a/dtrace.in ++++ b/dtrace.in +@@ -410,8 +410,12 @@ from tempfile import mkstemp + else: + print("header: " + fname) + +- fname = filename + ".dtrace-temp.c" +- fdesc = open(fname, mode='w') ++ try: # for reproducible-builds purposes, prefer a fixed path name pattern ++ fname = filename + ".dtrace-temp.c" ++ fdesc = open(fname, mode='w') ++ except: # but that doesn't work for -o /dev/null - see rhbz1504009 ++ (ignore,fname) = mkstemp(suffix=".c") ++ fdesc = open(fname, mode='w') + providers.semaphore_write(fdesc) + fdesc.close() + cc1 = os.environ.get("CC", "gcc") +diff --git a/testsuite/systemtap.base/dtrace.exp b/testsuite/systemtap.base/dtrace.exp +index fa6b3ec3f6d3..7c60f09d70b8 100644 +--- a/testsuite/systemtap.base/dtrace.exp ++++ b/testsuite/systemtap.base/dtrace.exp +@@ -83,6 +83,13 @@ if {[file exists /tmp/XXX.o]} then { + } + exec rm -f /tmp/XXX.o + ++verbose -log "$dtrace -G -s $dpath -o /dev/null" ++if [as_non_root "$python $dtrace -G -s $dpath -o /dev/null"] { ++ fail "$test -G -o /dev/null" ++} else { ++ pass "$test -G -o /dev/null" ++} ++ + verbose -log "$dtrace -G -s $dpath -o /tmp/XXX" + catch {exec $python $dtrace -G -s $dpath -o /tmp/XXX} res + if {[file exists /tmp/XXX]} then { diff --git a/systemtap.spec b/systemtap.spec index 3f3d039..fd53194 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -74,9 +74,10 @@ Name: systemtap Version: 3.2 -Release: 1%{?dist} +Release: 2%{?dist} # for version, see also configure.ac +Patch10: rhbz1504009.patch # Packaging abstract: # @@ -479,6 +480,8 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch cd .. %endif +%patch10 -p1 + %build %if %{with_bundled_elfutils} @@ -1158,6 +1161,9 @@ done # PRERELEASE %changelog +* Fri Oct 20 2017 Frank Ch. Eigler - 3.2-2 +- rhbz1504009 (dtrace -G -o /dev/null) + * Wed Oct 18 2017 Frank Ch. Eigler - 3.2-1 - Upstream release.