[med-svn] [Git][med-team/acedb][master] 3 commits: Reviewed hardening.patch to propagate on !amd64

[Étienne Mollier (@emollier)]

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


Commits:
be807ce7 by Étienne Mollier at 2021-10-25T21:22:51+02:00
Reviewed hardening.patch to propagate on !amd64

- - - - -
ad1d6168 by Étienne Mollier at 2021-10-25T21:25:39+02:00
Move linker option from glibc2.32.patch to d/rules

- - - - -
745c059d by Étienne Mollier at 2021-10-25T21:40:22+02:00
ready changelog to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/patches/glibc2.32.patch
- debian/patches/hardening.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-acedb (4.9.39+dfsg.02-7) UNRELEASED; urgency=medium
+acedb (4.9.39+dfsg.02-7) unstable; urgency=medium
 
+  * Team upload.
   * Make glibc2.32.patch header description coherent.
+  * Fix FTBFS on !amd64 architectures:
+    + Review hardening.patch to propagate flags on !amd64 architectures.
+    + Move linker option -ltirpc from glibc2.32.patch to d/rules.
 
- -- Étienne Mollier <emollier at debian.org>  Sun, 24 Oct 2021 23:47:13 +0200
+ -- Étienne Mollier <emollier at debian.org>  Mon, 25 Oct 2021 21:40:12 +0200
 
 acedb (4.9.39+dfsg.02-6) unstable; urgency=medium
 


=====================================
debian/patches/glibc2.32.patch
=====================================
@@ -28,25 +28,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  }
  
  
---- acedb.orig/wmake/LINUX_64_DEF
-+++ acedb/wmake/LINUX_64_DEF
-@@ -28,7 +28,7 @@
- LINKER = gcc $(COPT) $(LDFLAGS)
- 
- # The arg to libs-config is used if our private copy not installed.
--LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
-+LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11 -ltirpc
- 
- ### Linux uses flex to emulate the standard 'lex' program
- LEX_LIBS = -lfl
---- acedb.orig/wmake/LINUX_4_DEF
-+++ acedb/wmake/LINUX_4_DEF
-@@ -28,7 +28,7 @@
- LINKER = gcc $(COPT) $(LDFLAGS)
- 
- # The arg to libs-config is used if our private copy not installed.
--LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
-+LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11 -ltirpc
- 
- ### Linux uses flex to emulate the standard 'lex' program
- LEX_LIBS = -lfl


=====================================
debian/patches/hardening.patch
=====================================
@@ -1,32 +1,38 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 10 Dec 2015 15:24:16 +0100
 Description: Propagate hardening options
-
---- a/wmake/LINUX_64_DEF
-+++ b/wmake/LINUX_64_DEF
-@@ -23,9 +23,9 @@ LIBCC = gcc
+Reviewed-By: Étienne Mollier <emollier at debian.org>
+Last-Update: 2021-10-25
+--- acedb.orig/wmake/LINUX_64_DEF
++++ acedb/wmake/LINUX_64_DEF
+@@ -23,12 +23,12 @@
  COPT = -g
  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)` $(CLFAGS)
++COMPILER = gcc $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
  
--LINKER = gcc $(COPT)
-+LINKER = gcc $(COPT) $(LDFLAGS)
+ LINKER = gcc $(COPT)
  
  # The arg to libs-config is used if our private copy not installed.
- LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
---- a/wmake/LINUX_4_DEF
-+++ b/wmake/LINUX_4_DEF
-@@ -23,9 +23,9 @@ LIBCC = gcc
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl
+--- acedb.orig/wmake/LINUX_4_DEF
++++ acedb/wmake/LINUX_4_DEF
+@@ -23,12 +23,12 @@
  COPT = -g
  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)
  
--LINKER = gcc $(COPT)
-+LINKER = gcc $(COPT) $(LDFLAGS)
+ LINKER = gcc $(COPT)
  
  # The arg to libs-config is used if our private copy not installed.
- LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl


=====================================
debian/rules
=====================================
@@ -6,6 +6,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -I/usr/include/tirpc
+export DEB_LDFLAGS_MAINT_APPEND = -ltirpc
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS



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

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