Package: cdpr / 2.4-3

Metadata

Package Version Patches format
cdpr 2.4-3 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
0001 Spruced up Makefile.patch | (download)

Makefile | 28 25 3 - 0 !
1 file changed, 25 insertions( ), 3 deletions(-)

 spruced up makefile created targets to allow building of debian
 package.


0002 remove pseudo device all from list of interfaces.patch | (download)

cdpr.c | 21 14 7 - 0 !
1 file changed, 14 insertions( ), 7 deletions(-)

 remove pseudo-device "all" from list of interfaces the current pcap
 filter does not work with the "all" interface,
 therefore I am removing it. It should also close Debian bug #527245.


0003 comment out CFLAGS to allow dpkg buildflags to set C.patch | (download)

Makefile | 2 1 1 - 0 !
1 file changed, 1 insertion( ), 1 deletion(-)

 comment out cflags to allow dpkg-buildflags to set cflags

Let dh set the CFLAGS from dpkg-buildflags for hardening.

0004 fix ftbs with ld as needed closes 632665.patch | (download)

Makefile | 4 2 2 - 0 !
1 file changed, 2 insertions( ), 2 deletions(-)

 fix ftbs with ld --as-needed, closes #632665

Thanks Julian Taylor <[email protected]> for the patch!

0005 Simplify Makefile add CPPFLAGS for hardening also cl.patch | (download)

Makefile | 12 3 9 - 0 !
1 file changed, 3 insertions( ), 9 deletions(-)

 simplify makefile, add cppflags for hardening, also closes #901066

Use variables to simplify Makefile.

Add $(CPPFLAGS) to the compiling step to allow for hardening.

Use compiler variable $(CC) to close #901066 (cdpr FTCBFS: upstream
Makefile hard codes build architecture compiler gcc).

Thanks Helmut Grohne <[email protected]> for the patch!

0006 Fix FTBFS for GCC 10 Closes 957072.patch | (download)

cdpr.c | 7 7 0 - 0 !
cdpr.h | 7 0 7 - 0 !
2 files changed, 7 insertions( ), 7 deletions(-)

 fix ftbfs for gcc-10, closes: #957072

Migrate global variables from header to C file.

GCC 10 is complaining about multiple definitions...

cc -Wl,-z,relro -Wl,-z,now -o cdpr cdpr.o cdprs.o conffile.o -lpcap
/usr/bin/ld: cdprs.o:./cdpr.h:51: multiple definition of `handle';
cdpr.o:./cdpr.h:51: first defined here
/usr/bin/ld: cdprs.o:./cdpr.h:50: multiple definition of `cdprs';
cdpr.o:./cdpr.h:50: first defined here
/usr/bin/ld: cdprs.o:./cdpr.h:49: multiple definition of `timeout';
cdpr.o:./cdpr.h:49: first defined here
/usr/bin/ld: conffile.o:./cdpr.h:51: multiple definition of `handle';
cdpr.o:./cdpr.h:51: first defined here
/usr/bin/ld: conffile.o:./cdpr.h:50: multiple definition of `cdprs';
cdpr.o:./cdpr.h:50: first defined here
/usr/bin/ld: conffile.o:./cdpr.h:49: multiple definition of `timeout';
cdpr.o:./cdpr.h:49: first defined here

From evaluating the source code, the global variables declared in the
header are not used anywhere but in cdpr.c, thus we can move those
variable declarations to the source file (cdpr.c) to fix the error.