Import Debian changes 0.27.0+dfsg.1-0.4

libgit2 (0.27.0+dfsg.1-0.4) experimental; urgency=medium

  * Non-maintainer upload.
  * Fix stack smashing error on 32-bit targets (Closes: #900126)

diff --git a/debian/changelog b/debian/changelog
index 5ae6168a8259469ad0213bb7987f239d97e30903..fc2a8459b04ad35760672dedfe0e484d4446bd0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
 libgit2 (0.27.0+dfsg.1-0.4) experimental; urgency=medium
 
-  * Non-maintainer upload
-  * Switch vcs to salsa
-  * Bump standards version to 4.1.4
-  * Bump debhelper compatibility level to 11
+  * Non-maintainer upload.
+  * Fix stack smashing error on 32-bit targets (Closes: #900126)
 
- -- Pirate Praveen <praveen@debian.org>  Mon, 04 Jun 2018 18:41:38 +0530
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 26 May 2018 16:27:33 +0200
 
 libgit2 (0.27.0+dfsg.1-0.3) experimental; urgency=medium
 

diff --git a/debian/control b/debian/control
index cc34389b209bd6a41b95bc6c19c215b5eedf5e3a..834dce76743536404cb47caf76da20d199b22002 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: libgit2
 Section: libs
 Priority: optional
 Maintainer: Russell Sim <russell.sim@gmail.com>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 11),
                python-minimal (>= 2.4.0), pkg-config,
                cmake, libz-dev, libmbedtls-dev,
                libssh2-1-dev, libhttp-parser-dev, libkrb5-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.1.3
 Homepage: https://libgit2.github.com/
-Vcs-Git: https://salsa.debian.org/debian/libgit2.git
-Vcs-Browser: https://salsa.debian.org/debian/libgit2
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/libgit2.git/
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/libgit2.git/
 
 
 Package: libgit2-dev

diff --git a/debian/patches/fix-stack-smashing-error.patch b/debian/patches/fix-stack-smashing-error.patch
new file mode 100644 (file)
index 0000000..4eba11f
--- /dev/null
+++ b/debian/patches/fix-stack-smashing-error.patch
@@ -0,0 +1,19 @@
+Description: Fix stack smashing error on 32-bit targets 
+ Fix stack smashing due to wrong size of struct stat on the
+ stack on 32-bit systems with 64-bit file descriptor offsets
+ enabled by adding -D_FILE_OFFSET_BITS=64 when compiling the
+ test suite.
+ .
+Author: Andreas Baumann <mail@andreasbaumann.cc>
+Last-Update: 2018-05-26
+
+--- libgit2-0.27.0+dfsg.1.orig/tests/CMakeLists.txt
++++ libgit2-0.27.0+dfsg.1/tests/CMakeLists.txt
+@@ -9,6 +9,7 @@ SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURC
+ SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+ ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
+ ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\")
++ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
+ 
+ INCLUDE_DIRECTORIES(${CLAR_PATH} ${libgit2_BINARY_DIR}/src)
+ FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h)

diff --git a/debian/patches/series b/debian/patches/series
index c691bfa545f458d84a99f836cfb82ea6cbf5be07..cccba5bc202424e13d5a2cf56652feaf33fa727a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use-mbedtls.patch
 disable-online-tests.patch
 remove-mbedtls-from-pkgconfig.patch
 index-Fix-alignment-issues-in-write_disk_entry.patch
+fix-stack-smashing-error.patch

diff --git a/debian/rules b/debian/rules
index 523fc1d07967699c82ae6be2eeb81300d7513684..4a2607df87290e0986e383b3e18c87df0d8b4c7d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,5 +59,5 @@ override_dh_installexamples:
        dh_installexamples --exclude .gitignore
 
 %:
-       dh $@ --buildsystem cmake --dbgsym-migration='libgit2-dbg (<< 0.26.0+dfsg.1-1~)' --builddirectory=build-debian-release
-       dh $@ --buildsystem cmake --builddirectory=build-debian-devel
+       dh $@ --parallel --buildsystem cmake --dbgsym-migration='libgit2-dbg (<< 0.26.0+dfsg.1-1~)' --builddirectory=build-debian-release
+       dh $@ --parallel --buildsystem cmake --builddirectory=build-debian-devel