Skip to content

Commit 024c186

Browse files
committed
Update from Debian upstream (minus debug package migration)
Upstream: https://anonscm.debian.org/git/pkg-kafka/librdkafka.git Sha: b7c8c81c8e0d86c6e3eb5636dc30a07d268e2786
1 parent e1f7ff5 commit 024c186

File tree

6 files changed

+87
-7
lines changed

6 files changed

+87
-7
lines changed

Diff for: debian/changelog

+36
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
librdkafka (0.9.3-1) unstable; urgency=medium
2+
3+
* New upstream release.
4+
* Add Build-Depends to liblz4-dev to enable LZ4 compression.
5+
* Add copyright for xxhash.[hc] and regexp.[hc].
6+
* Update librdkafka1.symbols for 0.9.2 and 0.9.3.
7+
* Use hardening build flags.
8+
* Add myself to Uploaders.
9+
* Switch to debhelper 10.
10+
* Move packaging to alioth, under the pkg-kafka team.
11+
12+
-- Christos Trochalakis <[email protected]> Tue, 24 Jan 2017 17:33:40 +0200
13+
14+
librdkafka (0.9.1-1) unstable; urgency=medium
15+
16+
* New upstream release (Closes: #816047).
17+
- Remove 0001-mklove-update-add-disable-silent-rules patch (not needed)
18+
- Remove 0002_hexdump_use_size_t_instead_of_int patch (not needed)
19+
- Fixes a GCC6-identified warning and possible FTBFS. (Closes: #811596)
20+
* Add Build-Depends to libssl-dev/libsasl2-dev, to enable Kafka 0.9
21+
encryption and authentication.
22+
* Update the long description to mention 0.9 protocol support and also the
23+
high-performance aspect, by copying upstream's description almost
24+
verbatim.
25+
* Bump Standards-Version to 3.9.8 (no changes needed).
26+
* Switch Vcs-Git to GitHub's https (from git://)
27+
* Migrate from our own -dbg package to the automatic -dbgsym package.
28+
* Update librdkafka1.symbols with 0.9.0' and 0.9.1's new symbols.
29+
* Ship the new C++ library, by shipping a new binary package, librdkafka++1.
30+
* Ship pkg-config files in the -dev package for both the C and C++
31+
libraries.
32+
* Replace the perl build-dependency by python, as the build system (among
33+
others) now requires it.
34+
35+
-- Faidon Liambotis <[email protected]> Mon, 30 May 2016 16:07:33 +0300
36+
137
librdkafka (0.8.6-1.1) unstable; urgency=medium
238

339
* Non-maintainer upload.

Diff for: debian/control

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
Source: librdkafka
22
Priority: optional
33
Maintainer: Faidon Liambotis <[email protected]>
4-
Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, perl
5-
Standards-Version: 3.9.7
4+
Uploaders: Christos Trochalakis <[email protected]>
5+
Build-Depends: debhelper (>= 10), zlib1g-dev, libssl-dev, libsasl2-dev, liblz4-dev, python
6+
Standards-Version: 3.9.8
67
Section: libs
78
Homepage: https://github.com/edenhill/librdkafka
8-
Vcs-Git: https://github.com/edenhill/librdkafka.git -b debian
9-
Vcs-Browser: https://github.com/edenhill/librdkafka/tree/debian
9+
Vcs-Git: https://anonscm.debian.org/cgit/pkg-kafka/librdkafka.git -b debian
10+
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kafka/librdkafka.git
1011

1112
Package: librdkafka1
1213
Architecture: any
@@ -27,7 +28,7 @@ Package: librdkafka++1
2728
Architecture: any
2829
Multi-Arch: same
2930
Depends: ${shlibs:Depends}, ${misc:Depends}
30-
Description: library implementing the Apache Kafka protocol
31+
Description: library implementing the Apache Kafka protocol (C++ bindings)
3132
librdkafka is a C library implementation of the Apache Kafka protocol,
3233
containing both Producer and Consumer support. It was designed with message
3334
delivery reliability and high performance in mind, current figures exceed

Diff for: debian/copyright

+15
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,21 @@ License: BSD-3-clause
7979
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
8080
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8181

82+
Files: src/xxhash.h src/xxhash.c
83+
Copyright: 2012-2014, Yann Collet
84+
License: BSD-2-clause
85+
86+
Files: src/regexp.h src/regexp.c
87+
Copyright: n/a
88+
License: public-domain
89+
90+
License: public-domain
91+
The files tagged with this license contain the following paragraphs:
92+
.
93+
These libraries are in the public domain (or the equivalent where that is not
94+
possible). You can do anything you want with them. You have no legal
95+
obligation to do anything else, although I appreciate attribution.
96+
8297
Files: debian/*
8398
Copyright: 2013 Faidon Liambotis <[email protected]>
8499
License: BSD-2-clause

Diff for: debian/librdkafka1.symbols

+24
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ librdkafka.so.1 librdkafka1 #MINVER#
55
rd_kafka_brokers_add@Base 0.8.0
66
rd_kafka_commit@Base 0.9.0
77
rd_kafka_commit_message@Base 0.9.0
8+
rd_kafka_commit_queue@Base 0.9.2
89
rd_kafka_committed@Base 0.9.1
910
rd_kafka_conf_destroy@Base 0.8.0
1011
rd_kafka_conf_dump@Base 0.8.3
@@ -14,11 +15,14 @@ librdkafka.so.1 librdkafka1 #MINVER#
1415
rd_kafka_conf_new@Base 0.8.0
1516
rd_kafka_conf_properties_show@Base 0.8.0
1617
rd_kafka_conf_set@Base 0.8.0
18+
rd_kafka_conf_set_closesocket_cb@Base 0.9.3
19+
rd_kafka_conf_set_connect_cb@Base 0.9.3
1720
rd_kafka_conf_set_consume_cb@Base 0.9.0
1821
rd_kafka_conf_set_default_topic_conf@Base 0.9.0
1922
rd_kafka_conf_set_dr_cb@Base 0.8.0
2023
rd_kafka_conf_set_dr_msg_cb@Base 0.8.4
2124
rd_kafka_conf_set_error_cb@Base 0.8.0
25+
rd_kafka_conf_set_events@Base 0.9.2
2226
rd_kafka_conf_set_log_cb@Base 0.8.4
2327
rd_kafka_conf_set_offset_commit_cb@Base 0.9.0
2428
rd_kafka_conf_set_opaque@Base 0.8.0
@@ -44,6 +48,19 @@ librdkafka.so.1 librdkafka1 #MINVER#
4448
rd_kafka_err2str@Base 0.8.0
4549
rd_kafka_errno2err@Base 0.8.3
4650
rd_kafka_errno@Base 0.9.1
51+
rd_kafka_event_destroy@Base 0.9.2
52+
rd_kafka_event_error@Base 0.9.2
53+
rd_kafka_event_error_string@Base 0.9.2
54+
rd_kafka_event_log@Base 0.9.2
55+
rd_kafka_event_message_array@Base 0.9.2
56+
rd_kafka_event_message_count@Base 0.9.2
57+
rd_kafka_event_message_next@Base 0.9.2
58+
rd_kafka_event_name@Base 0.9.2
59+
rd_kafka_event_opaque@Base 0.9.2
60+
rd_kafka_event_topic_partition@Base 0.9.2
61+
rd_kafka_event_topic_partition_list@Base 0.9.2
62+
rd_kafka_event_type@Base 0.9.2
63+
rd_kafka_flush@Base 0.9.2
4764
rd_kafka_get_debug_contexts@Base 0.9.0
4865
rd_kafka_get_err_descs@Base 0.9.1
4966
rd_kafka_get_watermark_offsets@Base 0.9.1
@@ -74,7 +91,13 @@ librdkafka.so.1 librdkafka1 #MINVER#
7491
rd_kafka_produce_batch@Base 0.8.4
7592
rd_kafka_query_watermark_offsets@Base 0.9.1
7693
rd_kafka_queue_destroy@Base 0.8.4
94+
rd_kafka_queue_forward@Base 0.9.2
95+
rd_kafka_queue_get_consumer@Base 0.9.2
96+
rd_kafka_queue_get_main@Base 0.9.2
97+
rd_kafka_queue_io_event_enable@Base 0.9.2
98+
rd_kafka_queue_length@Base 0.9.2
7799
rd_kafka_queue_new@Base 0.8.4
100+
rd_kafka_queue_poll@Base 0.9.2
78101
rd_kafka_resume_partitions@Base 0.9.1
79102
rd_kafka_seek@Base 0.9.0
80103
rd_kafka_set_log_level@Base 0.8.0
@@ -95,6 +118,7 @@ librdkafka.so.1 librdkafka1 #MINVER#
95118
rd_kafka_topic_new@Base 0.8.0
96119
rd_kafka_topic_opaque@Base 0.9.0
97120
rd_kafka_topic_partition_available@Base 0.8.0
121+
rd_kafka_topic_partition_destroy@Base 0.9.2
98122
rd_kafka_topic_partition_list_add@Base 0.9.0
99123
rd_kafka_topic_partition_list_add_range@Base 0.9.0
100124
rd_kafka_topic_partition_list_copy@Base 0.9.0

Diff for: debian/rules

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
# Uncomment this to turn on verbose mode.
44
#export DH_VERBOSE=1
55

6+
export DPKG_EXPORT_BUILDFLAGS=1
7+
export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow,-pie
8+
include /usr/share/dpkg/buildflags.mk
9+
610
%:
7-
dh $@
11+
dh $@ --without systemd,autoreconf
812

913
override_dh_strip:
1014
dh_strip --dbg-package=librdkafka1-dbg

Diff for: debian/watch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
version=3
2-
http://github.com/edenhill/librdkafka/tags .*/(\d[\d\.]*)\.tar\.gz
2+
https://github.com/edenhill/librdkafka/tags .*/v?(\d[\d\.]*)\.tar\.gz

0 commit comments

Comments
 (0)