[med-svn] [Git][med-team/bart-view][master] 4 commits: Refresh enable-cross-build.patch

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / bart-view


Commits:
1f277fb0 by Nilesh Patra at 2021-12-29T20:15:04+05:30
Refresh enable-cross-build.patch

- - - - -
efc45661 by Nilesh Patra at 2021-12-29T20:20:16+05:30
d/p/0005-hardening.patch: Propagate hardening flags to fix blhc

- - - - -
ea9d9707 by Nilesh Patra at 2021-12-29T20:21:29+05:30
Upload to unstable

- - - - -
b1217ee1 by Nilesh Patra at 2021-12-29T20:25:49+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/patches/0003-enable-cross-build.patch
- + debian/patches/0005-hardening.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-bart-view (0.1.00-5.1) UNRELEASED; urgency=medium
+bart-view (0.1.00-6) unstable; urgency=medium
 
+  [ Martin Uecker ]
   * Patch to work around compiler bug (Closes: #1001916)
 
- -- Martin Uecker <ma.uecker at gmail.com>  Wed, 29 Dec 2021 13:28:33 +0100
+  [ Nilesh Patra ]
+  * d/p/0005-hardening.patch: Propagate hardening flags to fix blhc
+
+ -- Martin Uecker <martin.uecker at med.uni-goettingen.de>  Wed, 29 Dec 2021 20:20:21 +0530
 
 bart-view (0.1.00-5) unstable; urgency=medium
 


=====================================
debian/patches/0003-enable-cross-build.patch
=====================================
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index 61381c7..d29ffd0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -21,6 +21,7 @@ endif
+@@ -21,6 +21,7 @@
  
  
  CC ?= gcc
@@ -10,7 +8,7 @@ index 61381c7..d29ffd0 100644
  CFLAGS ?= -Wall -O2
  CFLAGS += -std=c11 -fopenmp
  
-@@ -47,7 +48,7 @@ src/viewer.inc: src/viewer.ui
+@@ -49,7 +50,7 @@
  	@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
  
  view:	src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc


=====================================
debian/patches/0005-hardening.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Enabling hardening options to fix blhc
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2021-12-29
+--- a/Makefile
++++ b/Makefile
+@@ -50,10 +50,11 @@
+ 	@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
+ 
+ view:	src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc
+-	$(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a \
++	 -lm -lpng $(LDFLAGS)
+ 
+ cfl2png:	src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
+-	$(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
+ 
+ install:
+ 	install -D view $(DESTDIR)/usr/lib/bart/commands/view


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 0002-don-t-build-cfl2png.patch
 0003-enable-cross-build.patch
 0004-workaround-for-GCC-11-compiler-bug-debian-bug-100250.patch
+0005-hardening.patch



View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/242bf056666db715afdc488882cc75b4be2c3cc6...b1217ee1c52764c90becbc24e1ce656874ad473e

-- 
View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/242bf056666db715afdc488882cc75b4be2c3cc6...b1217ee1c52764c90becbc24e1ce656874ad473e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211229/f286eaa2/attachment-0001.htm>