From 55866f8b81a34d5955b67237c854efba9095ee40 Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Sat, 18 Jun 2022 12:45:07 -0400 Subject: [PATCH 01/14] Merge v0.9.9 --- SPECS/lokinet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index 65cd62b15..8b69ea1b9 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -1,5 +1,5 @@ Name: lokinet -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Lokinet anonymous, decentralized overlay network @@ -156,6 +156,9 @@ fi %systemd_postun lokinet.service %changelog +* Sat Jun 18 2022 Technical Tumbleweed - 0.9.8-1 +- 0.9.9 release + * Wed Nov 17 2021 Technical Tumbleweed - 0.9.8-1 - bump version From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Sun, 19 Jun 2022 06:47:01 -0400 Subject: [PATCH 02/14] Change default port to 953 --- llarp/config/config.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp index 6bff96112..9c89bce6f 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp @@ -760,7 +760,10 @@ namespace llarp // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on // 127.0.0.1:53. #ifdef __linux__ - constexpr Default DefaultDNSBind{"127.3.2.1:53"}; + // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons, + // however since systemd-resolved is perfectly happy with a different port so listen on + // localhost:953 as a workaround. + constexpr Default DefaultDNSBind{"127.3.2.1:953"}; #else constexpr Default DefaultDNSBind{"127.0.0.1:53"}; #endif From 34874019838533555ce9bfa15b269624d40b7473 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Sun, 19 Jun 2022 07:03:08 -0400 Subject: [PATCH 03/14] update default-dns patch --- SOURCES/default-dns.patch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/SOURCES/default-dns.patch b/SOURCES/default-dns.patch index b646e8a54..2232811b7 100644 --- a/SOURCES/default-dns.patch +++ b/SOURCES/default-dns.patch @@ -1,8 +1,17 @@ +From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001 +From: necro-nemsis +Date: Sun, 19 Jun 2022 06:47:01 -0400 +Subject: [PATCH] Change default port to 953 + +--- + llarp/config/config.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp -index 78d152602..8b07b0cec 100644 +index 6bff9611..9c89bce6 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp -@@ -703,7 +703,10 @@ namespace llarp +@@ -760,7 +760,10 @@ namespace llarp // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on // 127.0.0.1:53. #ifdef __linux__ @@ -10,7 +19,10 @@ index 78d152602..8b07b0cec 100644 + // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons, + // however since systemd-resolved is perfectly happy with a different port so listen on + // localhost:953 as a workaround. -+ constexpr Default DefaultDNSBind{"127.0.0.1:953"}; ++ constexpr Default DefaultDNSBind{"127.3.2.1:953"}; #else constexpr Default DefaultDNSBind{"127.0.0.1:53"}; #endif +-- +2.30.2 + From f3ed998bb1ba9e501f753cedf1d9c2136ae4a59d Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Sun, 19 Jun 2022 07:14:24 -0400 Subject: [PATCH 04/14] Disable version-as-rpm patch --- SPECS/lokinet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index 8b69ea1b9..76268ed05 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -23,10 +23,10 @@ BuildRequires: jemalloc-devel BuildRequires: libsqlite3x-devel # Puts the rpm version instead of the git tag in the version string: -Patch1: version-as-rpm-version.patch +# Patch1: version-as-rpm-version.patch # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like # talking to 127.3.2.1:53 for unknown reasons. -Patch2: default-dns.patch +Patch1: default-dns.patch Requires: lokinet-bin = %{version}-%{release} %{?systemd_requires} From 67e80929e1bb5860699d0a73b2e3265e5a4e8b63 Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Sun, 19 Jun 2022 07:31:19 -0400 Subject: [PATCH 05/14] Comment regarding lokinet/cmake/Version.cmake --- SPECS/lokinet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index 76268ed05..ccabef0bd 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -24,6 +24,7 @@ BuildRequires: libsqlite3x-devel # Puts the rpm version instead of the git tag in the version string: # Patch1: version-as-rpm-version.patch +# Sun Jun 19 2022 Request Jason details to changes lokinet/cmake/Version.cmake # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like # talking to 127.3.2.1:53 for unknown reasons. Patch1: default-dns.patch From 0439bde6d414027a3cf24760e12263dfcdecd727 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 21:39:19 -0400 Subject: [PATCH 06/14] Update lokinet.spec --- SPECS/lokinet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index ccabef0bd..f4461ee60 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -85,7 +85,7 @@ export CFLAGS="%{optflags} -march=armv6 -mtune=cortex-a53 -mfloat-abi=hard -mfpu %endif %undefine __cmake_in_source_build -%cmake -DNATIVE_BUILD=OFF -DUSE_AVX2=OFF -DWITH_TESTS=OFF %{cmake_extra_args} -DCMAKE_BUILD_TYPE=Release -DGIT_VERSION="%{release}" -DWITH_SETCAP=OFF -DSUBMODULE_CHECK=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_LIBLOKINET=OFF +%cmake -DFORCE_OXENC_SUBMODULE=ON -DFORCE_OXENMQ_SUBMODULE=ON -DNATIVE_BUILD=OFF -DUSE_AVX2=OFF -DWITH_TESTS=OFF %{cmake_extra_args} -DCMAKE_BUILD_TYPE=Release -DLOKINET_VERSIONTAG=%{release} -DWITH_SETCAP=OFF -DSUBMODULE_CHECK=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_LIBLOKINET=OFF %cmake_build %install From 6548ac498157bcb11a8af7208c4b006c6b92b2d5 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 21:44:16 -0400 Subject: [PATCH 07/14] Update lokinet.spec --- SPECS/lokinet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index f4461ee60..3d0751d23 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -27,7 +27,7 @@ BuildRequires: libsqlite3x-devel # Sun Jun 19 2022 Request Jason details to changes lokinet/cmake/Version.cmake # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like # talking to 127.3.2.1:53 for unknown reasons. -Patch1: default-dns.patch +# Patch1: default-dns.patch Requires: lokinet-bin = %{version}-%{release} %{?systemd_requires} From f61515dae53a104ed257395690d0ecad54c2a409 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 21:51:32 -0400 Subject: [PATCH 08/14] Update lokinet.spec --- SPECS/lokinet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index 3d0751d23..b8f1b9546 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -101,7 +101,7 @@ install -Dm644 SOURCES/bootstrap.signed $RPM_BUILD_ROOT%{_sharedstatedir}/lokine %files -%license LICENSE.txt +%license LICENSE %doc readme.* %{_datadir}/polkit-1/rules.d/50-lokinet.rules %{_unitdir}/lokinet.service From fe7657c8fbee0bf5bb0792686a748772619f8fb9 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 22:30:05 -0400 Subject: [PATCH 09/14] backup patch --- SOURCES/{default-dns.patch => default-dns.patch.bak} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename SOURCES/{default-dns.patch => default-dns.patch.bak} (100%) diff --git a/SOURCES/default-dns.patch b/SOURCES/default-dns.patch.bak similarity index 100% rename from SOURCES/default-dns.patch rename to SOURCES/default-dns.patch.bak From cbf7e3180643dffba9161a60f5b49fcd94e9c2be Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 22:31:54 -0400 Subject: [PATCH 10/14] Create default-dns.patch from jammy patch --- SOURCES/default-dns.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 SOURCES/default-dns.patch diff --git a/SOURCES/default-dns.patch b/SOURCES/default-dns.patch new file mode 100644 index 000000000..dc742a296 --- /dev/null +++ b/SOURCES/default-dns.patch @@ -0,0 +1,26 @@ +From: Jason Rhinelander +Date: Wed, 18 May 2022 12:47:59 -0300 +Subject: Change default DNS to 127.0.0.1:953 + +This is a needed workaround for a systemd resolved bug 23010, until +0.9.10 comes out (which will have a better fix to listen on both +127.3.2.1 + 127.0.0.1:random-high-port). +--- + llarp/config/config.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp +index 6bff961..a01f560 100644 +--- a/llarp/config/config.cpp ++++ b/llarp/config/config.cpp +@@ -760,7 +760,9 @@ namespace llarp + // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on + // 127.0.0.1:53. + #ifdef __linux__ +- constexpr Default DefaultDNSBind{"127.3.2.1:53"}; ++ // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than ++ // 127.0.0.1. (This is temporary, until lokinet PR #1888 is merged in 0.9.10). ++ constexpr Default DefaultDNSBind{"127.0.0.1:953"}; + #else + constexpr Default DefaultDNSBind{"127.0.0.1:53"}; + #endif From 7c5c30f32b138e4840cd5f48cdbe982df080de86 Mon Sep 17 00:00:00 2001 From: necro-nemesis Date: Tue, 28 Jun 2022 22:34:00 -0400 Subject: [PATCH 11/14] include default-dns.patch --- SPECS/lokinet.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index b8f1b9546..2f6924d9a 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -22,12 +22,9 @@ BuildRequires: libcurl-devel BuildRequires: jemalloc-devel BuildRequires: libsqlite3x-devel -# Puts the rpm version instead of the git tag in the version string: -# Patch1: version-as-rpm-version.patch -# Sun Jun 19 2022 Request Jason details to changes lokinet/cmake/Version.cmake # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like # talking to 127.3.2.1:53 for unknown reasons. -# Patch1: default-dns.patch +Patch1: default-dns.patch Requires: lokinet-bin = %{version}-%{release} %{?systemd_requires} From 11040080a94138305fbd23b8e94170b9b0cf8eaa Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Tue, 28 Jun 2022 22:52:32 -0400 Subject: [PATCH 12/14] Revert "Change default port to 953" This reverts commit cdad3e7f093c4b0c69f73580e4fbacc24067db96. --- llarp/config/config.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp index 9c89bce6f..6bff96112 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp @@ -760,10 +760,7 @@ namespace llarp // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on // 127.0.0.1:53. #ifdef __linux__ - // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons, - // however since systemd-resolved is perfectly happy with a different port so listen on - // localhost:953 as a workaround. - constexpr Default DefaultDNSBind{"127.3.2.1:953"}; + constexpr Default DefaultDNSBind{"127.3.2.1:53"}; #else constexpr Default DefaultDNSBind{"127.0.0.1:53"}; #endif From 042e227f959d6c94809b8b99e39330dc63497f24 Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Wed, 29 Jun 2022 18:07:00 -0400 Subject: [PATCH 13/14] Update patch and SPEC --- SOURCES/default-dns.patch | 28 +++++++++++++++------------- SOURCES/default-dns.patch.bak | 28 ---------------------------- SOURCES/default-dns.patch.jason | 26 ++++++++++++++++++++++++++ SPECS/lokinet.spec | 7 +++++-- 4 files changed, 46 insertions(+), 43 deletions(-) delete mode 100644 SOURCES/default-dns.patch.bak create mode 100644 SOURCES/default-dns.patch.jason diff --git a/SOURCES/default-dns.patch b/SOURCES/default-dns.patch index dc742a296..2232811b7 100644 --- a/SOURCES/default-dns.patch +++ b/SOURCES/default-dns.patch @@ -1,26 +1,28 @@ -From: Jason Rhinelander -Date: Wed, 18 May 2022 12:47:59 -0300 -Subject: Change default DNS to 127.0.0.1:953 +From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001 +From: necro-nemsis +Date: Sun, 19 Jun 2022 06:47:01 -0400 +Subject: [PATCH] Change default port to 953 -This is a needed workaround for a systemd resolved bug 23010, until -0.9.10 comes out (which will have a better fix to listen on both -127.3.2.1 + 127.0.0.1:random-high-port). --- - llarp/config/config.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + llarp/config/config.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp -index 6bff961..a01f560 100644 +index 6bff9611..9c89bce6 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp -@@ -760,7 +760,9 @@ namespace llarp +@@ -760,7 +760,10 @@ namespace llarp // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on // 127.0.0.1:53. #ifdef __linux__ - constexpr Default DefaultDNSBind{"127.3.2.1:53"}; -+ // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than -+ // 127.0.0.1. (This is temporary, until lokinet PR #1888 is merged in 0.9.10). -+ constexpr Default DefaultDNSBind{"127.0.0.1:953"}; ++ // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons, ++ // however since systemd-resolved is perfectly happy with a different port so listen on ++ // localhost:953 as a workaround. ++ constexpr Default DefaultDNSBind{"127.3.2.1:953"}; #else constexpr Default DefaultDNSBind{"127.0.0.1:53"}; #endif +-- +2.30.2 + diff --git a/SOURCES/default-dns.patch.bak b/SOURCES/default-dns.patch.bak deleted file mode 100644 index 2232811b7..000000000 --- a/SOURCES/default-dns.patch.bak +++ /dev/null @@ -1,28 +0,0 @@ -From cdad3e7f093c4b0c69f73580e4fbacc24067db96 Mon Sep 17 00:00:00 2001 -From: necro-nemsis -Date: Sun, 19 Jun 2022 06:47:01 -0400 -Subject: [PATCH] Change default port to 953 - ---- - llarp/config/config.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp -index 6bff9611..9c89bce6 100644 ---- a/llarp/config/config.cpp -+++ b/llarp/config/config.cpp -@@ -760,7 +760,10 @@ namespace llarp - // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on - // 127.0.0.1:53. - #ifdef __linux__ -- constexpr Default DefaultDNSBind{"127.3.2.1:53"}; -+ // Fedora's systemd-resolved seems unable to connect to 127.3.2.1 for unknown reasons, -+ // however since systemd-resolved is perfectly happy with a different port so listen on -+ // localhost:953 as a workaround. -+ constexpr Default DefaultDNSBind{"127.3.2.1:953"}; - #else - constexpr Default DefaultDNSBind{"127.0.0.1:53"}; - #endif --- -2.30.2 - diff --git a/SOURCES/default-dns.patch.jason b/SOURCES/default-dns.patch.jason new file mode 100644 index 000000000..dc742a296 --- /dev/null +++ b/SOURCES/default-dns.patch.jason @@ -0,0 +1,26 @@ +From: Jason Rhinelander +Date: Wed, 18 May 2022 12:47:59 -0300 +Subject: Change default DNS to 127.0.0.1:953 + +This is a needed workaround for a systemd resolved bug 23010, until +0.9.10 comes out (which will have a better fix to listen on both +127.3.2.1 + 127.0.0.1:random-high-port). +--- + llarp/config/config.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp +index 6bff961..a01f560 100644 +--- a/llarp/config/config.cpp ++++ b/llarp/config/config.cpp +@@ -760,7 +760,9 @@ namespace llarp + // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on + // 127.0.0.1:53. + #ifdef __linux__ +- constexpr Default DefaultDNSBind{"127.3.2.1:53"}; ++ // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than ++ // 127.0.0.1. (This is temporary, until lokinet PR #1888 is merged in 0.9.10). ++ constexpr Default DefaultDNSBind{"127.0.0.1:953"}; + #else + constexpr Default DefaultDNSBind{"127.0.0.1:53"}; + #endif diff --git a/SPECS/lokinet.spec b/SPECS/lokinet.spec index 2f6924d9a..9d92ec44f 100644 --- a/SPECS/lokinet.spec +++ b/SPECS/lokinet.spec @@ -154,8 +154,11 @@ fi %systemd_postun lokinet.service %changelog -* Sat Jun 18 2022 Technical Tumbleweed - 0.9.8-1 -- 0.9.9 release +* Wed Jun 29 2022 Technical Tumbleweed - 0.9.9-1 +- bump version +- cmake flags for no system library search +- update port patch +- remove version patch * Wed Nov 17 2021 Technical Tumbleweed - 0.9.8-1 - bump version From dc7f635e20de235f860a9dd08a4dc7ba59b53150 Mon Sep 17 00:00:00 2001 From: necro-nemsis Date: Wed, 29 Jun 2022 18:15:57 -0400 Subject: [PATCH 14/14] remove dead patches --- SOURCES/default-dns.patch.jason | 26 -------------------------- SOURCES/version-as-rpm-version.patch | 28 ---------------------------- 2 files changed, 54 deletions(-) delete mode 100644 SOURCES/default-dns.patch.jason delete mode 100644 SOURCES/version-as-rpm-version.patch diff --git a/SOURCES/default-dns.patch.jason b/SOURCES/default-dns.patch.jason deleted file mode 100644 index dc742a296..000000000 --- a/SOURCES/default-dns.patch.jason +++ /dev/null @@ -1,26 +0,0 @@ -From: Jason Rhinelander -Date: Wed, 18 May 2022 12:47:59 -0300 -Subject: Change default DNS to 127.0.0.1:953 - -This is a needed workaround for a systemd resolved bug 23010, until -0.9.10 comes out (which will have a better fix to listen on both -127.3.2.1 + 127.0.0.1:random-high-port). ---- - llarp/config/config.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp -index 6bff961..a01f560 100644 ---- a/llarp/config/config.cpp -+++ b/llarp/config/config.cpp -@@ -760,7 +760,9 @@ namespace llarp - // can bind to other 127.* IPs to avoid conflicting with something else that may be listening on - // 127.0.0.1:53. - #ifdef __linux__ -- constexpr Default DefaultDNSBind{"127.3.2.1:53"}; -+ // Workaround for systemd bug #23010 that breaks 127.0.0.0/8 resolvers on anything other than -+ // 127.0.0.1. (This is temporary, until lokinet PR #1888 is merged in 0.9.10). -+ constexpr Default DefaultDNSBind{"127.0.0.1:953"}; - #else - constexpr Default DefaultDNSBind{"127.0.0.1:53"}; - #endif diff --git a/SOURCES/version-as-rpm-version.patch b/SOURCES/version-as-rpm-version.patch deleted file mode 100644 index 868783b3b..000000000 --- a/SOURCES/version-as-rpm-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jason Rhinelander -Date: Fri, 13 Dec 2019 17:23:41 -0400 -Subject: Pass debian version as GIT_VERSION - ---- - cmake/Version.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index 45037a0..d9fdaef 100644 ---- a/cmake/Version.cmake -+++ b/cmake/Version.cmake -@@ -1,4 +1,8 @@ - -+if(GIT_VERSION) -+ set(VERSIONTAG "${GIT_VERSION}") -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp") -+else() - find_package(Git QUIET) - set(GIT_INDEX_FILE "${PROJECT_SOURCE_DIR}/.git/index") - if(EXISTS ${GIT_INDEX_FILE} AND ( GIT_FOUND OR Git_FOUND) ) -@@ -18,5 +22,6 @@ else() - set(VERSIONTAG "nogit") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp") - endif() -+endif() - - add_custom_target(genversion DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp")