3
0
forked from pool/systemtap

Accepting request 627384 from home:simson:branches:devel:tools

- Upgrade to version 3.3:
  Changelog: https://lwn.net/Articles/757030/
  eBPF backend extensions, easier access to examples, adapting to
  meltdown/spectre complications, real-time / high-cpu-count
  concurrency fixes
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
  since he signed the new package
- Upgrade to version 3.3:
  Changelog: https://lwn.net/Articles/757030/
  eBPF backend extensions, easier access to examples, adapting to
  meltdown/spectre complications, real-time / high-cpu-count
  concurrency fixes
- Remove patches, because the issues were fixed upstream:
    systemtap-change-extra_cflags-escape-processing.patch 
- Adjust patch for version 3.3:
    systemtap-build-source-dir.patch
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
  since he signed the new package
- Upgrade to version 3.3:
  Changelog: https://lwn.net/Articles/757030/
  eBPF backend extensions, easier access to examples, adapting to
  meltdown/spectre complications, real-time / high-cpu-count
  concurrency fixes
- Remove patches, because the issues were fixed upstream:
    systemtap-fixes-for-gcc-8.patch
    systemtap-change-extra_cflags-escape-processing.patch 
- Adjust patch for version 3.3:
    systemtap-build-source-dir.patch
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
  since he signed the new package

OBS-URL: https://build.opensuse.org/request/show/627384
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=101
This commit is contained in:
Martin Pluskal 2018-08-16 07:21:58 +00:00 committed by Git OBS Bridge
parent 3983a728fd
commit ce0a3f0c47
14 changed files with 156 additions and 290 deletions

View File

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

View File

@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABCAAGBQJZ55i6AAoJEH6DYQEm3MLoymMH/iQbkklUGhZBlxQW16xk1X6V
ZlWhPIXScTVGlIv4b/30x2HoQ0LlhivGiChZxEWiGBquP6dEkAE+XE32us/bc5Q3
pr0QdC8K0rLDw1FNC9wY+eWR0RoLOCHDah1gqEiTgBZaC2qbivA4e2riDAvOg2Kq
8drHqH6p9ZCmlRErQKLc9CoQMXpe1RH1fzjzbxfHloq+vHQgF+sFzj45F0sNxY7P
XoyVKHfwSlVFsp+39jNPShojtzNIIzFHPZJGcxl2K+e4Hms1BrOPu4czPhuQFNtP
lNPJiWhmr+ynBEZasT7tGqUMokLqjLwGTiAH7su+2Dm8tr1U2ciP8QrR9bxCRr8=
=0Y0p
-----END PGP SIGNATURE-----

3
systemtap-3.3.tar.gz Normal file
View File

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

16
systemtap-3.3.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJbGwOGAAoJECWLbvoPIJ0kNO8P/1whbGag6RrPsS6cVaBKLbbj
YqHS+Hc+OcyN352+lBIy48+DuxDIzIz+9D1gn8SDG1lz8JpXUSPTOX2mjumrx4Pg
+qLsdNnsy+/7FOI8tQaZ0GIwEMZXY4NktYp1OfAb4kdqrzZIkma+jH17ge+kFT/v
OFxvqC8BjyXMbuItsgYLTfRZyH9ct5kowGxJ/Nhmk3yzOnMZyAbrtkUQc7IZcxsl
/9BMiXt3AxhwUzikKnGrv27J0/p3+ehmMtZv4OMhdu98BZGbKjCKIM5v53uGTNcI
JGgpeEUHRG3Mh6+akxMK3OxADr8nRFTvyaihyktt8OmtjnnBHpSCAOkVO7LyQkWc
fdDCG3cg9zIYnYr5Meiu4sBHw340v31gwVmqPeIgp0i/AhQzXsOT3t3uq3Uh9J2n
hqdNLEnSUh0+AxIuOmN2v77GFfn+9rBOdAQbWaUMO7/pwn4emTO1LRVTcZ+eNuXw
yZfUTrSy5GPVP2ltwF8aG+EpekyphwcSzPpAinolBYxW+wk/yOO9myG0+J9H/Ct4
9Z/SQwVSEuWmMUPAwSUA+uWpjswJO6y7Mesa8lUeFhIoW3qDmfs3pFe+MVmh2TWB
eQtecyfqHaFPTKWNv0a5k7O1NcKxmQiamMuSEhIGUhSGBxBJlXToYB+Ua+KkuGMk
0UMcHP00tXGtxCEXR1Hn
=5Dfr
-----END PGP SIGNATURE-----

