From 64e8afca44d261faebb82f20620d8561b64f59c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 10 Dec 2017 20:50:43 +0100 Subject: [PATCH 01/39] Rebuilt for libjson-c.so.3 --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index fd53194..f12e70c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -74,7 +74,7 @@ Name: systemtap Version: 3.2 -Release: 2%{?dist} +Release: 3%{?dist} # for version, see also configure.ac Patch10: rhbz1504009.patch @@ -1161,6 +1161,9 @@ done # PRERELEASE %changelog +* Sun Dec 10 2017 Björn Esser - 3.2-3 +- Rebuilt for libjson-c.so.3 + * Fri Oct 20 2017 Frank Ch. Eigler - 3.2-2 - rhbz1504009 (dtrace -G -o /dev/null) From ac3f11bfc657843f2fceafda1afc1d99b9d38f15 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 7 Feb 2018 17:44:25 +0100 Subject: [PATCH 02/39] Fix very old Requires Signed-off-by: Igor Gnatenko --- systemtap.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index f12e70c..230f918 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -74,7 +74,7 @@ Name: systemtap Version: 3.2 -Release: 3%{?dist} +Release: 4%{?dist} # for version, see also configure.ac Patch10: rhbz1504009.patch @@ -212,10 +212,7 @@ Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires: systemtap-devel = %{version}-%{release} -# On RHEL[45], /bin/mktemp comes from the 'mktemp' package. On newer -# distributions, /bin/mktemp comes from the 'coreutils' package. To -# avoid a specific RHEL[45] Requires, we'll do a file-based require. -Requires: nss /bin/mktemp +Requires: nss coreutils Requires: zip unzip Requires(pre): shadow-utils Requires(post): chkconfig @@ -1161,6 +1158,9 @@ done # PRERELEASE %changelog +* Wed Feb 07 2018 Igor Gnatenko - 3.2-4 +- Fix very old Requires + * Sun Dec 10 2017 Björn Esser - 3.2-3 - Rebuilt for libjson-c.so.3 From 9be34952bfc43f541cfc3fedc8cf97a0b64fc01a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:06:23 +0100 Subject: [PATCH 03/39] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- systemtap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 230f918..cf5a5f2 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -74,7 +74,7 @@ Name: systemtap Version: 3.2 -Release: 4%{?dist} +Release: 5%{?dist} # for version, see also configure.ac Patch10: rhbz1504009.patch @@ -1158,6 +1158,9 @@ done # PRERELEASE %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3.2-5 +- Escape macros in %%changelog + * Wed Feb 07 2018 Igor Gnatenko - 3.2-4 - Fix very old Requires @@ -1189,7 +1192,7 @@ done - Upstream release. * Mon Jul 07 2014 Josh Stone -- Flip with_dyninst to an %ifarch whitelist. +- Flip with_dyninst to an %%ifarch whitelist. * Wed Apr 30 2014 Jonathan Lebon - 2.5-1 - Upstream release. From 2c11815ddbf610cdf215811c5841c139de3fa10e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:42:22 +0100 Subject: [PATCH 04/39] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- systemtap.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index cf5a5f2..e446894 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -113,7 +113,6 @@ URL: http://sourceware.org/systemtap/ Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: pkgconfig(nss) From 75c387b28ce945855d473ea8df6c668d0d44708b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:07:51 +0100 Subject: [PATCH 05/39] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- systemtap.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index e446894..7f2317a 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -701,9 +701,6 @@ done touch $RPM_BUILD_ROOT%{dracutstap}/params.conf %endif -%clean -rm -rf ${RPM_BUILD_ROOT} - %pre runtime getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys From f70df36055e93c534ac344c33d386b70ad4679af Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Wed, 14 Feb 2018 11:12:36 -0500 Subject: [PATCH 06/39] Fixes for gcc 8.0.1 --- rhbz1544711.patch | 208 ++++++++++++++++++++++++++++++++++++++++++++++ systemtap.spec | 11 ++- 2 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 rhbz1544711.patch diff --git a/rhbz1544711.patch b/rhbz1544711.patch new file mode 100644 index 0000000..434fc53 --- /dev/null +++ b/rhbz1544711.patch @@ -0,0 +1,208 @@ +commit a8e317b60 (HEAD -> master, origin/master, origin/HEAD) +Author: Stan Cox +Date: Tue Feb 13 22:38:03 2018 -0500 + + Fixes for gcc 8 + + * includes/sys/sdt.h (__SDT_COND_SIGNED): Add CT, cast type argument + + Author: Will Cohen + + * stap-serverd.cxx (generate_mok, handleRequest, handle_connection): + Catch format overflow + + * translate.cxx (translate_pass): Use ref in catch. + +diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h +index 940f74483..c0c5a492c 100644 +--- a/includes/sys/sdt.h ++++ b/includes/sys/sdt.h +@@ -119,8 +119,8 @@ struct __sdt_type + + #define __SDT_ALWAYS_SIGNED(T) \ + template<> struct __sdt_type { static const bool __sdt_signed = true; }; +-#define __SDT_COND_SIGNED(T) \ +-template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 1); }; ++#define __SDT_COND_SIGNED(T,CT) \ ++template<> struct __sdt_type { static const bool __sdt_signed = ((CT)(-1) < 1); }; + __SDT_ALWAYS_SIGNED(signed char) + __SDT_ALWAYS_SIGNED(short) + __SDT_ALWAYS_SIGNED(int) +@@ -141,14 +141,14 @@ __SDT_ALWAYS_SIGNED(const volatile short) + __SDT_ALWAYS_SIGNED(const volatile int) + __SDT_ALWAYS_SIGNED(const volatile long) + __SDT_ALWAYS_SIGNED(const volatile long long) +-__SDT_COND_SIGNED(char) +-__SDT_COND_SIGNED(wchar_t) +-__SDT_COND_SIGNED(volatile char) +-__SDT_COND_SIGNED(volatile wchar_t) +-__SDT_COND_SIGNED(const char) +-__SDT_COND_SIGNED(const wchar_t) +-__SDT_COND_SIGNED(const volatile char) +-__SDT_COND_SIGNED(const volatile wchar_t) ++__SDT_COND_SIGNED(char, char) ++__SDT_COND_SIGNED(wchar_t, wchar_t) ++__SDT_COND_SIGNED(volatile char, char) ++__SDT_COND_SIGNED(volatile wchar_t, wchar_t) ++__SDT_COND_SIGNED(const char, char) ++__SDT_COND_SIGNED(const wchar_t, wchar_t) ++__SDT_COND_SIGNED(const volatile char, char) ++__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) + #if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + /* __SDT_COND_SIGNED(char16_t) */ + /* __SDT_COND_SIGNED(char32_t) */ +diff --git a/stap-serverd.cxx b/stap-serverd.cxx +index b8f70114c..063c3c587 100644 +--- a/stap-serverd.cxx ++++ b/stap-serverd.cxx +@@ -1607,6 +1607,7 @@ generate_mok(string &mok_fingerprint) + char tmpdir[PATH_MAX] = { '\0' }; + string public_cert_path, private_cert_path, destdir; + mode_t old_umask; ++ int retlen; + + mok_fingerprint.clear (); + +@@ -1631,7 +1632,14 @@ generate_mok(string &mok_fingerprint) + } + + // Make a temporary directory to store results in. +- snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); ++ retlen = snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Could not create %s name", "temporary directory")); ++ tmpdir[0] = '\0'; ++ goto cleanup; ++ } ++ + if (mkdtemp (tmpdir) == NULL) + { + server_error (_F("Could not create temporary directory %s: %s", tmpdir, +@@ -1704,6 +1712,7 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + unsigned u; + unsigned i; + FILE* f; ++ int retlen; + + // Save the server version. Do this early, so the client knows what version of the server + // it is dealing with, even if the request is not fully completed. +@@ -1782,7 +1791,12 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + struct stat st; + char *arg; + +- snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); ++ retlen = snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "path")); ++ return; ++ } + + rc = stat(stapargfile, & st); + if (rc) break; +@@ -1888,7 +1902,15 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + { + glob_t globber; + char pattern[PATH_MAX]; +- snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); ++ int retlen; ++ ++ retlen = snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "pattern")); ++ return; ++ } ++ + rc = glob (pattern, GLOB_ERR, NULL, &globber); + if (rc) + server_error (_F("Unable to find a module in %s", new_staptmpdir.c_str())); +@@ -2164,6 +2186,7 @@ handle_connection (void *arg) + copy for each connection.*/ + vector argv; + PRInt32 bytesRead; ++ int retlen; + + /* Detatch to avoid a memory leak */ + if(max_threads > 0) +@@ -2213,7 +2236,13 @@ handle_connection (void *arg) + #endif + + secStatus = SECFailure; +- snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); ++ retlen = snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "temporary directory")); ++ tmpdir[0]=0; /* prevent /bin/rm */ ++ goto cleanup; ++ } + rc1 = mkdtemp(tmpdir); + if (! rc1) + { +@@ -2223,9 +2252,20 @@ handle_connection (void *arg) + } + + /* Create a temporary files names and directories. */ +- snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); ++ retlen = snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "request.zip path")); ++ goto cleanup; ++ } ++ ++ retlen = snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "request directory path")); ++ goto cleanup; ++ } + +- snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); + rc = mkdir(requestDirName, 0700); + if (rc) + { +@@ -2233,7 +2273,13 @@ handle_connection (void *arg) + goto cleanup; + } + +- snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); ++ retlen = snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "response directory path")); ++ goto cleanup; ++ } ++ + rc = mkdir(responseDirName, 0700); + if (rc) + { +@@ -2243,7 +2289,12 @@ handle_connection (void *arg) + // Set this early, since it gets used for errors to be returned to the client. + stapstderr = string(responseDirName) + "/stderr"; + +- snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); ++ retlen = snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "response.zip path")); ++ goto cleanup; ++ } + + /* Read data from the socket. + * If the user is requesting/requiring authentication, authenticate +diff --git a/translate.cxx b/translate.cxx +index 1240a80ec..4ade06fdd 100644 +--- a/translate.cxx ++++ b/translate.cxx +@@ -7860,7 +7860,7 @@ translate_pass (systemtap_session& s) + if (versions.size() >= 3 && s.verbose > 1) + clog << _F("ignoring extra parts of compat version: %s", s.compatible.c_str()) << endl; + } +- catch (const runtime_error) ++ catch (const runtime_error&) + { + throw SEMANTIC_ERROR(_F("parse error in compatibility version: %s", s.compatible.c_str())); + } diff --git a/systemtap.spec b/systemtap.spec index cf5a5f2..e61740d 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -72,12 +72,16 @@ %define dracutbindir %{_bindir} %endif +# To avoid testsuite/*/*.stp has shebang which doesn't start with '/' +%undefine __brp_mangle_shebangs + Name: systemtap Version: 3.2 -Release: 5%{?dist} +Release: 6%{?dist} # for version, see also configure.ac Patch10: rhbz1504009.patch +Patch11: rhbz1544711.patch # Packaging abstract: # @@ -479,6 +483,8 @@ cd .. %patch10 -p1 +%patch11 -p1 + %build %if %{with_bundled_elfutils} @@ -1158,6 +1164,9 @@ done # PRERELEASE %changelog +* Tue Feb 13 2018 Stan Cox - 3.2-6 +- rebuilt + * Fri Feb 09 2018 Igor Gnatenko - 3.2-5 - Escape macros in %%changelog From 4f54dc0c80de81a6cb0fa44407b3ca21ef00b96f Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 21 Feb 2018 08:16:22 +0100 Subject: [PATCH 07/39] Update Python 2 dependency declarations to new packaging standards --- systemtap.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index a8f8025..ad71443 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -77,7 +77,7 @@ Name: systemtap Version: 3.2 -Release: 6%{?dist} +Release: 7%{?dist} # for version, see also configure.ac Patch10: rhbz1504009.patch @@ -184,8 +184,8 @@ BuildRequires: readline-devel BuildRequires: pkgconfig(ncurses) %endif %if %{with_python2_probes} -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python2-devel +BuildRequires: python2-setuptools %endif %if %{with_python3_probes} BuildRequires: python3-devel @@ -318,7 +318,7 @@ URL: http://sourceware.org/systemtap/ %if %{with_python3} Requires: python3-pyparsing %else -Requires: pyparsing +Requires: python2-pyparsing %endif %endif @@ -1160,6 +1160,10 @@ done # PRERELEASE %changelog +* Wed Feb 21 2018 Iryna Shcherbina - 3.2-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Tue Feb 13 2018 Stan Cox - 3.2-6 - rebuilt From e58b85846b38abdaffbea0625556631bab23c820 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 22 Feb 2018 15:15:51 -0500 Subject: [PATCH 08/39] Automated weekly systemtap rawhide release: 0.20180222git5ef0c24456e3 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 44 ++++++++++++++++---------------------------- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index a3e101d..a649363 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz /systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz /systemtap-3.2.tar.gz +/systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz diff --git a/sources b/sources index eabc5df..30a5a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2.tar.gz) = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 +SHA512 (systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz) = 984824eea52900492e77af7dc1ff3f3e0d4f4f8e46f1c54655174ee3f501dbb8674a6b60619e78e1c1638d31fc2c221b9d76b47306e59b489bd3abcf971003e7 diff --git a/systemtap.spec b/systemtap.spec index ad71443..c40f884 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -33,7 +33,7 @@ %{!?with_openssl: %global with_openssl 0} %endif %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7} -%{!?with_python3: %global with_python3 0%{?fedora} >= 23} +%{!?with_python3: %global with_python3 0%{?fedora} >= 23 || 0%{?rhel} > 7} %{!?with_python2_probes: %global with_python2_probes 1} %{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23} %{!?with_httpd: %global with_httpd 0} @@ -76,12 +76,10 @@ %undefine __brp_mangle_shebangs Name: systemtap -Version: 3.2 -Release: 7%{?dist} +Version: 3.3 +Release: 0.20180222git5ef0c24456e3%{?dist} # for version, see also configure.ac -Patch10: rhbz1504009.patch -Patch11: rhbz1544711.patch # Packaging abstract: # @@ -114,7 +112,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.20180222git5ef0c24456e3.tar.gz # Build* BuildRequires: gcc-c++ @@ -480,10 +478,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch cd .. %endif -%patch10 -p1 - -%patch11 -p1 - %build %if %{with_bundled_elfutils} @@ -719,6 +713,15 @@ getent passwd stap-server >/dev/null || \ useradd -c "Systemtap Compile Server" -u 155 -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server 2>/dev/null || \ useradd -c "Systemtap Compile Server" -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server +%pre testsuite +getent passwd stapusr >/dev/null || \ + useradd -c "Systemtap 'stapusr' User" -g stapusr -r -s /sbin/nologin stapusr +getent passwd stapsys >/dev/null || \ + useradd -c "Systemtap 'stapsys' User" -g stapsys -G stapusr -r -s /sbin/nologin stapsys +getent passwd stapdev >/dev/null || \ + useradd -c "Systemtap 'stapdev' User" -g stapdev -G stapusr -r -s /sbin/nologin stapdev +exit 0 + %post server # We have some duplication between the %files listings for the @@ -1160,24 +1163,9 @@ done # PRERELEASE %changelog -* Wed Feb 21 2018 Iryna Shcherbina - 3.2-7 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Tue Feb 13 2018 Stan Cox - 3.2-6 -- rebuilt - -* Fri Feb 09 2018 Igor Gnatenko - 3.2-5 -- Escape macros in %%changelog - -* Wed Feb 07 2018 Igor Gnatenko - 3.2-4 -- Fix very old Requires - -* Sun Dec 10 2017 Björn Esser - 3.2-3 -- Rebuilt for libjson-c.so.3 - -* Fri Oct 20 2017 Frank Ch. Eigler - 3.2-2 -- rhbz1504009 (dtrace -G -o /dev/null) +* Thu Feb 22 2018 Frank Ch. Eigler - 3.3-0.20180222git5ef0c24456e3 +- Automated weekly rawhide release +- Applied spec changes from upstream git * Wed Oct 18 2017 Frank Ch. Eigler - 3.2-1 - Upstream release. From 220dc6f998cb3fb94aaa7bc8a461a9b71d6f1da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 6 Mar 2018 15:16:43 +0100 Subject: [PATCH 09/39] Rebuilt for libjson-c.so.4 (json-c v0.13.1) --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index c40f884..8b8f230 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -77,7 +77,7 @@ Name: systemtap Version: 3.3 -Release: 0.20180222git5ef0c24456e3%{?dist} +Release: 0.20180223git5ef0c24456e3%{?dist} # for version, see also configure.ac @@ -1163,6 +1163,9 @@ done # PRERELEASE %changelog +* Tue Mar 06 2018 Björn Esser - 3.3-0.20180223git5ef0c24456e3 +- Rebuilt for libjson-c.so.4 (json-c v0.13.1) + * Thu Feb 22 2018 Frank Ch. Eigler - 3.3-0.20180222git5ef0c24456e3 - Automated weekly rawhide release - Applied spec changes from upstream git From 5a43746846b82e1a28dfed97461c707476cae0db Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 15 Mar 2018 12:49:35 -0400 Subject: [PATCH 10/39] Automated weekly systemtap rawhide release: 0.20180315gitc2585f2b58cd --- systemtap.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 8b8f230..8c9c070 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -77,7 +77,7 @@ Name: systemtap Version: 3.3 -Release: 0.20180223git5ef0c24456e3%{?dist} +Release: 0.20180315gitc2585f2b58cd%{?dist} # for version, see also configure.ac @@ -112,7 +112,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180222git5ef0c24456e3.tar.gz +Source: %{name}-%{version}-0.20180315gitc2585f2b58cd.tar.gz # Build* BuildRequires: gcc-c++ @@ -1163,6 +1163,10 @@ done # PRERELEASE %changelog +* Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Mar 06 2018 Björn Esser - 3.3-0.20180223git5ef0c24456e3 - Rebuilt for libjson-c.so.4 (json-c v0.13.1) From ebf8c2dba146c51e6aba03b93dceb2f1e71816a9 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 15 Mar 2018 12:51:53 -0400 Subject: [PATCH 11/39] Automated weekly systemtap rawhide release: 0.20180315gitc2585f2b58cd --- .gitignore | 1 + sources | 2 +- systemtap.spec | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a649363..9ea705c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz /systemtap-3.2.tar.gz /systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz +/systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz diff --git a/sources b/sources index 30a5a3a..4891a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz) = 984824eea52900492e77af7dc1ff3f3e0d4f4f8e46f1c54655174ee3f501dbb8674a6b60619e78e1c1638d31fc2c221b9d76b47306e59b489bd3abcf971003e7 +SHA512 (systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz) = 47c64c98b711cb32f45fa2971445e85590b2b8fbb7d6223947a8a77531b437eae81848b88ed9eb3b2f05a9582b5f7ad9f5ca028912ac5a868b667f0b1aaba1ba diff --git a/systemtap.spec b/systemtap.spec index 8c9c070..d8d25c8 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1167,6 +1167,10 @@ done - Automated weekly rawhide release - Applied spec changes from upstream git +* Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Mar 06 2018 Björn Esser - 3.3-0.20180223git5ef0c24456e3 - Rebuilt for libjson-c.so.4 (json-c v0.13.1) From 3634436052e971ead042f8149befe5218f67b73e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 20 Apr 2018 17:33:46 +0200 Subject: [PATCH 12/39] Automated weekly systemtap rawhide release: 0.20180420gitd4a446c --- .gitignore | 1 + sources | 2 +- systemtap.spec | 25 +++++++++++++++++++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9ea705c..ae546bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /systemtap-3.2.tar.gz /systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz /systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz +/systemtap-3.3-0.20180420gitd4a446c.tar.gz diff --git a/sources b/sources index 4891a87..66c23da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz) = 47c64c98b711cb32f45fa2971445e85590b2b8fbb7d6223947a8a77531b437eae81848b88ed9eb3b2f05a9582b5f7ad9f5ca028912ac5a868b667f0b1aaba1ba +SHA512 (systemtap-3.3-0.20180420gitd4a446c.tar.gz) = 3f07bf5f1c1084989ec4f0a72c4f4362b1fbe21568d85802b9a0713e9a99a25e5f73dd4933ad3a0ce7336be1c0a3915a293b36ba1f91003ac6288366f16f0a1f diff --git a/systemtap.spec b/systemtap.spec index d8d25c8..908f4d7 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -34,8 +34,8 @@ %endif %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7} %{!?with_python3: %global with_python3 0%{?fedora} >= 23 || 0%{?rhel} > 7} -%{!?with_python2_probes: %global with_python2_probes 1} -%{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23} +%{!?with_python2_probes: %global with_python2_probes (0%{?fedora} <= 28 && 0%{?rhel} <= 7)} +%{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)} %{!?with_httpd: %global with_httpd 0} %ifarch ppc64le aarch64 @@ -77,7 +77,7 @@ Name: systemtap Version: 3.3 -Release: 0.20180315gitc2585f2b58cd%{?dist} +Release: 0.20180420gitd4a446c%{?dist} # for version, see also configure.ac @@ -112,7 +112,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180315gitc2585f2b58cd.tar.gz +Source: %{name}-%{version}-0.20180420gitd4a446c.tar.gz # Build* BuildRequires: gcc-c++ @@ -183,7 +183,11 @@ BuildRequires: pkgconfig(ncurses) %endif %if %{with_python2_probes} BuildRequires: python2-devel +%if 0%{?fedora} >= 1 BuildRequires: python2-setuptools +%else +BuildRequires: python-setuptools +%endif %endif %if %{with_python3_probes} BuildRequires: python3-devel @@ -316,9 +320,13 @@ URL: http://sourceware.org/systemtap/ %if %{with_python3} Requires: python3-pyparsing %else +%if 0%{?rhel} >= 7 +Requires: pyparsing +%else Requires: python2-pyparsing %endif %endif +%endif %description sdt-devel This package includes the header file used for static @@ -421,6 +429,11 @@ License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires: systemtap-runtime = %{version}-%{release} +%if ! (%{with_python2_probes}) +# Provide an clean upgrade path when the python2 package is removed +Obsoletes: %{name}-runtime-python2 < %{version}-%{release} +%endif + %description runtime-python3 This package includes support files needed to run systemtap scripts that probe python 3 processes. @@ -1163,6 +1176,10 @@ done # PRERELEASE %changelog +* Fri Apr 20 2018 Mark Wielaard - 3.3-0.20180420gitd4a446c +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd - Automated weekly rawhide release - Applied spec changes from upstream git From 4283558d0bdf55110a007fc2fd132c6f6e189a89 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 20 Apr 2018 17:40:16 +0200 Subject: [PATCH 13/39] Automated weekly systemtap rawhide release: 0.20180420gitd4a446c --- systemtap.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemtap.spec b/systemtap.spec index 908f4d7..0809e32 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1180,6 +1180,10 @@ done - Automated weekly rawhide release - Applied spec changes from upstream git +* Fri Apr 20 2018 Mark Wielaard - 3.3-0.20180420gitd4a446c +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd - Automated weekly rawhide release - Applied spec changes from upstream git From c0bbf3707824b29bbda9f2bb38210194177e0bb3 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 8 May 2018 17:10:09 -0400 Subject: [PATCH 14/39] Automated weekly systemtap rawhide release: 0.20180508git9c6ac6cda49e --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ae546bd..f6ed169 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz /systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz /systemtap-3.3-0.20180420gitd4a446c.tar.gz +/systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz diff --git a/sources b/sources index 66c23da..d9a9a8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.3-0.20180420gitd4a446c.tar.gz) = 3f07bf5f1c1084989ec4f0a72c4f4362b1fbe21568d85802b9a0713e9a99a25e5f73dd4933ad3a0ce7336be1c0a3915a293b36ba1f91003ac6288366f16f0a1f +SHA512 (systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz) = eeb254486ce991d2bdbbaed6b350fe28455a921134465b4a74c015c433e059d09bd945ae778da39989f12873365be54a8278e57ef6c12a3f406118b35f7738d8 diff --git a/systemtap.spec b/systemtap.spec index 0809e32..869f4e9 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -77,7 +77,7 @@ Name: systemtap Version: 3.3 -Release: 0.20180420gitd4a446c%{?dist} +Release: 0.20180508git9c6ac6cda49e%{?dist} # for version, see also configure.ac @@ -112,7 +112,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180420gitd4a446c.tar.gz +Source: %{name}-%{version}-0.20180508git9c6ac6cda49e.tar.gz # Build* BuildRequires: gcc-c++ @@ -1176,6 +1176,10 @@ done # PRERELEASE %changelog +* Tue May 08 2018 Frank Ch. Eigler - 3.3-0.20180508git9c6ac6cda49e +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Apr 20 2018 Mark Wielaard - 3.3-0.20180420gitd4a446c - Automated weekly rawhide release - Applied spec changes from upstream git From 45296db740b9016f27b94b23165127c5ebf5c25c Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 8 Jun 2018 18:41:53 -0400 Subject: [PATCH 15/39] upstream release 3.3 --- .gitignore | 1 + rhbz1504009.patch | 49 ----------- rhbz1544711.patch | 208 ---------------------------------------------- sources | 2 +- systemtap.spec | 54 +++++------- 5 files changed, 22 insertions(+), 292 deletions(-) delete mode 100644 rhbz1504009.patch delete mode 100644 rhbz1544711.patch diff --git a/.gitignore b/.gitignore index f6ed169..f2cefbd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz /systemtap-3.3-0.20180420gitd4a446c.tar.gz /systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz +/systemtap-3.3.tar.gz diff --git a/rhbz1504009.patch b/rhbz1504009.patch deleted file mode 100644 index 7643891..0000000 --- a/rhbz1504009.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/rhbz1544711.patch b/rhbz1544711.patch deleted file mode 100644 index 434fc53..0000000 --- a/rhbz1544711.patch +++ /dev/null @@ -1,208 +0,0 @@ -commit a8e317b60 (HEAD -> master, origin/master, origin/HEAD) -Author: Stan Cox -Date: Tue Feb 13 22:38:03 2018 -0500 - - Fixes for gcc 8 - - * includes/sys/sdt.h (__SDT_COND_SIGNED): Add CT, cast type argument - - Author: Will Cohen - - * stap-serverd.cxx (generate_mok, handleRequest, handle_connection): - Catch format overflow - - * translate.cxx (translate_pass): Use ref in catch. - -diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h -index 940f74483..c0c5a492c 100644 ---- a/includes/sys/sdt.h -+++ b/includes/sys/sdt.h -@@ -119,8 +119,8 @@ struct __sdt_type - - #define __SDT_ALWAYS_SIGNED(T) \ - template<> struct __sdt_type { static const bool __sdt_signed = true; }; --#define __SDT_COND_SIGNED(T) \ --template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 1); }; -+#define __SDT_COND_SIGNED(T,CT) \ -+template<> struct __sdt_type { static const bool __sdt_signed = ((CT)(-1) < 1); }; - __SDT_ALWAYS_SIGNED(signed char) - __SDT_ALWAYS_SIGNED(short) - __SDT_ALWAYS_SIGNED(int) -@@ -141,14 +141,14 @@ __SDT_ALWAYS_SIGNED(const volatile short) - __SDT_ALWAYS_SIGNED(const volatile int) - __SDT_ALWAYS_SIGNED(const volatile long) - __SDT_ALWAYS_SIGNED(const volatile long long) --__SDT_COND_SIGNED(char) --__SDT_COND_SIGNED(wchar_t) --__SDT_COND_SIGNED(volatile char) --__SDT_COND_SIGNED(volatile wchar_t) --__SDT_COND_SIGNED(const char) --__SDT_COND_SIGNED(const wchar_t) --__SDT_COND_SIGNED(const volatile char) --__SDT_COND_SIGNED(const volatile wchar_t) -+__SDT_COND_SIGNED(char, char) -+__SDT_COND_SIGNED(wchar_t, wchar_t) -+__SDT_COND_SIGNED(volatile char, char) -+__SDT_COND_SIGNED(volatile wchar_t, wchar_t) -+__SDT_COND_SIGNED(const char, char) -+__SDT_COND_SIGNED(const wchar_t, wchar_t) -+__SDT_COND_SIGNED(const volatile char, char) -+__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) - #if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) - /* __SDT_COND_SIGNED(char16_t) */ - /* __SDT_COND_SIGNED(char32_t) */ -diff --git a/stap-serverd.cxx b/stap-serverd.cxx -index b8f70114c..063c3c587 100644 ---- a/stap-serverd.cxx -+++ b/stap-serverd.cxx -@@ -1607,6 +1607,7 @@ generate_mok(string &mok_fingerprint) - char tmpdir[PATH_MAX] = { '\0' }; - string public_cert_path, private_cert_path, destdir; - mode_t old_umask; -+ int retlen; - - mok_fingerprint.clear (); - -@@ -1631,7 +1632,14 @@ generate_mok(string &mok_fingerprint) - } - - // Make a temporary directory to store results in. -- snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); -+ retlen = snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Could not create %s name", "temporary directory")); -+ tmpdir[0] = '\0'; -+ goto cleanup; -+ } -+ - if (mkdtemp (tmpdir) == NULL) - { - server_error (_F("Could not create temporary directory %s: %s", tmpdir, -@@ -1704,6 +1712,7 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - unsigned u; - unsigned i; - FILE* f; -+ int retlen; - - // Save the server version. Do this early, so the client knows what version of the server - // it is dealing with, even if the request is not fully completed. -@@ -1782,7 +1791,12 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - struct stat st; - char *arg; - -- snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); -+ retlen = snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "path")); -+ return; -+ } - - rc = stat(stapargfile, & st); - if (rc) break; -@@ -1888,7 +1902,15 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - { - glob_t globber; - char pattern[PATH_MAX]; -- snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); -+ int retlen; -+ -+ retlen = snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "pattern")); -+ return; -+ } -+ - rc = glob (pattern, GLOB_ERR, NULL, &globber); - if (rc) - server_error (_F("Unable to find a module in %s", new_staptmpdir.c_str())); -@@ -2164,6 +2186,7 @@ handle_connection (void *arg) - copy for each connection.*/ - vector argv; - PRInt32 bytesRead; -+ int retlen; - - /* Detatch to avoid a memory leak */ - if(max_threads > 0) -@@ -2213,7 +2236,13 @@ handle_connection (void *arg) - #endif - - secStatus = SECFailure; -- snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); -+ retlen = snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "temporary directory")); -+ tmpdir[0]=0; /* prevent /bin/rm */ -+ goto cleanup; -+ } - rc1 = mkdtemp(tmpdir); - if (! rc1) - { -@@ -2223,9 +2252,20 @@ handle_connection (void *arg) - } - - /* Create a temporary files names and directories. */ -- snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); -+ retlen = snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "request.zip path")); -+ goto cleanup; -+ } -+ -+ retlen = snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "request directory path")); -+ goto cleanup; -+ } - -- snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); - rc = mkdir(requestDirName, 0700); - if (rc) - { -@@ -2233,7 +2273,13 @@ handle_connection (void *arg) - goto cleanup; - } - -- snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); -+ retlen = snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "response directory path")); -+ goto cleanup; -+ } -+ - rc = mkdir(responseDirName, 0700); - if (rc) - { -@@ -2243,7 +2289,12 @@ handle_connection (void *arg) - // Set this early, since it gets used for errors to be returned to the client. - stapstderr = string(responseDirName) + "/stderr"; - -- snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); -+ retlen = snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "response.zip path")); -+ goto cleanup; -+ } - - /* Read data from the socket. - * If the user is requesting/requiring authentication, authenticate -diff --git a/translate.cxx b/translate.cxx -index 1240a80ec..4ade06fdd 100644 ---- a/translate.cxx -+++ b/translate.cxx -@@ -7860,7 +7860,7 @@ translate_pass (systemtap_session& s) - if (versions.size() >= 3 && s.verbose > 1) - clog << _F("ignoring extra parts of compat version: %s", s.compatible.c_str()) << endl; - } -- catch (const runtime_error) -+ catch (const runtime_error&) - { - throw SEMANTIC_ERROR(_F("parse error in compatibility version: %s", s.compatible.c_str())); - } diff --git a/sources b/sources index d9a9a8c..80e8943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz) = eeb254486ce991d2bdbbaed6b350fe28455a921134465b4a74c015c433e059d09bd945ae778da39989f12873365be54a8278e57ef6c12a3f406118b35f7738d8 +SHA512 (systemtap-3.3.tar.gz) = b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e diff --git a/systemtap.spec b/systemtap.spec index 869f4e9..94d8769 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,5 +1,6 @@ %{!?with_sqlite: %global with_sqlite 0%{?fedora} >= 17 || 0%{?rhel} >= 7} -%{!?with_docs: %global with_docs 1} +# prefer prebuilt docs +%{!?with_docs: %global with_docs 0} %{!?with_htmldocs: %global with_htmldocs 0} %{!?with_monitor: %global with_monitor 1} # crash is not available @@ -66,18 +67,24 @@ %define dracutstap %{_prefix}/share/dracut/modules.d/99stap %endif -%if 0%{?rhel} >= 6 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 %define dracutbindir /sbin %else %define dracutbindir %{_bindir} %endif +%if 0%{?rhel} == 6 + %{!?_rpmmacrodir: %define _rpmmacrodir /etc/rpm/} +%else + %{!?_rpmmacrodir: %define _rpmmacrodir %{_rpmconfigdir}/macros.d} +%endif + # To avoid testsuite/*/*.stp has shebang which doesn't start with '/' %undefine __brp_mangle_shebangs Name: systemtap Version: 3.3 -Release: 0.20180508git9c6ac6cda49e%{?dist} +Release: 1%{?dist} # for version, see also configure.ac @@ -112,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180508git9c6ac6cda49e.tar.gz +Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* BuildRequires: gcc-c++ @@ -400,7 +407,7 @@ License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires: systemtap-runtime = %{version}-%{release} Requires: byteman > 2.0 -Requires: net-tools +Requires: iproute %description runtime-java This package includes support files needed to run systemtap scripts @@ -543,7 +550,7 @@ cd .. %global docs_config --enable-docs --disable-htmldocs %endif %else -%global docs_config --disable-docs +%global docs_config --enable-docs=prebuilt %endif # Enable pie as configure defaults to disabling it @@ -634,19 +641,21 @@ install -c -m 755 stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep # Copy over the testsuite cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap -%if %{with_docs} # We want the manuals in the special doc dir, not the generic doc install dir. # We build it in place and then move it away so it doesn't get installed # twice. rpm can specify itself where the (versioned) docs go with the # %doc directive. mkdir docs.installed mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +%if %{with_docs} %if %{with_htmldocs} mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/ %endif %endif +install -D -m 644 macros.systemtap $RPM_BUILD_ROOT%{_rpmmacrodir}/macros.systemtap + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server/.systemtap @@ -1071,8 +1080,8 @@ done %{_datadir}/systemtap/examples %{!?_licensedir:%global license %%doc} %license COPYING -%if %{with_docs} %doc docs.installed/*.pdf +%if %{with_docs} %if %{with_htmldocs} %doc docs.installed/tapsets/*.html %doc docs.installed/SystemTap_Beginners_Guide @@ -1117,6 +1126,7 @@ done %{_includedir}/sys/sdt.h %{_includedir}/sys/sdt-config.h %{_mandir}/man1/dtrace.1* +%{_rpmmacrodir}/macros.systemtap %doc README AUTHORS NEWS %{!?_licensedir:%global license %%doc} %license COPYING @@ -1176,32 +1186,8 @@ done # PRERELEASE %changelog -* Tue May 08 2018 Frank Ch. Eigler - 3.3-0.20180508git9c6ac6cda49e -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Apr 20 2018 Mark Wielaard - 3.3-0.20180420gitd4a446c -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Apr 20 2018 Mark Wielaard - 3.3-0.20180420gitd4a446c -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Thu Mar 15 2018 Frank Ch. Eigler - 3.3-0.20180315gitc2585f2b58cd -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Tue Mar 06 2018 Björn Esser - 3.3-0.20180223git5ef0c24456e3 -- Rebuilt for libjson-c.so.4 (json-c v0.13.1) - -* Thu Feb 22 2018 Frank Ch. Eigler - 3.3-0.20180222git5ef0c24456e3 -- Automated weekly rawhide release -- Applied spec changes from upstream git +* Thu Jun 07 2018 Frank Ch. Eigler - 3.3-1 +- Upstream release. * Wed Oct 18 2017 Frank Ch. Eigler - 3.2-1 - Upstream release. From 4919b3de2d2e6cff16e058d70e70eccf6b462af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:28:14 +0200 Subject: [PATCH 16/39] Rebuilt for Python 3.7 --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 94d8769..5c1c073 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} # for version, see also configure.ac @@ -1186,6 +1186,9 @@ done # PRERELEASE %changelog +* Tue Jun 19 2018 Miro Hrončok - 3.3-2 +- Rebuilt for Python 3.7 + * Thu Jun 07 2018 Frank Ch. Eigler - 3.3-1 - Upstream release. From b24274bf9771ed60a5835fc16f899dd967a62033 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:33:29 -0500 Subject: [PATCH 17/39] Remove needless use of %defattr --- systemtap.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 5c1c073..ed6572c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -966,7 +966,6 @@ done # The master "systemtap" rpm doesn't include any files. %files server -f systemtap.lang -%defattr(-,root,root) %{_bindir}/stap-server %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/stap-serverd @@ -1039,7 +1038,6 @@ done %files runtime -f systemtap.lang -%defattr(-,root,root) %attr(4110,root,stapusr) %{_bindir}/staprun %{_bindir}/stapsh %{_bindir}/stap-merge @@ -1075,7 +1073,6 @@ done %files client -f systemtap.lang -%defattr(-,root,root) %doc README README.unprivileged AUTHORS NEWS %{_datadir}/systemtap/examples %{!?_licensedir:%global license %%doc} @@ -1105,7 +1102,6 @@ done %files initscript -%defattr(-,root,root) %{initdir}/systemtap %dir %{_sysconfdir}/systemtap %dir %{_sysconfdir}/systemtap/conf.d @@ -1121,7 +1117,6 @@ done %files sdt-devel -%defattr(-,root,root) %{_bindir}/dtrace %{_includedir}/sys/sdt.h %{_includedir}/sys/sdt-config.h @@ -1133,7 +1128,6 @@ done %files testsuite -%defattr(-,root,root) %dir %{_datadir}/systemtap %{_datadir}/systemtap/testsuite From fe71a913bf92ad60910e26a3c2686a76d38b4442 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:12:48 +0000 Subject: [PATCH 18/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index ed6572c..a753b25 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 3.3 -Release: 2%{?dist} +Release: 3%{?dist} # for version, see also configure.ac @@ -1180,6 +1180,9 @@ done # PRERELEASE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 3.3-2 - Rebuilt for Python 3.7 From 6c9283129e5086d9cf02228961f75ccabdac7522 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:22:25 +0200 Subject: [PATCH 19/39] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{pyth?= =?UTF-8?q?on2=5Fsitearch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- systemtap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index a753b25..8a1a2c3 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1142,8 +1142,8 @@ done %if %{with_python2_probes} %files runtime-python2 -%{python_sitearch}/HelperSDT -%{python_sitearch}/HelperSDT-*.egg-info +%{python2_sitearch}/HelperSDT +%{python2_sitearch}/HelperSDT-*.egg-info %endif %if %{with_python3_probes} %files runtime-python3 From d4c7fab7e033c600682642d1a55b90ae05e6461b Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 10 Aug 2018 15:35:12 -0400 Subject: [PATCH 20/39] Automated weekly systemtap rawhide release: 0.20180810git --- .gitignore | 1 + sources | 2 +- systemtap.spec | 112 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 102 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index f2cefbd..e371862 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /systemtap-3.3-0.20180420gitd4a446c.tar.gz /systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz /systemtap-3.3.tar.gz +/systemtap-4.0-0.20180810git.tar.gz diff --git a/sources b/sources index 80e8943..aea2955 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.3.tar.gz) = b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e +SHA512 (systemtap-4.0-0.20180810git.tar.gz) = 39ec6621f9e8c768f2922f0ebd8fe074c19b09036f0744d2b64a30e44fe6be1d2f1181149d7c226d7b76c4fa95d0d31ba4ae899089dc3d578b2e78e7f28424e2 diff --git a/systemtap.spec b/systemtap.spec index 8a1a2c3..cb7385e 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -83,8 +83,8 @@ %undefine __brp_mangle_shebangs Name: systemtap -Version: 3.3 -Release: 3%{?dist} +Version: 4.0 +Release: 0.20180810git%{?dist} # for version, see also configure.ac @@ -119,7 +119,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.20180810git.tar.gz # Build* BuildRequires: gcc-c++ @@ -224,19 +224,23 @@ Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires: systemtap-devel = %{version}-%{release} +Conflicts: systemtap-devel < %{version}-%{release} +Conflicts: systemtap-runtime < %{version}-%{release} +Conflicts: systemtap-client < %{version}-%{release} Requires: nss coreutils Requires: zip unzip Requires(pre): shadow-utils Requires(post): chkconfig Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts BuildRequires: nss-devel avahi-devel %if %{with_openssl} Requires: openssl %endif %if %{with_systemd} Requires: systemd +%else +Requires(preun): initscripts +Requires(postun): initscripts %endif %description server @@ -256,6 +260,9 @@ URL: http://sourceware.org/systemtap/ Requires: kernel-devel-uname-r %{?fedora:Suggests: kernel-devel} Requires: gcc make +Conflicts: systemtap-client < %{version}-%{release} +Conflicts: systemtap-server < %{version}-%{release} +Conflicts: systemtap-runtime < %{version}-%{release} # Suggest: kernel-debuginfo %description devel @@ -273,6 +280,9 @@ Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires(pre): shadow-utils +Conflicts: systemtap-devel < %{version}-%{release} +Conflicts: systemtap-server < %{version}-%{release} +Conflicts: systemtap-client < %{version}-%{release} %description runtime SystemTap runtime contains the components needed to execute @@ -289,6 +299,9 @@ Requires: zip unzip Requires: systemtap-runtime = %{version}-%{release} Requires: coreutils grep sed unzip zip Requires: openssh-clients +Conflicts: systemtap-devel < %{version}-%{release} +Conflicts: systemtap-server < %{version}-%{release} +Conflicts: systemtap-runtime < %{version}-%{release} %if %{with_mokutil} Requires: mokutil %endif @@ -309,8 +322,12 @@ URL: http://sourceware.org/systemtap/ Requires: systemtap = %{version}-%{release} Requires(post): chkconfig Requires(preun): chkconfig +%if %{with_systemd} +Requires: systemd +%else Requires(preun): initscripts Requires(postun): initscripts +%endif %description initscript This package includes a SysVinit script to launch selected systemtap @@ -411,8 +428,7 @@ Requires: iproute %description runtime-java This package includes support files needed to run systemtap scripts -that probe Java processes running on the OpenJDK 1.6 and OpenJDK 1.7 -runtimes using Byteman. +that probe Java processes running on the OpenJDK runtimes using Byteman. %endif %if %{with_python2_probes} @@ -446,6 +462,20 @@ This package includes support files needed to run systemtap scripts that probe python 3 processes. %endif +%if %{with_python3} +%package stap-exporter +Summary: Systemtap-prometheus interoperation mechanism +Group: Development/System +License: GPLv2+ +URL: http://sourceware.org/systemtap/ +Requires: systemtap-runtime = %{version}-%{release} + +%description stap-exporter +This package includes files for a systemd service that manages +systemtap sessions and relays prometheus metrics from the sessions +to remote requesters on demand. +%endif + %if %{with_virthost} %package runtime-virthost Summary: Systemtap Cross-VM Instrumentation - host @@ -601,10 +631,16 @@ cd .. %global httpd_config --disable-httpd %endif +%if %{with_bpf} +%global bpf_config --with-bpf +%else +%global bpf_config --without-bpf +%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} %{httpd_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} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -665,12 +701,27 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -m 644 initscript/logrotate.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/stap-server + +# If using systemd systemtap.service file, retain the old init script in %{_libexecdir} as a helper. +%if %{with_systemd} +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +touch $RPM_BUILD_ROOT%{_unitdir}/systemtap.service +install -m 644 initscript/systemtap.service $RPM_BUILD_ROOT%{_unitdir}/systemtap.service +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sbindir}/systemtap-service +%else mkdir -p $RPM_BUILD_ROOT%{initdir} install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{initdir} +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +ln -sf %{initdir}/systemtap $RPM_BUILD_ROOT%{_sbindir}/systemtap-service +# TODO CHECK CORRECTNESS: symlink %{_sbindir}/systemtap-service to %{initdir}/systemtap +%endif + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/conf.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/script.d install -m 644 initscript/config.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/config + %if %{with_systemd} mkdir -p $RPM_BUILD_ROOT%{_unitdir} touch $RPM_BUILD_ROOT%{_unitdir}/stap-server.service @@ -723,6 +774,13 @@ done touch $RPM_BUILD_ROOT%{dracutstap}/params.conf %endif +%if %{with_python3} + mkdir -p $RPM_BUILD_ROOT/stap-exporter + install -p -m 755 stap-exporter/stap-exporter $RPM_BUILD_ROOT%{_bindir} + install -m 644 stap-exporter/stap-exporter.service $RPM_BUILD_ROOT%{_unitdir} + install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8 +%endif + %pre runtime getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys @@ -898,6 +956,13 @@ if [ "$1" -ge "1" ]; then fi exit 0 +%if %{with_python3} +%preun stap-exporter +/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || : +/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || : +%endif + + %post # Remove any previously-built uprobes.ko materials (make -C %{_datadir}/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true @@ -962,10 +1027,11 @@ done # ------------------------------------------------------------------------ -%files -f systemtap.lang +%files # The master "systemtap" rpm doesn't include any files. %files server -f systemtap.lang +%defattr(-,root,root) %{_bindir}/stap-server %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/stap-serverd @@ -1038,6 +1104,7 @@ done %files runtime -f systemtap.lang +%defattr(-,root,root) %attr(4110,root,stapusr) %{_bindir}/staprun %{_bindir}/stapsh %{_bindir}/stap-merge @@ -1073,6 +1140,7 @@ done %files client -f systemtap.lang +%defattr(-,root,root) %doc README README.unprivileged AUTHORS NEWS %{_datadir}/systemtap/examples %{!?_licensedir:%global license %%doc} @@ -1102,14 +1170,21 @@ done %files initscript +%defattr(-,root,root) +%if %{with_systemd} +%{_unitdir}/systemtap.service +%{_sbindir}/systemtap-service +%else %{initdir}/systemtap +%{_sbindir}/systemtap-service +%endif %dir %{_sysconfdir}/systemtap %dir %{_sysconfdir}/systemtap/conf.d %dir %{_sysconfdir}/systemtap/script.d %config(noreplace) %{_sysconfdir}/systemtap/config %dir %{_localstatedir}/cache/systemtap %ghost %{_localstatedir}/run/systemtap -%{_mandir}/man8/systemtap.8* +%{_mandir}/man8/systemtap-service.8* %if %{with_dracut} %dir %{dracutstap} %{dracutstap}/* @@ -1117,6 +1192,7 @@ done %files sdt-devel +%defattr(-,root,root) %{_bindir}/dtrace %{_includedir}/sys/sdt.h %{_includedir}/sys/sdt-config.h @@ -1128,6 +1204,7 @@ done %files testsuite +%defattr(-,root,root) %dir %{_datadir}/systemtap %{_datadir}/systemtap/testsuite @@ -1142,8 +1219,8 @@ done %if %{with_python2_probes} %files runtime-python2 -%{python2_sitearch}/HelperSDT -%{python2_sitearch}/HelperSDT-*.egg-info +%{python_sitearch}/HelperSDT +%{python_sitearch}/HelperSDT-*.egg-info %endif %if %{with_python3_probes} %files runtime-python3 @@ -1171,6 +1248,13 @@ done %endif %endif +%if %{with_python3} +%files stap-exporter +%{_unitdir}/stap-exporter.service +%{_mandir}/man8/stap-exporter.8* +%{_bindir}/stap-exporter +%endif + # ------------------------------------------------------------------------ # Future new-release entries should be of the form @@ -1180,6 +1264,10 @@ done # PRERELEASE %changelog +* Fri Aug 10 2018 Frank Ch. Eigler - 4.0-0.20180810git +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Sat Jul 14 2018 Fedora Release Engineering - 3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8564a9f880482ef25e95ba7a4c34ae61584c8dfb Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 6 Sep 2018 21:58:00 -0400 Subject: [PATCH 21/39] Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c --- systemtap.spec | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index cb7385e..06f4345 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -80,11 +80,11 @@ %endif # To avoid testsuite/*/*.stp has shebang which doesn't start with '/' -%undefine __brp_mangle_shebangs +%define __brp_mangle_shebangs_exclude_from .stp$ Name: systemtap Version: 4.0 -Release: 0.20180810git%{?dist} +Release: 0.20180906git37598c4fee7c%{?dist} # for version, see also configure.ac @@ -119,10 +119,11 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180810git.tar.gz +Source: %{name}-%{version}-0.20180906git37598c4fee7c.tar.gz # Build* BuildRequires: gcc-c++ +BuildRequires: cpio BuildRequires: gettext-devel BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(avahi-client) @@ -463,14 +464,14 @@ that probe python 3 processes. %endif %if %{with_python3} -%package stap-exporter +%package exporter Summary: Systemtap-prometheus interoperation mechanism Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ Requires: systemtap-runtime = %{version}-%{release} -%description stap-exporter +%description exporter This package includes files for a systemd service that manages systemtap sessions and relays prometheus metrics from the sessions to remote requesters on demand. @@ -774,13 +775,6 @@ done touch $RPM_BUILD_ROOT%{dracutstap}/params.conf %endif -%if %{with_python3} - mkdir -p $RPM_BUILD_ROOT/stap-exporter - install -p -m 755 stap-exporter/stap-exporter $RPM_BUILD_ROOT%{_bindir} - install -m 644 stap-exporter/stap-exporter.service $RPM_BUILD_ROOT%{_unitdir} - install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8 -%endif - %pre runtime getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys @@ -957,11 +951,22 @@ fi exit 0 %if %{with_python3} -%preun stap-exporter -/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || : -/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || : -%endif +%if %{with_systemd} +%preun exporter +if [ $1 = 0 ] ; then + /bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || : + /bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || : +fi +exit 0 +%postun exporter +# Restart service if this is an upgrade rather than an uninstall +if [ "$1" -ge "1" ]; then + /bin/systemctl condrestart stap-exporter >/dev/null 2>&1 || : +fi +exit 0 +%endif +%endif %post # Remove any previously-built uprobes.ko materials @@ -1249,10 +1254,12 @@ done %endif %if %{with_python3} -%files stap-exporter +%files exporter +%{_sysconfdir}/stap-exporter +%{_sysconfdir}/sysconfig/stap-exporter %{_unitdir}/stap-exporter.service %{_mandir}/man8/stap-exporter.8* -%{_bindir}/stap-exporter +%{_sbindir}/stap-exporter %endif # ------------------------------------------------------------------------ @@ -1264,6 +1271,10 @@ done # PRERELEASE %changelog +* Thu Sep 06 2018 Frank Ch. Eigler - 4.0-0.20180906git37598c4fee7c +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Aug 10 2018 Frank Ch. Eigler - 4.0-0.20180810git - Automated weekly rawhide release - Applied spec changes from upstream git From ddcf2c9e17aa08c31096859a423907f6a30f2ea8 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 6 Sep 2018 22:00:28 -0400 Subject: [PATCH 22/39] Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c --- .gitignore | 1 + sources | 2 +- systemtap.spec | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e371862..d55bac2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz /systemtap-3.3.tar.gz /systemtap-4.0-0.20180810git.tar.gz +/systemtap-4.0-0.20180906git37598c4fee7c.tar.gz diff --git a/sources b/sources index aea2955..2138792 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180810git.tar.gz) = 39ec6621f9e8c768f2922f0ebd8fe074c19b09036f0744d2b64a30e44fe6be1d2f1181149d7c226d7b76c4fa95d0d31ba4ae899089dc3d578b2e78e7f28424e2 +SHA512 (systemtap-4.0-0.20180906git37598c4fee7c.tar.gz) = ed52e1ec8c1aa19d62d3d1be825f039ac0137c3bc6621d81beb209603ad8f9596084157f0706bdc7b401f0ae0d73b54610c7531fc71a6cacc7c2609039ef364e diff --git a/systemtap.spec b/systemtap.spec index 06f4345..e715b1d 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1275,6 +1275,10 @@ done - Automated weekly rawhide release - Applied spec changes from upstream git +* Thu Sep 06 2018 Frank Ch. Eigler - 4.0-0.20180906git37598c4fee7c +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Aug 10 2018 Frank Ch. Eigler - 4.0-0.20180810git - Automated weekly rawhide release - Applied spec changes from upstream git From d09f6eaf35e913ede41fda79015b11d84a29c353 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 14:21:05 -0400 Subject: [PATCH 23/39] CI experiment --- .gitignore | 1 + tests/dejagnu-smoketest/PURPOSE | 3 +++ tests/dejagnu-smoketest/runtest.sh | 11 +++++++++++ tests/tests.yml | 12 ++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 tests/dejagnu-smoketest/PURPOSE create mode 100755 tests/dejagnu-smoketest/runtest.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index d55bac2..9272f7c 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 diff --git a/tests/dejagnu-smoketest/PURPOSE b/tests/dejagnu-smoketest/PURPOSE new file mode 100644 index 0000000..5a6a058 --- /dev/null +++ b/tests/dejagnu-smoketest/PURPOSE @@ -0,0 +1,3 @@ +Test Name: dejagnu-smoketest +Author: +Short Description: Run a minimal systemtap testsuite diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh new file mode 100755 index 0000000..1ca3c89 --- /dev/null +++ b/tests/dejagnu-smoketest/runtest.sh @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e +cd /usr/share/systemtap/testsuite +make installcheck RUNTESTFLAGS=proc_by_pid.exp +cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results +if grep -q unexpected systemtap.sum.results ; then + exit 0 +else + exit 1 +fi diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..00b92b1 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +--- +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - dejagnu-smoketest + required_packages: + - systemtap-testsuite + - kernel-debuginfo + - kernel-devel From 48bf30857929dc0ca2798b71017ef2f684061d5b Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 14:37:28 -0400 Subject: [PATCH 24/39] Automated weekly systemtap rawhide release: 0.20180914gitc51d4e55d285 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9272f7c..ed65144 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /systemtap-3.3.tar.gz /systemtap-4.0-0.20180810git.tar.gz /systemtap-4.0-0.20180906git37598c4fee7c.tar.gz +/systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz diff --git a/sources b/sources index 2138792..977fd6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180906git37598c4fee7c.tar.gz) = ed52e1ec8c1aa19d62d3d1be825f039ac0137c3bc6621d81beb209603ad8f9596084157f0706bdc7b401f0ae0d73b54610c7531fc71a6cacc7c2609039ef364e +SHA512 (systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz) = cc019bedae025f13c6e99384b5f197553e5c8a25edf6bf7388bd8e12e2f815b96e8b5be9ce6466d09d8987f54e12d7c333a6e3ef5ac0ce3d28ed04cf8915b381 diff --git a/systemtap.spec b/systemtap.spec index e715b1d..2d14a7a 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180906git37598c4fee7c%{?dist} +Release: 0.20180914gitc51d4e55d285%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180906git37598c4fee7c.tar.gz +Source: %{name}-%{version}-0.20180914gitc51d4e55d285.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc51d4e55d285 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Thu Sep 06 2018 Frank Ch. Eigler - 4.0-0.20180906git37598c4fee7c - Automated weekly rawhide release - Applied spec changes from upstream git From 40630c72c233d7a855bae84c88382ac0d16be98a Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 16:01:34 -0400 Subject: [PATCH 25/39] more rhts boilerplate imported from acl/ --- tests/dejagnu-smoketest/Makefile | 38 +++++++++++++++++++++++++++ tests/dejagnu-smoketest/runtest.sh | 12 ++------- tests/dejagnu-smoketest/test-smoke.sh | 12 +++++++++ 3 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 tests/dejagnu-smoketest/Makefile create mode 100755 tests/dejagnu-smoketest/test-smoke.sh diff --git a/tests/dejagnu-smoketest/Makefile b/tests/dejagnu-smoketest/Makefile new file mode 100644 index 0000000..837c343 --- /dev/null +++ b/tests/dejagnu-smoketest/Makefile @@ -0,0 +1,38 @@ +TOPLEVEL_NAMESPACE=fedora +PACKAGE_NAME=systemtap +RELATIVE_PATH=Sanity/dejagnu-smoketest +export TESTVERSION=1.0 +export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) + +.PHONY: all install download clean +BUILT_FILES= +FILES=$(METADATA) runtest.sh Makefile PURPOSE test-smoke.sh + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x ./runtest.sh ./test-smoke.sh + +clean: + rm -f *~ *.rpm $(BUILT_FILES) + +include /usr/share/rhts/lib/rhts-make.include + +# Generate the testinfo.desc here: +$(METADATA): Makefile + @touch $(METADATA) +# Change to the test owner's name + @echo "Owner: Frank Ch. Eigler " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "Description: smoke test" >> $(METADATA) + @echo "TestTime: 10m" >> $(METADATA) + @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) + @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + +# You may need other fields here; see the documentation + rhts-lint $(METADATA) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 1ca3c89..879aaf0 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -1,11 +1,3 @@ -#! /bin/sh +#!/bin/sh -set -e -cd /usr/share/systemtap/testsuite -make installcheck RUNTESTFLAGS=proc_by_pid.exp -cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results -if grep -q unexpected systemtap.sum.results ; then - exit 0 -else - exit 1 -fi +rhts-run-simple-test $TEST ./test-smoke.sh diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh new file mode 100755 index 0000000..4dcdc6d --- /dev/null +++ b/tests/dejagnu-smoketest/test-smoke.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e +set -x +cd /usr/share/systemtap/testsuite +make installcheck RUNTESTFLAGS=proc_by_pid.exp +cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results +if grep -q unexpected systemtap.sum.results ; then + exit 0 +else + exit 1 +fi From 85ce83bb042af8480a3e3cc9ce14b340218e2ee3 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 16:03:52 -0400 Subject: [PATCH 26/39] Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ed65144..c4eb1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /systemtap-4.0-0.20180810git.tar.gz /systemtap-4.0-0.20180906git37598c4fee7c.tar.gz /systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz +/systemtap-4.0-0.20180914gitc1befcceae01.tar.gz diff --git a/sources b/sources index 977fd6a..413efa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz) = cc019bedae025f13c6e99384b5f197553e5c8a25edf6bf7388bd8e12e2f815b96e8b5be9ce6466d09d8987f54e12d7c333a6e3ef5ac0ce3d28ed04cf8915b381 +SHA512 (systemtap-4.0-0.20180914gitc1befcceae01.tar.gz) = 2f6da0a6fe474218fa37ad9bc155ca1456952a0fd6c8239765425a43e49187fdd33c9e3d0db7b0d6c854c5da83658679b3bf25edaffa99074adcd7a3bc09ab29 diff --git a/systemtap.spec b/systemtap.spec index 2d14a7a..5e89b6f 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitc51d4e55d285%{?dist} +Release: 0.20180914gitc1befcceae01%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180914gitc51d4e55d285.tar.gz +Source: %{name}-%{version}-0.20180914gitc1befcceae01.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc1befcceae01 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc51d4e55d285 - Automated weekly rawhide release - Applied spec changes from upstream git From 534796bb5d7d07ec5897117330ce483015551bc9 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 16:58:23 -0400 Subject: [PATCH 27/39] CI try 3 - hand-install the kernel-debuginfo --- tests/dejagnu-smoketest/runtest.sh | 3 +++ tests/tests.yml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 879aaf0..7f4bc2d 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -1,3 +1,6 @@ #!/bin/sh +set -e +dnf debuginfo-install -y kernel + rhts-run-simple-test $TEST ./test-smoke.sh diff --git a/tests/tests.yml b/tests/tests.yml index 00b92b1..5d88e66 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -8,5 +8,4 @@ - dejagnu-smoketest required_packages: - systemtap-testsuite - - kernel-debuginfo - kernel-devel From 31f6729a4fdae3f6b895335f8129f0196dc2dbcb Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 17:15:01 -0400 Subject: [PATCH 28/39] Automated weekly systemtap rawhide release: 0.20180914gitc1befcceae01 --- systemtap.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemtap.spec b/systemtap.spec index 5e89b6f..e169ace 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1275,6 +1275,10 @@ done - Automated weekly rawhide release - Applied spec changes from upstream git +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc1befcceae01 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc51d4e55d285 - Automated weekly rawhide release - Applied spec changes from upstream git From 33ac182b0172bafb187ea88ae4c5a9b69958b762 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 18:00:46 -0400 Subject: [PATCH 29/39] Automated weekly systemtap rawhide release: 0.20180914git11a0a7aea387 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c4eb1a5..d6f89a9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /systemtap-4.0-0.20180906git37598c4fee7c.tar.gz /systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz /systemtap-4.0-0.20180914gitc1befcceae01.tar.gz +/systemtap-4.0-0.20180914git11a0a7aea387.tar.gz diff --git a/sources b/sources index 413efa8..cdda8c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180914gitc1befcceae01.tar.gz) = 2f6da0a6fe474218fa37ad9bc155ca1456952a0fd6c8239765425a43e49187fdd33c9e3d0db7b0d6c854c5da83658679b3bf25edaffa99074adcd7a3bc09ab29 +SHA512 (systemtap-4.0-0.20180914git11a0a7aea387.tar.gz) = 91f7fbb8758f3bcc2a07ba77e674fbbb036e735ade59266ea160c9d8a4a98e444a433857bbfa93e734f6b87d9668138ade77451bd3e091682abb8bae996d16d5 diff --git a/systemtap.spec b/systemtap.spec index e169ace..338598b 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitc1befcceae01%{?dist} +Release: 0.20180914git11a0a7aea387%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180914gitc1befcceae01.tar.gz +Source: %{name}-%{version}-0.20180914git11a0a7aea387.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914git11a0a7aea387 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc1befcceae01 - Automated weekly rawhide release - Applied spec changes from upstream git From c730acbcfd77a6a71d49aa5ab8cfb4154d723143 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 19:38:15 -0400 Subject: [PATCH 30/39] CI try 4 --- tests/dejagnu-smoketest/runtest.sh | 2 +- tests/dejagnu-smoketest/test-smoke.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 7f4bc2d..94edebe 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -dnf debuginfo-install -y kernel +dnf debuginfo-install -y kernel libstdc++-devel rhts-run-simple-test $TEST ./test-smoke.sh diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh index 4dcdc6d..4108b37 100755 --- a/tests/dejagnu-smoketest/test-smoke.sh +++ b/tests/dejagnu-smoketest/test-smoke.sh @@ -1,12 +1,14 @@ #! /bin/sh -set -e -set -x cd /usr/share/systemtap/testsuite +rm -f systemtap.sum.results make installcheck RUNTESTFLAGS=proc_by_pid.exp cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results -if grep -q unexpected systemtap.sum.results ; then - exit 0 +log "Results: `cat systemtap.sum.results`" +if [ ! -f systemtap.sum.results ]; then + log "RESULT: FAIL" +elif grep -q unexpected systemtap.sum.results ; then + log "RESULT: FAIL" else - exit 1 + log "RESULT: PASS" fi From 645ca4419550c0d79d98e08aac2cecac420de32c Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 19:46:13 -0400 Subject: [PATCH 31/39] Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d6f89a9..0612e3c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz /systemtap-4.0-0.20180914gitc1befcceae01.tar.gz /systemtap-4.0-0.20180914git11a0a7aea387.tar.gz +/systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz diff --git a/sources b/sources index cdda8c5..0a0a54d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180914git11a0a7aea387.tar.gz) = 91f7fbb8758f3bcc2a07ba77e674fbbb036e735ade59266ea160c9d8a4a98e444a433857bbfa93e734f6b87d9668138ade77451bd3e091682abb8bae996d16d5 +SHA512 (systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz) = 18687c3dea7c67cb7c99df7c24b7e57d5fa369bfd2786486b834d0571a4f7dd1bb848811d7f6ce96a355b9387523bb32ad24130ae52c7e43c58b43912d6ff63b diff --git a/systemtap.spec b/systemtap.spec index 338598b..04a5057 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914git11a0a7aea387%{?dist} +Release: 0.20180914gitfe4e14f4af16%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180914git11a0a7aea387.tar.gz +Source: %{name}-%{version}-0.20180914gitfe4e14f4af16.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914git11a0a7aea387 - Automated weekly rawhide release - Applied spec changes from upstream git From 19d1385d28bbede8204b3e98fc1670976d6f7ac4 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 21:15:38 -0400 Subject: [PATCH 32/39] CI take 5, k.i.s.s. --- tests/dejagnu-smoketest/Makefile | 4 ++-- tests/dejagnu-smoketest/runtest.sh | 10 ++++++++-- tests/dejagnu-smoketest/test-smoke.sh | 14 -------------- 3 files changed, 10 insertions(+), 18 deletions(-) delete mode 100755 tests/dejagnu-smoketest/test-smoke.sh diff --git a/tests/dejagnu-smoketest/Makefile b/tests/dejagnu-smoketest/Makefile index 837c343..e212345 100644 --- a/tests/dejagnu-smoketest/Makefile +++ b/tests/dejagnu-smoketest/Makefile @@ -6,13 +6,13 @@ export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) .PHONY: all install download clean BUILT_FILES= -FILES=$(METADATA) runtest.sh Makefile PURPOSE test-smoke.sh +FILES=$(METADATA) runtest.sh Makefile PURPOSE run: $(FILES) build ./runtest.sh build: $(BUILT_FILES) - chmod a+x ./runtest.sh ./test-smoke.sh + chmod a+x ./runtest.sh clean: rm -f *~ *.rpm $(BUILT_FILES) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 94edebe..546a583 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -1,6 +1,12 @@ #!/bin/sh set -e -dnf debuginfo-install -y kernel libstdc++-devel +set -x -rhts-run-simple-test $TEST ./test-smoke.sh +dnf debuginfo-install -y kernel + +stap -L 'process("stap").mark("*")' | grep -q pass +stap -L 'kernel.trace("*")' | grep -q sys_ +stap -v --example helloworld.stp +stap -v -T 1 -e 'probe kernel.function("do_exit") {println($$vars)}' +stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}' diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh deleted file mode 100755 index 4108b37..0000000 --- a/tests/dejagnu-smoketest/test-smoke.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -cd /usr/share/systemtap/testsuite -rm -f systemtap.sum.results -make installcheck RUNTESTFLAGS=proc_by_pid.exp -cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results -log "Results: `cat systemtap.sum.results`" -if [ ! -f systemtap.sum.results ]; then - log "RESULT: FAIL" -elif grep -q unexpected systemtap.sum.results ; then - log "RESULT: FAIL" -else - log "RESULT: PASS" -fi From 4fb6cc1adf5ab5f2ed5587253f5af1da03139ccd Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 21:18:48 -0400 Subject: [PATCH 33/39] Automated weekly systemtap rawhide release: 0.20180914gitfe4e14f4af16.1 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0612e3c..cb45f17 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /systemtap-4.0-0.20180914gitc1befcceae01.tar.gz /systemtap-4.0-0.20180914git11a0a7aea387.tar.gz /systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz +/systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz diff --git a/sources b/sources index 0a0a54d..71ef46b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz) = 18687c3dea7c67cb7c99df7c24b7e57d5fa369bfd2786486b834d0571a4f7dd1bb848811d7f6ce96a355b9387523bb32ad24130ae52c7e43c58b43912d6ff63b +SHA512 (systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz) = 18687c3dea7c67cb7c99df7c24b7e57d5fa369bfd2786486b834d0571a4f7dd1bb848811d7f6ce96a355b9387523bb32ad24130ae52c7e43c58b43912d6ff63b diff --git a/systemtap.spec b/systemtap.spec index 04a5057..bbbecc4 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitfe4e14f4af16%{?dist} +Release: 0.20180914gitfe4e14f4af16.1%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180914gitfe4e14f4af16.tar.gz +Source: %{name}-%{version}-0.20180914gitfe4e14f4af16.1.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16.1 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16 - Automated weekly rawhide release - Applied spec changes from upstream git From 2bcf1a304545c08be29db3bb6d2be495bd6f3df3 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sun, 16 Sep 2018 06:26:23 -0400 Subject: [PATCH 34/39] CI try 6 --- systemtap.spec | 2 +- tests/dejagnu-smoketest/runtest.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index bbbecc4..0150965 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitfe4e14f4af16.1%{?dist} +Release: 0.20180914gitfe4e14f4af16.2%{?dist} # for version, see also configure.ac diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 546a583..ea38115 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -10,3 +10,5 @@ stap -L 'kernel.trace("*")' | grep -q sys_ stap -v --example helloworld.stp stap -v -T 1 -e 'probe kernel.function("do_exit") {println($$vars)}' stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}' + +echo PASS From c985571b05744fddb05a45941803e8dda99e1bd3 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sun, 16 Sep 2018 07:32:39 -0400 Subject: [PATCH 35/39] CI try 7 --- systemtap.spec | 2 +- tests/dejagnu-smoketest/runtest.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 0150965..959b21d 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitfe4e14f4af16.2%{?dist} +Release: 0.20180914gitfe4e14f4af16.3%{?dist} # for version, see also configure.ac diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index ea38115..8449c1c 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -5,10 +5,13 @@ set -x dnf debuginfo-install -y kernel +# on Fedora CI, can only assume about 1GB RAM to run these tests + stap -L 'process("stap").mark("*")' | grep -q pass -stap -L 'kernel.trace("*")' | grep -q sys_ +# stap -L 'kernel.trace("sys_enter")' stap -v --example helloworld.stp stap -v -T 1 -e 'probe kernel.function("do_exit") {println($$vars)}' -stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}' +# stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}' -echo PASS +echo +echo RESULT: PASS From b6ed2853aa9ef1d1098c451736add773ff901448 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sun, 16 Sep 2018 11:11:19 -0400 Subject: [PATCH 36/39] CI try 8 --- systemtap.spec | 2 +- tests/dejagnu-smoketest/runtest.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 959b21d..62784c9 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitfe4e14f4af16.3%{?dist} +Release: 0.20180914gitfe4e14f4af16.4%{?dist} # for version, see also configure.ac diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 8449c1c..11b4d87 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -7,11 +7,11 @@ dnf debuginfo-install -y kernel # on Fedora CI, can only assume about 1GB RAM to run these tests -stap -L 'process("stap").mark("*")' | grep -q pass +stap -L 'process("stap").mark("*")' | grep pass # stap -L 'kernel.trace("sys_enter")' stap -v --example helloworld.stp -stap -v -T 1 -e 'probe kernel.function("do_exit") {println($$vars)}' -# stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}' +stap -v -T 10 -e 'probe kernel.function("do_exit") {println($$vars)}' -c true +# stap -v -T 10 -e 'probe syscall.* ? {println(argstr)}' echo echo RESULT: PASS From e5251ded4181a7c03d896c8b5ac93a1a75ac621d Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 3 Oct 2018 22:29:39 -0400 Subject: [PATCH 37/39] Automated weekly systemtap rawhide release: 0.20181003git4ad1e11de831 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb45f17..c78d180 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /systemtap-4.0-0.20180914git11a0a7aea387.tar.gz /systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz /systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz +/systemtap-4.0-0.20181003git4ad1e11de831.tar.gz diff --git a/sources b/sources index 71ef46b..e4259e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz) = 18687c3dea7c67cb7c99df7c24b7e57d5fa369bfd2786486b834d0571a4f7dd1bb848811d7f6ce96a355b9387523bb32ad24130ae52c7e43c58b43912d6ff63b +SHA512 (systemtap-4.0-0.20181003git4ad1e11de831.tar.gz) = 7c2f76da08eacb6eb9742ccb6d4cc84f5ea84ff3ff0049f6190d4f6d0c7f864c2507abc6287f57b278faa0afcb6195b52d4408ed70d8f9b694ac2dc2dce34707 diff --git a/systemtap.spec b/systemtap.spec index 62784c9..fbc05cb 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20180914gitfe4e14f4af16.4%{?dist} +Release: 0.20181003git4ad1e11de831%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20180914gitfe4e14f4af16.1.tar.gz +Source: %{name}-%{version}-0.20181003git4ad1e11de831.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,6 +1271,10 @@ done # PRERELEASE %changelog +* Wed Oct 03 2018 Frank Ch. Eigler - 4.0-0.20181003git4ad1e11de831 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16.1 - Automated weekly rawhide release - Applied spec changes from upstream git From 864ecbdfc234c8a24cc3e8b50767f8ae9a2ff118 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 3 Oct 2018 22:17:17 -0400 Subject: [PATCH 38/39] test simplify more --- tests/dejagnu-smoketest/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 11b4d87..d988142 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -10,7 +10,7 @@ dnf debuginfo-install -y kernel stap -L 'process("stap").mark("*")' | grep pass # stap -L 'kernel.trace("sys_enter")' stap -v --example helloworld.stp -stap -v -T 10 -e 'probe kernel.function("do_exit") {println($$vars)}' -c true +stap -v -T 10 -p4 -e 'probe kernel.function("do_exit") {println($$vars)}' # stap -v -T 10 -e 'probe syscall.* ? {println(argstr)}' echo From 227f3127cef89fb913a0811d5477aec5d79d453d Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sat, 13 Oct 2018 15:30:56 -0400 Subject: [PATCH 39/39] upstream 4.0 release --- .gitignore | 1 + sources | 2 +- systemtap.spec | 51 ++++---------------------------------------------- 3 files changed, 6 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index c78d180..36cb986 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz /systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz /systemtap-4.0-0.20181003git4ad1e11de831.tar.gz +/systemtap-4.0.tar.gz diff --git a/sources b/sources index e4259e2..b11ecf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.0-0.20181003git4ad1e11de831.tar.gz) = 7c2f76da08eacb6eb9742ccb6d4cc84f5ea84ff3ff0049f6190d4f6d0c7f864c2507abc6287f57b278faa0afcb6195b52d4408ed70d8f9b694ac2dc2dce34707 +SHA512 (systemtap-4.0.tar.gz) = 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79 diff --git a/systemtap.spec b/systemtap.spec index fbc05cb..afd579f 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -84,7 +84,7 @@ Name: systemtap Version: 4.0 -Release: 0.20181003git4ad1e11de831%{?dist} +Release: 1%{?release_override}%{?dist} # for version, see also configure.ac @@ -119,7 +119,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20181003git4ad1e11de831.tar.gz +Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* BuildRequires: gcc-c++ @@ -1271,51 +1271,8 @@ done # PRERELEASE %changelog -* Wed Oct 03 2018 Frank Ch. Eigler - 4.0-0.20181003git4ad1e11de831 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16.1 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitfe4e14f4af16 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914git11a0a7aea387 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc1befcceae01 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc1befcceae01 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Sep 14 2018 Frank Ch. Eigler - 4.0-0.20180914gitc51d4e55d285 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Thu Sep 06 2018 Frank Ch. Eigler - 4.0-0.20180906git37598c4fee7c -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Thu Sep 06 2018 Frank Ch. Eigler - 4.0-0.20180906git37598c4fee7c -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Fri Aug 10 2018 Frank Ch. Eigler - 4.0-0.20180810git -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Sat Jul 14 2018 Fedora Release Engineering - 3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 3.3-2 -- Rebuilt for Python 3.7 +* Sat Oct 13 2018 Frank Ch. Eigler - 4.0-1 +- Upstream release. * Thu Jun 07 2018 Frank Ch. Eigler - 3.3-1 - Upstream release.