Package: samhain
Version: 3.1.0-5
Followup-For: Bug #735530
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Configure with disable-asm on amd64 targets to work around FTBFS.
* Build-depend on autotools-dev to always update config.{sub,guess}
Obviously, upstream fixing their asm would be better than disabling it,
but this works around the FTBFS nicely. Tacked on to this diff is also
updating build-deps to add autotools-dev so that builds on new arches
get config.{sub,guess} automatically without you needing to do a fresh
upload to update the diff.
... Adam
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-19-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u samhain-3.1.0/debian/changelog samhain-3.1.0/debian/changelog
diff -u samhain-3.1.0/debian/control samhain-3.1.0/debian/control
--- samhain-3.1.0/debian/control
+++ samhain-3.1.0/debian/control
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org>
-Build-Depends: debhelper (>= 4.1.16), autoconf, procps, libgmp3-dev, e2fslibs-dev, libprelude-dev, libauparse-dev [linux-any]
+Build-Depends: debhelper (>= 4.1.16), autoconf, procps, libgmp3-dev, e2fslibs-dev, libprelude-dev, libauparse-dev [linux-any], autotools-dev
Standards-Version: 3.5.8
Homepage: http://la-samhna.de/samhain/index.html
diff -u samhain-3.1.0/debian/rules samhain-3.1.0/debian/rules
--- samhain-3.1.0/debian/rules
+++ samhain-3.1.0/debian/rules
@@ -33,6 +33,10 @@
endif
endif
+ifeq (x86_64,$(DEB_HOST_GNU_CPU))
+DISABLE_ASM = --disable-asm
+endif
+
build: build-stamp
build-stamp:
dh_testdir
@@ -50,6 +54,7 @@
--with-state-dir=/var/state/samhain \
--with-prelude \
$(DNMALLOC) \
+ $(DISABLE_ASM) \
--enable-network=no \
--with-pid-file=/var/run/samhain/samhain.pid \
--with-log-file=/var/log/samhain/samhain.log
