Your message dated Fri, 02 Sep 2016 07:35:44 +0000
with message-id <[email protected]>
and subject line Bug#836200: fixed in protobuf 3.0.0-7
has caused the Debian Bug report #836200,
regarding protobuf: Patch to restore New*Callback into google::protobuf
namespace
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
836200: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836200
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: protobuf
Version: 3.0.0-6
Severity: important
Tags: upstream patch
Control: block 835435 by -1
Control: block 835170 by -1
Dear Maintainer,
To fix the ostinato build failure with protobuf 3.0.0 (#835435), the
attached patch is required to restore the New*Callback into the
google::protobuf namespace.
The patch was taken from the PR by Srivats P (ostinato upstream) which
should be merged into protobuf upstream soon. [0]
[0] https://github.com/google/protobuf/pull/2024
Kind Regards,
Bas
diff -Nru protobuf-3.0.0/debian/changelog protobuf-3.0.0/debian/changelog
--- protobuf-3.0.0/debian/changelog 2016-08-27 01:02:16.000000000 +0200
+++ protobuf-3.0.0/debian/changelog 2016-08-31 15:15:24.000000000 +0200
@@ -1,3 +1,11 @@
+protobuf (3.0.0-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch by Srivats P to restore New*Callback into google::protobuf
+ namespace. Required for ostinato (#835435).
+
+ -- Bas Couwenberg <[email protected]> Wed, 31 Aug 2016 15:13:00 +0200
+
protobuf (3.0.0-6) unstable; urgency=medium
* New "java-test-scope.patch" to set scope of "junit" and "easymock" to
diff -Nru protobuf-3.0.0/debian/patches/Restore-New-Callback-into-google-protobuf-namespace.patch protobuf-3.0.0/debian/patches/Restore-New-Callback-into-google-protobuf-namespace.patch
--- protobuf-3.0.0/debian/patches/Restore-New-Callback-into-google-protobuf-namespace.patch 1970-01-01 01:00:00.000000000 +0100
+++ protobuf-3.0.0/debian/patches/Restore-New-Callback-into-google-protobuf-namespace.patch 2016-08-31 15:12:55.000000000 +0200
@@ -0,0 +1,106 @@
+Description: Restore New*Callback into google::protobuf namespace
+ since these are used by the service stubs code
+Author: Srivats P <[email protected]>
+Origin: https://github.com/pstavirs/protobuf/commit/eedc7be6803924e158e6a08471bbdf1908c7a93e
+Bug: https://github.com/google/protobuf/issues/1966
+
+--- a/src/google/protobuf/compiler/cpp/cpp_message.cc
++++ b/src/google/protobuf/compiler/cpp/cpp_message.cc
+@@ -2956,7 +2956,7 @@ GenerateMergeFromCodedStream(io::Printer
+ // on the CodedOutputStream.
+ printer->Print(
+ " ::google::protobuf::io::LazyStringOutputStream unknown_fields_string(\n"
+- " ::google::protobuf::internal::NewPermanentCallback(\n"
++ " ::google::protobuf::NewPermanentCallback(\n"
+ " &MutableUnknownFieldsFor$classname$, this));\n"
+ " ::google::protobuf::io::CodedOutputStream unknown_fields_stream(\n"
+ " &unknown_fields_string, false);\n",
+--- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc
++++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc
+@@ -1252,7 +1252,7 @@ class GeneratedServiceTest : public test
+ foo_(descriptor_->FindMethodByName("Foo")),
+ bar_(descriptor_->FindMethodByName("Bar")),
+ stub_(&mock_channel_),
+- done_(::google::protobuf::internal::NewPermanentCallback(&DoNothing)) {}
++ done_(NewPermanentCallback(&DoNothing)) {}
+
+ virtual void SetUp() {
+ ASSERT_TRUE(foo_ != NULL);
+--- a/src/google/protobuf/stubs/callback.h
++++ b/src/google/protobuf/stubs/callback.h
+@@ -381,6 +381,8 @@ class MethodResultCallback_5_2 : public
+ typename remove_reference<P5>::type p5_;
+ };
+
++} // namespace internal
++
+ // See Closure.
+ inline Closure* NewCallback(void (*function)()) {
+ return new internal::FunctionClosure0(function, true);
+@@ -533,8 +535,6 @@ inline ResultCallback2<R, A1, A2>* NewPe
+ p2, p3, p4, p5);
+ }
+
+-} // namespace internal
+-
+ // A function which does nothing. Useful for creating no-op callbacks, e.g.:
+ // Closure* nothing = NewCallback(&DoNothing);
+ void LIBPROTOBUF_EXPORT DoNothing();
+--- a/src/google/protobuf/stubs/common_unittest.cc
++++ b/src/google/protobuf/stubs/common_unittest.cc
+@@ -41,8 +41,6 @@
+
+ namespace google {
+ namespace protobuf {
+-using internal::NewCallback;
+-using internal::NewPermanentCallback;
+ namespace {
+
+ // TODO(kenton): More tests.
+--- a/src/google/protobuf/stubs/once_unittest.cc
++++ b/src/google/protobuf/stubs/once_unittest.cc
+@@ -43,7 +43,6 @@
+
+ namespace google {
+ namespace protobuf {
+-using internal::NewCallback;
+ namespace {
+
+ class OnceInitTest : public testing::Test {
+@@ -128,11 +127,11 @@ class OnceInitTest : public testing::Tes
+ };
+
+ TestThread* RunInitOnceInNewThread() {
+- return new TestThread(internal::NewCallback(this, &OnceInitTest::InitOnce));
++ return new TestThread(NewCallback(this, &OnceInitTest::InitOnce));
+ }
+ TestThread* RunInitRecursiveOnceInNewThread() {
+ return new TestThread(
+- internal::NewCallback(this, &OnceInitTest::InitRecursiveOnce));
++ NewCallback(this, &OnceInitTest::InitRecursiveOnce));
+ }
+
+ enum State {
+--- a/src/google/protobuf/util/internal/protostream_objectwriter.cc
++++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc
+@@ -907,7 +907,7 @@ Status ProtoStreamObjectWriter::RenderFi
+ // conversions as much as possible. Because ToSnakeCase sometimes returns the
+ // wrong value.
+ google::protobuf::scoped_ptr<ResultCallback1<util::Status, StringPiece> > callback(
+- ::google::protobuf::internal::NewPermanentCallback(&RenderOneFieldPath, ow));
++ NewPermanentCallback(&RenderOneFieldPath, ow));
+ return DecodeCompactFieldMaskPaths(data.str(), callback.get());
+ }
+
+--- a/src/google/protobuf/util/message_differencer.cc
++++ b/src/google/protobuf/util/message_differencer.cc
+@@ -1389,8 +1389,7 @@ bool MessageDifferencer::MatchRepeatedFi
+ // doesn't necessarily imply Compare(b, c). Therefore a naive greedy
+ // algorithm will fail to find a maximum matching.
+ // Here we use the argumenting path algorithm.
+- MaximumMatcher::NodeMatchCallback* callback =
+- ::google::protobuf::internal::NewPermanentCallback(
++ MaximumMatcher::NodeMatchCallback* callback = NewPermanentCallback(
+ this, &MessageDifferencer::IsMatch,
+ repeated_field, key_comparator,
+ &message1, &message2, parent_fields);
diff -Nru protobuf-3.0.0/debian/patches/series protobuf-3.0.0/debian/patches/series
--- protobuf-3.0.0/debian/patches/series 2016-08-27 00:58:15.000000000 +0200
+++ protobuf-3.0.0/debian/patches/series 2016-08-31 15:12:49.000000000 +0200
@@ -4,3 +4,4 @@
misleading-indentation.patch
s390x.patch
sparc64.patch
+Restore-New-Callback-into-google-protobuf-namespace.patch
--- End Message ---
--- Begin Message ---
Source: protobuf
Source-Version: 3.0.0-7
We believe that the bug you reported is fixed in the latest version of
protobuf, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Dmitry Smirnov <[email protected]> (supplier of updated protobuf package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 02 Sep 2016 16:57:13 +1000
Source: protobuf
Binary: libprotobuf10 libprotobuf-lite10 libprotobuf-dev libprotoc10
libprotoc-dev protobuf-compiler python-protobuf libprotobuf-java
Architecture: source amd64 all
Version: 3.0.0-7
Distribution: unstable
Urgency: medium
Maintainer: Debian protobuf maintainers
<[email protected]>
Changed-By: Dmitry Smirnov <[email protected]>
Description:
libprotobuf-dev - protocol buffers C++ library (development files)
libprotobuf-java - Java bindings for protocol buffers
libprotobuf-lite10 - protocol buffers C++ library (lite version)
libprotobuf10 - protocol buffers C++ library
libprotoc-dev - protocol buffers compiler library (development files)
libprotoc10 - protocol buffers compiler library
protobuf-compiler - compiler for protocol buffer definition files
python-protobuf - Python bindings for protocol buffers
Closes: 836200
Changes:
protobuf (3.0.0-7) unstable; urgency=medium
.
* Team upload.
.
[ Bas Couwenberg ]
* Added patch by Srivats P to restore New*Callback into google::protobuf
namespace. Required for ostinato (#835435). (Closes: #836200).
Checksums-Sha1:
17677c5968c08e700df02450389f58e9b95d5669 2859 protobuf_3.0.0-7.dsc
4358674d71b3a70155ea80d3a461e661020c4c73 22196 protobuf_3.0.0-7.debian.tar.xz
fe0fd473184b85852179ba0fb44bd1c75f6be28c 937420
libprotobuf-dev_3.0.0-7_amd64.deb
4c9a9b0c855dc0273c818ff3cbef7935cb6fa478 643712
libprotobuf-java_3.0.0-7_all.deb
bff6d114a4a2b93f7a592edc75394361f98133a6 713618
libprotobuf-lite10-dbgsym_3.0.0-7_amd64.deb
0f4efd1fc57846c25faa4759d0df6de8ff72e811 124474
libprotobuf-lite10_3.0.0-7_amd64.deb
09eee33d300bd269b142beb0bc377c355a7ae415 6433704
libprotobuf10-dbgsym_3.0.0-7_amd64.deb
cdff05961a4a6ce11b14e402a5f7b4a2a166e017 681850 libprotobuf10_3.0.0-7_amd64.deb
c328c503accc18679060ba84841cd2f73aa3e8be 674256 libprotoc-dev_3.0.0-7_amd64.deb
e01ce67fb75077e0cfc0db5ecb76cc402b4daa73 8986754
libprotoc10-dbgsym_3.0.0-7_amd64.deb
18b394b946a54cbcb314c966382b518e1b772348 625140 libprotoc10_3.0.0-7_amd64.deb
bca60ace262c1c91182295d02c562947d9b4f434 50392
protobuf-compiler-dbgsym_3.0.0-7_amd64.deb
65cfbac25711febce8f217bbaa1e45b043981b65 52520
protobuf-compiler_3.0.0-7_amd64.deb
a32d8cfe3f478fd155afeb9cd3ea309674565317 747928
python-protobuf-dbgsym_3.0.0-7_amd64.deb
7001ba1aa4699f3f4f3efef1b999e0d9d8a23cc5 291310
python-protobuf_3.0.0-7_amd64.deb
Checksums-Sha256:
cd33574b589aeca6d4c8e0bf3d8137a605ba771e3c3332327b20b4d911ce0096 2859
protobuf_3.0.0-7.dsc
1f593cdbc63df1c224ae6f967bf5fa26fdf718a79e207da064592f4f95b1efba 22196
protobuf_3.0.0-7.debian.tar.xz
c74d442abae3afc88490b9806782d3c155ebacd3ee40f3b5ae098b981c57fa2b 937420
libprotobuf-dev_3.0.0-7_amd64.deb
86149a7d388d57f69fed32ae7b051e6757478934d5dcb3ccdffb4e556810417f 643712
libprotobuf-java_3.0.0-7_all.deb
355d3809b4fd7eae1463dafca5f0ff186ffb5801a102855ea4fab7b6d08980bf 713618
libprotobuf-lite10-dbgsym_3.0.0-7_amd64.deb
c7279af67c1514adbfaf21ef7d95e849609d961ee0c665e22ed52a407661ddd0 124474
libprotobuf-lite10_3.0.0-7_amd64.deb
29ee82a16cb72e335564e946d17d9c4d8777d7fb8b192664c8cf6c55bb30557c 6433704
libprotobuf10-dbgsym_3.0.0-7_amd64.deb
fdf0a40b5d3dbde3fb7fce8b5922e6868470e7d1608807931dbc0fb96e7128bf 681850
libprotobuf10_3.0.0-7_amd64.deb
fd1cfa4486ca83453113931e2da040a95b30cfc4b40e47bd706da51c58295385 674256
libprotoc-dev_3.0.0-7_amd64.deb
44e24630baa2d28daae49641c2e7d4f36433177aa392f4f8581e3a7aedab33a5 8986754
libprotoc10-dbgsym_3.0.0-7_amd64.deb
2829d758490322f200aa9332c35692a7b31af61d14b27404703a813fe61b25dc 625140
libprotoc10_3.0.0-7_amd64.deb
673dde4927fb0914df5f870c92c09cfb2b5eaaf816eed17c1a8f3f84a5c200d7 50392
protobuf-compiler-dbgsym_3.0.0-7_amd64.deb
2746974ac08d6b2f3c5299665deadaadec92b5f3a96f7ccde35e46c0c5849910 52520
protobuf-compiler_3.0.0-7_amd64.deb
53a24714577d6bf1e20a9ada671fc910e67633d5ae5d24a75e7055df41a11891 747928
python-protobuf-dbgsym_3.0.0-7_amd64.deb
ba9701eb4e50982fcd178d87cbcae8afefc9839e724d6627c23df91cc70da632 291310
python-protobuf_3.0.0-7_amd64.deb
Files:
c727dcf80215db1317929c48fb0637d5 2859 devel optional protobuf_3.0.0-7.dsc
4af4137fa10d84975c2d9c45cc728bd8 22196 devel optional
protobuf_3.0.0-7.debian.tar.xz
d8323409498e813986754f56d6afe68b 937420 libdevel optional
libprotobuf-dev_3.0.0-7_amd64.deb
98afbefa9fdffa543393f68d68566812 643712 java optional
libprotobuf-java_3.0.0-7_all.deb
f2db7a994b14732e69d39d2c650be278 713618 debug extra
libprotobuf-lite10-dbgsym_3.0.0-7_amd64.deb
46a6bad92724b9552717cb38a7c3b97a 124474 libs optional
libprotobuf-lite10_3.0.0-7_amd64.deb
2bea04984abda6af6164932a70c40a3c 6433704 debug extra
libprotobuf10-dbgsym_3.0.0-7_amd64.deb
caad5cdde2ce9381f8c598024f6322cf 681850 libs optional
libprotobuf10_3.0.0-7_amd64.deb
fa393d697ad4cbb537487634e10f475f 674256 libdevel optional
libprotoc-dev_3.0.0-7_amd64.deb
777fd588409d080d3196a9d72656a58d 8986754 debug extra
libprotoc10-dbgsym_3.0.0-7_amd64.deb
3c8369e31e48a8447e3b4eaca876563d 625140 libs optional
libprotoc10_3.0.0-7_amd64.deb
d950934a1b969508e78560b992342520 50392 debug extra
protobuf-compiler-dbgsym_3.0.0-7_amd64.deb
cdfa725cab5cbc2f23665085f9b54256 52520 devel optional
protobuf-compiler_3.0.0-7_amd64.deb
ad93ea93e3fc8b388a8cc8ef9a3d9ced 747928 debug extra
python-protobuf-dbgsym_3.0.0-7_amd64.deb
6cd1ca19e48a1965d3dc89ad0ed69726 291310 python optional
python-protobuf_3.0.0-7_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJXyShkAAoJEFK2u9lTlo0bq3EP/jmOrfzBJ5nUmJ+E50KB9EO2
FkitO2m2dLIIUyNV9YZAK59f5+aCJcYQsg11Jc05eqf3ikEzfWIu0QEnYWSvE29E
/sRPv/2a4NLJcYqRxkrspreowQqPN0fzQU9NLMSBf9EPncbBBiKxNeecJzhfJ9Xy
fKU594A0OReV+GVLTO+sguubOy5ZefSseWFFFaKe4tsg5rbYdt/IXCePZOVZybD5
aFKz0wAchZs/pUJZilt2NfzH7ObepQJH2U//2LORDitEEEF0bKjaKVwmf1iCKEh4
To2Oa0j7hKZt6ZqQmVUNsUXLT621YNAKyXVfq0+DNGjrRxWwcS+j0M2FwpwxzdPk
JJuMCH4bZwkUncLFgHQdEOfrnegnqv321XiBjD6e8++kssO6TXceL8xJvom4lXOT
lF9qDX5is/wR4XeJaPlPufyLI4YE1/SkvcNdsMyM1Xtj3oKW0FxJKkVE4uiWQwjn
f/kfvyCdlfXcxfW9wRaCx+OFZVigLKBQIb7auGgZmjUKTaNfXbpaF99zbAazKy1P
wYKgmw8bYG3EnIHEgBk+J+twJpNdGqZnvVycUctWWccxr4V2/mAkfuSHWDMKxI1S
fwJCCmCOKReOBmuUETzPHZBr3nTxrWlDB10zFcn8wonofzdjpJ32AlzCBMnhUWei
2hL4gx8rDPGPS/E782rS
=3+HH
-----END PGP SIGNATURE-----
--- End Message ---
