From b1af393362f179b1dab421a89ffb48d5e9fe27ee Mon Sep 17 00:00:00 2001 From: Mohammed Bilal Date: Thu, 5 May 2022 11:20:44 +0000 Subject: [PATCH] d/p/: Refresh patches --- debian/patches/disable-online-tests.patch | 35 +++++++++++++++-------- debian/patches/enable-repro-builds.patch | 23 ++++++--------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/debian/patches/disable-online-tests.patch b/debian/patches/disable-online-tests.patch index ea811be68..273cc6e60 100644 --- 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 c2137cf67..cbac4bdc9 100644 --- a/debian/patches/enable-repro-builds.patch +++ b/debian/patches/enable-repro-builds.patch @@ -3,17 +3,12 @@ Author: Utkarsh Gupta --- 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 " Dqc ") -+ SET(CMAKE_C_ARCHIVE_APPEND " Dq ") -+ SET(CMAKE_C_ARCHIVE_FINISH " -D ") -+ - ELSE () - IF (ENABLE_REPRODUCIBLE_BUILDS) - SET(CMAKE_C_ARCHIVE_CREATE " Dqc ") +@@ -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) -- 2.39.2