View File

@ -26,7 +26,7 @@ necessary headers.
--- a/session.cxx
+++ b/session.cxx
@@ -105,6 +105,7 @@ systemtap_session::systemtap_session ():
@@ -108,6 +108,7 @@ systemtap_session::systemtap_session ():
kernel_release = string (buf.release);
release = kernel_release;
kernel_build_tree = "/lib/modules/" + kernel_release + "/build";
@ -34,7 +34,7 @@ necessary headers.
architecture = machine = normalize_machine(buf.machine);
for (unsigned i=0; i<5; i++) perpass_verbose[i]=0;
@@ -291,6 +292,7 @@ systemtap_session::systemtap_session (co
@@ -298,6 +299,7 @@ systemtap_session::systemtap_session (co
{
release = kernel_release = kern;
kernel_build_tree = "/lib/modules/" + kernel_release + "/build";
@ -42,7 +42,7 @@ necessary headers.
kernel_extra_cflags = other.kernel_extra_cflags;
architecture = machine = normalize_machine(arch);
setup_kernel_release(kern.c_str());
@@ -2027,21 +2029,39 @@ systemtap_session::setup_kernel_release
@@ -2218,21 +2220,39 @@ systemtap_session::setup_kernel_release
// normal search in tapsets.cxx. Without CONFIG_DEBUG_INFO, we'd
// need heuristics such as this one:
@ -77,7 +77,7 @@ necessary headers.
else
{
update_release_sysroot = true;
kernel_release = string (kstr);
kernel_release = kstr;
- if (!kernel_release.empty())
+ if (!kernel_release.empty()) {
kernel_build_tree = "/lib/modules/" + kernel_release + "/build";

View File

@ -1,45 +0,0 @@
From: David Smith <dsmith@redhat.com>
Date: Mon Nov 20 09:51:40 2017 -0600
Subject: change EXTRA_CFLAGS escape processing
Git-commit: c0a01780574234b7c87a7babdc7ee41f33a83983
References: bsc#1067437
Signed-off-by: Tony Jones <tonyj@suse.de>
Fix PR22462 by updating the way we generate the Makefile.
* buildrun.cxx (compile_pass): If the runtime path doesn't have any odd
characters in it, don't bother quoting it in the generated Makefile.
diff --git a/buildrun.cxx b/buildrun.cxx
index 6dc4e5fda..c286a4a80 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -36,6 +36,8 @@ extern "C" {
// https://bugs.gentoo.org/show_bug.cgi?id=522908
#define WERROR ("-W" "error")
+#define PATH_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+,-./_"
+
using namespace std;
/* Adjust and run make_cmd to build a kernel module. */
@@ -513,7 +515,18 @@ compile_pass (systemtap_session& s)
#if CHECK_POINTER_ARITH_PR5947
o << "EXTRA_CFLAGS += -Wpointer-arith" << endl;
#endif
- o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
+
+ // If we've got a reasonable runtime path from the user, we'll just
+ // do '-IDIR'. If there are any sneaky/odd characters in it, we'll
+ // have to quote it, like '-I"DIR"'.
+ if (s.runtime_path.find_first_not_of(PATH_ALLOWED_CHARS, 0) == string::npos)
+ o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;
+ else
+ {
+ s.print_warning("quoting runtime path in the module Makefile.");
+ o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
+ }
+
// XXX: this may help ppc toc overflow
// o << "CFLAGS := $(subst -Os,-O2,$(CFLAGS)) -fminimal-toc" << endl;
o << "obj-m := " << s.module_name << ".o" << endl;

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Aug 3 16:50:41 UTC 2018 - sschricker@suse.de
- Upgrade to version 3.3:
Changelog: https://lwn.net/Articles/757030/
eBPF backend extensions, easier access to examples, adapting to
meltdown/spectre complications, real-time / high-cpu-count
concurrency fixes
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
since he signed the new package
-------------------------------------------------------------------
Fri Feb 2 23:31:59 UTC 2018 - tonyj@suse.com

View File

@ -17,14 +17,14 @@
Name: systemtap-docs
Version: 3.2
Version: 3.3
Release: 0
Summary: Documents and examples for systemtap
License: GPL-2.0-or-later
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Url: https://sourceware.org/systemtap/
Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Source2: systemtap.keyring
Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING

View File

@ -1,211 +0,0 @@
From: Stan Cox <scox@redhat.com>
Date: Tue Feb 13 22:38:03 2018 -0500S
Subject: Fixes for gcc 8
Git-commit: a8e317b60139238fef4038027eb37507e066d720
References: bsc#1084642
Signed-off-by: Tony Jones <tonyj@suse.de>
Fixes for gcc 8
* includes/sys/sdt.h (__SDT_COND_SIGNED): Add CT, cast type argument
Author: Will Cohen <wcohen.redhat.com>
* 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<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()));
}

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Aug 3 16:50:41 UTC 2018 - sschricker@suse.de
- Upgrade to version 3.3:
Changelog: https://lwn.net/Articles/757030/
eBPF backend extensions, easier access to examples, adapting to
meltdown/spectre complications, real-time / high-cpu-count
concurrency fixes
- Remove patches, because the issues were fixed upstream:
systemtap-change-extra_cflags-escape-processing.patch
- Adjust patch for version 3.3:
systemtap-build-source-dir.patch
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
since he signed the new package
-------------------------------------------------------------------
Fri Feb 16 15:20:50 UTC 2018 - matz@suse.com

View File

@ -25,7 +25,7 @@
%define _rundir %{_localstatedir}/run
%endif
Name: systemtap-headers
Version: 3.2
Version: 3.3
Release: 0
Summary: SystemTap headers
License: GPL-2.0-or-later
@ -34,14 +34,13 @@ Url: http://sourceware.org/systemtap/
# sdt-devel provides the same header files as us, so we
# must conflict
Conflicts: systemtap-sdt-devel
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Source2: systemtap.keyring
Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING
Source5: stap-server.conf
Patch1: systemtap-build-source-dir.patch
Patch2: systemtap-change-extra_cflags-escape-processing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -53,7 +52,6 @@ systemtap-sdt-devel, which also contains these headers.
%prep
%setup -q -n systemtap-%{version}
%patch1 -p1
%patch2 -p1
%build
# Our binutils always support '?' in the section characters on all

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Fri Aug 3 16:50:41 UTC 2018 - sschricker@suse.de
- Upgrade to version 3.3:
Changelog: https://lwn.net/Articles/757030/
eBPF backend extensions, easier access to examples, adapting to
meltdown/spectre complications, real-time / high-cpu-count
concurrency fixes
- Remove patches, because the issues were fixed upstream:
systemtap-fixes-for-gcc-8.patch
systemtap-change-extra_cflags-escape-processing.patch
- Adjust patch for version 3.3:
systemtap-build-source-dir.patch
- Added public key of "Frank Ch. Eigler <fche@elastic.org>",
since he signed the new package
-------------------------------------------------------------------
Fri Mar 23 23:54:17 UTC 2018 - tonyj@suse.com

View File

@ -70,3 +70,70 @@ UG9hLDySLPeJkiW5YlZ/qgf3lb1yxGYj3zWgGXhRZVV85LOj3g1uxtxZXLcx9kFC
1wrX4e3+gUQkro6pEd6XOj7D9FASebMyN4hMbhJqTwA58Z/ROTJaWfFE9T8tGvtm
=ZzTJ
-----END PGP PUBLIC KEY BLOCK-----
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
m7AxNRbKxow=
=vfMt
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -20,21 +20,19 @@
%define _rundir %{_localstatedir}/run
%endif
Name: systemtap
Version: 3.2
Version: 3.3
Release: 0
Summary: Instrumentation System
License: GPL-2.0-or-later
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Url: https://sourceware.org/systemtap/
Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Source2: %{name}.keyring
Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING
Source5: stap-server.conf
Patch1: systemtap-build-source-dir.patch
Patch2: systemtap-change-extra_cflags-escape-processing.patch
Patch3: systemtap-fixes-for-gcc-8.patch
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libcap-devel
@ -97,8 +95,6 @@ This package contains the support tools for static probes.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure \