=== modified file 'Makefile'
--- Makefile	2009-10-22 00:05:01 +0000
+++ Makefile	2009-10-26 21:16:16 +0000
@@ -10,14 +10,19 @@
 # For info about _FORTIFY_SOURCE, see
 # <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 # and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
-FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
-LINK_FORTIFY_LD=-z relro -fPIE
-LINK_FORTIFY=-pie
+FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
+LINK_FORTIFY_LD=-z relro -z now
+LINK_FORTIFY=
+ifndef BROKEN_PIE
+FORTIFY += -fPIE
+LINK_FORTIFY_LD += -fPIE
+LINK_FORTIFY += -pie
+endif
 #COVERAGE=--coverage
 OPTIMIZE=-Os
 LANGUAGE=-std=gnu99
 htmldir=man
-version=1.0.13
+version=1.0.14
 SED=sed
 
 ## Use these settings for a traditional /usr/local install

=== modified file 'NEWS'
--- NEWS	2009-10-22 00:05:01 +0000
+++ NEWS	2009-10-26 21:16:16 +0000
@@ -1,6 +1,9 @@
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
+Version 1.0.14 (2009-10-25)
+Enable building without -pie and -fPIE if BROKEN_PIE is set.
+
 Version 1.0.13 (2009-10-22)
 * Client
 ** Security bug fix: If Mandos server is also installed, do not copy

=== modified file 'common.ent'
--- common.ent	2009-10-22 00:05:01 +0000
+++ common.ent	2009-10-26 21:16:16 +0000
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Edited by Makefile -->
-<!ENTITY version "1.0.13">
+<!ENTITY version "1.0.14">

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-22 00:05:01 +0000
+++ debian/changelog	2009-10-26 21:16:16 +0000
@@ -1,3 +1,11 @@
+mandos (1.0.14-1) unstable; urgency=low (HIGH on mips and mipsel)
+
+  * New upstream release.
+  * debian/rules: Build with BROKEN_PIE set on mips and mipsel
+    architectures - fixes FTBFS there.
+
+ -- Teddy Hogeborn <teddy@fukt.bsnet.se>  Sun, 25 Oct 2009 20:10:09 +0100
+
 mandos (1.0.13-1) unstable; urgency=high
 
   * New upstream release.

=== modified file 'debian/rules'
--- debian/rules	2009-01-18 00:18:50 +0000
+++ debian/rules	2009-10-26 21:16:16 +0000
@@ -15,6 +15,15 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:))
+  BROKEN_PIE := yes
+  export BROKEN_PIE
+endif
+ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))
+  BROKEN_PIE := yes
+  export BROKEN_PIE
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir

=== modified file 'mandos'
--- mandos	2009-10-22 00:05:01 +0000
+++ mandos	2009-10-26 21:16:16 +0000
@@ -79,7 +79,7 @@
         SO_BINDTODEVICE = None
 
 
-version = "1.0.13"
+version = "1.0.14"
 
 logger = logging.Logger(u'mandos')
 syslogger = (logging.handlers.SysLogHandler

=== modified file 'mandos-ctl'
--- mandos-ctl	2009-10-22 00:05:01 +0000
+++ mandos-ctl	2009-10-26 21:16:16 +0000
@@ -31,7 +31,7 @@
 server_path = '/'
 server_interface = domain + '.Mandos'
 client_interface = domain + '.Mandos.Client'
-version = "1.0.13"
+version = "1.0.14"
 bus = dbus.SystemBus()
 mandos_dbus_objc = bus.get_object(busname, server_path)
 mandos_serv = dbus.Interface(mandos_dbus_objc,

=== modified file 'mandos-keygen'
--- mandos-keygen	2009-10-24 17:56:24 +0000
+++ mandos-keygen	2009-10-26 21:16:16 +0000
@@ -21,7 +21,7 @@
 # Contact the authors at <mandos@fukt.bsnet.se>.
 # 
 
-VERSION="1.0.13"
+VERSION="1.0.14"
 
 KEYDIR="/etc/keys/mandos"
 KEYTYPE=DSA

=== modified file 'mandos.lsm'
--- mandos.lsm	2009-10-22 00:05:01 +0000
+++ mandos.lsm	2009-10-26 21:16:16 +0000
@@ -1,7 +1,7 @@
 Begin4
 Title:		Mandos
-Version:	1.0.13
-Entered-date:	2009-10-22
+Version:	1.0.14
+Entered-date:	2009-10-25
 Description:	The Mandos system allows computers to have encrypted
 root file systems and at the same time be capable of remote and/or
 unattended reboots.
@@ -12,9 +12,9 @@
 Maintained-by:	teddy@fukt.bsnet.se (Teddy Hogeborn),
 		belorn@fukt.bsnet.se (Björn Påhlsson)
 Primary-site: http://www.fukt.bsnet.se/mandos
-	      103K mandos_1.0.13.orig.tar.gz
+	      103K mandos_1.0.14.orig.tar.gz
 Alternate-site: ftp://ftp.fukt.bsnet.se/pub/mandos
-		103K mandos_1.0.13.orig.tar.gz
+		103K mandos_1.0.14.orig.tar.gz
 Platforms:	Requires GCC, GNU libC, Avahi, GnuPG, Python 2.5, and
 various other libraries.  While made for Debian GNU/Linux, it is
 probably portable to other distributions, but not other Unixes.