From 3e256d0679bb56f63e119df766d189b14c20b634 Mon Sep 17 00:00:00 2001
From: Ivan Afonichev <ivan.afonichev@gmail.com>
Date: Jan 11 2015 18:51:48 +0000
Subject: Resolves: rhbz 1062095 Harden android-tools


Remove 0002-Add-missing-headers.patch

---

diff --git a/0002-Add-missing-headers.patch b/0002-Add-missing-headers.patch
deleted file mode 100644
index 639f0c3..0000000
--- a/0002-Add-missing-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ee818ba3cb26b65eb93eb5f85eca18546e9a9c2e Mon Sep 17 00:00:00 2001
-From: Jonathan Dieter <jdieter@lesbg.com>
-Date: Fri, 26 Dec 2014 19:50:06 +0200
-Subject: [PATCH 2/2] Add missing headers
-
-Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
----
- f2fs_utils/f2fs_ioutils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/f2fs_utils/f2fs_ioutils.c b/f2fs_utils/f2fs_ioutils.c
-index 2706d04..e4c6c83 100644
---- a/f2fs_utils/f2fs_ioutils.c
-+++ b/f2fs_utils/f2fs_ioutils.c
-@@ -39,6 +39,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <dlfcn.h>
-+#include <unistd.h>
- 
- #include <assert.h>
- 
--- 
-2.1.0
-
diff --git a/adb-Makefile b/adb-Makefile
index caaadbf..b089eeb 100644
--- a/adb-Makefile
+++ b/adb-Makefile
@@ -48,6 +48,7 @@ CPPFLAGS+= -I../include
 
 CFLAGS+= $(RPM_OPT_FLAGS)
 LIBS= -lrt -lpthread -lz -lcrypto
+LDFLAGS+= $(RPM_LD_FLAGS)
 
 CC= $(TOOLCHAIN)gcc
 LD= $(TOOLCHAIN)gcc
diff --git a/android-tools.spec b/android-tools.spec
index 703d605..4b283c5 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -2,14 +2,14 @@
 %global git_commit 8393e50
 
 %global packdname core-%{git_commit}
-#last extras ext4_utils  commit without custom libselinux requirement
 %global extras_git_commit 1e7d4f3
 %global extras_packdname extras-%{extras_git_commit}
 
+%global _hardened_build 1
 
 Name:          android-tools
 Version:       %{date}git%{git_commit}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Android platform tools(adb, fastboot)
 
 Group:         Applications/System
@@ -33,13 +33,13 @@ Source6:       adb.service
 # None of the code *we* compile uses anything from selinux/android.h, but 
 # other code may, so not upstreaming these patches
 Patch1:        0001-Remove-android-selinux-header.patch
-Patch2:        0002-Add-missing-headers.patch
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: libselinux-devel
+BuildRequires: f2fs-tools-devel
 BuildRequires: systemd
 
 Provides:      adb
@@ -68,7 +68,6 @@ setup between the host and the target phone as adb.
 %prep
 %setup -q -b 1 -n extras
 %patch1 -p1
-%patch2 -p1
 %setup -q -b 0 -n %{packdname}
 cp -p %{SOURCE2} Makefile
 cp -p %{SOURCE3} adb/Makefile
@@ -105,6 +104,10 @@ install -p -D -m 0644 %{SOURCE6} \
 
 
 %changelog
+* Sun Jan 11 2015 Ivan Afonichev <ivan.afonichev@gmail.com> - 20141224git8393e50-2
+- Resolves: rhbz 1062095 Harden android-tools
+- Remove 0002-Add-missing-headers.patch
+
 * Wed Dec 24 2014 Jonathan Dieter <jdieter@lesbg.com> - 20141224git8393e50-1
 - Update to 5.0.2 release
 
diff --git a/fastboot-Makefile b/fastboot-Makefile
index a41b6b4..a139c61 100644
--- a/fastboot-Makefile
+++ b/fastboot-Makefile
@@ -53,6 +53,7 @@ CPPFLAGS+= -I../../extras/f2fs_utils
 
 CFLAGS+= $(RPM_OPT_FLAGS) -std=gnu99
 LIBS= -lrt -lpthread -lz -lselinux
+LDFLAGS+= $(RPM_LD_FLAGS)
 
 CC= $(TOOLCHAIN)gcc
 LD= $(TOOLCHAIN)gcc