diff options
author | 2013-05-03 14:07:12 +0000 | |
---|---|---|
committer | 2013-05-03 14:07:12 +0000 | |
commit | dd175711d7e568fa9f3e0c3507c30087d10de7fa (patch) | |
tree | a81aaa660fe7409c91a0e48f211adb37a5af3f32 /net-libs/librsync/files | |
parent | Add DEPEND on setuptools (bug 467314) (diff) | |
download | historical-dd175711d7e568fa9f3e0c3507c30087d10de7fa.tar.gz historical-dd175711d7e568fa9f3e0c3507c30087d10de7fa.tar.bz2 historical-dd175711d7e568fa9f3e0c3507c30087d10de7fa.zip |
net-libs/librsync: Fix obsolete macros to work with automake-1.13, #467414; add some patches from fedora and debian to fix compiler warnings
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916
Diffstat (limited to 'net-libs/librsync/files')
3 files changed, 56 insertions, 0 deletions
diff --git a/net-libs/librsync/files/librsync-0.9.7-format-security.patch b/net-libs/librsync/files/librsync-0.9.7-format-security.patch new file mode 100644 index 000000000000..e35980a4d7a0 --- /dev/null +++ b/net-libs/librsync/files/librsync-0.9.7-format-security.patch @@ -0,0 +1,20 @@ +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)); diff --git a/net-libs/librsync/files/librsync-0.9.7-getopt.patch b/net-libs/librsync/files/librsync-0.9.7-getopt.patch new file mode 100644 index 000000000000..0859089b970a --- /dev/null +++ b/net-libs/librsync/files/librsync-0.9.7-getopt.patch @@ -0,0 +1,17 @@ +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 } + }; diff --git a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch new file mode 100644 index 000000000000..782597c8fe2b --- /dev/null +++ b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch @@ -0,0 +1,19 @@ +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" + |