[med-svn] [Git][med-team/acedb][master] 5 commits: Adjust hardening.patch to inject CPPFLAGS too.

Mon Oct 25 21:54:52 BST 2021


Étienne Mollier pushed to branch master at Debian Med / acedb


Commits:
3f33c4db by Étienne Mollier at 2021-10-25T22:22:41+02:00
Adjust hardening.patch to inject CPPFLAGS too.

- - - - -
15553210 by Étienne Mollier at 2021-10-25T22:29:45+02:00
update changelog

- - - - -
0f9be900 by Étienne Mollier at 2021-10-25T22:43:37+02:00
Adjust hardening.patch to propagate more LDFLAGS

- - - - -
b92ef8eb by Étienne Mollier at 2021-10-25T22:47:32+02:00
Refresh no_dotter_and_belvu.patch accordingly.

- - - - -
6d98f111 by Étienne Mollier at 2021-10-25T22:54:28+02:00
update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/patches/hardening.patch
- debian/patches/no_dotter_and_belvu.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+acedb (4.9.39+dfsg.02-8) UNRELEASED; urgency=medium
+
+  * Adjust hardening.patch to inject CPPFLAGS too, plus more LDFLAGS.
+  * Refresh no_dotter_and_belvu.patch accordingly.
+
+ -- Étienne Mollier <emollier at debian.org>  Mon, 25 Oct 2021 22:53:22 +0200
+
 acedb (4.9.39+dfsg.02-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/hardening.patch
=====================================
@@ -9,7 +9,7 @@ Last-Update: 2021-10-25
  GTKVER = glib-2.0 gtk+-2.0
  
 -COMPILER = gcc $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)`
-+COMPILER = gcc $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
++COMPILER = gcc $(COPT) $(CPPFLAGS) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
  
  LINKER = gcc $(COPT)
  
@@ -26,7 +26,7 @@ Last-Update: 2021-10-25
  GTKVER = glib-2.0 gtk+-2.0
  
 -COMPILER = gcc $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)`
-+COMPILER = gcc $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
++COMPILER = gcc $(CPPFLAGS) $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
  
  LINKER = gcc $(COPT)
  
@@ -36,3 +36,34 @@ Last-Update: 2021-10-25
  
  ### Linux uses flex to emulate the standard 'lex' program
  LEX_LIBS = -lfl
+--- acedb.orig/wmake/truemake
++++ acedb/wmake/truemake
+@@ -780,8 +780,8 @@
+ $(LIBMD5_TEST_OBJ) : $(LIBMD5_HDR) $(LIBMD5_TEST_HDR)
+ 
+ md5test : libmd5.a $(LIBMD5_TEST_OBJ) mddriver digtest
+-	$(LINKER) -o mddriver mddriver.o -L. -lmd5
+-	$(LINKER) -o digtest digcalc.o digtest.o -L. -lmd5
++	$(LINKER) -o mddriver mddriver.o -L. -lmd5 $(LDFLAGS)
++	$(LINKER) -o digtest digcalc.o digtest.o -L. -lmd5 $(LDFLAGS)
+ 
+ #########################################
+ #### public C interface: libace #########
+@@ -966,7 +966,7 @@
+ #	$(CC) -g -o genefeatures gfcode.o readseq.o -lm
+ 
+ genefeatures : gfcode.o readseq.o
+-	$(LINKER) -o genefeatures gfcode.o readseq.o -lm
++	$(LINKER) -o genefeatures gfcode.o readseq.o -lm $(LDFLAGS)
+ 
+ readseq.o : readseq.c 
+ 	$(CC) $(CFLAGS) readseq.c
+@@ -1267,7 +1267,7 @@
+ 	-L. $(GRAPHXWIN_LIBS) -lfree $(XWIN_LIBS) $(LIBS)
+ 
+ efetch : efetch.o dbidx.o
+-	$(LINKER) -o efetch efetch.o dbidx.o
++	$(LINKER) -o efetch efetch.o dbidx.o $(LDFLAGS)
+ 
+ efetch.o: efetch.c
+ 	$(CC) -DMIXDB efetch.c


=====================================
debian/patches/no_dotter_and_belvu.patch
=====================================
@@ -6,9 +6,9 @@ Description: Package acedb-other-dotter and acedb-other-belvu are now
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
 
---- a/wmake/makefile
-+++ b/wmake/makefile
-@@ -49,7 +49,7 @@ ace : $(ACE_BIN)
+--- acedb.orig/wmake/makefile
++++ acedb/wmake/makefile
+@@ -49,7 +49,7 @@
  ACEMBLY_BIN = makeSCF xacembly tacembly gifacemblyserver
  acembly : libstaden.a $(ACEMBLY_BIN)
  
@@ -17,7 +17,7 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
  	gnbk gnbkclient genefeatures
  other : $(OTHER_BIN)
  
-@@ -82,7 +82,7 @@ xace xremote tace giface taql \
+@@ -82,7 +82,7 @@
  aceserver gifaceserver aceclient xaceclient \
  saceserver sgifaceserver saceclient sxaceclient sace_build \
  libstaden.a makeSCF xacembly tacembly gifacemblyserver \
@@ -26,9 +26,9 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
  makeUserPasswd acediff acediffsorted pmapace diskdump diskfix metacheck homonym tagcount \
  xtest coltest giftest boxtest md5test acelibtest \
  tace5 xace5 xacembly5 tacembly5 \
---- a/wtools/MAKE_INSTALL
-+++ b/wtools/MAKE_INSTALL
-@@ -110,13 +110,13 @@ srcname='source'
+--- acedb.orig/wtools/MAKE_INSTALL
++++ acedb/wtools/MAKE_INSTALL
+@@ -110,13 +110,13 @@
  srcpattern='./makefile ./w*'
  binname='binary'
  staticbinname='STATIC_binary'
@@ -44,9 +44,9 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
  helpname='help'
  helppattern='./*'
  docname='doc'
---- a/wmake/truemake
-+++ b/wmake/truemake
-@@ -620,7 +620,7 @@ acembly : libstaden.a tacembly xacembly
+--- acedb.orig/wmake/truemake
++++ acedb/wmake/truemake
+@@ -620,7 +620,7 @@
  	gifacemblyserver\
  	gnbk gnbkclient 
  
@@ -55,7 +55,7 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
  	pmapace tagcount diskdump diskfix \
  	xtest coltest genefeatures \
  	libfree.a \
-@@ -1246,10 +1246,6 @@ blixem : $(GRAPHXWIN_DEPEND) libfree.a b
+@@ -1246,10 +1246,6 @@
  blixem.o : blxview.c
  	$(COMPILER) $(USEROPTS) $(IDIR) -D$(NAME) -c -o $@ blxview.c
  
@@ -66,7 +66,7 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
  
  # I have removed this optimisation stuff from dotter for now because you cannot
  # debug properly with it, EG
-@@ -1262,10 +1258,6 @@ dotter.o: dotter.c
+@@ -1262,10 +1258,6 @@
  belvu.o: belvu.c
  	$(COMPILER) $(USEROPTS) -O2 -g3 $(IDIR) -D$(NAME) -c -o $@ belvu.c
  
@@ -75,5 +75,5 @@ Last-Update: Tue, 19 Dec 2017 13:00:46 +0100
 -	-L. $(GRAPHXWIN_LIBS) -lfree $(XWIN_LIBS) $(LIBS)
 -
  efetch : efetch.o dbidx.o
- 	$(LINKER) -o efetch efetch.o dbidx.o
+ 	$(LINKER) -o efetch efetch.o dbidx.o $(LDFLAGS)
  



View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/745c059d87380c31bec21671ce9d1e63fc43fb76...6d98f111c3a0313c0aad2ede5c79380b4e98d011

-- 
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/745c059d87380c31bec21671ce9d1e63fc43fb76...6d98f111c3a0313c0aad2ede5c79380b4e98d011
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/20211025/c9aaaa44/attachment-0001.htm>
