[med-svn] [Git][med-team/gjh-asl-json][master] 6 commits: fixed d/control short description

[Andrei Rozanski]

Andrei Rozanski pushed to branch master at Debian Med / gjh-asl-json


Commits:
802228d9 by Andrei Rozanski at 2020-10-05T21:09:58+02:00
fixed d/control short description

- - - - -
0a24a432 by Andrei Rozanski at 2020-10-05T21:10:45+02:00
fixed rules - hardening

- - - - -
b7280e2e by Andrei Rozanski at 2020-10-05T21:22:20+02:00
fixed patch - -g add debug symbols

- - - - -
5de18514 by Andrei Rozanski at 2020-10-05T21:25:19+02:00
removed dh_dwz workaround

- - - - -
1b02531c by Andrei Rozanski at 2020-10-05T21:51:17+02:00
fix lags - hardening

- - - - -
6f74de60 by Andrei Rozanski at 2020-10-05T21:54:25+02:00
fix ldlags - hardening

- - - - -


3 changed files:

- debian/control
- debian/patches/fix-makefile-lib.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Rules-Requires-Root: no
 Package: gjh-asl-json
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A gjh solver like solution.
+Description: gjh solver, like solver from AMPL Library
  A simple tool providing similar functionality 
  to that of the gjh "solver" distributed  with 
  the AMPL Solver Library. 


=====================================
debian/patches/fix-makefile-lib.patch
=====================================
@@ -21,8 +21,10 @@ Description: fix Makefile link to libamplsolver.
  
 -CINC=-I$(SRC) -I$(TPL)/solvers
 +CINC=-I$(SRC) -I$(LIB) -I$(INC_DIR)
- CFLAGS= -pipe -DASL_BUILD -fPIC -DPIC -Wall
- LDFLAGS=-ldl
+-CFLAGS= -pipe -DASL_BUILD -fPIC -DPIC -Wall
++CFLAGS= -g -pipe -DASL_BUILD -fPIC -DPIC -Wall -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
+-LDFLAGS=-ldl
++LDFLAGS=-Wl,-z,relro -ldl
  
 -all: 	$(TPL)/solvers/amplsolver.a \
 -	$(BIN)/gjh_asl_json


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ include /usr/share/dpkg/default.mk
 #                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
 # for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
@@ -30,6 +30,6 @@ include /usr/share/dpkg/default.mk
 #get-orig-source:
 #	. debian/get-orig-source
 
-override_dh_dwz:
-	echo "dh_dwz fails - no idea how to fix"
+#override_dh_dwz:
+#	echo "dh_dwz fails - no idea how to fix"
 



View it on GitLab: https://salsa.debian.org/med-team/gjh-asl-json/-/compare/dca55fc172932e098a342b7730ad2077ce15bed3...6f74de60cdf9d92ef8eb791a24ce935033f915df

-- 
View it on GitLab: https://salsa.debian.org/med-team/gjh-asl-json/-/compare/dca55fc172932e098a342b7730ad2077ce15bed3...6f74de60cdf9d92ef8eb791a24ce935033f915df
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/20201005/4c21b0cb/attachment-0001.html>