user debian-rele...@lists.debian.org

usertag 884721 + bsp-2019-02-de-berlin
usertag 912051 + bsp-2019-02-de-berlin
thank you

Dear maintainers,

Greetings from the BSP at the DCSO office in Berlin.

I have fixed this bug and NMU'd rsyncrypto_1.14-1.1 to DELAYED/5. Please
feel free to reschedule or cancel my upload as you see fit. I have
attached the diff.

Cheers
Sascha
diff -Nru rsyncrypto-1.14/debian/changelog rsyncrypto-1.14/debian/changelog
--- rsyncrypto-1.14/debian/changelog	2017-09-06 19:30:22.000000000 +0200
+++ rsyncrypto-1.14/debian/changelog	2019-02-09 15:11:50.000000000 +0100
@@ -1,3 +1,13 @@
+rsyncrypto (1.14-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add explicit build dependency on automake-1.15.
+    Closes: #912051   
+  * Fix segfault with --delete. Thanks to Chris Boot for the patch.
+    Closes: #884721
+
+ -- Sascha Steinbiss <sa...@debian.org>  Sat, 09 Feb 2019 15:11:50 +0100
+
 rsyncrypto (1.14-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru rsyncrypto-1.14/debian/control rsyncrypto-1.14/debian/control
--- rsyncrypto-1.14/debian/control	2017-09-06 19:30:22.000000000 +0200
+++ rsyncrypto-1.14/debian/control	2019-02-09 15:11:50.000000000 +0100
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Shachar Shemesh <shac...@debian.org>
-Build-Depends: debhelper (>= 9), libssl-dev (>= 1.1.0), libargtable2-dev, autotools-dev
+Build-Depends: debhelper (>= 9), libssl-dev (>= 1.1.0), libargtable2-dev, autotools-dev, automake-1.15
 Standards-Version: 4.1.0
 Homepage: https://rsyncrypto.lingnu.com
 
diff -Nru rsyncrypto-1.14/debian/patches/fix_segfault_in_unlink rsyncrypto-1.14/debian/patches/fix_segfault_in_unlink
--- rsyncrypto-1.14/debian/patches/fix_segfault_in_unlink	1970-01-01 01:00:00.000000000 +0100
+++ rsyncrypto-1.14/debian/patches/fix_segfault_in_unlink	2019-02-09 15:11:50.000000000 +0100
@@ -0,0 +1,17 @@
+Description: fix segfault
+ This fixes a crash when using rsyncrypto to refresh an
+ encrypted directory tree with --delete enabled.
+ This happens because of an infinite recursion in autofd::unlink()
+Author: Chris Boot <bo...@debian.org>
+Last-Update: 2019-02-09
+--- a/autofd.h
++++ b/autofd.h
+@@ -216,7 +216,7 @@
+     // unless it failed with ENOENT - the file already doesn't exist
+     static int unlink(const char *pathname)
+     {
+-        bool success=unlink( pathname )==0;
++        bool success=::unlink( pathname )==0;
+         if( !success && errno!=ENOENT )
+             throw rscerror("Erasing file", errno, pathname );
+ 
diff -Nru rsyncrypto-1.14/debian/patches/series rsyncrypto-1.14/debian/patches/series
--- rsyncrypto-1.14/debian/patches/series	2017-09-06 19:30:22.000000000 +0200
+++ rsyncrypto-1.14/debian/patches/series	2019-02-09 15:11:50.000000000 +0100
@@ -1 +1,2 @@
 remove_precompiled_headers
+fix_segfault_in_unlink

Reply via email to