[snaphu] 02/05: Refresh all patches
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Mon Aug 7 21:51:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository snaphu.
commit 855811f3ca8affccd9bc5201e642d2d4b90a23b4
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Mon Aug 7 21:36:33 2017 +0000
Refresh all patches
---
debian/changelog | 3 +
...s.patch => 0001-fix-compilation-warnings.patch} | 85 ++++++++++++++--------
...e-hyphens.patch => 0002-man-page-hyphens.patch} | 24 ++++--
.../{hardening.patch => 0003-hardening.patch} | 12 ++-
debian/patches/series | 6 +-
5 files changed, 89 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1974d34..16450d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ snaphu (1.4.2-3) UNRELEASED; urgency=medium
* debian/copyright
- use secure URI for copyright format
- checked with cme
+ * debian/patches
+ - refresh all patches
+ - renumber patches
-- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 07 Aug 2017 21:27:07 +0000
diff --git a/debian/patches/fix-compilation-warnings.patch b/debian/patches/0001-fix-compilation-warnings.patch
similarity index 71%
rename from debian/patches/fix-compilation-warnings.patch
rename to debian/patches/0001-fix-compilation-warnings.patch
index 8d63add..f463a39 100644
--- a/debian/patches/fix-compilation-warnings.patch
+++ b/debian/patches/0001-fix-compilation-warnings.patch
@@ -1,7 +1,22 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Mon, 7 Aug 2017 21:34:46 +0000
+Subject: fix-compilation-warnings
+
Fix a few compilation warning and also prevent a segfault when logging is enabled.
+---
+ src/snaphu_cost.c | 8 ++++----
+ src/snaphu_cs2.c | 1 +
+ src/snaphu_io.c | 1 +
+ src/snaphu_solver.c | 4 ++--
+ src/snaphu_tile.c | 18 +++++++++---------
+ src/snaphu_util.c | 1 +
+ 6 files changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/src/snaphu_cost.c b/src/snaphu_cost.c
+index f7a14e1..339137b 100644
--- a/src/snaphu_cost.c
+++ b/src/snaphu_cost.c
-@@ -40,11 +40,11 @@
+@@ -40,11 +40,11 @@ void BuildCostArrays(void ***costsptr, short ***mstcostsptr,
outfileT *outfiles){
long row, col, maxcol, tempcost;
@@ -17,6 +32,20 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
/* read weights */
weights=NULL;
+diff --git a/src/snaphu_cs2.c b/src/snaphu_cs2.c
+index 0c3f9b2..a9f4641 100644
+--- a/src/snaphu_cs2.c
++++ b/src/snaphu_cs2.c
+@@ -637,6 +637,7 @@ register double p_max, /* current maximal price */
+ i_price, /* price of node i */
+ dp; /* current arc partial residual cost */
+
++a_max = NULL;
+ p_max = price_min;
+ i_price = i -> price;
+
+diff --git a/src/snaphu_io.c b/src/snaphu_io.c
+index 812b79b..9f0beb1 100644
--- a/src/snaphu_io.c
+++ b/src/snaphu_io.c
@@ -19,6 +19,7 @@
@@ -27,19 +56,11 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
---- a/src/snaphu_util.c
-+++ b/src/snaphu_util.c
-@@ -18,6 +18,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <time.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
+diff --git a/src/snaphu_solver.c b/src/snaphu_solver.c
+index 09e284c..8c86c6f 100644
--- a/src/snaphu_solver.c
+++ b/src/snaphu_solver.c
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ long TreeSolve(nodeT **nodes, nodesuppT **nodesupp, nodeT *ground,
candidateT *candidatelist, *candidatebag, *tempcandidateptr;
nodeT *from, *to, *cycleapex, *node1, *node2, *leavingparent, *leavingchild;
nodeT *root, *mntpt, *oldmntpt, *skipthread, *tempnode1, *tempnode2;
@@ -48,7 +69,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
nodeT **apexlist;
float **unwrappedphase;
-@@ -2203,7 +2203,7 @@
+@@ -2203,7 +2203,7 @@ long DischargeTree(nodeT *source, short **mstcosts, short **flows,
signed char **residue, signed char **arcstatus,
nodeT **nodes, nodeT *ground, long nrow, long ncol){
@@ -57,9 +78,11 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
long arcnum, upperarcnum, ngroundarcs;
nodeT *from, *to, *nextnode;
nodesuppT **nodesupp;
+diff --git a/src/snaphu_tile.c b/src/snaphu_tile.c
+index 096040f..61719aa 100644
--- a/src/snaphu_tile.c
+++ b/src/snaphu_tile.c
-@@ -172,9 +172,9 @@
+@@ -172,9 +172,9 @@ void GrowRegions(void **costs, short **flows, long nrow, long ncol,
long i, row, col, maxcol;
long arcrow, arccol, arcnum, fromdist, arcdist;
long regioncounter, *regionsizes, regionsizeslen, *thisregionsize;
@@ -71,7 +94,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
nodeT **nodes;
nodeT *source, *from, *to, *ground;
char regionfile[MAXSTRLEN];
-@@ -887,8 +887,8 @@
+@@ -887,8 +887,8 @@ void AssembleTiles(outfileT *outfiles, paramT *params,
long nlines, long linelen){
long tilerow, tilecol, ntilerow, ntilecol, ntiles, rowovrlp, colovrlp;
@@ -82,7 +105,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
long n, ncycle, nflowdone, nflow, candidatelistsize, candidatebagsize;
long nnodes, maxnflowcycles, arclen, narcs, sourcetilenum, flowmax;
long *totarclens;
-@@ -1195,7 +1195,7 @@
+@@ -1195,7 +1195,7 @@ void ReadNextRegion(long tilerow, long tilecol, long nlines, long linelen,
void ***nextcostsptr,
long *nextnrowptr, long *nextncolptr){
@@ -91,7 +114,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
tileparamT nexttileparams[1];
outfileT nexttileoutfiles[1];
char nextfile[MAXSTRLEN], tempstring[MAXTMPSTRLEN];
-@@ -1315,7 +1315,7 @@
+@@ -1315,7 +1315,7 @@ void ReadEdgesAboveAndBelow(long tilerow, long tilecol, long nlines,
float *unwphaseabove, float *unwphasebelow,
void *costsabove, void *costsbelow){
@@ -100,7 +123,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
long ntilerow, ntilecol, rowovrlp, colovrlp;
tileparamT tileparams[1];
outfileT outfilesabove[1], outfilesbelow[1];
-@@ -1487,7 +1487,7 @@
+@@ -1487,7 +1487,7 @@ void TraceRegions(short **regions, short **nextregions, short **lastregions,
short *nscndryarcs, long *totarclens, short **bulkoffsets,
paramT *params){
@@ -109,7 +132,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
long nnewnodes, nnewarcs, npathsout, flowmax, totarclen;
long nupdatednontilenodes, updatednontilenodesize, ntilecol;
short **flows;
-@@ -2383,7 +2383,7 @@
+@@ -2383,7 +2383,7 @@ void TraceSecondaryArc(nodeT *primaryhead, nodeT **scndrynodes,
long mincost, mincostflow;
long *scndrycostarr;
long double templongdouble;
@@ -118,7 +141,7 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
short **flows;
void **costs;
nodeT *tempnode, *primarytail, *scndrytail, *scndryhead;
-@@ -2922,7 +2922,7 @@
+@@ -2922,7 +2922,7 @@ void IntegrateSecondaryFlows(long linelen, long nlines, nodeT **scndrynodes,
FILE *outfp;
float **unwphase, **tileunwphase, **mag, **tilemag;
float *outline;
@@ -127,13 +150,15 @@ Fix a few compilation warning and also prevent a segfault when logging is enable
long readtilelinelen, readtilenlines, nextcoloffset, nextrowoffset;
long tilerow, tilecol, ntilerow, ntilecol, rowovrlp, colovrlp;
long ni, nj, tilenum;
---- a/src/snaphu_cs2.c
-+++ b/src/snaphu_cs2.c
-@@ -637,6 +637,7 @@
- i_price, /* price of node i */
- dp; /* current arc partial residual cost */
-
-+a_max = NULL;
- p_max = price_min;
- i_price = i -> price;
-
+diff --git a/src/snaphu_util.c b/src/snaphu_util.c
+index bb1422d..e66189b 100644
+--- a/src/snaphu_util.c
++++ b/src/snaphu_util.c
+@@ -18,6 +18,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
diff --git a/debian/patches/man-page-hyphens.patch b/debian/patches/0002-man-page-hyphens.patch
similarity index 76%
rename from debian/patches/man-page-hyphens.patch
rename to debian/patches/0002-man-page-hyphens.patch
index b7f5875..57ae748 100644
--- a/debian/patches/man-page-hyphens.patch
+++ b/debian/patches/0002-man-page-hyphens.patch
@@ -1,7 +1,17 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Mon, 7 Aug 2017 21:34:46 +0000
+Subject: man-page-hyphens
+
Escape hyphens in the manpage.
+---
+ man/man1/snaphu.1 | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/man/man1/snaphu.1 b/man/man1/snaphu.1
+index 8cf83f1..8b9253f 100644
--- a/man/man1/snaphu.1
+++ b/man/man1/snaphu.1
-@@ -348,15 +348,15 @@
+@@ -348,15 +348,15 @@ file whose name is compiled into the program):
.fi
Unwrap the same file as above, but use brightness information from the
@@ -20,7 +30,7 @@ Escape hyphens in the manpage.
.fi
Unwrap the interferogram as above, but read correlation
-@@ -364,8 +364,8 @@
+@@ -364,8 +364,8 @@ information from the file ``corrfile'' instead of generating it from
the interferogram and amplitude data:
.nf
@@ -31,7 +41,7 @@ Escape hyphens in the manpage.
.fi
The following is equivalent to the previous example, but input
-@@ -377,25 +377,25 @@
+@@ -377,25 +377,25 @@ displayed:
# This is a comment line which will be ignored
AMPFILE ampfile
CORRFILE corrfile
@@ -61,7 +71,7 @@ Escape hyphens in the manpage.
.fi
Note that in the previous two examples, the output file name in the
-@@ -408,7 +408,7 @@
+@@ -408,7 +408,7 @@ Unwrap the interferogram as above, but use the MCF algorithm for
initialization:
.nf
@@ -70,7 +80,7 @@ Escape hyphens in the manpage.
.fi
Unwrap the interferogram once again, but first flatten it with the
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ unwrapped data in ``estfile,'' then reinsert the subtracted phase
after unwrapping:
.nf
@@ -79,7 +89,7 @@ Escape hyphens in the manpage.
.fi
The following assumes that the wrapped input interferogram measures
-@@ -424,14 +424,14 @@
+@@ -424,14 +424,14 @@ deformation, not topography. Unwrap the interferogram with the given
correlation data:
.nf
@@ -96,7 +106,7 @@ Escape hyphens in the manpage.
.fi
Unwrap the interferogram as a three-by-four set of tiles that overlap
-@@ -439,8 +439,8 @@
+@@ -439,8 +439,8 @@ by 30 pixels, with the specified configuration file, using two
processors:
.nf
diff --git a/debian/patches/hardening.patch b/debian/patches/0003-hardening.patch
similarity index 66%
rename from debian/patches/hardening.patch
rename to debian/patches/0003-hardening.patch
index 1dc4f6d..f4bd0f3 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/0003-hardening.patch
@@ -1,6 +1,16 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Mon, 7 Aug 2017 21:34:46 +0000
+Subject: hardening
+
CFLAGS setup has been modified to extent the settings of the external
environment.
CPPFLAGS and LDFLAGS are now used during the build phase.
+---
+ src/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index d008a0b..93b3762 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,8 +13,8 @@
@@ -14,7 +24,7 @@ CPPFLAGS and LDFLAGS are now used during the build phase.
LIBS = -lm
BINDIR = ../bin
INSTALLDIR = /usr/local/bin
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ OBJS = snaphu_tile.o \
all: $(SNAPHU)
$(SNAPHU): snaphu.c $(OBJS) snaphu.h Makefile
diff --git a/debian/patches/series b/debian/patches/series
index df7004f..63d1fc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix-compilation-warnings.patch
-man-page-hyphens.patch
-hardening.patch
+0001-fix-compilation-warnings.patch
+0002-man-page-hyphens.patch
+0003-hardening.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/snaphu.git
More information about the Pkg-grass-devel
mailing list