Imported Debian patch 6.2+svn3841-1.2

diff --git a/debian/changelog b/debian/changelog
index 5405448512d7d4d055cd97e9d64d5f31c9e080b5..fd7e7c49a93797f83e09720e63c407c3eeb3d416 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+smartmontools (6.2+svn3841-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Switch to automake1.11. (Closes: #724436)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 16 Feb 2014 16:27:11 -0500
+
+smartmontools (6.2+svn3841-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on GNU/kFreeBSD. (Closes: #736660)
+
+ -- Robert Millan <rmh@debian.org>  Thu, 06 Feb 2014 13:48:48 +0100
+
 smartmontools (6.2+svn3841-1) unstable; urgency=low
 
   * [3d17a85] Imported Upstream version 6.2+svn3841

diff --git a/debian/control b/debian/control
index 626a3ca1c1f25500bbe438517c584755baef109e..280ea890b0c9c19d2d23821db2caa1a5deca51c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Giuseppe Iuculano <iuculano@debian.org>
 Uploaders: Florian Maier <contact@marsmenschen.com>
-Build-Depends: debhelper (>= 7), libcam-dev [kfreebsd-i386 kfreebsd-amd64], automake1.10, autoconf, libcap-ng-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sparc !avr32], libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb2-dev [kfreebsd-i386 kfreebsd-amd64], hardening-wrapper
+Build-Depends: debhelper (>= 7), libcam-dev [kfreebsd-any], freebsd-glue [kfreebsd-any], automake1.11, autoconf, libcap-ng-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sparc !avr32], libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb2-dev [kfreebsd-i386 kfreebsd-amd64], hardening-wrapper
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/collab-maint/smartmontools.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/smartmontools.git

diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index d0ca5132045238f4600fe4619543a02afd3ea08e..4833bf7d3775db8b2c814bc4f1adea2d2d0b406d 100644 (file)
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -1,7 +1,5 @@
-Index: smartmontools/dev_areca.h
-===================================================================
---- smartmontools.orig/dev_areca.h     2013-09-05 13:31:22.863972312 +0200
-+++ smartmontools/dev_areca.h  2013-09-05 13:34:00.587972763 +0200
+--- a/dev_areca.h
++++ b/dev_areca.h
 @@ -58,7 +58,7 @@
  #define ARCMSR_IOCTL_CLEAR_RQBUFFER          (ARECA_SATA_RAID | FUNCTION_CLEAR_RQBUFFER)
  #define ARCMSR_IOCTL_CLEAR_WQBUFFER          (ARECA_SATA_RAID | FUNCTION_CLEAR_WQBUFFER)
@@ -11,3 +9,25 @@ Index: smartmontools/dev_areca.h
  #include <sys/ioctl.h> // _IOWR
  
  /*FunctionCode*/
+--- a/cciss.cpp
++++ b/cciss.cpp
+@@ -18,18 +18,10 @@
+ #  ifndef be32toh
+ #    define be32toh __be32_to_cpu
+ #  endif
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #  include <sys/endian.h>
+ #  include CISS_LOCATION
+ #  define _HAVE_CCISS
+-#elif defined(__FreeBSD_kernel__)
+-#  include <endian.h>
+-#  ifdef __GLIBC__
+-#  include <bsd/sys/cdefs.h>
+-#  include <stdint.h>
+-#  endif
+-#  include CISS_LOCATION
+-#  define _HAVE_CCISS
+ #endif
+ 
+ #ifdef _HAVE_CCISS

diff --git a/debian/rules b/debian/rules
index fa0dc7f17a2e359bda38e6b869fa4b18acce9c06..dbe146f508d375d4535c763aa8f465f28901bbe6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,10 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
        CONFIGURE_ARGS += --with-selinux
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+       CFLAGS += -I/usr/include/freebsd
+endif
+
 CFLAGS += -fsigned-char -Wall
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
@@ -44,7 +48,7 @@ configure: configure-stamp
 configure-stamp: 
        dh_testdir
        ./autogen.sh
-       CFLAGS="${CFLAGS}" ./configure --prefix=/usr             \
+       CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr                \
                                --sysconfdir=/etc                \
                                --mandir=/usr/share/man          \
                                --with-initscriptdir=no \