android tools update

Signed-off-by: tuibuilder_pel7x64builder0 <tuibuilder@powerel.org>

SOURCES/adb-Makefile

@@ -13,10 +13,8 @@ SRCS+= transport_local.c
 SRCS+= transport_usb.c
 SRCS+= usb_linux.c
 SRCS+= usb_vendors.c
-SRCS+= utils.c
 
 VPATH+= ../libcutils
-SRCS+= abort_socket.c
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
@@ -24,7 +22,6 @@ SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
 SRCS+= load_file.c
-SRCS+= list.c
 
 VPATH+= ../libzipfile
 SRCS+= centraldir.c
@@ -32,9 +29,11 @@ SRCS+= zipfile.c
 
 VPATH+= ../libmincrypt
 SRCS+= rsa.c
-SRCS+= rsa_e_3.c
+SRCS+= sha256.c
-SRCS+= rsa_e_f4.c
 SRCS+= sha.c
+SRCS+= p256.c
+SRCS+= p256_ec.c
+SRCS+= p256_ecdsa.c
 
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
@@ -42,11 +41,14 @@ CPPFLAGS+= -DHAVE_SYMLINKS
 CPPFLAGS+= -DHAVE_TERMIO_H
 CPPFLAGS+= -D_GNU_SOURCE
 CPPFLAGS+= -D_XOPEN_SOURCE
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -DHAVE_OFF64_T
 CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 
 CFLAGS+= $(RPM_OPT_FLAGS)
 LIBS= -lrt -lpthread -lz -lcrypto
+LDFLAGS+= $(RPM_LD_FLAGS)
 
 CC= $(TOOLCHAIN)gcc
 LD= $(TOOLCHAIN)gcc

SOURCES/adb.service

@@ -8,6 +8,7 @@ Type=forking
 ExecStart=/usr/bin/adb start-server
 ExecStop=/usr/bin/adb kill-server
 PrivateTmp=yes
+Environment=HOME=/var/lib/adb
 
 [Install]
 WantedBy=multi-user.target

SPECS/android-tools.spec

@@ -1,10 +1,11 @@
-%global date 20130123
+%global date 20141219
-%global git_commit 98d0789
+%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_git_commit 4ff85ad
 %global extras_packdname extras-%{extras_git_commit}
 
+%global _hardened_build 1
 
 Name:          android-tools
 Version:       %{date}git%{git_commit}
@@ -17,9 +18,9 @@ License:       ASL 2.0 and (ASL 2.0 and BSD)
 URL:           http://developer.android.com/guide/developing/tools/
 
 #  using git archive since upstream hasn't created tarballs. 
-#  git archive --format=tar --prefix=%%{packdname}/ %%{git_commit} adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | xz  > %%{packdname}.tar.xz
+#  git archive --format=tar --prefix=%%{packdname}/ %%{git_commit} adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt include/utils include/private | xz  > %%{packdname}.tar.xz
 #  https://android.googlesource.com/platform/system/core.git
-#  git archive --format=tar --prefix=extras/ %%{extras_git_commit} ext4_utils | xz  > %%{extras_packdname}.tar.xz
+#  git archive --format=tar --prefix=extras/ %%{extras_git_commit} ext4_utils f2fs_utils | xz  > %%{extras_packdname}.tar.xz
 #  https://android.googlesource.com/platform/system/extras.git
 
 Source0:       %{packdname}.tar.xz
@@ -29,17 +30,18 @@ Source3:       adb-Makefile
 Source4:       fastboot-Makefile
 Source5:       51-android.rules
 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
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: libselinux-devel
+BuildRequires: f2fs-tools-devel
 BuildRequires: systemd
 
-ExcludeArch:    %{power64}
-
 Provides:      adb
 Provides:      fastboot
 
@@ -65,6 +67,7 @@ setup between the host and the target phone as adb.
 
 %prep
 %setup -q -b 1 -n extras
+%patch1 -p1
 %setup -q -b 0 -n %{packdname}
 cp -p %{SOURCE2} Makefile
 cp -p %{SOURCE3} adb/Makefile
@@ -76,6 +79,7 @@ make %{?_smp_mflags}
 
 %install
 install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
+install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir}
 install -p -D -m 0644 %{SOURCE6} \
     %{buildroot}%{_unitdir}/adb.service
@@ -92,6 +96,7 @@ install -p -D -m 0644 %{SOURCE6} \
 %files
 %doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt 51-android.rules
 %{_unitdir}/adb.service
+%attr(0755,root,root) %dir %{_sharedstatedir}/adb
 #ASL2.0
 %{_bindir}/adb
 #ASL2.0 and BSD.
@@ -99,8 +104,26 @@ install -p -D -m 0644 %{SOURCE6} \
 
 
 %changelog
-* Thu Sep 18 2014 Adam Miller <maxamillion@fedoraproject.org> - 20130123git98d0789-5
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20141219git8393e50-5
-- Exclude power64 architecture for EPEL7, not supported upstream.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20141219git8393e50-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed May 20 2015 Bastien Nocera <bnocera@redhat.com> 20141224git8393e50-3
+- Remove Apple from the vendor to launch adb.service for
+  They never created an Android phone, and probably never will
+
+* 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
+
+* Fri Sep 19 2014 Ivan Afonichev <ivan.afonichev@gmail.com> - 20130123git98d0789-5
+- Added more udev devices
+- Resolves: rhbz 967216 Adb service now stores keys in /var/lib/adb
 
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130123git98d0789-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild