Control: tags 828583 + pending

Dear maintainer,

I've prepared an NMU for uhub (versioned as 0.4.1-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,

Eriberto

diff -Nru uhub-0.4.1/debian/changelog uhub-0.4.1/debian/changelog
--- uhub-0.4.1/debian/changelog 2013-05-12 14:10:30.000000000 -0300
+++ uhub-0.4.1/debian/changelog 2016-12-23 02:27:45.000000000 -0200
@@ -1,3 +1,13 @@
+uhub (0.4.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Bumped DH level to 10.
+  * Bumped Standards-Version to 3.9.8.
+  * patches/openssl1.1.patch: added to provide compatibility with OpenSSL 1.1.
+    Thanks to Reiner Herrmann <rei...@reiner-h.de>. (Closes: #828583)
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org>  Fri, 23 Dec 2016 02:27:45 
-0200
+
 uhub (0.4.1-3) unstable; urgency=low
 
   * Move package to unstable: no changes required.
diff -Nru uhub-0.4.1/debian/compat uhub-0.4.1/debian/compat
--- uhub-0.4.1/debian/compat    2013-05-12 14:10:30.000000000 -0300
+++ uhub-0.4.1/debian/compat    2016-12-23 02:27:45.000000000 -0200
@@ -1 +1 @@
-8
+10
diff -Nru uhub-0.4.1/debian/control uhub-0.4.1/debian/control
--- uhub-0.4.1/debian/control   2013-05-12 14:10:30.000000000 -0300
+++ uhub-0.4.1/debian/control   2016-12-23 02:27:45.000000000 -0200
@@ -2,12 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Boris Pek <tehnic...@mail.ru>
-Build-Depends: debhelper (>= 8), cmake (>= 2.8.3), fakeroot,
+Build-Depends: debhelper (>= 10), cmake (>= 2.8.3), fakeroot,
  libsqlite3-dev, libssl-dev
 Homepage: http://www.uhub.org/
 Vcs-Git: git://github.com/tehnick/uhub-debian.git
 Vcs-Browser: https://github.com/tehnick/uhub-debian
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 
 Package: uhub
 Architecture: any
diff -Nru uhub-0.4.1/debian/patches/openssl1.1.patch 
uhub-0.4.1/debian/patches/openssl1.1.patch
--- uhub-0.4.1/debian/patches/openssl1.1.patch  1969-12-31 21:00:00.000000000 
-0300
+++ uhub-0.4.1/debian/patches/openssl1.1.patch  2016-12-23 02:27:45.000000000 
-0200
@@ -0,0 +1,37 @@
+Author: Reiner Herrmann <rei...@reiner-h.de>
+Description: Compatibility with OpenSSL 1.1
+Bug-Debian: https://bugs.debian.org/828583
+
+--- a/src/network/openssl.c
++++ b/src/network/openssl.c
+@@ -67,7 +67,6 @@
+       ERR_clear_error();
+       ERR_remove_state(0);
+ 
+-      ENGINE_cleanup();
+       CONF_modules_unload(1);
+ 
+         ERR_free_strings();
+@@ -80,16 +79,16 @@
+ 
+ static void add_io_stats(struct net_ssl_openssl* handle)
+ {
+-      if (handle->bio->num_read > handle->bytes_rx)
++      if (BIO_number_read(handle->bio) > handle->bytes_rx)
+       {
+-              net_stats_add_rx(handle->bio->num_read - handle->bytes_rx);
+-              handle->bytes_rx = handle->bio->num_read;
++              net_stats_add_rx(BIO_number_read(handle->bio) - 
handle->bytes_rx);
++              handle->bytes_rx = BIO_number_read(handle->bio);
+       }
+ 
+-      if (handle->bio->num_write > handle->bytes_tx)
++      if (BIO_number_written(handle->bio) > handle->bytes_tx)
+       {
+-              net_stats_add_tx(handle->bio->num_write - handle->bytes_tx);
+-              handle->bytes_tx = handle->bio->num_write;
++              net_stats_add_tx(BIO_number_written(handle->bio) - 
handle->bytes_tx);
++              handle->bytes_tx = BIO_number_written(handle->bio);
+       }
+ }
+ 
diff -Nru uhub-0.4.1/debian/patches/series uhub-0.4.1/debian/patches/series
--- uhub-0.4.1/debian/patches/series    2013-05-12 14:10:30.000000000 -0300
+++ uhub-0.4.1/debian/patches/series    2016-12-23 02:27:45.000000000 -0200
@@ -1 +1,2 @@
 fix-build-on-hurd-i386
+openssl1.1.patch

Reply via email to