[med-svn] [grabix] 01/02: Refresh patches

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository grabix.

commit 6bb75fe0709babddf98bd957163a9fc5b1bbd423
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 7 20:03:53 2017 +0100

    Refresh patches
---
 debian/patches/Hardening.patch | 14 +++++++-------
 debian/patches/warnings.patch  | 26 ++++----------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/debian/patches/Hardening.patch b/debian/patches/Hardening.patch
index 3b6c4fe..5bbcec2 100644
--- a/debian/patches/Hardening.patch
+++ b/debian/patches/Hardening.patch
@@ -1,13 +1,13 @@
-Index: grabix-0.0~git20130718/Makefile
-===================================================================
---- grabix-0.0~git20130718.orig/Makefile
-+++ grabix-0.0~git20130718/Makefile
-@@ -1,2 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,2 +1,9 @@
 +LDFLAGS+= -lstdc++ -lz
 +CFLAGS+=-Wall
++
  all:
--	gcc -Wall -O2 -o grabix grabix.cpp bgzf.c -lstdc++ -lz
-+	gcc $(CFLAGS) -o grabix grabix.cpp bgzf.c $(LDFLAGS)
+-	gcc -Wall -O2 -o grabix grabix_main.cpp grabix.cpp bgzf.c -lstdc++ -lz
++	gcc $(CFLAGS) -o grabix grabix_main.cpp grabix.cpp bgzf.c $(LDFLAGS)
 +
 +clean:
 +	rm -f grabix
++
diff --git a/debian/patches/warnings.patch b/debian/patches/warnings.patch
index 5409ce7..56ea544 100644
--- a/debian/patches/warnings.patch
+++ b/debian/patches/warnings.patch
@@ -1,29 +1,11 @@
-Index: grabix-0.0~git20130718/grabix.cpp
-===================================================================
---- grabix-0.0~git20130718.orig/grabix.cpp
-+++ grabix-0.0~git20130718/grabix.cpp
-@@ -261,7 +261,7 @@
-         srand(seed);
-         
-         // reservoir sample
--        size_t s, N, result_size;
-+        uint64_t N=0, result_size=0;
-         vector<string> sample;
-         kstring_t *line;
-         line = new kstring_t;
-@@ -282,7 +282,7 @@
+--- a/grabix.cpp
++++ b/grabix.cpp
+@@ -299,7 +299,7 @@ int random(string bgzf_file, uint64_t K)
              }
-             else 
+             else
              {
 -                s = (int) ((double)rand()/(double)RAND_MAX * N);
 +                uint64_t s = (uint64_t) ((double)rand()/(double)RAND_MAX * N);
                  if (s < K)
                      sample[s] = line->s;
              }
-@@ -327,4 +327,4 @@
-     }
- 
-     return EXIT_SUCCESS;
--}
-\ No newline at end of file
-+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/grabix.git