From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] protobuf28: drop versioned names and lib subpackages, update to 3.18.0
Date: Wed, 06 Oct 2021 21:56:15 +0200 [thread overview]
Message-ID: <20211006195615.Si3RsLQDGmwk0QlvTbkAr0sNtdurjzueIArqukXg6Sw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32984@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages protobuf
https://github.com/void-linux/void-packages/pull/32984
protobuf28: drop versioned names and lib subpackages, update to 3.18.0
In a [discussion a year ago](https://github.com/void-linux/void-packages/pull/18691), I proposed dropping versioned libs subpackages and the consensus was that the versioning should be kept. Since then, protobuf has been updated several times and we've always been able to migrate all dependants, so there's no need to keep the versioned packages around just in case that can't happen some day.
Let's drop the versioned packages to make upgrades easier and avoid polluting repo indexes with old packages that don't get cleaned. Users who need old versions of the libs for un-packaged software may need to build those old versions by hand, but this is just one of the pitfalls of using a rolling Linux distribution.
Another argument was about staging the repo, but that really shouldn't be an issue. Either everything gets moved to the new version or we have to split an protobuf version if there is a breaking incompatibility.
@Hoshpak you originally argued in favor of keeping the versioned naming. @the-maldridge I don't know if you cared one way or another, but you were the maintainer at the time. @q66 and @ericonr both seemed receptive to this proposal a few months back on IRC, so I invite them to weigh in.
A patch file from https://github.com/void-linux/void-packages/pull/32984.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protobuf-32984.patch --]
[-- Type: text/x-diff, Size: 30684 bytes --]
From a970062c85ea5f3ed6ebac554325b82ed0f5b5ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:31:28 -0400
Subject: [PATCH 01/25] protobuf28: rename to protobuf, update to 3.18.0
In a discussion a year ago [1], I proposed dropping versioned libs
subpackages and the consensus was that the versioning should be kept.
Since then, protobuf has been updated several times and we've always
been able to migrate all dependants, so there's no need to keep the
versioned packages around just in case that can't happen some day.
Let's drop the versioned packages to make upgrades easier and avoid
polluting repo indexes with old packages that don't get cleaned. Users
who need old versions of the libs for un-packaged software may need to
build those old versions by hand, but this is just one of the pitfalls
of using a rolling Linux distribution.
[1]: https://github.com/void-linux/void-packages/pull/18691
---
common/shlibs | 6 +--
srcpkgs/libprotobuf | 1 +
srcpkgs/libprotobuf-lite | 1 +
srcpkgs/libprotobuf28 | 1 -
srcpkgs/libprotobuf28-lite | 1 -
srcpkgs/libprotoc | 1 +
srcpkgs/libprotoc-devel | 2 +-
srcpkgs/libprotoc28 | 1 -
srcpkgs/libprotoc28-devel | 1 -
srcpkgs/protobuf | 1 -
srcpkgs/protobuf-devel | 2 +-
srcpkgs/protobuf-lite | 1 -
srcpkgs/{protobuf28 => protobuf}/template | 65 ++++++++---------------
srcpkgs/protobuf28-devel | 1 -
14 files changed, 30 insertions(+), 55 deletions(-)
create mode 120000 srcpkgs/libprotobuf
create mode 120000 srcpkgs/libprotobuf-lite
delete mode 120000 srcpkgs/libprotobuf28
delete mode 120000 srcpkgs/libprotobuf28-lite
create mode 120000 srcpkgs/libprotoc
delete mode 120000 srcpkgs/libprotoc28
delete mode 120000 srcpkgs/libprotoc28-devel
delete mode 120000 srcpkgs/protobuf
delete mode 120000 srcpkgs/protobuf-lite
rename srcpkgs/{protobuf28 => protobuf}/template (61%)
delete mode 120000 srcpkgs/protobuf28-devel
diff --git a/common/shlibs b/common/shlibs
index 7e5289f58f66..3445d0f54803 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3079,9 +3079,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
libm17n-gui.so.0 m17n-lib-1.7.0_1
libm17n-core.so.0 m17n-lib-1.7.0_1
libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.28 libprotobuf28-lite-3.17.0_1
-libprotoc.so.28 libprotoc28-3.17.0_1
-libprotobuf.so.28 libprotobuf28-3.17.0_1
+libprotobuf-lite.so.29 libprotobuf-lite-3.18.0_1
+libprotoc.so.29 libprotoc-3.18.0_1
+libprotobuf.so.29 libprotobuf-3.18.0_1
libsombok.so.3 sombok-2.4.0_1
libdeviceclient.so.0 pragha-1.3.3_1
libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf b/srcpkgs/libprotobuf
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotobuf
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf-lite b/srcpkgs/libprotobuf-lite
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf28 b/srcpkgs/libprotobuf28
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotobuf28
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf28-lite b/srcpkgs/libprotobuf28-lite
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotobuf28-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotoc b/srcpkgs/libprotoc
new file mode 120000
index 000000000000..779a5a300bcd
--- /dev/null
+++ b/srcpkgs/libprotoc
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
index 695e4991b431..779a5a300bcd 120000
--- a/srcpkgs/libprotoc-devel
+++ b/srcpkgs/libprotoc-devel
@@ -1 +1 @@
-protobuf28
\ No newline at end of file
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc28 b/srcpkgs/libprotoc28
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotoc28
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/libprotoc28-devel b/srcpkgs/libprotoc28-devel
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/libprotoc28-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
index 695e4991b431..779a5a300bcd 120000
--- a/srcpkgs/protobuf-devel
+++ b/srcpkgs/protobuf-devel
@@ -1 +1 @@
-protobuf28
\ No newline at end of file
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
diff --git a/srcpkgs/protobuf28/template b/srcpkgs/protobuf/template
similarity index 61%
rename from srcpkgs/protobuf28/template
rename to srcpkgs/protobuf/template
index 7fcf2e2fa707..c127080916f4 100644
--- a/srcpkgs/protobuf28/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
-# Template file for 'protobuf28'
-pkgname=protobuf28
-version=3.17.3
-revision=2
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.18.1
+revision=1
wrksrc="protobuf-${version}"
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
@@ -12,13 +12,14 @@ license="BSD-3-Clause"
homepage="https://developers.google.com/protocol-buffers/"
changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db
+checksum=9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7
# Checks rely on googletest
make_check=no
# Switch to versioned package
-conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0 protobuf26>=0"
-replaces="protobuf<=3.11.4_1 ${conflicts}"
+conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
+ protobuf25>=0 protobuf26>=0 protobuf28>=0"
+replaces="${conflicts}"
if [ "$CROSS_BUILD" ]; then
# needs host protoc
@@ -44,7 +45,7 @@ post_install() {
vlicense LICENSE
}
-libprotobuf28_package() {
+libprotobuf_package() {
short_desc="Protocol buffers C++ library"
pkg_install() {
vmove "usr/lib/libprotobuf.so.*"
@@ -52,7 +53,7 @@ libprotobuf28_package() {
}
}
-libprotobuf28-lite_package() {
+libprotobuf-lite_package() {
short_desc="Protocol buffers C++ library (lite version)"
pkg_install() {
vmove "usr/lib/libprotobuf-lite.so.*"
@@ -60,7 +61,7 @@ libprotobuf28-lite_package() {
}
}
-libprotoc28_package() {
+libprotoc_package() {
short_desc="Protocol buffers compiler library"
pkg_install() {
vmove "usr/lib/libprotoc.so.*"
@@ -68,13 +69,14 @@ libprotoc28_package() {
}
}
-libprotoc28-devel_package() {
- depends="libprotoc28-${version}_${revision}"
+libprotoc-devel_package() {
+ depends="libprotoc-${version}_${revision}"
short_desc="Protocol buffers compiler library - development files"
# Switch to versioned package
conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0
- libprotoc24-devel>=0 libprotoc25-devel>=0 libprotoc26-devel>=0"
- replaces="libprotoc-devel<=3.11.4_1 ${conflicts}"
+ libprotoc24-devel>=0 libprotoc25-devel>=0
+ libprotoc26-devel>=0 libprotoc28-devel>=0"
+ replaces="${conflicts}"
pkg_install() {
vmove usr/lib/libprotoc.a
vmove usr/lib/libprotoc.so
@@ -82,15 +84,16 @@ libprotoc28-devel_package() {
}
}
-protobuf28-devel_package() {
+protobuf-devel_package() {
depends="zlib-devel
- libprotobuf28-${version}_${revision}
- libprotobuf28-lite-${version}_${revision}"
+ libprotobuf-${version}_${revision}
+ libprotobuf-lite-${version}_${revision}"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
conflicts="protobuf18-devel>=0 protobuf23-devel>=0
- protobuf24-devel>=0 protobuf25-devel>=0 protobuf26-devel>=0"
- replaces="protobuf-devel<=3.11.4_1 ${conflicts}"
+ protobuf24-devel>=0 protobuf25-devel>=0
+ protobuf26-devel>=0 protobuf28-devel>=0"
+ replaces="${conflicts}"
pkg_install() {
vmove usr/include
vmove usr/lib/libprotobuf.a
@@ -100,27 +103,3 @@ protobuf28-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-protobuf_package() {
- build_style=meta
- short_desc="Protocol buffers compiler (meta package)"
- depends="protobuf28"
-}
-
-protobuf-devel_package() {
- build_style=meta
- short_desc="Protocol buffers C++ library - development files (meta package)"
- depends="protobuf28-devel"
-}
-
-protobuf-lite_package() {
- build_style=meta
- short_desc="Protocol buffers C++ library - lite version (meta package)"
- depends="libprotobuf28-lite"
-}
-
-libprotoc-devel_package() {
- build_style=meta
- short_desc="Protocol buffers compiler library - development files (meta package)"
- depends="libprotoc28-devel"
-}
diff --git a/srcpkgs/protobuf28-devel b/srcpkgs/protobuf28-devel
deleted file mode 120000
index 695e4991b431..000000000000
--- a/srcpkgs/protobuf28-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf28
\ No newline at end of file
From b326bbc33f0a781c36da1bb368bac5026b7d5fa1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 02/25] python3-protobuf: update to 3.18.0.
---
srcpkgs/python3-protobuf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index b9753ed5ed78..d17d50bd3b49 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=3.17.3
+version=3.18.1
revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://developers.google.com/protocol-buffers/"
distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b
+checksum=1c9bb40503751087300dd12ce2e90899d68628977905c76effc48e66d089391e
build_options="cppext"
build_options_default="cppext"
From 2bf28d16990d25f70c97b27868886a76939d1212 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:55 -0400
Subject: [PATCH 03/25] EternalTerminal: rebuild for protobuf
---
srcpkgs/EternalTerminal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index f4f2b4720362..08fd631a1028 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
version=6.0.13
-revision=3
+revision=4
wrksrc="${pkgname}-et-v${version}"
build_style=cmake
hostmakedepends="protobuf"
From bfeba3b9f2f93a35990d32f40ec70b58ad0779cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:55 -0400
Subject: [PATCH 04/25] android-tools: rebuild for protobuf
---
srcpkgs/android-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 20ffbbb80366..214c3002145f 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
# Template file for 'android-tools'
pkgname=android-tools
version=31.0.2
-revision=1
+revision=2
archs="armv* aarch64* x86_64* i686* ppc64le*"
build_style=cmake
hostmakedepends="perl go protobuf pkg-config"
From 752b61fac3c6f675888bfcecf993ce823e84530e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 05/25] astroid: rebuild for protobuf
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index e5095cbaf5f2..039f1c8c66a9 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From cd66d7bb64ec0cd5b47b5faf7f96ebaafd1e9f31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 06/25] bloaty: rebuild for protobuf
---
srcpkgs/bloaty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index bee0eae3543a..6427ccc64be3 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
# Template file for 'bloaty'
pkgname=bloaty
version=1.1
-revision=6
+revision=7
build_style=cmake
hostmakedepends="pkg-config protobuf"
makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"
From 88411d9fd88402a4fcc1a7db56d6441f6ee4900f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 07/25] clementine: rebuild for protobuf
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 40a6ac8c70a1..7f7e4eac9332 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.0rc1
-revision=5
+revision=6
_fullver=$version-343-gb49afcc5b
wrksrc=${pkgname}-${_fullver}
build_style=cmake
From 95cdd04076ea77117c7ee942d319a6955b156eec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 08/25] cura-engine: rebuild for protobuf
---
srcpkgs/cura-engine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 10a1a7f45021..c1f2be20a24b 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
# Template file for 'cura-engine'
pkgname=cura-engine
version=4.11.0
-revision=1
+revision=2
wrksrc="CuraEngine-${version}"
build_style=cmake
configure_args="-DCURA_ENGINE_VERSION=${version}"
From f6dfdb6cdd29b3335a93ae69fd3f644da8d57a59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 09/25] grpc: rebuild for protobuf
---
srcpkgs/grpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 551fcd28f3d1..dcbfa82d1997 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.39.1
-revision=1
+revision=2
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
From e1d98258eecf6da67fee3134977bc837a32a850d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 10/25] kismet: rebuild for protobuf
---
srcpkgs/kismet/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 6d8a4524beeb..175be70112e5 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
version=2021.08.R1
-revision=1
+revision=2
_realver="${version//./-}"
wrksrc="${pkgname}-${_realver}"
build_style=gnu-configure
From c4201f4a583c31739c8c426f67abef092b0399ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 11/25] libArcus: rebuild for protobuf
---
srcpkgs/libArcus/patches/protobuf.patch | 42 +++++++++++++++++++++++++
srcpkgs/libArcus/template | 2 +-
2 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libArcus/patches/protobuf.patch
diff --git a/srcpkgs/libArcus/patches/protobuf.patch b/srcpkgs/libArcus/patches/protobuf.patch
new file mode 100644
index 000000000000..e138558cf2ba
--- /dev/null
+++ b/srcpkgs/libArcus/patches/protobuf.patch
@@ -0,0 +1,42 @@
+Migrate away from previously deprecated functions dropped in protobuf>=3.18.0_1.
+
+--- a/src/Socket_p.h
++++ b/src/Socket_p.h
+@@ -128,9 +128,6 @@
+
+ static const int keep_alive_rate = 500; //Number of milliseconds between sending keepalive packets
+
+- // This value determines when protobuf should warn about very large messages.
+- static const int message_size_warning = 400 * 1048576;
+-
+ // This value determines when protobuf should error out because the message is too large.
+ // Due to the way Protobuf is implemented, messages large than 512MiB will cause issues.
+ static const int message_size_maximum = 500 * 1048576;
+@@ -362,11 +359,15 @@
+ return;
+ }
+
+- uint32_t message_size = message->ByteSize();
+- if(platform_socket.writeUInt32(message_size) == -1)
++ auto message_size = message->ByteSizeLong();
++ if (message_size > UINT32_MAX) {
++ error(ErrorCode::SendFailedError, "Message size is too large to send");
++ return;
++ }
++
++ if(platform_socket.writeUInt32(static_cast<uint32_t>(message_size)) == -1)
+ {
+ error(ErrorCode::SendFailedError, "Could not send message size");
+- return;
+ }
+
+ uint32_t type_id = message_types.getMessageTypeId(message);
+@@ -548,7 +549,7 @@
+
+ google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
+ google::protobuf::io::CodedInputStream stream(&array);
+- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning);
++ stream.SetTotalBytesLimit(message_size_maximum);
+ if(!message->ParseFromCodedStream(&stream))
+ {
+ error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data));
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 6f243225cba6..d43a77dbd980 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
# Template file for 'libArcus'
pkgname=libArcus
version=4.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
hostmakedepends="protobuf python3-sip-devel"
From 787242e4a0f36b0362837ce259abe83715c35ba2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:56 -0400
Subject: [PATCH 12/25] libcompizconfig: rebuild for protobuf
---
srcpkgs/libcompizconfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index bef72c22e6bc..f178053b42db 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
# Template file for 'libcompizconfig'
pkgname=libcompizconfig
version=0.8.18
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake intltool libtool pkg-config protobuf"
From f8c2d2f59a334d0a530a2663ed8d5c9e62491f09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 13/25] litecoin: rebuild for protobuf
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index fc91bb89f120..89d084d742ff 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 02b243982ede480f920a5c472c2d2d9d0d07f3a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 14/25] mixxx: rebuild for protobuf
---
srcpkgs/mixxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 6841ca1322cf..75e4921b1347 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.2.4
-revision=9
+revision=10
wrksrc="mixxx-release-${version}"
build_style=scons
hostmakedepends="pkg-config protobuf"
From b5542420237f232965b2985dad8a4ea8618aa411 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 15/25] mosh: rebuild for protobuf
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index a4641f66bb3e..4b66ba23dd89 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.3.2
-revision=22
+revision=23
build_style=gnu-configure
hostmakedepends="pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From a7b8a5027a7b05d8f7a31ebdd8bf05fc3859d976 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 16/25] mozc: rebuild for protobuf
---
srcpkgs/mozc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 2c279fc35f57..f10095f057fb 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,7 +3,7 @@ pkgname=mozc
# src/data/version/mozc_version_template.bzl
# revision is always 102, template always says 100 ;)
version=2.26.4472.102
-revision=1
+revision=2
_commit=439a610ac6b6a92375b4a8188d6c9ef45ea591dd
_abseil=20210324.1
create_wrksrc=yes
From 8b1d46ab8b6ebe5fdfd82cd799e7d8b4f007a32a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 17/25] mumble: rebuild for protobuf
---
srcpkgs/mumble/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d578a511d47e..69a5cb3c7961 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.3.4
-revision=6
+revision=7
build_style=qmake
configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
From 006d57c02ad604ae1663d7e37af8bb65ce8b63fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 18/25] nsjail: rebuild for protobuf
---
srcpkgs/nsjail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index acff592d2eee..67f0035c30d4 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
# Template file for 'nsjail'
pkgname=nsjail
version=3.0
-revision=5
+revision=6
build_style=gnu-makefile
hostmakedepends="bison flex pkg-config protobuf which"
makedepends="libnl3-devel protobuf-devel"
From a2d99ea799a86c96b1245abdd6ba24fadc841775 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:57 -0400
Subject: [PATCH 19/25] protobuf-c: rebuild for protobuf
---
srcpkgs/protobuf-c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index ab3915524c66..f2fb4d113f9c 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf-c'
pkgname=protobuf-c
version=1.3.3
-revision=7
+revision=8
build_style=gnu-configure
configure_args="$(vopt_enable protoc)"
hostmakedepends="pkg-config protobuf"
From 9f0b1dfffe19686b7e6931e099905032d107c8bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 20/25] strawberry: rebuild for protobuf
---
srcpkgs/strawberry/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 35828b1e3c24..7b631bdb7b68 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
# Template file for 'strawberry'
pkgname=strawberry
version=0.9.3
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config protobuf gettext"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
From 540088734c90ada2e834311939158b16d687b192 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 21/25] sysdig: rebuild for protobuf
---
srcpkgs/sysdig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 56cdb8f38dcb..160bd7bbe41c 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.1
-revision=11
+revision=12
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
From 97faa21f2f4d9aa13ef9e9e7a2d0141b1870c48b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 22/25] usbguard: rebuild for protobuf
---
srcpkgs/usbguard/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index 06fc3bf92e95..df27cec8a154 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
version=1.0.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
From 5261da6a9bc860ec505b2b9150b63ea15169ba31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 10:43:58 -0400
Subject: [PATCH 23/25] vlc: rebuild for protobuf
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..c18324de4345 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 91f5a014a0f189b742c8c663282d83b288b93c71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 13:44:02 -0400
Subject: [PATCH 24/25] zbackup: remove package
Package will not build with new protobuf, upstream hasn't seen a commit
since Feb 2016, a release hasn't been cut since Sep 2015, and issues/PRs
have sat for years without maintainer feedback or other activity.
This project is dead.
---
.../patches/cmake-build-type-none.patch | 26 -------------------
srcpkgs/zbackup/template | 13 ----------
2 files changed, 39 deletions(-)
delete mode 100644 srcpkgs/zbackup/patches/cmake-build-type-none.patch
delete mode 100644 srcpkgs/zbackup/template
diff --git a/srcpkgs/zbackup/patches/cmake-build-type-none.patch b/srcpkgs/zbackup/patches/cmake-build-type-none.patch
deleted file mode 100644
index caba5e5e45a8..000000000000
--- a/srcpkgs/zbackup/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,8 +6,6 @@ project( zbackup )
-
- set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
-
--set( CMAKE_BUILD_TYPE Release )
--
- find_package( ZLIB REQUIRED )
- include_directories( ${ZLIB_INCLUDE_DIRS} )
-
-Index: tartool/CMakeLists.txt
-===================================================================
---- a/tartool/CMakeLists.txt
-+++ b/tartool/CMakeLists.txt
-@@ -4,8 +4,6 @@
- cmake_minimum_required( VERSION 2.6.0 )
- project( tartool )
-
--set( CMAKE_BUILD_TYPE Release )
--
- add_executable( tartool tartool.cc ../file.cc ../dir.cc )
-
- install( TARGETS tartool DESTINATION bin )
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
deleted file mode 100644
index c69c8e711cfd..000000000000
--- a/srcpkgs/zbackup/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'zbackup'
-pkgname=zbackup
-version=1.4.4
-revision=23
-build_style=cmake
-hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
-short_desc="Versatile deduplicating backup tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://zbackup.org/"
-distfiles="https://github.com/zbackup/zbackup/archive/${version}.tar.gz"
-checksum=efccccd2a045da91576c591968374379da1dc4ca2e3dec4d3f8f12628fa29a85
From 929deb61c7cbdd6a3771d9a8dbe05c217c91dd7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 16 Sep 2021 13:47:32 -0400
Subject: [PATCH 25/25] removed-packages: add zbackup
---
srcpkgs/removed-packages/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5fe46ab48121..ec23a12829c7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -337,6 +337,7 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libco<=20_1
libco-devel<=20_1
+ zbackup<=1.4.4_23
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
next prev parent reply other threads:[~2021-10-06 19:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 19:24 [PR PATCH] Protobuf ahesford
2021-09-18 0:15 ` protobuf28: drop versioned names and lib subpackages, update to 3.18.0 ericonr
2021-10-06 19:56 ` ahesford [this message]
2021-10-12 20:15 ` [PR PATCH] [Updated] " ahesford
2021-10-13 0:29 ` ahesford
2021-10-13 0:29 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211006195615.Si3RsLQDGmwk0QlvTbkAr0sNtdurjzueIArqukXg6Sw@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).