[gentoo-commits] gentoo-x86 commit in net-libs/librsync/files: librsync-0.9.7-getopt.patch librsync-0.9.7-implicit-declaration.patch librsync-0.9.7-format-security.patch

[gentoo-commits] gentoo-x86 commit in net-libs/librsync/files: librsync-0.9.7-getopt.patch librsync-0.9.7-implicit-declaration.patch librsync-0.9.7-format-security.patch

[Justin Lecher (jlec)]

jlec        13/05/03 14:07:11

  Added:                librsync-0.9.7-getopt.patch
                        librsync-0.9.7-implicit-declaration.patch
                        librsync-0.9.7-format-security.patch
  Log:
  net-libs/librsync: Fix obsolete macros to work with automake-1.13, #467414; add some patches from fedora and debian to fix compiler warnings
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

Revision  Changes    Path
1.1                  net-libs/librsync/files/librsync-0.9.7-getopt.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-getopt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-getopt.patch?rev=1.1&content-type=text/plain

Index: librsync-0.9.7-getopt.patch
===================================================================
Patch by Daniel Baumann <daniel@debian.org> for librsync >= 0.9.7, which makes
rdiff aware of -i and -z getopt options mentioned in --help output. For further
information, please have a look to Debian bug ID #435894.

--- librsync-0.9.7/rdiff.c			2004-09-17 23:35:50.000000000 +0200
+++ librsync-0.9.7/rdiff.c.getopt		2008-12-20 13:45:58.000000000 +0100
@@ -97,8 +97,8 @@
     { "sum-size",    'S', POPT_ARG_INT,  &strong_len },
     { "statistics",  's', POPT_ARG_NONE, &show_stats },
     { "stats",        0,  POPT_ARG_NONE, &show_stats },
-    { "gzip",         0,  POPT_ARG_NONE, 0,             OPT_GZIP },
-    { "bzip2",        0,  POPT_ARG_NONE, 0,             OPT_BZIP2 },
+    { "gzip",        'z', POPT_ARG_NONE, 0,             OPT_GZIP },
+    { "bzip2",       'i', POPT_ARG_NONE, 0,             OPT_BZIP2 },
     { "paranoia",     0,  POPT_ARG_NONE, &rs_roll_paranoia },
     { 0 }
 };



1.1                  net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch?rev=1.1&content-type=text/plain

Index: librsync-0.9.7-implicit-declaration.patch
===================================================================
Description: Fix -Wimplicit-function-declaration warning in the test suite
 Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of
 function ‘strcmp’ [-Wimplicit-function-declaration]
Author: Andrey Rahmatullin <wrar@wrar.name>
Forwarded: no
Last-Update: 2012-02-05

diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c
index a9fd77b..df558c2 100644
--- a/testsuite/isprefix.driver.c
+++ b/testsuite/isprefix.driver.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "isprefix.h"
 



1.1                  net-libs/librsync/files/librsync-0.9.7-format-security.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-format-security.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/librsync/files/librsync-0.9.7-format-security.patch?rev=1.1&content-type=text/plain

Index: librsync-0.9.7-format-security.patch
===================================================================
Description: Always use a format string in printf
 Fix the warning: buf.c:216:9: error: format not a string literal and no
 format arguments [-Werror=format-security]
Author: Andrey Rahmatullin <wrar@wrar.name>
Forwarded: no
Last-Update: 2012-02-05

diff --git a/buf.c b/buf.c
index 7f4e7a0..3a83f2b 100644
--- a/buf.c
+++ b/buf.c
@@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf)
 
     got = fread(*buf, 1, *len, f);
     if (got == -1) {
-        rs_error(strerror(errno));
+        rs_error("%s", strerror(errno));
         return RS_IO_ERROR;
     } else if (got == 0) {
         rs_error("unexpected eof on fd%d", fileno(f));