From 2ba41ebdcd4963728c8d5460e389a5381b8e2293 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 30 Mar 2015 14:47:34 -0600
Subject: [PATCH] Version 6.6.2 Fix typographical error

---
 ChangeLog                 | 13 ++++++++++++-
 db-mysql/Makefile         |  2 +-
 db-oracle/oracle-sql.lisp |  2 +-
 debian/changelog          | 14 +++++++++++++-
 uffi/Makefile             |  2 +-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc41781..2bc632f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2014-02-26 Kevin Rosenberg <kevin@rosenberg.net>
+2015-03-30 Kevin Rosenberg <kevin@rosenberg.net>
+	* Version 6.6.2 release
+	* db-oracle/oracle-sql.lisp: Remove extra hyphen, thanks to
+	Thomas Vossen
+
+2015-03-18 Kevin Rosenberg <kevin@rosenberg.net>
+	* Version 6.6.1 release
+	* {uffi,db-mysql}/Makefile: Remove pie from build
+	hardening options for Debian/Ubuntu systems. Thanks to
+	DJ <jakep@arqux.com> and Russ Tyndall <russ@acceleration.net>
+
+2015-02-26 Kevin Rosenberg <kevin@rosenberg.net>
 	* Version 6.6.0 release
 	* {uffi,db-mysql}/Makefile: Add build hardening for Debian
 
diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 6a52dc8..d67afe1 100644
--- 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 env DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+  LDFLAGS:=$(LDFLAGS) $(shell env DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif
 
 $(shared_lib): $(source) Makefile
diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index f8f5836..9460011 100644
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -514,7 +514,7 @@ the length of that format.")
                  (oci-stmt-prepare (deref-vp stmthp)
                                    (deref-vp errhp)
                                    c-stmt-string
-                                   (uffi:foreign-string-length c--stmt-string)
+                                   (uffi:foreign-string-length c-stmt-string)
                                    +oci-ntv-syntax+ +oci-default+ :database db)
                  (oci-attr-get (deref-vp stmthp)
                                +oci-htype-stmt+
diff --git a/debian/changelog b/debian/changelog
index 0d2b64a..6cceaad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
+cl-sql (6.6.2-1) unstable; urgency=medium
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 30 Mar 2015 14:46:53 -0600
+
+cl-sql (6.6.1-1) unstable; urgency=medium
+
+  * {uffi,db-mysql}/Makefile: Change build hardening to +all,-pie
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 18 Mar 2015 21:30:11 -0600
+
 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
diff --git a/uffi/Makefile b/uffi/Makefile
index 910750b..77203fd 100644
--- 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 DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
+  LDFLAGS:=$(LDFLAGS) $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie dpkg-buildflags --get LDFLAGS | sed "s/-Wl\|,/ /ig")
 endif
 
 
-- 
2.34.1