summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Angelopoulos2018-08-20 11:45:16 +0200
committerGeorge Angelopoulos2018-08-20 11:45:16 +0200
commit69c45dce7d4436d65b89b8d37c6ba1e445f7c41c (patch)
tree52065f1411e5265640af3aa27f9b2d06a6ea1b01
parent422e628c9fbcc9e805ce9e9afbff481194a30f0b (diff)
downloadaur-69c45dce7d4436d65b89b8d37c6ba1e445f7c41c.tar.gz
version 3.3
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD25
-rw-r--r--fix-timers-for-4.15-kernel.patch243
-rw-r--r--fixes-for-gcc-8.patch193
-rw-r--r--stp_remove_install_hooks.patch37
5 files changed, 12 insertions, 504 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ef0e3658e7..a07cea71804 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jun 3 17:06:32 UTC 2018
+# Mon Aug 20 09:44:39 UTC 2018
pkgbase = systemtap
pkgdesc = provides infrastructure to simplify the gathering of information about the running system.
- pkgver = 3.2
- pkgrel = 4
+ pkgver = 3.3
+ pkgrel = 1
url = http://sourceware.org/systemtap/
install = systemtap.install
arch = x86_64
@@ -15,16 +15,10 @@ pkgbase = systemtap
depends = nss
depends = python2
optdepends = sqlite3: for storing results in a database
- source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz
- source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc
- source = stp_remove_install_hooks.patch
- source = fixes-for-gcc-8.patch
- source = fix-timers-for-4.15-kernel.patch
- sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94
+ source = systemtap-3.3.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz
+ source = systemtap-3.3.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz.asc
+ sha512sums = b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e
sha512sums = SKIP
- sha512sums = 1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537
- sha512sums = 970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a
- sha512sums = 3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d
pkgname = systemtap
diff --git a/PKGBUILD b/PKGBUILD
index 5af45230ec7..6a3583f5dd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer : Christian Rebischke <Chris.Rebischke@archlinux.org>
# Contributor:dront78 <dront78@gmail.com>
pkgname=systemtap
-pkgver=3.2
-pkgrel=4
+pkgver=3.3
+pkgrel=1
pkgdesc="provides infrastructure to simplify the gathering of information about the running system."
url="http://sourceware.org/systemtap/"
arch=('x86_64' 'i686')
@@ -12,26 +12,13 @@ makedepends=('python2-setuptools' 'xmlto')
optdepends=('sqlite3: for storing results in a database')
source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz"
"${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc"
- 'stp_remove_install_hooks.patch'
- 'fixes-for-gcc-8.patch'
- 'fix-timers-for-4.15-kernel.patch'
)
-sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94'
- 'SKIP'
- '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537'
- '970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a'
- '3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d'
- )
+sha512sums=('b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e'
+ 'SKIP')
install='systemtap.install'
-validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8')
+validpgpkeys=('41A0C11274B1E87FE28E4C53E3D77E1F95161991')
+
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch"
- patch -Np1 -i "${srcdir}/fixes-for-gcc-8.patch"
- patch -Np1 -i "${srcdir}/fix-timers-for-4.15-kernel.patch"
- autoreconf -i
-}
build() {
cd "${pkgname}-${pkgver}"
./configure \
diff --git a/fix-timers-for-4.15-kernel.patch b/fix-timers-for-4.15-kernel.patch
deleted file mode 100644
index 3ca7c401e4c..00000000000
--- a/fix-timers-for-4.15-kernel.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff --git a/runtime/linux/runtime.h b/runtime/linux/runtime.h
-index 9c585a20d..df9b74c5c 100644
---- a/runtime/linux/runtime.h
-+++ b/runtime/linux/runtime.h
-@@ -34,7 +34,7 @@
- #include <linux/compat.h>
- #include <linux/sched.h>
- #include <linux/mm.h>
--#include <linux/timer.h>
-+#include "timer_compatibility.h"
- #include <linux/delay.h>
- #include <linux/profile.h>
- #include <linux/rcupdate.h>
-diff --git a/runtime/linux/timer_compatibility.h b/runtime/linux/timer_compatibility.h
-new file mode 100644
-index 000000000..ac03de998
---- /dev/null
-+++ b/runtime/linux/timer_compatibility.h
-@@ -0,0 +1,76 @@
-+/*
-+ * linux/timer.h compatibility defines and inlines
-+ * Copyright (C) 2017 Red Hat Inc.
-+ *
-+ * This file is part of systemtap, and is free software. You can
-+ * redistribute it and/or modify it under the terms of the GNU General
-+ * Public License (GPL); either version 2, or (at your option) any
-+ * later version.
-+ */
-+
-+#ifndef _TIMER_COMPATIBILITY_H_
-+#define _TIMER_COMPATIBILITY_H_
-+
-+#include <linux/timer.h>
-+
-+/*
-+ * Starting with the 4.15 kernel, the timer interface
-+ * changed. Originally, you'd do something like:
-+ *
-+ * static void timer_func(unsigned long val);
-+ *
-+ * init_timer(&timer);
-+ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL;
-+ * timer.function = timer_func;
-+ * timer.data = 0;
-+ * add_timer(&timer);
-+ *
-+ * The 'data' parameter would get passed to the callback
-+ * function. Starting with 4.15, you'd do something like this:
-+ *
-+ * static void timer_func(struct timer_list *val);
-+ *
-+ * timer_setup(&timer, timer_func, 0);
-+ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL;
-+ * add_timer(&timer);
-+ *
-+ * With the new code, the timer that caused the callback gets passed
-+ * to the timer callback function. The 'data' field has been removed.
-+ *
-+ * So, we're going to use the new interface. To hide the differences
-+ * between the callback function parameter type, we'll define a new
-+ * type, 'stp_timer_callback_parameter_t'.
-+ *
-+ * If code needs to figure out the difference between the old and new
-+ * interface, it should test the TIMER_TRACE_FLAGMASK define (which
-+ * only exists in the new interface).
-+ */
-+
-+#if defined(TIMER_TRACE_FLAGMASK)
-+/* This is the >= 4.15 kernel interface. */
-+
-+typedef struct timer_list * stp_timer_callback_parameter_t;
-+
-+#else
-+/* This is the < 4.15 kernel interface. */
-+
-+typedef unsigned long stp_timer_callback_parameter_t;
-+
-+/**
-+ * timer_setup - prepare a timer for first use
-+ * @timer: the timer in question
-+ * @callback: the function to call when timer expires
-+ * @flags: any TIMER_* flags (note that anything other than 0 is an
-+ * error, since this compatibility function can't support any
-+ * of the TIMER_* flags)
-+ */
-+#define timer_setup(timer, callback, flags) \
-+ { \
-+ init_timer((timer)); \
-+ (timer)->function = callback; \
-+ (timer)->data = 0; \
-+ BUILD_BUG_ON_ZERO((flags) != 0); \
-+ }
-+#endif
-+
-+#endif /* _TIMER_COMPATIBILITY_H_ */
-diff --git a/runtime/time.c b/runtime/time.c
-index 2e666d54c..91ceafa6a 100644
---- a/runtime/time.c
-+++ b/runtime/time.c
-@@ -168,10 +168,10 @@ __stp_time_smp_callback(void *val)
-
- /* The timer callback is in a softIRQ -- interrupts enabled. */
- static void
--__stp_time_timer_callback(unsigned long val)
-+__stp_time_timer_callback(stp_timer_callback_parameter_t unused)
- {
- stp_time_t *time =__stp_time_local_update();
-- (void) val;
-+ (void) unused;
-
- /* PR6481: make sure IRQs are enabled before resetting the timer
- (IRQs are disabled and then reenabled in
-@@ -200,9 +200,8 @@ __stp_init_time(void *info)
- time->freq = __stp_get_freq();
- __stp_time_local_update();
-
-- init_timer(&time->timer);
-+ timer_setup(&time->timer, __stp_time_timer_callback, 0);
- time->timer.expires = jiffies + STP_TIME_SYNC_INTERVAL;
-- time->timer.function = __stp_time_timer_callback;
-
- #ifndef STAPCONF_ADD_TIMER_ON
- add_timer(&time->timer);
-diff --git a/runtime/transport/relay_v2.c b/runtime/transport/relay_v2.c
-index f81d75dfa..135951a8e 100644
---- a/runtime/transport/relay_v2.c
-+++ b/runtime/transport/relay_v2.c
-@@ -30,7 +30,7 @@
- #include <linux/debugfs.h>
- #include <linux/mm.h>
- #include <linux/relay.h>
--#include <linux/timer.h>
-+#include "../linux/timer_compatibility.h"
- #include "../uidgid_compatibility.h"
- #include "relay_compat.h"
-
-@@ -120,7 +120,7 @@ static void __stp_relay_wakeup_readers(struct rchan_buf *buf)
- wake_up_interruptible(&buf->read_wait);
- }
-
--static void __stp_relay_wakeup_timer(unsigned long val)
-+static void __stp_relay_wakeup_timer(stp_timer_callback_parameter_t unused)
- {
- #ifdef STP_BULKMODE
- int i;
-@@ -151,10 +151,8 @@ static void __stp_relay_wakeup_timer(unsigned long val)
- static void __stp_relay_timer_init(void)
- {
- atomic_set(&_stp_relay_data.wakeup, 0);
-- init_timer(&_stp_relay_data.timer);
-+ timer_setup(&_stp_relay_data.timer, __stp_relay_wakeup_timer, 0);
- _stp_relay_data.timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL;
-- _stp_relay_data.timer.function = __stp_relay_wakeup_timer;
-- _stp_relay_data.timer.data = 0;
- add_timer(&_stp_relay_data.timer);
- smp_mb();
- }
-diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
-index 3400f220a..320fd187e 100644
---- a/runtime/transport/transport.c
-+++ b/runtime/transport/transport.c
-@@ -311,7 +311,7 @@ static void _stp_detach(void)
- }
-
-
--static void _stp_ctl_work_callback(unsigned long val);
-+static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused);
-
- /*
- * Called when stapio opens the control channel.
-@@ -320,13 +320,12 @@ static void _stp_attach(void)
- {
- dbug_trans(1, "attach\n");
- _stp_pid = current->pid;
-- if (_stp_namespaces_pid < 1)
-- _stp_namespaces_pid = _stp_pid;
-+ if (_stp_namespaces_pid < 1)
-+ _stp_namespaces_pid = _stp_pid;
- _stp_transport_data_fs_overwrite(0);
-- init_timer(&_stp_ctl_work_timer);
-+
-+ timer_setup(&_stp_ctl_work_timer, _stp_ctl_work_callback, 0);
- _stp_ctl_work_timer.expires = jiffies + STP_CTL_TIMER_INTERVAL;
-- _stp_ctl_work_timer.function = _stp_ctl_work_callback;
-- _stp_ctl_work_timer.data= 0;
- add_timer(&_stp_ctl_work_timer);
- }
-
-@@ -341,7 +340,7 @@ static void _stp_attach(void)
- * notified. Reschedules itself if someone is still attached
- * to the cmd channel.
- */
--static void _stp_ctl_work_callback(unsigned long val)
-+static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused)
- {
- int do_io = 0;
- unsigned long flags;
-diff --git a/tapset-timers.cxx b/tapset-timers.cxx
-index 1a40bcda0..0ab4d69cd 100644
---- a/tapset-timers.cxx
-+++ b/tapset-timers.cxx
-@@ -122,9 +122,13 @@ timer_derived_probe_group::emit_module_decls (systemtap_session& s)
- s.op->newline(-1) << "};";
- s.op->newline();
-
-- s.op->newline() << "static void enter_timer_probe (unsigned long val) {";
-+ s.op->newline() << "static void enter_timer_probe (stp_timer_callback_parameter_t val) {";
-+ s.op->newline() << "#if defined(TIMER_TRACE_FLAGMASK)";
-+ s.op->newline(1) << "struct stap_timer_probe* stp = container_of(val, struct stap_timer_probe, timer_list);";
-+ s.op->newline(-1) << "#else";
- s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [val];";
-- s.op->newline() << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||";
-+ s.op->newline(-1) << "#endif";
-+ s.op->newline(1) << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||";
- s.op->newline() << " (atomic_read (session_state()) == STAP_SESSION_RUNNING))";
- s.op->newline(1) << "mod_timer (& stp->timer_list, jiffies + ";
- emit_interval (s.op);
-@@ -148,9 +152,11 @@ timer_derived_probe_group::emit_module_init (systemtap_session& s)
- s.op->newline() << "for (i=0; i<" << probes.size() << "; i++) {";
- s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [i];";
- s.op->newline() << "probe_point = stp->probe->pp;";
-- s.op->newline() << "init_timer (& stp->timer_list);";
-- s.op->newline() << "stp->timer_list.function = & enter_timer_probe;";
-+
-+ s.op->newline() << "timer_setup (& stp->timer_list, enter_timer_probe, 0);";
-+ s.op->newline() << "#if !defined(TIMER_TRACE_FLAGMASK)";
- s.op->newline() << "stp->timer_list.data = i;"; // NB: important!
-+ s.op->newline() << "#endif";
- // copy timer renew calculations from above :-(
- s.op->newline() << "stp->timer_list.expires = jiffies + ";
- emit_interval (s.op);
-diff --git a/tapset/linux/scsi.stp b/tapset/linux/scsi.stp
-index 44f686c2a..35779421b 100644
---- a/tapset/linux/scsi.stp
-+++ b/tapset/linux/scsi.stp
-@@ -14,7 +14,7 @@
- #include <scsi/scsi_cmnd.h>
- #include <scsi/scsi_device.h>
- #include <scsi/scsi_host.h>
--#include <linux/timer.h>
-+#include "linux/timer_compatibility.h"
- #include <linux/blkdev.h>
- %}
diff --git a/fixes-for-gcc-8.patch b/fixes-for-gcc-8.patch
deleted file mode 100644
index 464be3f3b3d..00000000000
--- a/fixes-for-gcc-8.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-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<T> { static const bool __sdt_signed = true; };
--#define __SDT_COND_SIGNED(T) \
--template<> struct __sdt_type<T> { static const bool __sdt_signed = ((T)(-1) < 1); };
-+#define __SDT_COND_SIGNED(T,CT) \
-+template<> struct __sdt_type<T> { 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<string> 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/stp_remove_install_hooks.patch b/stp_remove_install_hooks.patch
deleted file mode 100644
index 244ac833c5f..00000000000
--- a/stp_remove_install_hooks.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am
-index a303d25f6..703668362 100644
---- a/stapbpf/Makefile.am
-+++ b/stapbpf/Makefile.am
-@@ -38,14 +38,4 @@ CLEANFILES =
- BUILT_SOURCES += git_version.stamp
- git_version.stamp ../git_version.h:
- $(MAKE) -C .. $(notdir $@)
--
--# Why the "id -u" condition? This way, an unprivileged user can run
--# make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
--install-exec-hook:
-- if [ `id -u` -eq 0 ]; then \
-- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
-- getent group stapusr >/dev/null \
-- && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
-- && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
-- fi
- endif
-diff --git a/staprun/Makefile.am b/staprun/Makefile.am
-index 4073aa01c..978d115f9 100644
---- a/staprun/Makefile.am
-+++ b/staprun/Makefile.am
-@@ -68,13 +68,3 @@ CLEANFILES =
- BUILT_SOURCES += git_version.stamp
- git_version.stamp ../git_version.h:
- $(MAKE) -C .. $(notdir $@)
--
--
--# Why the "id -u" condition? This way, an unprivileged user can run
--# make install, and have "sudo stap ...." or "sudo staprun ...." work later.
--install-exec-hook:
-- if [ `id -u` -eq 0 ]; then \
-- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
-- getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
-- chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
-- fi