diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:21:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:21:14 +0000 |
| commit | 1cb1a86779f89f0c629e21a0ae36f8b68b271edb (patch) | |
| tree | 3fd92bfc8e5cf610589fdf3b8ff3efa944cc0281 /debian/patches | |
| parent | Merging upstream version 1.14~rc1. (diff) | |
| download | lziprecover-1cb1a86779f89f0c629e21a0ae36f8b68b271edb.tar.xz lziprecover-1cb1a86779f89f0c629e21a0ae36f8b68b271edb.zip | |
Adding debian version 1.14~rc1-1.debian/1.14_rc1-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-build.patch (renamed from debian/patches/01-build.patch) | 12 | ||||
| -rw-r--r-- | debian/patches/0002-format-security.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 32 insertions, 7 deletions
diff --git a/debian/patches/01-build.patch b/debian/patches/0001-build.patch index d9862e5..42a9dce 100644 --- a/debian/patches/01-build.patch +++ b/debian/patches/0001-build.patch @@ -1,13 +1,13 @@ Author: Daniel Baumann <mail@daniel-baumann.ch> Description: Avoid overwriting build-environment. -diff -Naurp lzip.orig/configure lzip/configure ---- lzip.orig/configure 2012-06-30 00:54:43.926501688 +0200 -+++ lzip/configure 2012-06-30 00:55:57.423296881 +0200 +diff -Naurp lziprecover.orig/configure lziprecover/configure +--- lziprecover.orig/configure ++++ lziprecover/configure @@ -23,9 +23,9 @@ datarootdir='$(prefix)/share' infodir='$(datarootdir)/info' mandir='$(datarootdir)/man' - CXX= + CXX=g++ -CPPFLAGS= -CXXFLAGS='-Wall -W -O2' -LDFLAGS= @@ -15,5 +15,5 @@ diff -Naurp lzip.orig/configure lzip/configure +#CXXFLAGS='-Wall -W -O2' +#LDFLAGS= - # Loop over all args - while [ -n "$1" ] ; do + # checking whether we are using GNU C++. + if [ ! -x /bin/g++ ] && diff --git a/debian/patches/0002-format-security.patch b/debian/patches/0002-format-security.patch new file mode 100644 index 0000000..ac9a3c9 --- /dev/null +++ b/debian/patches/0002-format-security.patch @@ -0,0 +1,24 @@ +Author: Daniel Baumann <mail@daniel-baumann.ch> +Description: Using string literal to fix FTBFS with -Werror=format-security. + +diff -Naurp lziprecover.orig/main.cc lziprecover/main.cc +--- lziprecover.orig/main.cc ++++ lziprecover/main.cc +@@ -418,7 +418,7 @@ int decompress( const int infd, const Pr + } + retval = 2; break; + } +- if( verbosity >= 2 ) { std::fprintf( stderr, ok_msg ); pp.reset(); } ++ if( verbosity >= 2 ) { std::fprintf( stderr, "%s", ok_msg ); pp.reset(); } + } + } + catch( std::bad_alloc ) +@@ -427,7 +427,7 @@ int decompress( const int infd, const Pr + retval = 1; + } + catch( Error e ) { pp(); show_error( e.msg, errno ); retval = 1; } +- if( verbosity == 1 && retval == 0 ) std::fprintf( stderr, ok_msg ); ++ if( verbosity == 1 && retval == 0 ) std::fprintf( stderr, "%s", ok_msg ); + return retval; + } + diff --git a/debian/patches/series b/debian/patches/series index 605653d..86cb98b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -01-build.patch +0001-build.patch +0002-format-security.patch |