[med-svn] [Git][med-team/estscan][master] 4 commits: Accommodate CFLAGS, CPPFLAGS and FFLAGS as envvars (for hardening). Fuse...

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / estscan


Commits:
9a9d91c7 by Juhani Numminen at 2021-01-11T16:00:21+02:00
Accommodate CFLAGS, CPPFLAGS and FFLAGS as envvars (for hardening). Fuse Makefile-related patches to a single patch file.

- - - - -
f9345218 by Juhani Numminen at 2021-01-11T16:18:53+02:00
Add "set -e" before a loop in debian/rules (Policy §4.6).

- - - - -
3d7a03cc by Juhani Numminen at 2021-01-11T16:39:04+02:00
Skip dh_dwz on mipsel as a workaround for #972269.

- - - - -
c0b41d37 by Juhani Numminen at 2021-01-11T18:27:44+00:00
Apply 1 suggestion(s) to 1 file(s)
- - - - -


5 changed files:

- debian/changelog
- debian/patches/Makfile.patch
- − debian/patches/ld-as-needed.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+estscan (3.0.3-5) UNRELEASED; urgency=medium
+
+  * Accommodate CFLAGS, CPPFLAGS and FFLAGS as envvars (for hardening).
+  * Fuse Makefile-related patches to a single patch file.
+  * Add "set -e" before a loop in debian/rules (Policy §4.6).
+  * Skip dh_dwz on mipsel as a workaround for #972269.
+
+ -- Juhani Numminen <juhaninumminen0 at gmail.com>  Mon, 11 Jan 2021 15:55:48 +0200
+
 estscan (3.0.3-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/Makfile.patch
=====================================
@@ -1,18 +1,52 @@
-Author: Steffen Moeller
-Last-Update: 2018-05-31 16:24:57 +0200
-Description: Fix Fortran compiler name, debugging symbols, hardening
+Author: Steffen Moeller <moeller at debian.org>,
+        Logan Rosen <logan at ubuntu.com>,
+        Juhani Numminen <juhaninumminen0 at gmail.com>
+Last-Update: Mon, 11 Jan 2021 15:18:03 +0200
+Forwarded: https://sourceforge.net/p/estscan/bugs/5/
+Bug-Debian: https://bugs.debian.org/916740
+Description: Fix Fortran compiler name,
+ accommodate CFLAGS, CPPFLAGS and FFLAGS as envvars (for hardening),
+ put LDLIBS after .o files because linking with -Wl,--as-needed.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -2,9 +2,8 @@
+@@ -2,10 +2,10 @@
  # Set the appropriate compilers and options for your system:
  # Any system with GNU compilers:
   CC = gcc
 - CFLAGS = -O2
 - F77 = g77
 - FFLAGS = -O2
+- LDFLAGS = -lm
++ CFLAGS ?= -O2
 + F77 = gfortran
-+ FFLAGS = -O2 -g
-  LDFLAGS = -lm
++ FFLAGS ?= -O2
++ LDLIBS = -lm
  
  # Linux with Intel compilers:
+ # CC = icc
+@@ -21,19 +21,19 @@
+ 	\rm -f *~ $(PROGS) *.o
+ 
+ maskred: maskred.o
+-	$(CC) $(LDFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ makesmat: makesmat.o
+-	$(CC) $(LDFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ estscan: estscan.o
+-	$(CC) $(LDFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ winsegshuffle: winsegshuffle.o
+-	$(F77) $(LDFLAGS) -o $@ $<
++	$(F77) $(LDFLAGS) -o $@ $< $(LDLIBS)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+ 
+ .f.o:
+ 	$(F77) $(FFLAGS) -c $<


=====================================
debian/patches/ld-as-needed.patch deleted
=====================================
@@ -1,37 +0,0 @@
-Author: Logan Rosen <logan at ubuntu.com>
-Last-Update: Mon, 17 Dec 2018 23:16:56 -0500
-Bug-Debian: https://bugs.debian.org/916740
-Description: build with ld --as-needed
-
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@
-  CC = gcc
-  F77 = gfortran
-  FFLAGS = -O2 -g
-- LDFLAGS = -lm
-+ LDLIBS = -lm
- 
- # Linux with Intel compilers:
- # CC = icc
-@@ -20,16 +20,16 @@ clean:
- 	\rm -f *~ $(PROGS) *.o
- 
- maskred: maskred.o
--	$(CC) $(LDFLAGS) -o $@ $<
-+	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
- 
- makesmat: makesmat.o
--	$(CC) $(LDFLAGS) -o $@ $<
-+	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
- 
- estscan: estscan.o
--	$(CC) $(LDFLAGS) -o $@ $<
-+	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
- 
- winsegshuffle: winsegshuffle.o
--	$(F77) $(LDFLAGS) -o $@ $<
-+	$(F77) $(LDFLAGS) -o $@ $< $(LDLIBS)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
 Makfile.patch
-ld-as-needed.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
 
+include /usr/share/dpkg/architecture.mk
+
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
@@ -11,6 +13,12 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_install:
 	dh_install
+	set -e ; \
 	for pl in `grep -Rl '#!/usr/bin/env[[:space:]]\+perl' debian/*/usr/*` ; do \
 	    sed -i '1s?^#!/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
 	done
+
+ifeq ($(DEB_HOST_ARCH),mipsel)
+override_dh_dwz:
+	: # Skip dh_dwz on mipsel, https://bugs.debian.org/972269
+endif



View it on GitLab: https://salsa.debian.org/med-team/estscan/-/compare/0f62e7ea41e1fbba380677b4ab0e9a20b6412024...c0b41d373f1ac90d3a09e3733dd377a838eb7908

-- 
View it on GitLab: https://salsa.debian.org/med-team/estscan/-/compare/0f62e7ea41e1fbba380677b4ab0e9a20b6412024...c0b41d373f1ac90d3a09e3733dd377a838eb7908
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/20210111/5df659ae/attachment-0001.html>