d/p/: Refresh patches

diff --git a/debian/patches/disable-online-tests.patch b/debian/patches/disable-online-tests.patch
index ea811be684f802ba0283dbd3cde8c534ca8f0e73..273cc6e60b3ffb4c1b7e926f7fac4e28d2b70581 100644 (file)
--- a/debian/patches/disable-online-tests.patch
+++ b/debian/patches/disable-online-tests.patch
@@ -2,16 +2,27 @@ Skip tests that needs an active internet connection
 
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -62,12 +62,4 @@
-       ENDIF()
- ENDFUNCTION(ADD_CLAR_TEST)
+@@ -68,15 +68,15 @@
+       endif()
+ endfunction(ADD_CLAR_TEST)
  
--ADD_CLAR_TEST(offline             -v -xonline)
- ADD_CLAR_TEST(invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
--ADD_CLAR_TEST(online              -v -sonline -xonline::customcert)
--ADD_CLAR_TEST(online_customcert   -v -sonline::customcert)
--ADD_CLAR_TEST(gitdaemon           -v -sonline::push)
--ADD_CLAR_TEST(ssh                 -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths -sonline::clone::path_whitespace_ssh)
--ADD_CLAR_TEST(proxy               -v -sonline::clone::proxy)
--ADD_CLAR_TEST(auth_clone          -v -sonline::clone::cred)
--ADD_CLAR_TEST(auth_clone_and_push -v -sonline::clone::push -sonline::push)
+-add_clar_test(offline             -v -xonline)
++#add_clar_test(offline             -v -xonline)
+ add_clar_test(invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
+-add_clar_test(online              -v -sonline -xonline::customcert)
+-add_clar_test(online_customcert   -v -sonline::customcert)
+-add_clar_test(gitdaemon           -v -sonline::push)
+-add_clar_test(ssh                 -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths -sonline::clone::path_whitespace_ssh)
+-add_clar_test(proxy               -v -sonline::clone::proxy)
+-add_clar_test(auth_clone          -v -sonline::clone::cred)
+-add_clar_test(auth_clone_and_push -v -sonline::clone::push -sonline::push)
++#add_clar_test(online              -v -sonline -xonline::customcert)
++#add_clar_test(online_customcert   -v -sonline::customcert)
++#add_clar_test(gitdaemon           -v -sonline::push)
++#add_clar_test(ssh                 -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths -sonline::clone::path_whitespace_ssh)
++#add_clar_test(proxy               -v -sonline::clone::proxy)
++#add_clar_test(auth_clone          -v -sonline::clone::cred)
++#add_clar_test(auth_clone_and_push -v -sonline::clone::push -sonline::push)
+ 
+ #
+ # Header file validation project: ensure that we do not publish any sloppy

diff --git a/debian/patches/enable-repro-builds.patch b/debian/patches/enable-repro-builds.patch
index c2137cf67f3db1537706e3ebd39e2d22b22810e2..cbac4bdc9b290be3841cf928af1ec389c3351225 100644 (file)
--- a/debian/patches/enable-repro-builds.patch
+++ b/debian/patches/enable-repro-builds.patch
@@ -3,17 +3,12 @@ Author: Utkarsh Gupta <utkarsh@debian.org>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -191,6 +191,13 @@
-       SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
-       SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
-       SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}")
-+
-+      # Enable reproducible builds by default
-+      SET(CMAKE_C_FLAGS "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=. ${CMAKE_C_FLAGS}")
-+      SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>")
-+      SET(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> Dq  <TARGET> <LINK_FLAGS> <OBJECTS>")
-+      SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>")
-+
- ELSE ()
-       IF (ENABLE_REPRODUCIBLE_BUILDS)
-               SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>")
+@@ -54,7 +54,7 @@
+               option(USE_NTLMCLIENT  "Enable NTLM support on Unix."                   ON)
+       endif()
+ 
+-      option(ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds"                 OFF)
++      option(ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds"                 ON)
+ endif()
+ 
+ if(APPLE)