diff -Nru redsocks-0.5/debian/changelog redsocks-0.5/debian/changelog --- redsocks-0.5/debian/changelog 2017-07-31 01:31:36.000000000 +0000 +++ redsocks-0.5/debian/changelog 2018-03-29 20:05:32.000000000 +0000 @@ -1,8 +1,14 @@ -redsocks (0.5-1build1) artful; urgency=medium +redsocks (0.5-2) unstable; urgency=medium - * No-change rebuild against libevent-core-2.1-6 + * Fix http-relay and http-connect modes with libevent 2.1 (Closes: #892872) + * Bump Standards-Version to 4.1.3; no changes needed + * Bump dh compat to 11 + + Drop B-D on dh-systemd + + Do not pass --with=systemd to dh + * Switch Vcs-* URLs to salsa.d.o + * d/copyright: bump debian/* years - -- Steve Langasek Mon, 31 Jul 2017 01:31:36 +0000 + -- Apollon Oikonomopoulos Thu, 29 Mar 2018 23:05:32 +0300 redsocks (0.5-1) unstable; urgency=medium diff -Nru redsocks-0.5/debian/compat redsocks-0.5/debian/compat --- redsocks-0.5/debian/compat 2017-01-02 12:18:48.000000000 +0000 +++ redsocks-0.5/debian/compat 2018-03-29 20:01:52.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru redsocks-0.5/debian/control redsocks-0.5/debian/control --- redsocks-0.5/debian/control 2017-07-31 01:31:36.000000000 +0000 +++ redsocks-0.5/debian/control 2018-03-29 20:03:53.000000000 +0000 @@ -1,13 +1,12 @@ Source: redsocks Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Apollon Oikonomopoulos -Build-Depends: debhelper (>= 9), libevent-dev, dh-systemd (>= 1.5) -Standards-Version: 3.9.8 +Maintainer: Apollon Oikonomopoulos +Build-Depends: debhelper (>= 11~), libevent-dev +Standards-Version: 4.1.3 Homepage: http://darkk.net.ru/redsocks/ -Vcs-Git: https://anonscm.debian.org/git/collab-maint/redsocks.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/redsocks.git;a=summary +Vcs-Git: https://salsa.debian.org/debian/redsocks.git +Vcs-Browser: https://salsa.debian.org/debian/redsocks Package: redsocks Architecture: any diff -Nru redsocks-0.5/debian/copyright redsocks-0.5/debian/copyright --- redsocks-0.5/debian/copyright 2017-01-02 12:18:48.000000000 +0000 +++ redsocks-0.5/debian/copyright 2018-03-29 20:04:38.000000000 +0000 @@ -60,7 +60,7 @@ License can be found in "/usr/share/common-licenses/LGPL". Files: debian/* -Copyright: 2011-2016 Apollon Oikonomopoulos +Copyright: 2011-2018 Apollon Oikonomopoulos License: permissive Copying and distribution of this package, with or without modification, are permitted in any medium without royalty diff -Nru redsocks-0.5/debian/patches/libevent-2.1-compat.patch redsocks-0.5/debian/patches/libevent-2.1-compat.patch --- redsocks-0.5/debian/patches/libevent-2.1-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ redsocks-0.5/debian/patches/libevent-2.1-compat.patch 2018-03-29 19:59:20.000000000 +0000 @@ -0,0 +1,35 @@ +From 792a06ba87621b3c9e921c7fd080cb350ff6892b Mon Sep 17 00:00:00 2001 +From: Apollon Oikonomopoulos +Date: Thu, 29 Mar 2018 22:50:56 +0300 +Subject: [PATCH] Fix redsocks_evbuffer_readline with libevent 2.1 + +_EVENT_NUMERIC_VERSION was renamed to EVENT__NUMERIC_VERSION in libevent +2.1. As a result, redsocks_evbuffer_readline would end up using +evbuffer_readline(buf), which causes client connections to hang +indefinitely. + +Switch the check to using LIBEVENT_VERSION_NUMBER instead. +LIBEVENT_VERSION_NUMBER has been around since libevent 2.0.3 and +redsocks is already using it in other parts of the code. + +Fixes #107, #122. +--- + utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils.c b/utils.c +index 824d0cc..30ee290 100644 +--- a/utils.c ++++ b/utils.c +@@ -117,7 +117,7 @@ int redsocks_gettimeofday(struct timeval *tv) + + char *redsocks_evbuffer_readline(struct evbuffer *buf) + { +-#if _EVENT_NUMERIC_VERSION >= 0x02000000 ++#if LIBEVENT_VERSION_NUMBER >= 0x02000000 + return evbuffer_readln(buf, NULL, EVBUFFER_EOL_CRLF); + #else + return evbuffer_readline(buf); +-- +2.16.2 + diff -Nru redsocks-0.5/debian/patches/series redsocks-0.5/debian/patches/series --- redsocks-0.5/debian/patches/series 2017-01-02 12:18:48.000000000 +0000 +++ redsocks-0.5/debian/patches/series 2018-03-29 19:59:25.000000000 +0000 @@ -1 +1,2 @@ fix_default_config_location.patch +libevent-2.1-compat.patch diff -Nru redsocks-0.5/debian/rules redsocks-0.5/debian/rules --- redsocks-0.5/debian/rules 2017-01-02 12:18:48.000000000 +0000 +++ redsocks-0.5/debian/rules 2018-03-29 20:01:47.000000000 +0000 @@ -7,6 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with systemd + dh $@ .PHONY: override_dh_auto_test