[arch-commits] Commit in android-tools/trunk (PKGBUILD gcc12.patch)
Date: Tuesday, August 9, 2022 @ 15:57:39
Author: anatolik
Revision: 1263738
upgpkg: android-tools 31.0.3-7
Modified:
android-tools/trunk/PKGBUILD
Deleted:
android-tools/trunk/gcc12.patch
-+
PKGBUILD| 18 ++
gcc12.patch | 11 ---
2 files changed, 6 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-08-09 15:57:37 UTC (rev 1263737)
+++ PKGBUILD2022-08-09 15:57:39 UTC (rev 1263738)
@@ -4,23 +4,17 @@
pkgname=android-tools
pkgver=31.0.3
-_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=6
+_tag=${pkgver}p2 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
+pkgrel=7
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
license=(Apache MIT)
-depends=(libusb protobuf brotli zstd android-udev)
-makedepends=(pcre2 gtest cmake go ninja git)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
gcc12.patch)
-sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8'
-'df27d803da03d0a2656c4feb3cf471a076c459f45004ec20ec86a5cfb36be862')
+depends=(libusb protobuf brotli zstd android-udev pcre2)
+makedepends=(gtest cmake go ninja git)
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('2e1274d625368f57128477c2cda8474489443cc56e8738cb71919412a2872fca')
-prepare() {
- cd android-tools-$_tag
- patch -Np1 -i ../gcc12.patch
-}
-
build() {
cd android-tools-$_tag
Deleted: gcc12.patch
===
--- gcc12.patch 2022-08-09 15:57:37 UTC (rev 1263737)
+++ gcc12.patch 2022-08-09 15:57:39 UTC (rev 1263738)
@@ -1,11 +0,0 @@
-diff -upr
android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h
android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h
android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h
2021-03-22 19:48:10.0 +0200
-+++ android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h
2022-06-11 19:39:36.472011172 +0300
-@@ -19,6 +19,7 @@
- #include
- #include
-
-+#include
- #include
- #include
-
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Saturday, June 11, 2022 @ 16:42:11
Author: felixonmars
Revision: 1233888
upgpkg: android-tools 31.0.3-6: protobuf 21 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-06-11 16:41:07 UTC (rev 1233887)
+++ PKGBUILD2022-06-11 16:42:11 UTC (rev 1233888)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.3
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=5
+pkgrel=6
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD gcc12.patch)
Date: Saturday, June 11, 2022 @ 16:41:07
Author: foutrelis
Revision: 1233887
Fix build with GCC 12
Added:
android-tools/trunk/gcc12.patch
Modified:
android-tools/trunk/PKGBUILD
-+
PKGBUILD| 10 --
gcc12.patch | 11 +++
2 files changed, 19 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-06-11 16:35:52 UTC (rev 1233886)
+++ PKGBUILD2022-06-11 16:41:07 UTC (rev 1233887)
@@ -12,9 +12,15 @@
license=(Apache MIT)
depends=(libusb protobuf brotli zstd android-udev)
makedepends=(pcre2 gtest cmake go ninja git)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8')
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
gcc12.patch)
+sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8'
+'df27d803da03d0a2656c4feb3cf471a076c459f45004ec20ec86a5cfb36be862')
+prepare() {
+ cd android-tools-$_tag
+ patch -Np1 -i ../gcc12.patch
+}
+
build() {
cd android-tools-$_tag
Added: gcc12.patch
===
--- gcc12.patch (rev 0)
+++ gcc12.patch 2022-06-11 16:41:07 UTC (rev 1233887)
@@ -0,0 +1,11 @@
+diff -upr
android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h
android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h
+---
android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h
2021-03-22 19:48:10.0 +0200
android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h
2022-06-11 19:39:36.472011172 +0300
+@@ -19,6 +19,7 @@
+ #include
+ #include
+
++#include
+ #include
+ #include
+
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Wednesday, April 27, 2022 @ 16:03:31
Author: jelle
Revision: 1191219
upgpkg: android-tools 31.0.3-5: go 1.18
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-04-27 15:50:59 UTC (rev 1191218)
+++ PKGBUILD2022-04-27 16:03:31 UTC (rev 1191219)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.3
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=4
+pkgrel=5
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Saturday, April 23, 2022 @ 20:04:02
Author: foutrelis
Revision: 1188183
upgpkg: android-tools 31.0.3-4: protobuf 3.20 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-04-23 20:03:58 UTC (rev 1188182)
+++ PKGBUILD2022-04-23 20:04:02 UTC (rev 1188183)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.3
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=3
+pkgrel=4
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Wednesday, January 5, 2022 @ 18:06:45
Author: anatolik
Revision: 1093326
upgpkg: android-tools 31.0.3-3
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-01-05 18:06:31 UTC (rev 1093325)
+++ PKGBUILD2022-01-05 18:06:45 UTC (rev 1093326)
@@ -4,8 +4,8 @@
pkgname=android-tools
pkgver=31.0.3
-_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=2
+_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
+pkgrel=3
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
@@ -13,7 +13,7 @@
depends=(libusb protobuf brotli zstd android-udev)
makedepends=(pcre2 gtest cmake go ninja git)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('d7d2d945b6e1a7ba0c7d0b68a6d21ada6914155bf3ca02ff06c9db628ae6b029')
+sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8')
build() {
cd android-tools-$_tag
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Wednesday, December 22, 2021 @ 21:03:30
Author: felixonmars
Revision: 1082892
upgpkg: android-tools 31.0.3-2: protobuf 3.19 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-12-22 21:03:19 UTC (rev 1082891)
+++ PKGBUILD2021-12-22 21:03:30 UTC (rev 1082892)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.3
_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=1
+pkgrel=2
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Sunday, October 24, 2021 @ 19:03:23
Author: anatolik
Revision: 1033217
upgpkg: android-tools 31.0.3-1
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-24 18:49:45 UTC (rev 1033216)
+++ PKGBUILD2021-10-24 19:03:23 UTC (rev 1033217)
@@ -3,7 +3,7 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=31.0.2
+pkgver=31.0.3
_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
pkgrel=1
pkgdesc='Android platform tools'
@@ -13,7 +13,7 @@
depends=(libusb protobuf brotli zstd android-udev)
makedepends=(pcre2 gtest cmake go ninja git)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4')
+sha256sums=('d7d2d945b6e1a7ba0c7d0b68a6d21ada6914155bf3ca02ff06c9db628ae6b029')
build() {
cd android-tools-$_tag
[arch-commits] Commit in android-tools/trunk (PKGBUILD android-tools-gcc11.patch)
Date: Tuesday, July 20, 2021 @ 17:18:09
Author: anatolik
Revision: 980375
upgpkg: android-tools 31.0.2-1
Modified:
android-tools/trunk/PKGBUILD
Deleted:
android-tools/trunk/android-tools-gcc11.patch
---+
PKGBUILD | 17
android-tools-gcc11.patch | 4065
2 files changed, 5 insertions(+), 4077 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-07-20 17:17:50 UTC (rev 980374)
+++ PKGBUILD2021-07-20 17:18:09 UTC (rev 980375)
@@ -3,9 +3,9 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=31.0.0
-_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=4
+pkgver=31.0.2
+_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
+pkgrel=1
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
@@ -12,16 +12,9 @@
license=(Apache MIT)
depends=(libusb protobuf brotli zstd android-udev)
makedepends=(pcre2 gtest cmake go ninja git)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
-android-tools-gcc11.patch)
-sha256sums=('51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6'
-'75fd8517769e5cb3b9a4b54c7d2d0b728537e35a42113531e8b7dfb6f296ea84')
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4')
-prepare() {
- cd android-tools-$_tag
- patch -d vendor/boringssl -p1 < ../android-tools-gcc11.patch
-}
-
build() {
cd android-tools-$_tag
Deleted: android-tools-gcc11.patch
===
--- android-tools-gcc11.patch 2021-07-20 17:17:50 UTC (rev 980374)
+++ android-tools-gcc11.patch 2021-07-20 17:18:09 UTC (rev 980375)
@@ -1,4065 +0,0 @@
-From 139adff9b27eaf0bdaac664ec4c9a7db2fe3f920 Mon Sep 17 00:00:00 2001
-From: David Benjamin
-Date: Thu, 25 Mar 2021 01:41:51 -0400
-Subject: [PATCH] Fix mismatch between header and implementation of
bn_sqr_comba8.
-
-Bug: 402
-Change-Id: I6de879f44f6e3eca26f2f49c500769d944fa9bc0
-Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46404
-Reviewed-by: Adam Langley
-
-diff --git a/crypto/fipsmodule/bn/internal.h b/crypto/fipsmodule/bn/internal.h
-index 623e0c6..3d368db 100644
a/crypto/fipsmodule/bn/internal.h
-+++ b/crypto/fipsmodule/bn/internal.h
-@@ -297,7 +297,7 @@
- void bn_mul_comba8(BN_ULONG r[16], const BN_ULONG a[8], const BN_ULONG b[8]);
-
- // bn_sqr_comba8 sets |r| to |a|^2.
--void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[4]);
-+void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[8]);
-
- // bn_sqr_comba4 sets |r| to |a|^2.
- void bn_sqr_comba4(BN_ULONG r[8], const BN_ULONG a[4]);
-From a24ab549e6ae246b391155d7bed3790ac0e07de2 Mon Sep 17 00:00:00 2001
-From: David Benjamin
-Date: Thu, 25 Mar 2021 15:26:25 -0400
-Subject: [PATCH] Use an unsized helper for truncated SHA-512 variants.
-
-Although it is strictly fine to call SHA512_Final in SHA384_Final
-(array sizes in C parameters are purely decorational, according to the
-language), GCC 11 reportedly checks now and gets upset about the size
-mismatch. Use an unsized helper function so all our code matches the
-specified bounds.
-
-Unfortunately, the bounds in all the functions are a bit misleading
-because SHA512_Final really outputs based on sha->md_len (which Init
-function you called) rather than which Final function. I've fixed this
-places within a library where we mismatched and added asserts to the
-smaller functions. SHA512_Final is assert-less because I've seen lots of
-code use SHA384_Init / SHA512_Update / SHA512_Final.
-
-This doesn't fix the SHA256 variant since that is generated by a pile of
-macros in a multiply-included file. This is probably a good opportunity
-to make that code less macro-heavy.
-
-Update-Note: There is a small chance the asserts will trip something,
-but hopefully not since I've left SHA512_Final alone.
-
-Bug: 402
-Change-Id: I4c9d579a63ee0a0dea103c19ef219c13bb9aa62c
-Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46405
-Reviewed-by: Adam Langley
-
-diff --git a/crypto/fipsmodule/digest/digests.c
b/crypto/fipsmodule/digest/digests.c
-index 16daeba..f006ebb 100644
a/crypto/fipsmodule/digest/digests.c
-+++ b/crypto/fipsmodule/digest/digests.c
-@@ -247,13 +247,21 @@
- CHECK(SHA512_256_Init(ctx->md_data));
- }
-
-+static void sha512_256_update(EVP_MD_CTX *ctx, const void *data, size_t
count) {
-+ CHECK(SHA512_256_Update(ctx->md_data, data, count));
-+}
-+
-+static void sha512_256_final(EVP_MD_CTX *ctx, uint8_t *md) {
-+ CHECK(SHA512_256_Final(md, ctx->md_data));
-+}
-+
-
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Sunday, June 20, 2021 @ 20:34:06
Author: felixonmars
Revision: 966069
upgpkg: android-tools 31.0.0-4: protobuf 3.17.3 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-06-20 20:30:28 UTC (rev 966068)
+++ PKGBUILD2021-06-20 20:34:06 UTC (rev 966069)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.0
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=3
+pkgrel=4
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD android-tools-gcc11.patch)
Date: Sunday, June 20, 2021 @ 20:30:28
Author: arojas
Revision: 966068
Fix build with GCC 11
Added:
android-tools/trunk/android-tools-gcc11.patch
Modified:
android-tools/trunk/PKGBUILD
---+
PKGBUILD | 13
android-tools-gcc11.patch | 4065
2 files changed, 4075 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-06-20 20:22:56 UTC (rev 966067)
+++ PKGBUILD2021-06-20 20:30:28 UTC (rev 966068)
@@ -11,10 +11,17 @@
url='http://tools.android.com/'
license=(Apache MIT)
depends=(libusb protobuf brotli zstd android-udev)
-makedepends=(pcre2 gtest cmake go ninja)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6')
+makedepends=(pcre2 gtest cmake go ninja git)
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
+android-tools-gcc11.patch)
+sha256sums=('51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6'
+'75fd8517769e5cb3b9a4b54c7d2d0b728537e35a42113531e8b7dfb6f296ea84')
+prepare() {
+ cd android-tools-$_tag
+ patch -d vendor/boringssl -p1 < ../android-tools-gcc11.patch
+}
+
build() {
cd android-tools-$_tag
Added: android-tools-gcc11.patch
===
--- android-tools-gcc11.patch (rev 0)
+++ android-tools-gcc11.patch 2021-06-20 20:30:28 UTC (rev 966068)
@@ -0,0 +1,4065 @@
+From 139adff9b27eaf0bdaac664ec4c9a7db2fe3f920 Mon Sep 17 00:00:00 2001
+From: David Benjamin
+Date: Thu, 25 Mar 2021 01:41:51 -0400
+Subject: [PATCH] Fix mismatch between header and implementation of
bn_sqr_comba8.
+
+Bug: 402
+Change-Id: I6de879f44f6e3eca26f2f49c500769d944fa9bc0
+Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46404
+Reviewed-by: Adam Langley
+---
+
+diff --git a/crypto/fipsmodule/bn/internal.h b/crypto/fipsmodule/bn/internal.h
+index 623e0c6..3d368db 100644
+--- a/crypto/fipsmodule/bn/internal.h
b/crypto/fipsmodule/bn/internal.h
+@@ -297,7 +297,7 @@
+ void bn_mul_comba8(BN_ULONG r[16], const BN_ULONG a[8], const BN_ULONG b[8]);
+
+ // bn_sqr_comba8 sets |r| to |a|^2.
+-void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[4]);
++void bn_sqr_comba8(BN_ULONG r[16], const BN_ULONG a[8]);
+
+ // bn_sqr_comba4 sets |r| to |a|^2.
+ void bn_sqr_comba4(BN_ULONG r[8], const BN_ULONG a[4]);
+From a24ab549e6ae246b391155d7bed3790ac0e07de2 Mon Sep 17 00:00:00 2001
+From: David Benjamin
+Date: Thu, 25 Mar 2021 15:26:25 -0400
+Subject: [PATCH] Use an unsized helper for truncated SHA-512 variants.
+
+Although it is strictly fine to call SHA512_Final in SHA384_Final
+(array sizes in C parameters are purely decorational, according to the
+language), GCC 11 reportedly checks now and gets upset about the size
+mismatch. Use an unsized helper function so all our code matches the
+specified bounds.
+
+Unfortunately, the bounds in all the functions are a bit misleading
+because SHA512_Final really outputs based on sha->md_len (which Init
+function you called) rather than which Final function. I've fixed this
+places within a library where we mismatched and added asserts to the
+smaller functions. SHA512_Final is assert-less because I've seen lots of
+code use SHA384_Init / SHA512_Update / SHA512_Final.
+
+This doesn't fix the SHA256 variant since that is generated by a pile of
+macros in a multiply-included file. This is probably a good opportunity
+to make that code less macro-heavy.
+
+Update-Note: There is a small chance the asserts will trip something,
+but hopefully not since I've left SHA512_Final alone.
+
+Bug: 402
+Change-Id: I4c9d579a63ee0a0dea103c19ef219c13bb9aa62c
+Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46405
+Reviewed-by: Adam Langley
+---
+
+diff --git a/crypto/fipsmodule/digest/digests.c
b/crypto/fipsmodule/digest/digests.c
+index 16daeba..f006ebb 100644
+--- a/crypto/fipsmodule/digest/digests.c
b/crypto/fipsmodule/digest/digests.c
+@@ -247,13 +247,21 @@
+ CHECK(SHA512_256_Init(ctx->md_data));
+ }
+
++static void sha512_256_update(EVP_MD_CTX *ctx, const void *data, size_t
count) {
++ CHECK(SHA512_256_Update(ctx->md_data, data, count));
++}
++
++static void sha512_256_final(EVP_MD_CTX *ctx, uint8_t *md) {
++ CHECK(SHA512_256_Final(md, ctx->md_data));
++}
++
+ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_sha512_256) {
+ out->type = NID_sha512_256;
+ out->md_size = SHA512_256_DIGEST_LENGTH;
+ out->flags = 0;
+ out->init = sha512_256_init;
+- out->update = sha512_update;
+- out->final = sha512_final;
++ out->update = sha512_256_update;
++ out->final = sha512_256_final;
+ out->block_size = 128;
+ out->ctx_size = sizeof(SHA512_CTX);
+ }
+diff --git
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Saturday, May 8, 2021 @ 13:31:33
Author: foutrelis
Revision: 928837
upgpkg: android-tools 31.0.0-3: protobuf 3.16.0 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-05-08 13:29:31 UTC (rev 928836)
+++ PKGBUILD2021-05-08 13:31:33 UTC (rev 928837)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=31.0.0
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=2
+pkgrel=3
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Tuesday, April 27, 2021 @ 07:16:34
Author: anatolik
Revision: 924678
FS#70595: android-tools does not work without android specific udev rules
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-27 06:44:41 UTC (rev 924677)
+++ PKGBUILD2021-04-27 07:16:34 UTC (rev 924678)
@@ -10,7 +10,7 @@
arch=(x86_64)
url='http://tools.android.com/'
license=(Apache MIT)
-depends=(libusb protobuf brotli zstd)
+depends=(libusb protobuf brotli zstd android-udev)
makedepends=(pcre2 gtest cmake go ninja)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
sha256sums=('51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6')
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Wednesday, April 14, 2021 @ 17:49:46
Author: anatolik
Revision: 918697
upgpkg: android-tools 31.0.0-2
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-14 17:48:23 UTC (rev 918696)
+++ PKGBUILD2021-04-14 17:49:46 UTC (rev 918697)
@@ -4,8 +4,8 @@
pkgname=android-tools
pkgver=31.0.0
-_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
-pkgrel=1
+_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
+pkgrel=2
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
@@ -13,7 +13,7 @@
depends=(libusb protobuf brotli zstd)
makedepends=(pcre2 gtest cmake go ninja)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d')
+sha256sums=('51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6')
build() {
cd android-tools-$_tag
[arch-commits] Commit in android-tools/trunk (PKGBUILD bash_completion.fastboot)
Date: Sunday, March 28, 2021 @ 21:29:14
Author: anatolik
Revision: 907950
upgpkg: android-tools 31.0.0-1
Modified:
android-tools/trunk/PKGBUILD
Deleted:
android-tools/trunk/bash_completion.fastboot
--+
PKGBUILD | 14 ++-
bash_completion.fastboot | 90 -
2 files changed, 5 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-03-28 21:28:49 UTC (rev 907949)
+++ PKGBUILD2021-03-28 21:29:14 UTC (rev 907950)
@@ -3,9 +3,9 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=30.0.5
-_tag=${pkgver}p1 # https://github.com/nmeum/android-tools carries extra patch
version on top of the upstream versioning
-pkgrel=3
+pkgver=31.0.0
+_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries
extra patch version on top of the upstream versioning
+pkgrel=1
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
@@ -12,11 +12,8 @@
license=(Apache MIT)
depends=(libusb protobuf brotli zstd)
makedepends=(pcre2 gtest cmake go ninja)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
-bash_completion.fastboot)
-# Bash completion file was taken from
https://github.com/mbrubeck/android-completion
-sha256sums=('8400387db0ff3c7d030418b9f63ea171917c26e6bcc82d9dc666c8c4c02e9806'
-'0807281422825404a7bee2a76f89062a104777011530f7c5e559910b8e585b0a')
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d')
build() {
cd android-tools-$_tag
@@ -33,5 +30,4 @@
cd android-tools-$_tag
DESTDIR="${pkgdir}" ninja -C build install
- install -Dm 644 ../bash_completion.fastboot
"$pkgdir"/usr/share/bash-completion/completions/fastboot
}
Deleted: bash_completion.fastboot
===
--- bash_completion.fastboot2021-03-28 21:28:49 UTC (rev 907949)
+++ bash_completion.fastboot2021-03-28 21:29:14 UTC (rev 907950)
@@ -1,90 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to
deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _fastboot()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-w -s -p -c -i -b -n"
- cmds="update flashall flash erase getvar boot devices \
-reboot reboot-bootloader oem continue"
- subcommand=""
- partition_list="boot recovery system userdata bootloader radio"
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
-word="${COMP_WORDS[c]}"
-if [ "$word" = "-s" ]; then
- device_selected=true
-fi
-for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
-subcommand="$word"
- fi
-done
-c=$((++c))
- done
-
- case "${subcommand}" in
-'')
- case "${prev}" in
--s)
- # Use 'fastboot devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
--*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
-local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
-if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
- return 0
-fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
-flash)
- # partition name
-
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Monday, March 15, 2021 @ 00:28:22
Author: anatolik
Revision: 891369
Remove unneeded dependencies
vim is not needed with the new build system
python is not needed as we do not ship the scripts anymore
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-03-14 23:57:49 UTC (rev 891368)
+++ PKGBUILD2021-03-15 00:28:22 UTC (rev 891369)
@@ -11,10 +11,7 @@
url='http://tools.android.com/'
license=(Apache MIT)
depends=(libusb protobuf brotli zstd)
-optdepends=('python: for mkbootimg & avbtool scripts'
-'python2: for unpack_bootimg script')
-# it depends on 'vim' because of 'xxd' tool.
-makedepends=(pcre2 gtest cmake go vim ninja)
+makedepends=(pcre2 gtest cmake go ninja)
source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
bash_completion.fastboot)
# Bash completion file was taken from
https://github.com/mbrubeck/android-completion
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Saturday, March 13, 2021 @ 22:49:53
Author: foutrelis
Revision: 890666
upgpkg: android-tools 30.0.5-3: protobuf 3.15.6 rebuild
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-03-13 22:48:36 UTC (rev 890665)
+++ PKGBUILD2021-03-13 22:49:53 UTC (rev 890666)
@@ -5,7 +5,7 @@
pkgname=android-tools
pkgver=30.0.5
_tag=${pkgver}p1 # https://github.com/nmeum/android-tools carries extra patch
version on top of the upstream versioning
-pkgrel=2
+pkgrel=3
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
[arch-commits] Commit in android-tools/trunk (PKGBUILD)
Date: Sunday, January 24, 2021 @ 15:08:58
Author: eschwartz
Revision: 828801
android-tools: latest version of avbtool uses python3
See:
https://android.googlesource.com/platform/external/avb/+/13efb5f99e9a022a92a3dba12c7fa72b05d1d9e1
The sed no longer applies in the currently packaged version (drop it), and the
optdepends is no longer accurate (move it).
Modified:
android-tools/trunk/PKGBUILD
--+
PKGBUILD |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-01-24 14:34:03 UTC (rev 828800)
+++ PKGBUILD2021-01-24 15:08:58 UTC (rev 828801)
@@ -11,8 +11,8 @@
url='http://tools.android.com/'
license=(Apache MIT)
depends=(pcre2 libusb protobuf brotli)
-optdepends=('python: for mkbootimg script'
-'python2: for unpack_bootimg & avbtool scripts')
+optdepends=('python: for mkbootimg & avbtool scripts'
+'python2: for unpack_bootimg script')
# it depends on 'vim' because of 'xxd' tool.
makedepends=(git clang gtest cmake ninja go vim)
provides=(fastboot adb)
@@ -36,7 +36,7 @@
# To avoid the complexity we prebuilt the lib from the Android sources directly
# using following instructions:
# (See https://wiki.archlinux.org/index.php/Android for context)
-#
+#
# source build/envsetup.sh
# lunch full-eng
# mmm system/core/adb/
@@ -74,9 +74,6 @@
cd "$srcdir"/libziparchive
patch -p1 < ../fix_libziparchive.patch
- cd "$srcdir"/avb
- sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
-
cd "$srcdir"/mkbootimg
sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py
