Replace go rpm stuff with export GO111MODULE=off

Add go rpm stuff
Use GO111MODULE=off to let go work offline
2021-08-04 01:44:47 +04:00 · 2021-08-03 03:56:19 +04:00 · 2021-08-03 03:41:29 +04:00 · 2021-08-03 01:47:30 +04:00 · 2021-08-02 02:58:43 +04:00 · 2021-03-15 01:11:29 +04:00
9 changed files with 9140 additions and 370 deletions
--- a/0001-Fix-libusb-enumeration.patch
+++ b/0001-Fix-libusb-enumeration.patch
@ -1,38 +0,0 @@
-From d349fae010f6c780d76e89c5d6b81d45119137c0 Mon Sep 17 00:00:00 2001
-From: Arnav Singh <me@arnavion.dev>
-Date: Sat, 3 Aug 2024 21:55:23 -0700
-Subject: [PATCH] Fix libusb enumeration to handle PINE64 PinePhone modem.
-
-The PINE64 PinePhone modem exposes itself as an adb-accessible device over USB
-but its device class is LIBUSB_CLASS_MISCELLANEOUS, so allow that too.
---
- vendor/adb/client/usb_libusb.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vendor/adb/client/usb_libusb.cpp b/vendor/adb/client/usb_libusb.cpp
-index 6133e7c8..9af91eb7 100644
--- a/vendor/adb/client/usb_libusb.cpp
-+++ b/vendor/adb/client/usb_libusb.cpp
-@@ -364,8 +364,8 @@ struct LibusbConnection : public Connection {
-     }
- 
-     bool FindInterface(libusb_device_descriptor* device_desc) {
-        if (device_desc->bDeviceClass != LIBUSB_CLASS_PER_INTERFACE) {
-            // Assume that all Android devices have the device class set to per interface.
-+        if (device_desc->bDeviceClass != LIBUSB_CLASS_PER_INTERFACE && device_desc->bDeviceClass != LIBUSB_CLASS_MISCELLANEOUS) {
-+            // Assume that all Android devices have the device class set to per interface or miscellaneous.
-             // TODO: Is this assumption valid?
-             VLOG(USB) << "skipping device with incorrect class at " << device_address_;
-             return false;
-@@ -1039,7 +1039,7 @@ void usb_init() {
-             static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-                                               LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
-             LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY,
-            LIBUSB_CLASS_PER_INTERFACE, hotplug_callback, nullptr, nullptr);
-+            LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, nullptr, nullptr);
- 
-     if (rc != LIBUSB_SUCCESS) {
-         LOG(FATAL) << "failed to register libusb hotplug callback";
-- 
-2.46.0
-
--- a/0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
+++ b/0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
@ -1,36 +0,0 @@
-From 36c605004ae1c75813181ffe4c59907016aaf9e9 Mon Sep 17 00:00:00 2001
-From: Biswapriyo Nath <nathbappai@gmail.com>
-Date: Tue, 22 Apr 2025 15:12:23 +0000
-Subject: [PATCH] extras/libjsonpb: Fix incompatibility with protobuf v30
-
-This commit fixes the following compiler error.
-
-jsonpb.cpp:36:44: error: invalid operands to binary expression (
-'basic_string<char, char_traits<char>, allocator<char>>' and
-'internal::DescriptorStringView' (aka 'basic_string_view<char>'))
-36 |   return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name();
-   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-More info here https://protobuf.dev/news/2024-10-02/#descriptor-apis
-
-Change-Id: I3c76d51dfdfbe013eaa5031e6194bf5edae1be35
---
- libjsonpb/parse/jsonpb.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vendor/extras/libjsonpb/parse/jsonpb.cpp b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-index b342c2b..ebd71bf 100644
--- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
-+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-@@ -33,7 +33,7 @@ using google::protobuf::util::TypeResolver;
- static constexpr char kTypeUrlPrefix[] = "type.googleapis.com";
- 
- std::string GetTypeUrl(const Message& message) {
-  return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name();
-+  return std::string(kTypeUrlPrefix) + "/" + std::string(message.GetDescriptor()->full_name());
- }
- 
- ErrorOr<std::string> MessageToJsonString(const Message& message) {
-- 
-2.49.0
-
--- a/0003-Make-legacy-USB-driver-default-on-Linux.patch
+++ b/0003-Make-legacy-USB-driver-default-on-Linux.patch
@ -1,34 +0,0 @@
-From 55d30a3098c29431bcbeb2d2a5f1a0c40844c311 Mon Sep 17 00:00:00 2001
-From: Fabien Sanglard <sanglardf@google.com>
-Date: Mon, 23 Jun 2025 11:21:16 -0700
-Subject: [PATCH] Make legacy USB driver default on Linux
-
-Bug: 366314975
-Bug: 398328647
-Test: Manual
-Flag: EXEMPT (adb.exe)
-Change-Id: Id49df58587d3f479d263a5b2da1679a1e675feb5
---
- client/transport_usb.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vendor/adb/client/transport_usb.cpp b/vendor/adb/client/transport_usb.cpp
-index 3b0b4906..d3b4929c 100644
--- a/vendor/adb/client/transport_usb.cpp
-+++ b/vendor/adb/client/transport_usb.cpp
-@@ -177,9 +177,9 @@ bool is_adb_interface(int usb_class, int usb_subclass, int usb_protocol) {
- }
- 
- bool is_libusb_enabled() {
-    bool enable = true;
-#if defined(_WIN32)
-    enable = false;
-+    bool enable = false;
-+#if defined(__APPLE__)
-+    enable = true;
- #endif
-     char* env = getenv("ADB_LIBUSB");
-     if (env) {
-- 
-2.52.0
-
--- a/51-android.rules
+++ b/51-android.rules
--- a/adb.service
+++ b/adb.service
@ -0,0 +1,14 @@
+# Systemd unit file for adb
+
+[Unit]
+Description=Android Debug Bridge (adb) service
+
+[Service]
+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
--- a/android-tools.spec
+++ b/android-tools.spec
@ -1,43 +1,41 @@
+%global _hardened_build 1
+
 Name:          android-tools
-Version:       35.0.2
-Release:       %autorelease
+Version:       31.0.2
+Release:       1%{?dist}
 Epoch:         1
 Summary:       Android platform tools(adb, fastboot)

 # The entire source code is ASL 2.0 except boringssl which is BSD
-# Automatically converted from old format: ASL 2.0 and (ASL 2.0 and BSD) - review is highly recommended.
-License:       Apache-2.0 AND (Apache-2.0 AND LicenseRef-Callaway-BSD)
+License:       ASL 2.0 and (ASL 2.0 and BSD)
 URL:           http://developer.android.com/guide/developing/tools/

 #  Sources with all needed patches and cmakelists live there now: 
+#  
 Source0:       https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
-# https://github.com/nmeum/android-tools/issues/153
-Patch0:        0001-Fix-libusb-enumeration.patch
-# https://github.com/nmeum/android-tools/pull/172
-Patch1:        0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
-# https://github.com/nmeum/android-tools/pull/190
-Patch2:        0003-Make-legacy-USB-driver-default-on-Linux.patch
+Source1:       51-android.rules
+Source2:       adb.service

-BuildRequires: brotli-devel
-BuildRequires: cmake
-BuildRequires: fmt-devel
-BuildRequires: gcc
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 BuildRequires: gcc-c++
+BuildRequires: cmake
 BuildRequires: gtest-devel
-BuildRequires: golang
-BuildRequires: golang(golang.org/x/crypto/chacha20)
-BuildRequires: golang(golang.org/x/crypto/chacha20poly1305)
-BuildRequires: golang(golang.org/x/crypto/curve25519)
-BuildRequires: golang(golang.org/x/crypto/hkdf)
-BuildRequires: golang(golang.org/x/crypto/xts)
 BuildRequires: libusbx-devel
+BuildRequires: systemd
+BuildRequires: golang
+BuildRequires:  golang(golang.org/x/crypto/chacha20)
+BuildRequires:  golang(golang.org/x/crypto/chacha20poly1305)
+BuildRequires:  golang(golang.org/x/crypto/curve25519)
+BuildRequires:  golang(golang.org/x/crypto/hkdf)
+BuildRequires:  golang(golang.org/x/crypto/xts)
+BuildRequires: perl
+BuildRequires: pcre2-devel
+BuildRequires: protobuf-devel
 BuildRequires: libzstd-devel
 BuildRequires: lz4-devel
-BuildRequires: multilib-rpm-config
-BuildRequires: pcre2-devel
-BuildRequires: perl
-BuildRequires: protobuf-devel
-BuildRequires: systemd-rpm-macros
+BuildRequires: brotli-devel

 Provides:      adb = %{epoch}:%{version}-%{release}
 Provides:      fastboot = %{epoch}:%{version}-%{release}
@ -47,8 +45,7 @@ Provides:      mke2fs.android = %{epoch}:%{version}-%{release}
 Provides: bundled(boringssl)

 # Bundled boringssl doesn't support the big endian architectures rhbz 1431379
-# And dropped ppc64le support: https://github.com/google/boringssl/commit/7d2338d000eb1468a5bbf78e91854236e18fb9e4
-ExcludeArch: ppc ppc64 s390x ppc64le
+ExcludeArch: ppc ppc64 s390x

 %description

@ -71,7 +68,8 @@ to read and write the flash partitions. It needs the same USB device
 setup between the host and the target phone as adb.

 %prep
-%autosetup -p1
+%autosetup
+cp -p %{SOURCE1} 51-android.rules

 %build
 export GO111MODULE=off
@ -80,37 +78,224 @@ export GO111MODULE=off

 %install
 %cmake_install
+install -p -D -m 0644 %{SOURCE2} \
+    %{buildroot}%{_unitdir}/adb.service
+install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
+
+%post
+%systemd_post adb.service
+
+%preun
+%systemd_preun adb.service
+
+%postun
+%systemd_postun_with_restart adb.service

 %files
+%doc 51-android.rules
+%{_unitdir}/adb.service
+%attr(0755,root,root) %dir %{_sharedstatedir}/adb
+%attr(0755,root,root) %dir %{_datadir}/android-tools
 #ASL2.0 and BSD
 %{_bindir}/adb
 #ASL2.0
-%{_bindir}/avbtool
-%{_bindir}/mke2fs.android
 %{_bindir}/simg2img
 %{_bindir}/img2simg
 %{_bindir}/fastboot
 %{_bindir}/append2simg
-%{_bindir}/e2fsdroid
-%{_bindir}/ext2simg
-%{_bindir}/lpadd
-%{_bindir}/lpdump
-%{_bindir}/lpflash
-%{_bindir}/lpmake
-%{_bindir}/lpunpack
-%{_bindir}/make_f2fs
-%{_bindir}/mkbootimg
-%{_bindir}/mkdtboimg
-%{_bindir}/repack_bootimg
-%{_bindir}/sload_f2fs
-%{_bindir}/unpack_bootimg
+%{_bindir}/mke2fs.android
 %{_datadir}/android-tools/completions/adb
 %{_datadir}/android-tools/completions/fastboot
-%{_datadir}/android-tools/mkbootimg/gki/generate_gki_certificate.py
-%{_datadir}/android-tools/mkbootimg/mkbootimg.py
 %{_datadir}/bash-completion/completions/adb
 %{_datadir}/bash-completion/completions/fastboot
-%{_mandir}/man1/adb.1.*
+
+

 %changelog
-%autochangelog
+* Mon Aug 2 2021 Ivan Afonichev <ivan.afonichev@gmail.com> - 1:31.0.2-1
+- GCC 11 compatibility
+- Add bash complitions
+- Specify golang build dependencies
+- Resolves: rhbz 1923681 1987363 1674645
+
+* Sun Mar 14 2021 Ivan Afonichev <ivan.afonichev@gmail.com> - 1:30.0.5p1-1
+- Switch to linux-friendly upstream
+- Use Android SDK versions for versioning(Epoch 1 introduced)
+- Resolves: rhbz 1937578 1873878 1923681 1776001
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Nov 6 2020 Ivan Afonichev <ivan.afonichev@gmail.com> - 20180828gitc7815d675-9
+- Fix plugdev udev rule 
+- Resolves: rhbz 1779855
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Jeff Law <law@redhat.com> - 20180828gitc7815d675-7
+- Move LTO disablement so that it impacts the optflags override too
+
+* Sat Jul 11 2020 Jeff Law <law@redhat.com> - 20180828gitc7815d675-6
+- Disable LTO
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 27 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20180828gitc7815d675-3
+- Fix FTBFS, minor cleanups
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Aug 29 2018 Ivan Afonichev <ivan.afonichev@gmail.com> - 20180828gitc7815d675-1
+- Update to upstream git commit c7815d675
+- Resolves: rhbz 1535542 1550703 1603379 Switch to clang and ninja
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Feb 27 2018 Bastien Nocera <bnocera@redhat.com> - 20170311gite7195be7725a-7
+- Fix USB resets when adb daemon is started (#1470740)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Oct 26 2017 Vít Ondruch <vondruch@redhat.com> - 20170311gite7195be7725a-5
+- Drop the explicit dependnecy on rubypick.
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Apr 25 2017 Jan Pokorný <jpokorny@fedoraproject.org> - 20170311gite7195be7725a-2
+- Resolves: rhbz 1441234 Fix adb crash when generating a key (OpenSSL 1.1.0 API)
+
+* Sat Mar 11 2017 Ivan Afonichev <ivan.afonichev@gmail.com> - 20170311gite7195be7725a-1
+- Update to upstream git commit e7195be7725a
+- Resolves: rhbz 1323632 1423219 Add optflags. Support new versions.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20160327git3761365735de-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun May 08 2016 Bastien Nocera <hadess@hadess.net> - 20160327git3761365735de-2
+- Add missing BuildRequires for Ruby script to run
+- Compile and build img2simg and simg2img
+
+* Mon Apr  4 2016 Ville Skyttä <ville.skytta@iki.fi> - 20160327git3761365735de-2
+- Build with %%{optflags}
+
+* Sun Mar 27 2016 Ivan Afonichev <ivan.afonichev@gmail.com> - 20160327git3761365735de-1
+- Update to upstream git commit 3761365735de
+
+* Sat Mar 26 2016 Ivan Afonichev <ivan.afonichev@gmail.com> - 20160321git922e151ba2d8-1
+- Update to upstream git commit 922e151ba2d8
+- Resolves: rhbz 1278769 1318099 Migrate to ruby generate_build. Support new versions 
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20141219git8393e50-5
+- 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
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130123git98d0789-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130123git98d0789-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jan 28 2013 Ivan Afonichev <ivan.afonichev@gmail.com> - 20130123git98d0789-1
+- Update to upstream git commit 98d0789
+- Resolves: rhbz 903074 Move udev rule to docs as example
+- Resolves: rhbz 879585 Introduce adb.service with PrivateTmp
+
+* Tue Nov 20 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20121120git3ddc005-1
+- Update to upstream git commit 3ddc005
+- Added more udev devices
+- Added ext4_utils from extras for fastboot
+- Updated makefiles
+- Resolves: rhbz 869624 start adb server by udev
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20120510gitd98c87c-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu May 10 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20120510gitd98c87c-1
+- Update to upstream git commit d98c87c
+- Added more udev devices
+- Resolves: rhbz 819292 secure udev permissions
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20111220git1b251bd-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 20 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111220git1b251bd-1
+- Update to upstream git commit 1b251bd
+
+* Wed Nov 23 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-3
+- Fix license
+- More specific URL
+
+* Tue Nov 22 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-2
+- Require udev
+
+* Sun Nov 20 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-1
+- Versioning changes
+- Use only needed sources
+- Udev rules moved to lib
+- More license info added
+- adb and fastboot moved to provides from summary
+
+* Tue Nov 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111115.4a25390-1
+- Change upstream git repo URL
+- Update to upstream git commit 4a25390
+- Added more udev devices
+
+* Mon Oct 17 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-3
+- Update udev rules (s/SYSFS/ATTR/g) 
+
+* Sat Aug 27 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-2
+- Remove the rm in the install section
+- Remove defattr
+- Use install command(not macro)
+- Add description of fastboot
+
+* Tue Aug 16 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-1
+- Update to upstream git commit 80d508f
+- Added more udev devices
+
+* Sun Jul 31 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110731.810cf41-1
+- Update to upstream git commit 810cf41
+- Fix License
+- Use optflags
+- Added more udev devices
+- Remove Epoch
+
+* Tue Jul 26 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 0:20110726.212282c-1
+- Update to upstream git commit 212282c
+
+* Wed May 18 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 0:20110516.327b2b7-1
+- Initial spec
+- Initial makefiles
+- Initial udev rule
--- a/214
+++ b/214
@ -1,214 +0,0 @@
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:31.0.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 1:31.0.2-6
- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
-  golang
-
-* Fri Jun 17 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1:31.0.2-5
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:31.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 1:31.0.2-3
- Rebuilt for protobuf 3.19.0
-
-* Sun Oct 24 2021 Adrian Reber <adrian@lisas.de> - 1:31.0.2-2
- Rebuilt for protobuf 3.18.1
-
-* Mon Aug 2 2021 Ivan Afonichev <ivan.afonichev@gmail.com> - 1:31.0.2-1
- GCC 11 compatibility
- Add bash complitions
- Specify golang build dependencies
- Resolves: rhbz 1923681 1987363 1674645
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:30.0.5p1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Mar 14 2021 Ivan Afonichev <ivan.afonichev@gmail.com> - 1:30.0.5p1-1
- Switch to linux-friendly upstream
- Use Android SDK versions for versioning(Epoch 1 introduced)
- Resolves: rhbz 1937578 1873878 1923681 1776001
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20180828gitc7815d675-11
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Nov 6 2020 Ivan Afonichev <ivan.afonichev@gmail.com> - 20180828gitc7815d675-9
- Fix plugdev udev rule
- Resolves: rhbz 1779855
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Jeff Law <law@redhat.com> - 20180828gitc7815d675-7
- Move LTO disablement so that it impacts the optflags override too
-
-* Sat Jul 11 2020 Jeff Law <law@redhat.com> - 20180828gitc7815d675-6
- Disable LTO
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 27 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20180828gitc7815d675-3
- Fix FTBFS, minor cleanups
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180828gitc7815d675-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug 29 2018 Ivan Afonichev <ivan.afonichev@gmail.com> - 20180828gitc7815d675-1
- Update to upstream git commit c7815d675
- Resolves: rhbz 1535542 1550703 1603379 Switch to clang and ninja
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Feb 27 2018 Bastien Nocera <bnocera@redhat.com> - 20170311gite7195be7725a-7
- Fix USB resets when adb daemon is started (#1470740)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Oct 26 2017 Vít Ondruch <vondruch@redhat.com> - 20170311gite7195be7725a-5
- Drop the explicit dependnecy on rubypick.
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20170311gite7195be7725a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Apr 25 2017 Jan Pokorný <jpokorny@fedoraproject.org> - 20170311gite7195be7725a-2
- Resolves: rhbz 1441234 Fix adb crash when generating a key (OpenSSL 1.1.0 API)
-
-* Sat Mar 11 2017 Ivan Afonichev <ivan.afonichev@gmail.com> - 20170311gite7195be7725a-1
- Update to upstream git commit e7195be7725a
- Resolves: rhbz 1323632 1423219 Add optflags. Support new versions.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20160327git3761365735de-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sun May 08 2016 Bastien Nocera <hadess@hadess.net> - 20160327git3761365735de-2
- Add missing BuildRequires for Ruby script to run
- Compile and build img2simg and simg2img
-
-* Mon Apr  4 2016 Ville Skyttä <ville.skytta@iki.fi> - 20160327git3761365735de-2
- Build with %%{optflags}
-
-* Sun Mar 27 2016 Ivan Afonichev <ivan.afonichev@gmail.com> - 20160327git3761365735de-1
- Update to upstream git commit 3761365735de
-
-* Sat Mar 26 2016 Ivan Afonichev <ivan.afonichev@gmail.com> - 20160321git922e151ba2d8-1
- Update to upstream git commit 922e151ba2d8
- Resolves: rhbz 1278769 1318099 Migrate to ruby generate_build. Support new versions
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20141219git8393e50-5
- 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
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130123git98d0789-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130123git98d0789-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jan 28 2013 Ivan Afonichev <ivan.afonichev@gmail.com> - 20130123git98d0789-1
- Update to upstream git commit 98d0789
- Resolves: rhbz 903074 Move udev rule to docs as example
- Resolves: rhbz 879585 Introduce adb.service with PrivateTmp
-
-* Tue Nov 20 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20121120git3ddc005-1
- Update to upstream git commit 3ddc005
- Added more udev devices
- Added ext4_utils from extras for fastboot
- Updated makefiles
- Resolves: rhbz 869624 start adb server by udev
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20120510gitd98c87c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu May 10 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20120510gitd98c87c-1
- Update to upstream git commit d98c87c
- Added more udev devices
- Resolves: rhbz 819292 secure udev permissions
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20111220git1b251bd-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 20 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111220git1b251bd-1
- Update to upstream git commit 1b251bd
-
-* Wed Nov 23 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-3
- Fix license
- More specific URL
-
-* Tue Nov 22 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-2
- Require udev
-
-* Sun Nov 20 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111120git4a25390-1
- Versioning changes
- Use only needed sources
- Udev rules moved to lib
- More license info added
- adb and fastboot moved to provides from summary
-
-* Tue Nov 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20111115.4a25390-1
- Change upstream git repo URL
- Update to upstream git commit 4a25390
- Added more udev devices
-
-* Mon Oct 17 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-3
- Update udev rules (s/SYSFS/ATTR/g)
-
-* Sat Aug 27 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-2
- Remove the rm in the install section
- Remove defattr
- Use install command(not macro)
- Add description of fastboot
-
-* Tue Aug 16 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110816.80d508f-1
- Update to upstream git commit 80d508f
- Added more udev devices
-
-* Sun Jul 31 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 20110731.810cf41-1
- Update to upstream git commit 810cf41
- Fix License
- Use optflags
- Added more udev devices
- Remove Epoch
-
-* Tue Jul 26 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 0:20110726.212282c-1
- Update to upstream git commit 212282c
-
-* Wed May 18 2011 Ivan Afonichev <ivan.afonichev@gmail.com> - 0:20110516.327b2b7-1
- Initial spec
- Initial makefiles
- Initial udev rule
--- a/generate_build.rb
+++ b/generate_build.rb
@ -0,0 +1,234 @@
+#!/usr/bin/ruby
+
+# Android build system is complicated and does not allow to build
+# separate parts easily.
+# This script tries to mimic Android build rules.
+
+def expand(dir, files)
+  files.map{|f| File.join(dir,f)}
+end
+
+# Compiles sources to *.o files.
+# Returns array of output *.o filenames
+def compile(sources, cflags)
+  outputs = []
+  for s in sources
+    ext = File.extname(s)
+
+    case ext
+    when '.c'
+      cc = 'cc'
+      lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
+    when '.cpp', '.cc'
+      cc = 'cxx'
+      lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS'
+    else
+        raise "Unknown extension #{ext}"
+    end
+
+    output = s + '.o'
+    outputs << output
+    puts "build #{output}: #{cc} #{s}\n    cflags = #{lang_flags} #{cflags}"
+  end
+
+  return outputs
+end
+
+# dir - directory where ninja file is located
+# lib - static library path relative to dir
+def subninja(dir, lib)
+  puts "subninja #{dir}build.ninja"
+  return lib.each{|l| dir + l}
+end
+
+# Links object files
+def link(output, objects, ldflags)
+  puts "build #{output}: link #{objects.join(' ')}\n    ldflags = #{ldflags} $LDFLAGS"
+end
+
+puts "# This set of commands generated by generate_build.rb script\n\n"
+puts "CC = #{ENV['CC'] || 'clang'}"
+puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
+puts "CFLAGS = #{ENV['CFLAGS']}"
+puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
+puts "LDFLAGS = #{ENV['LDFLAGS']}"
+puts "PKGVER = #{ENV['PKGVER']}\n\n"
+
+
+puts """
+rule cc
+  command = $CC $cflags -c $in -o $out
+
+rule cxx
+  command = $CXX $cflags -c $in -o $out
+
+rule link
+  command = $CXX $ldflags $LDFLAGS $in -o $out
+
+
+"""
+
+adbdfiles = %w(
+  adb.cpp
+  adb_io.cpp
+  adb_listeners.cpp
+  adb_trace.cpp
+  adb_utils.cpp
+  adb_unique_fd.cpp
+  sockets.cpp
+  transport.cpp
+  transport_local.cpp
+  transport_usb.cpp
+  fdevent.cpp
+  shell_service_protocol.cpp
+)
+libadbd = compile(expand('core/adb', adbdfiles), '-DADB_HOST=1 -Icore/diagnose_usb/include -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include')
+
+adbfiles = %w(
+  client/auth.cpp
+  client/console.cpp
+  socket_spec.cpp
+  client/bugreport.cpp
+  client/line_printer.cpp
+  client/commandline.cpp
+  client/adb_client.cpp
+  services.cpp
+  client/file_sync_client.cpp
+  sysdeps_unix.cpp
+  sysdeps/errno.cpp
+  sysdeps/posix/network.cpp
+  client/main.cpp
+  client/usb_dispatch.cpp
+  client/usb_linux.cpp
+  client/usb_libusb.cpp
+  client/transport_mdns.cpp
+)
+libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/libcrypto_utils/include -Iboringssl/src/include -Icore/include -Icore/base/include -Icore/adb -Imdnsresponder/mDNSShared')
+
+basefiles = %w(
+  file.cpp
+  threads.cpp
+  logging.cpp
+  parsenetaddress.cpp
+  stringprintf.cpp
+  strings.cpp
+  errors_unix.cpp
+  test_utils.cpp
+)
+libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
+
+logfiles = %w(
+  log_event_write.c
+  fake_log_device.c
+  log_event_list.c
+  logger_write.c
+  config_write.c
+  config_read.c
+  logger_lock.c
+  local_logger.c
+  fake_writer.c
+  logger_name.c
+  stderr_write.c
+  logprint.c
+)
+liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/libsystem/include -Icore/liblog/include -Icore/include')
+
+cutilsfiles = %w(
+  fs_config.cpp
+  canned_fs_config.cpp
+  android_get_control_file.cpp
+  socket_network_client_unix.cpp
+  socket_inaddr_any_server_unix.cpp
+  sockets.cpp
+  sockets_unix.cpp
+  socket_local_client_unix.cpp
+  socket_local_server_unix.cpp
+)
+libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Icore/base/include')
+
+diagnoseusbfiles = %w(
+  diagnose_usb.cpp
+)
+libdiagnoseusb = compile(expand('core/diagnose_usb', diagnoseusbfiles), '-Icore/diagnose_usb/include -Icore/include -Icore/base/include')
+
+libcryptofiles = %w(
+  android_pubkey.c
+)
+libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/src/include')
+
+utilfiles = %w(
+  FileMap.cpp
+  Unicode.cpp
+  SharedBuffer.cpp
+  String8.cpp
+  String16.cpp
+)
+libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
+
+mdnsfiles = %w(
+  mDNSShared/dnssd_ipc.c
+  mDNSShared/dnssd_clientstub.c
+)
+mdns = compile(expand('mdnsresponder', mdnsfiles), '-D_GNU_SOURCE -DHAVE_IPV6 -DHAVE_LINUX -DNOT_HAVE_SA_LEN -DUSES_NETLINK -UMDNS_DEBUGMSGS -DMDNS_DEBUGMSGS=0 -Imdnsresponder/mDNSShared -Imdnsresponder/mDNSCore -Iinclude')
+
+zipfiles = %w(
+  zip_archive_stream_entry.cc
+  zip_archive.cc
+)
+libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/libziparchive/include -Icore/base/include -Icore/include')
+
+boringcryptofiles = %w(
+  bn/cmp.c
+  bn/bn.c
+  bytestring/cbb.c
+  mem.c
+  buf/buf.c
+  bio/file.c
+  bn/convert.c
+  base64/base64.c
+)
+
+boringcrypto = compile(expand('boringssl/src/crypto', boringcryptofiles), '-Iboringssl/src/include -Iinclude')
+
+link('adb', libbase + liblog + libcutils + libcrypto + libadbd + libadb + libdiagnoseusb + libutil + libzip + mdns + boringcrypto, '-lz -lcrypto -lpthread -lusb-1.0')
+
+
+fastbootfiles = %w(
+  bootimg_utils.cpp
+  fs.cpp
+  socket.cpp
+  tcp.cpp
+  udp.cpp
+  usb_linux.cpp
+  util.cpp
+  main.cpp
+  engine.cpp
+  fastboot.cpp
+  fastboot_driver.cpp
+)
+libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg/include/bootimg -Icore/libziparchive/include -Icore/diagnose_usb/include')
+
+sparsefiles = %w(
+  backed_block.cpp
+  output_file.cpp
+  sparse.cpp
+  sparse_crc32.cpp
+  sparse_err.cpp
+  sparse_read.cpp
+)
+libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
+
+link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
+
+simg2imgfiles = %w(
+  simg2img.cpp
+)
+libsimg2img = compile(expand('core/libsparse', simg2imgfiles), '-Iinclude -Icore/libsparse/include')
+link('simg2img', libbase + libsparse + libsimg2img, '-lz')
+
+img2simgfiles = %w(
+  img2simg.cpp
+)
+libimg2simg = compile(expand('core/libsparse', img2simgfiles), '-Iinclude -Icore/libsparse/include')
+link('img2simg', libbase + libsparse + libimg2simg, '-lz')
+
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (android-tools-35.0.2.tar.xz) = 391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10
+SHA512 (android-tools-31.0.2.tar.xz) = 55f592c2622ef5936f7aea254271fb0b4f57ffcae3ac089c79522efa0d27c31373ba936418a56758d553ebf290cabcd65582b2a6ae60f81bdea15711941664cb
Author	SHA1	Message	Date
Ivan Afonichev	e558967c0a	Replace go rpm stuff with export GO111MODULE=off	2021-08-04 01:44:47 +04:00
Ivan Afonichev	f82e4faf88	Add go rpm stuff	2021-08-03 03:56:19 +04:00
Ivan Afonichev	ffea4c77bf	Use GO111MODULE=off to let go work offline	2021-08-03 03:41:29 +04:00
Ivan Afonichev	e14a609d32	Specify golang build dependencies.	2021-08-03 01:47:30 +04:00
Ivan Afonichev	7a595cf1cb	- GCC 11 compatibility - Resolves: rhbz 1923681 1987363 1674645	2021-08-02 02:58:43 +04:00
Ivan Afonichev	3ea2e6043a	Re-exclude big endian arches	2021-03-15 01:11:29 +04:00
Ivan Afonichev	1517678177	Explicitly BuildRequire gcc-c++	2021-03-15 00:30:21 +04:00
Ivan Afonichev	0c6c571b48	Switch to linux-friendly upstream Use Android SDK versions for versioning(Epoch 1 introduced) Resolves: rhbz 1937578 1873878 1923681 1776001	2021-03-15 00:30:18 +04:00