Version 6.6.0 Release

Add build hardening for shared libraries on Debian systems

diff --git a/ChangeLog b/ChangeLog
index 5c3162fde4180a84a69860bd8f9b5ae0ac0e29a5..fc417812ec318e494028f8db753fbfd9c8066e55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
+2014-02-26 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 6.6.0 release
+       * {uffi,db-mysql}/Makefile: Add build hardening for Debian
+
 2014-02-24 Russ Tyndall <russ@acceleration.net>
        * mysql-sql.lisp
        an error in type declarations generating a compilation warning
        was being treated as an error in recent SBCLs, fixed the type
-       warning by correcting the type (still a ton of compliation 
+       warning by correcting the type (still a ton of compliation
        notes)
 
 2014-02-23 Russ Tyndall <russ@acceleration.net>

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 604aac5b15b40cd83714fa9354c8e54845a77308..6a52dc81c9b411ed300230146c0f895f17691689 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -38,7 +38,7 @@ ifneq ($(OS_CYGWIN),0)
 endif
 ifneq ($(OS_DPKG_BUILDFLAGS),0)
   CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
-  LDFLAGS:=$(LDFLAGS) $(shell dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+  LDFLAGS:=$(LDFLAGS) $(shell env DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif
 
 $(shared_lib): $(source) Makefile

diff --git a/debian/changelog b/debian/changelog
index 7a72023c350422063a9423d65a1343427537b03a..0d2b64a213ab97f2f30196b6190ced9d69aa1580 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-sql (6.6.0-1) unstable; urgency=medium
+
+  * New upstream
+  * {uffi,db-mysql}/Makefile: Add build hardening
+  
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 26 Feb 2015 15:32:46 -0700
+
 cl-sql (6.5.0-1) unstable; urgency=low
 
   * New upstream

diff --git a/debian/control b/debian/control
index da7533aa0a52a46246be455b0931bd3cc7784198..524a4c9f12c0f6c1368c59e990393f035dd6e195 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
-Standards-Version: 3.9.5.0
+Standards-Version: 3.9.6
 Homepage: http://clsql.b9.com/
 Vcs-Git: git://git.b9.com/clsql.git
 Vcs-Browser: http://git.b9.com/?p=clsql.git

diff --git a/uffi/Makefile b/uffi/Makefile
index 6f4467ac25f7bffccb185f7e03fb48d6a87e2d69..910750b85823cefcc458ce606328d1246dde6bae 100644 (file)
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -25,7 +25,7 @@ dylib=$(base).dylib
 
 ifneq ($(OS_DPKG_BUILDFLAGS),0)
   CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
-  LDFLAGS:=$(LDFLAGS) $(shell dpkg-buildflags --get LDFLAGS | sed "/-Wl,\(.*\)/ s//\1/")
+  LDFLAGS:=$(LDFLAGS) $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif