1. photon
  2. Commit a6a94bc2fe59961c3b6e83ef0db66d09adbcb6d1
Browse code

falco and file are updated for Photon 2.0

Change-Id: If02f1d506d98253de2a045e8670abb392e6da661
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2274
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sarah Choi <sarahc@vmware.com>

changpil authored on 2017/04/05 06:31:40
Showing 3 changed files
SPECS/falco/falco.spec
History View file @ a6a94bc
... ... 
@@ -1,36 +1,34 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        The Behavioral Activity Monitor With Container Support
3 3 
 Name:           falco
4 
-Version:        0.2.0
5 
-Release:        7%{?kernelsubrelease}%{?dist}
6 
-License:        GPLv2
4 
+Version:        0.6.0
5 
+Release:        1%{?kernelsubrelease}%{?dist}
6 
+License:        GPLv2
7 7 
 URL:            http://www.sysdig.org/falco/
8 
-Group:          Applications/System
8 
+Group:          Applications/System
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution:   Photon
11 11 
 Source0:        https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz
12 
-%define sha1    falco=c40840c6dcbd25fd1d0bf8aa2d1f77b1f5a7cde2
13 
-Source1:        https://github.com/draios/sysdig/archive/sysdig-0.10.1.tar.gz
14 
-%define sha1    sysdig=272b95ad02be4d194bba66d360ff935084d9c842
12 
+%define sha1    falco=04dc79c1c4773ba2080c2c49c718305e7920c2f7
13 
+Source1:        https://github.com/draios/sysdig/archive/sysdig-0.15.1.tar.gz
14 
+%define sha1    sysdig=5b1a7a4978315176412989b5400572d849691917
15 15 
 Source2:        http://stedolan.github.io/jq/download/linux64/jq
16 16 
 %define sha1    jq=e820e9e91c9cce6154f52949a3b2a451c4de8af4
17 17 
 Source3:        http://libvirt.org/sources/libvirt-2.0.0.tar.xz
18 18 
 %define sha1    libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f
19 
-Patch0:         sysdig_for_linux-4.9.2.patch
20 19 
 BuildRequires:  cmake
21 20 
 BuildRequires:  openssl-devel
22 21 
 BuildRequires:  curl-devel
23 22 
 BuildRequires:  zlib-devel
24 23 
 BuildRequires:  ncurses-devel
25 
-BuildRequires:  automake
26 24 
 BuildRequires:  linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
27 
-BuildRequires:  autoconf
28 
-BuildRequires:  libgcrypt
25 
+BuildRequires:  libgcrypt
29 26 
 BuildRequires:  sysdig
30 27 
 BuildRequires:  git
31 28 
 BuildRequires:  lua-devel
32 29 
 BuildRequires:  libyaml-devel
33 30 
 BuildRequires:  linux-api-headers
31 
+BuildRequires:  wget
34 32 
 Requires:       zlib
35 33 
 Requires:       ncurses
36 34 
 Requires:       openssl
... ... 
@@ -45,13 +43,14 @@ Sysdig falco is an open source, behavioral activity monitor designed to detect a
45 45 
 %prep
46 46 
 %setup
47 47 
 %setup -T -D -a 1
48 
-%patch0 -p1
49 48 
 chmod +x %{SOURCE2}
50 49 
 cp %{SOURCE2} /usr/bin
51 50 
 tar xf %{SOURCE3} --no-same-owner
52 51
53 52 
 %build
54 
-mv sysdig-0.10.1 ../sysdig
53 
+mv sysdig-0.15.1 ../sysdig
54 
+sed -i 's|../falco/rules|rules|g' userspace/engine/CMakeLists.txt
55 
+sed -i 's|../falco/userspace|userspace|g' userspace/engine/config_falco_engine.h.in
55 56 
 # fix for linux-4.9
56 57 
 sed -i 's|task_thread_info(current)->status|current->thread.status|g' ../sysdig/driver/main.c
57 58 
 sed -i 's|task_thread_info(task)->status|current->thread.status|g' ../sysdig/driver/ppm_syscall.h
... ... 
@@ -79,6 +78,8 @@ rm -rf %{buildroot}/*
79 79 
 %{_datadir}/*
80 80
81 81 
 %changelog
82 
+*   Mon Apr 03 2017 Chang Lee <changlee@vmware.com> 0.6.0-1
83 
+-   Update to version 0.6.0
82 84 
 *   Wed Jan 11 2017 Alexey Makhalov <amakhalov@vmware.com> 0.2.0-7
83 85 
 -   Fix building for linux-4.9.2
84 86 
 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.2.0-6
SPECS/file/file-5.30-keep-not-stripped-last.patch
History View file @ a6a94bc
85 87 
new file mode 100644
... ... 
@@ -0,0 +1,35 @@
0 
+From 590b893222ee6102f1bcaad7a5e3e6abf315de3a Mon Sep 17 00:00:00 2001
1 
+From: Christos Zoulas <christos@zoulas.com>
2 
+Date: Tue, 14 Feb 2017 12:56:48 +0000
3 
+Subject: [PATCH] keep "[not] stripped" last since some scripts expect it to be
4 
+ there.
5 
+
6 
+Upstream-commit: 1507352bc5cbdebaa9f64f1c73876ec9d8a638bc
7 
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
8 
+---
9 
+ src/readelf.c | 6 +++---
10 
+ 1 file changed, 3 insertions(+), 3 deletions(-)
11 
+
12 
+diff --git a/src/readelf.c b/src/readelf.c
13 
+index d1b71cf..3695c89 100644
14 
+--- a/src/readelf.c
15 
+@@ -1373,12 +1373,12 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
16 
+ 		}
17 
+ 	}
18 
+
19 
+-	if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1)
20 
+-		return -1;
21 
+ 	if (has_debug_info) {
22 
+ 		if (file_printf(ms, ", with debug_info") == -1)
23 
+ 			return -1;
24 
+ 	}
25 
++	if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1)
26 
++		return -1;
27 
+ 	if (cap_hw1) {
28 
+ 		const cap_desc_t *cdp;
29 
+ 		switch (mach) {
30 
+--
31 
+2.7.4
32 
+
33 
+
SPECS/file/file.spec
History View file @ a6a94bc
... ... 
@@ -1,19 +1,21 @@
1 1 
 Summary:	Contains a utility for determining file types
2 2 
 Name:		file
3 
-Version:	5.24
4 
-Release:	2%{?dist}
3 
+Version:	5.30
4 
+Release:	1%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://www.darwinsys.com/file
7 7 
 Group:		Applications/File
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
11 
-%define sha1 file=152daac79ccb4560dc65d5aaf754196ec1536f1d
11 
+%define sha1 file=276051cd2c438d4e7a321c4422a5b3bc850fd747
12 
+Patch0:  file-5.30-keep-not-stripped-last.patch
12 13 
 %description
13 14 
 The package contains a utility for determining the type of a
14 15 
 given file or files
15 16 
 %prep
16 17 
 %setup -q
18 
+%patch0 -p1
17 19 
 %build
18 20 
 ./configure \
19 21 
 	--prefix=%{_prefix} \
... ... 
@@ -37,6 +39,8 @@ make %{?_smp_mflags} check
37 37 
 %{_mandir}/*/*
38 38 
 %{_datarootdir}/misc/magic.mgc
39 39 
 %changelog
40 
+*	Tue Apr 04 2017 Chang Lee <changlee@vmware.com> 5.30-1
41 
+-	Updated to version 5.30
40 42 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.24-2
41 43 
 -	GA - Bump release of all rpms
42 44 
 * 	Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 5.24-1