summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-04-19 15:46:25 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-04-19 15:46:25 +0200
commit740bc2932fa89806842ae83ed97bb46e94077520 (patch)
treeb9033c69c1efe97191dfe0b35fdc13bac939207a
parent71b298bfdd7d721aee0ded18505a93cd3bcda539 (diff)
downloadpackages-740bc2932fa89806842ae83ed97bb46e94077520.tar.xz
extra/libgit2: temporary fix for the stack smash during check()
-rw-r--r--extra/libgit2/PKGBUILD9
-rw-r--r--extra/libgit2/libgit2-ssp-offset64-stat-buf.patch12
2 files changed, 21 insertions, 0 deletions
diff --git a/extra/libgit2/PKGBUILD b/extra/libgit2/PKGBUILD
new file mode 100644
index 00000000..052719d7
--- /dev/null
+++ b/extra/libgit2/PKGBUILD
@@ -0,0 +1,9 @@
+# See: https://github.com/libgit2/libgit2/pull/4631
+
+source+=('libgit2-ssp-offset64-stat-buf.patch')
+sha1sums+=('378a2c3eaef1957145aa58f51f75a07c634f77d7')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i "$srcdir/libgit2-ssp-offset64-stat-buf.patch"
+}
diff --git a/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch b/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch
new file mode 100644
index 00000000..a6ee91d9
--- /dev/null
+++ b/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 775f33f2d..e73e7237c 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -9,6 +9,7 @@ SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/resources/")
+ 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)