diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-10-01 09:44:06 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-10-01 09:44:06 +0200 |
| commit | a4f2cc4296014eca8d97be5c785b321150a86a6d (patch) | |
| tree | f1d016b29f58913809b37b6d0c763d3cdb712721 | |
| parent | fc0c3599dc2926284867ff285befebd2fbc4a7b2 (diff) | |
New debian/patches/0001-hardening.patch to fix hardening; d/rules: Fix tests
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/0001-hardening.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
4 files changed, 25 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 7ca2e9d..e1da291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * New debian/patches/0001-hardening.patch to fix hardening. * debian/control: - Change VCS-* to point to the new repository. - Replace Priority extra with optional. @@ -22,6 +23,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Add code to remove unused .md5 files from documentation. - Use /usr/share/dpkg/pkg-info.mk to get Upstream version. - Remove now useless code. + - Fix tests. -- Jörg Frings-Fürst <debian@jff.email> Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/patches/0001-hardening.patch b/debian/patches/0001-hardening.patch new file mode 100644 index 0000000..e3c77eb --- /dev/null +++ b/debian/patches/0001-hardening.patch @@ -0,0 +1,20 @@ +Description: Fix hardening +Author: Jörg Frings-Fürst <debian@jff.email> +Last-Update: 2018-10-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -73,8 +73,8 @@ int main() + return 0; + } + ]])],[blb_cv_glib_sane=yes],[blb_cv_glib_sane=no],[blb_cv_glib_sane=yes])]) +-CPPFLAGS=$old_CPPFLAGS +-LDFLAGS=$old_LDFLAGS ++CPPFLAGS="$old_CPPFLAGS -fPIE" ++LDFLAGS="$old_LDFLAGS -fPIE -pie" + + if test "x$blb_cv_glib_sane" = "xno"; then + AC_MSG_ERROR([Glib headers inconsistent with current compiler setting. You might be using 32 bit Glib with a 64 bit compiler, check PKG_CONFIG_PATH]) diff --git a/debian/patches/series b/debian/patches/series index 8587bd5..3879ee5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +0001-hardening.patch 0100-gcc5.patch diff --git a/debian/rules b/debian/rules index 9a96c74..3402cb8 100755 --- a/debian/rules +++ b/debian/rules @@ -23,8 +23,8 @@ override_dh_auto_configure-arch: override_dh_auto_build-arch: dh_auto_build -- V=1 -override_dh_auto_test-arch: ; -# dh_auto_test -- V=1 +override_dh_auto_test-arch: + cd build-tree/tests && make check ## # Arch independent overrides |