Bug#1034666: unblock: mirrorbits/0.5.1+git20220308.9189dc7+ds1-1+b1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: mirrorbits@packages.debian.org
Control: affects -1 + src:mirrorbits
Please unblock package mirrorbits
This changeset fixes the build of mirrorbits.
[ Reason ]
This is to fix FTBFS reported at https://bugs.debian.org/1026674. FTBFS
was due to changes in build dependencies, the package needed some minor
adjustments.
[ Impact ]
mirrorbits won't be included in bookworm
[ Tests ]
N/A
[ Risks ]
Low risk, this is a leaf package
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
The package has not been uploaded to unstable yet.
unblock mirrorbits/0.5.1+git20220308.9189dc7+ds1-1+b1
diff -Nru mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/changelog mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/changelog
--- mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/changelog 2022-07-18 19:55:10.000000000 +0700
+++ mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/changelog 2023-04-21 11:20:56.000000000 +0700
@@ -1,3 +1,11 @@
+mirrorbits (0.5.1+git20220308.9189dc7+ds1-2) unstable; urgency=medium
+
+ * Replace transitional golang-goprotobuf-dev package
+ * Drop patch aimed at compatibility with golang-goprotobuf-dev 1.5.x
+ * Fix FTBFS with libprotobuf-dev 3.21.9 (Closes: #1026674)
+
+ -- Arnaud Rebillout <arnaudr@kali.org> Fri, 21 Apr 2023 11:20:56 +0700
+
mirrorbits (0.5.1+git20220308.9189dc7+ds1-1) unstable; urgency=medium
* Drop patches, applied upstream
diff -Nru mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/control mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/control
--- mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/control 2022-07-18 19:55:10.000000000 +0700
+++ mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/control 2023-04-21 11:20:56.000000000 +0700
@@ -10,6 +10,7 @@
dh-sequence-golang,
golang-any,
golang-github-coreos-go-systemd-dev,
+ golang-github-golang-protobuf-1-3-dev,
golang-github-gomodule-redigo-dev,
golang-github-howeyc-gopass-dev,
golang-github-op-go-logging-dev,
@@ -19,8 +20,8 @@
golang-golang-x-net-dev,
golang-google-grpc-dev,
golang-gopkg-tylerb-graceful.v1-dev,
- golang-goprotobuf-dev,
golang-yaml.v2-dev,
+ protoc-gen-go-1-3,
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian/mirrorbits
Vcs-Git: https://salsa.debian.org/debian/mirrorbits.git
diff -Nru mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/Add-Go-import-path-to-.proto-file.patch mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/Add-Go-import-path-to-.proto-file.patch
--- mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/Add-Go-import-path-to-.proto-file.patch 2022-07-18 19:55:10.000000000 +0700
+++ mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/Add-Go-import-path-to-.proto-file.patch 1970-01-01 08:00:00.000000000 +0800
@@ -1,52 +0,0 @@
-From: Arnaud Rebillout <arnaudr@kali.org>
-Date: Mon, 11 Jul 2022 14:59:38 +0200
-Subject: Add Go import path to .proto file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is required for golang-goprotobuf-dev 1.5.2-1 (currently in Debian
-experimental), otherwise protoc fails with:
-
- protoc -I rpc --go_out=plugins=grpc:rpc rpc/rpc.proto
- protoc-gen-go: unable to determine Go import path for "rpc.proto"
-
- Please specify either:
- . a "go_package" option in the .proto source file, or
- . a "M" argument on the command line.
-
- See https://developers.google.com/protocol-buffers/docs/reference/go-generated#package for more information.
-
- --go_out: protoc-gen-go: Plugin failed with status code 1.
-
-The fancy value '.;rpc' comes from:
-https://github.com/golang/protobuf/issues/1102#issuecomment-619240905
-
-Actually the option should specify the full Go path, howeverif I do that,
-protoc generates the file rpc.pb.go in a completely different location, and the
-value of 'package' in rpc.pb.go becomes a full path, rather than just "rpc".
-
-I'm aiming at minimal changes here (because of my poor Go skills), so I prefer
-to use this trick in order to keep the generated file unchanged, as much as
-possible.
-
-Forwarded: not-needed, Debian-specific
----
- rpc/rpc.proto | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/rpc/rpc.proto b/rpc/rpc.proto
-index fed9eb3..b5b9eae 100644
---- a/rpc/rpc.proto
-+++ b/rpc/rpc.proto
-@@ -3,6 +3,8 @@ syntax = "proto3";
- import "google/protobuf/empty.proto";
- import "google/protobuf/timestamp.proto";
-
-+option go_package = ".;rpc";
-+
- service CLI {
- rpc GetVersion (google.protobuf.Empty) returns (VersionReply) {}
- rpc Upgrade (google.protobuf.Empty) returns (google.protobuf.Empty) {}
---
-2.36.1
diff -Nru mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/series mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/series
--- mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/series 2022-07-18 19:55:10.000000000 +0700
+++ mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/patches/series 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-Add-Go-import-path-to-.proto-file.patch
diff -Nru mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/rules mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/rules
--- mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/rules 2022-07-18 19:55:10.000000000 +0700
+++ mirrorbits-0.5.1+git20220308.9189dc7+ds1/debian/rules 2023-04-21 11:20:56.000000000 +0700
@@ -16,7 +16,7 @@
execute_after_dh_auto_configure:
cd _build/src/$(PKG) && \
find -name "*.pb.go" -delete -printf "removed %p\n" && \
- protoc -I rpc --go_out=plugins=grpc:rpc rpc/rpc.proto
+ protoc -I rpc --go_out=plugins=grpc,Mgoogle/protobuf/empty.proto=github.com/golang/protobuf/ptypes/empty,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp:rpc rpc/rpc.proto
override_dh_auto_build:
dh_auto_build -- $(GO_BUILDFLAGS) -ldflags '$(GO_LDFLAGS)'
Reply to: