New Upstream Snapshot - golang-gogoprotobuf

Ready changes

Summary

Merged new upstream version: 1.3.2+git20221024.1.f67b897 (was: 1.3.2).

Resulting package

Built on 2023-01-20T12:10 (took 6m53s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of: 

apt install -t fresh-snapshots gogoprotobufapt install -t fresh-snapshots golang-github-gogo-protobuf-devapt install -t fresh-snapshots golang-gogoprotobuf-dev

Lintian Result

Diff

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
deleted file mode 100644
index 8b98b0b2..00000000
--- a/.github/workflows/ci-workflow.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Continuous Integration
-on:
-  push:
-    branches:
-      - ghworkflow
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build_and_test:
-    name: go ${{ matrix.go_version }} - pb-${{ matrix.protobuf_version }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go_version: [1.15.x, 1.12.x]
-        protobuf_version: [3.14.0, 3.0.2, 2.6.1]
-      fail-fast: false
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-        with:
-          path: gopath/src/github.com/gogo/protobuf
-          fetch-depth: 5
-
-      - name: Setup go
-        uses: actions/setup-go@v1
-        with:
-          go-version: ${{ matrix.go_version }}
-
-      - name: Setup protoc
-        env:
-          PROTOBUF_VERSION: ${{ matrix.protobuf_version }}
-        run: ./install-protobuf.sh
-
-      - name: Protoc version
-        run: PATH=$HOME/bin:$PATH protoc --version
-      - name: env
-        run: env && go env && pwd
-
-      - name: Build server all
-        run: GOPATH=/home/runner/work/protobuf/gopath GOBIN=$GOPATH/bin PATH=$HOME/bin:$GOBIN:$PATH make buildserverall
-
-      - name: Diff check
-        if: matrix.protobuf_version == '3.14.0' && matrix.go_version == '1.15.x'
-        run: (! git status --porcelain | read || (git status; git diff; exit 1))
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 82f4de4a..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-._*
-*.js
-*.js.map
-
-# Conformance test output and transient files.
-conformance/failing_tests.txt
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index e11dad70..085f17d0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,10 @@
-[GoGo Protobuf looking for new ownership](https://github.com/gogo/protobuf/issues/691)
+[GoGo Protobuf is Deprecated](https://twitter.com/awalterschulze/status/1584553056100057088)
 
-# Protocol Buffers for Go with Gadgets
+# [[Deprecated](https://twitter.com/awalterschulze/status/1584553056100057088)] Protocol Buffers for Go with Gadgets
+
+<a href="https://www.youtube.com/watch?v=HTIltI0NuNg&list=PLYwF9EIrl42T3ml_ANaNifOuTQtLxaZgQ&index=3" target="_blank">
+ <img src="https://img.youtube.com/vi/HTIltI0NuNg/maxres1.jpg" alt="Watch the video" width="480" border="10" />
+</a>
 
 [![Build Status](https://github.com/gogo/protobuf/workflows/Continuous%20Integration/badge.svg)](https://github.com/gogo/protobuf/actions)
 [![GoDoc](https://godoc.org/github.com/gogo/protobuf?status.svg)](http://godoc.org/github.com/gogo/protobuf)
@@ -79,6 +83,12 @@ Please let us know if you are using gogoprotobuf by posting on our <a href="http
   - <a href="https://jbrandhorst.com/post/gogoproto/">So you want to use GoGo Protobuf - Johan Brandhorst</a>
   - <a href="https://jbrandhorst.com/post/grpc-errors/">Advanced gRPC Error Usage - Johan Brandhorst</a>
   - <a href="https://www.udemy.com/grpc-golang/?couponCode=GITHUB10">gRPC Golang Course on Udemy - Stephane Maarek</a>
+  
+## Preparing for GopherCon UK 2022
+
+<a href="https://www.youtube.com/watch?v=8kL7_KTsIoc" target="_blank">
+ <img src="https://img.youtube.com/vi/8kL7_KTsIoc/maxres3.jpg" alt="Preparing for GopherCon UK 2022 video" width="480" border="10" />
+</a>
 
 ## Getting Started
 
diff --git a/debian/changelog b/debian/changelog
index da1d4d59..83c9c9a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-gogoprotobuf (1.3.2+git20221024.1.f67b897-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 20 Jan 2023 12:05:46 -0000
+
 golang-gogoprotobuf (1.3.2-3) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0002-Skip-flaky-test.patch b/debian/patches/0002-Skip-flaky-test.patch
index 09b904a7..311bea0e 100644
--- a/debian/patches/0002-Skip-flaky-test.patch
+++ b/debian/patches/0002-Skip-flaky-test.patch
@@ -7,11 +7,11 @@ GoString may return `<nil>`, which is not regonized by go's ParseExpr.
  test/stdtypes/stdtypespb_test.go | 4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/test/stdtypes/stdtypespb_test.go b/test/stdtypes/stdtypespb_test.go
-index 7002354..aace58a 100644
---- a/test/stdtypes/stdtypespb_test.go
-+++ b/test/stdtypes/stdtypespb_test.go
-@@ -606,10 +606,6 @@ func TestStdTypesGoString(t *testing.T) {
+Index: golang-gogoprotobuf.git/test/stdtypes/stdtypespb_test.go
+===================================================================
+--- golang-gogoprotobuf.git.orig/test/stdtypes/stdtypespb_test.go
++++ golang-gogoprotobuf.git/test/stdtypes/stdtypespb_test.go
+@@ -606,10 +606,6 @@ func TestStdTypesGoString(t *testing.T)
  	if s1 != s2 {
  		t.Fatalf("GoString want %v got %v", s1, s2)
  	}
diff --git a/debian/patches/test--skip-TestGolden.patch b/debian/patches/test--skip-TestGolden.patch
index ddbd5b8d..12241aa5 100644
--- a/debian/patches/test--skip-TestGolden.patch
+++ b/debian/patches/test--skip-TestGolden.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
  protoc-gen-gogo/golden_test.go | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/protoc-gen-gogo/golden_test.go b/protoc-gen-gogo/golden_test.go
-index aea5f99..4574e67 100644
---- a/protoc-gen-gogo/golden_test.go
-+++ b/protoc-gen-gogo/golden_test.go
+Index: golang-gogoprotobuf.git/protoc-gen-gogo/golden_test.go
+===================================================================
+--- golang-gogoprotobuf.git.orig/protoc-gen-gogo/golden_test.go
++++ golang-gogoprotobuf.git/protoc-gen-gogo/golden_test.go
 @@ -29,6 +29,7 @@ func init() {
  }
  
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
index ab07ed61..879939ea 100644
--- a/protoc-gen-gogo/generator/generator.go
+++ b/protoc-gen-gogo/generator/generator.go
@@ -1413,7 +1413,15 @@ func (g *Generator) generateImports() {
 	} else {
 		g.PrintImport(GoPackageName(g.Pkg["proto"]), GoImportPath(g.ImportPrefix)+GoImportPath("github.com/golang/protobuf/proto"))
 	}
-	for importPath, packageName := range imports {
+	importsOrder := make([]GoImportPath, 0, len(imports))
+	for importPath := range imports {
+		importsOrder = append(importsOrder, importPath)
+	}
+	sort.Slice(importsOrder, func(i, j int) bool {
+		return importsOrder[i] < importsOrder[j]
+	})
+	for _, importPath := range importsOrder {
+		packageName := imports[importPath]
 		g.P(packageName, " ", GoImportPath(g.ImportPrefix)+importPath)
 	}
 	// Custom gogo imports

Debdiff

File lists identical (after any substitutions)

Control files of package gogoprotobuf: lines which differ (wdiff format)

  • Built-Using: golang-1.19 (= 1.19.5-1)
  • Depends: golang-github-gogo-protobuf-dev (= 1.3.2-3~jan+unchanged1), protobuf-compiler, libc6 (>= 2.34), libgcc-s1 (>= 3.3.1), libgo21 1.3.2+git20221024.1.f67b897-1~jan+nus2), protobuf-compiler

No differences were encountered between the control files of package golang-github-gogo-protobuf-dev

No differences were encountered between the control files of package golang-gogoprotobuf-dev

More details

Full run details

© 2018-2023 Jelmer Vernooij. File a bug. Source code. Published under the GNU GPLv2 or later.