Rebuilt with OpenSSL 3.0.0

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -12,3 +12,28 @@
 /libgit2-0.23.2.tar.gz
 /libgit2-0.23.3.tar.gz
 /libgit2-0.23.4.tar.gz
+/libgit2-0.24.0.tar.gz
+/libgit2-0.24.1.tar.gz
+/libgit2-0.24.2.tar.gz
+/libgit2-0.24.3.tar.gz
+/libgit2-0.24.6.tar.gz
+/libgit2-0.25.1.tar.gz
+/libgit2-0.26.0.tar.gz
+/libgit2-0.26.3.tar.gz
+/libgit2-0.26.4.tar.gz
+/libgit2-0.26.5.tar.gz
+/libgit2-0.26.6.tar.gz
+/libgit2-0.27.4.tar.gz
+/libgit2-0.27.5.tar.gz
+/libgit2-0.27.7.tar.gz
+/libgit2-0.27.8.tar.gz
+/libgit2-0.28.0-rc1.tar.gz
+/libgit2-0.28.0.tar.gz
+/libgit2-0.28.1.tar.gz
+/libgit2-0.28.2.tar.gz
+/libgit2-0.28.3.tar.gz
+/libgit2-0.28.4.tar.gz
+/libgit2-0.99.0.tar.gz
+/libgit2-1.0.0.tar.gz
+/libgit2-1.0.1.tar.gz
+/libgit2-1.1.0.tar.gz

0001-checkout-Fix-removing-untracked-files-by-path-in-sub.patch

@@ -0,0 +1,76 @@
+From d62e44cb8218840a0291fb5fbb7c5106e1e35a12 Mon Sep 17 00:00:00 2001
+From: Segev Finer <segev@codeocean.com>
+Date: Mon, 3 Jun 2019 18:35:08 +0300
+Subject: [PATCH] checkout: Fix removing untracked files by path in
+ subdirectories
+
+The checkout code didn't iterate into a subdir if it didn't match the
+pathspec, but since the pathspec might match files in the subdir we
+should recurse into it (In contrast to gitignore handling).
+
+Fixes #5089
+---
+ src/checkout.c        |  9 +++++++--
+ tests/checkout/head.c | 26 ++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/src/checkout.c b/src/checkout.c
+index f0dd736dc..59ff873dd 100644
+--- a/src/checkout.c
++++ b/src/checkout.c
+@@ -371,8 +371,13 @@ static int checkout_action_wd_only(
+ 	if (!git_pathspec__match(
+ 			pathspec, wd->path,
+ 			(data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0,
+-			git_iterator_ignore_case(workdir), NULL, NULL))
+-		return git_iterator_advance(wditem, workdir);
++			git_iterator_ignore_case(workdir), NULL, NULL)) {
++
++		if (wd->mode == GIT_FILEMODE_TREE)
++			return git_iterator_advance_into(wditem, workdir);
++		else
++			return git_iterator_advance(wditem, workdir);
++	}
+ 
+ 	/* check if item is tracked in the index but not in the checkout diff */
+ 	if (data->index != NULL) {
+diff --git a/tests/checkout/head.c b/tests/checkout/head.c
+index 799123086..5b3a034e7 100644
+--- a/tests/checkout/head.c
++++ b/tests/checkout/head.c
+@@ -109,6 +109,32 @@ void test_checkout_head__do_not_remove_untracked_file_in_subdir(void)
+ 	cl_assert(git_path_isfile("testrepo/tracked/subdir/untracked"));
+ }
+ 
++void test_checkout_head__do_remove_untracked_paths(void)
++{
++	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
++	git_index *index;
++	char *paths[] = {"tracked/untracked"};
++
++	cl_git_pass(p_mkdir("testrepo/tracked", 0755));
++	cl_git_pass(p_mkdir("testrepo/tracked/subdir", 0755));
++	cl_git_mkfile("testrepo/tracked/tracked", "tracked\n");
++	cl_git_mkfile("testrepo/tracked/untracked", "untracked\n");
++
++	cl_git_pass(git_repository_index(&index, g_repo));
++	cl_git_pass(git_index_add_bypath(index, "tracked/tracked"));
++	cl_git_pass(git_index_write(index));
++
++	git_index_free(index);
++
++	opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED;
++	opts.paths.strings = paths;
++	opts.paths.count = 1;
++	cl_git_pass(git_checkout_head(g_repo, &opts));
++
++	cl_assert(git_path_isfile("testrepo/tracked/tracked"));
++	cl_assert(!git_path_isfile("testrepo/tracked/untracked"));
++}
++
+ void test_checkout_head__do_remove_tracked_subdir(void)
+ {
+ 	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+-- 
+2.27.0
+

libgit2.spec

@@ -1,61 +1,78 @@
+# libssh2 is not available on RHEL
+%if 0%{?rhel}
+%bcond_with libssh2
+%else
+%bcond_without libssh2
+%endif
+
 Name:           libgit2
-Version:        0.23.4
-Release:        1%{?dist}
+Version:        1.1.0
+Release:        6%{?dist}
 Summary:        C implementation of the Git core methods as a library with a solid API
 License:        GPLv2 with exceptions
-URL:            http://libgit2.github.com/
-Source0:        https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  cmake
+URL:            https://libgit2.org/
+Source0:        https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  gcc
+BuildRequires:  cmake >= 3.5.1
+BuildRequires:  ninja-build
 BuildRequires:  http-parser-devel
 BuildRequires:  libcurl-devel
+%if %{with libssh2}
 BuildRequires:  libssh2-devel
+%endif
 BuildRequires:  openssl-devel
-BuildRequires:  python2
+BuildRequires:  pcre2-devel
+BuildRequires:  python3
 BuildRequires:  zlib-devel
 Provides:       bundled(libxdiff)
 
 %description
-libgit2 is a portable, pure C implementation of the Git core methods 
+libgit2 is a portable, pure C implementation of the Git core methods
 provided as a re-entrant linkable library with a solid API, allowing
 you to write native speed custom Git applications in any language
 with bindings.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description    devel
 This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup
+%autosetup -p1
 
 # Remove VCS files from examples
 find examples -name ".gitignore" -delete -print
 
-# Fix pkgconfig generation
-sed -i 's|@CMAKE_INSTALL_PREFIX@/||' libgit2.pc.in
-
-# Don't test network
-sed -i 's/ionline/xonline/' CMakeLists.txt
+# Don't run "online" tests
+sed -i '/-sonline/s/^/#/' tests/CMakeLists.txt
 
 # Remove bundled libraries
-rm -frv deps
+rm -vr deps
 
 %build
-%cmake -DTHREADSAFE=ON .
-%make_build
+%cmake . -B%{_target_platform} \
+  -GNinja \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DREGEX_BACKEND=pcre2 \
+  -DUSE_HTTP_PARSER=system \
+  -DUSE_SHA1=HTTPS \
+  -DUSE_HTTPS=OpenSSL \
+  -DUSE_NTLMCLIENT=OFF \
+%if %{without libssh2}
+  -DUSE_SSH=OFF \
+%endif
+  %{nil}
+%ninja_build -C %{_target_platform}
 
 %install
-%make_install
+%ninja_install -C %{_target_platform}
 
 %check
-ctest -V
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ninja_test -C %{_target_platform}
 
 %files
 %license COPYING
@@ -69,6 +86,140 @@ ctest -V
 %{_includedir}/git2/
 
 %changelog
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.1.0-6
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Mar 18 2021 Kamil Dudka <kdudka@redhat.com> - 1.1.0-4
+- make the run-time dependency on libssh2 optional
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.1.0-2
+- Rebuild
+
+* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.0.1-2
+- Fix removing untracked files by path in subdirectories
+
+* Thu Jun 04 2020 Pete Walter <pwalter@fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1
+
+* Wed Apr 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.0.0-2
+- Rebuild for http-parser 2.9.4
+
+* Wed Apr 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0
+
+* Tue Mar 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0-2
+- Fix broken deps for pcre2
+
+* Mon Mar 02 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.99.0-1
+- Update to 0.99.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Dec 11 09:00:52 CET 2019 Igor Gnatenko <ingnatenkobrain@fedoraproject.org> - 0.28.4-1
+- Update to 0.28.4
+
+* Fri Sep 13 2019 Pete Walter <pwalter@fedoraproject.org> - 0.28.3-1
+- Update to 0.28.3
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jul 14 13:34:04 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.28.2-2
+- Obsolete libgit2_0.28
+
+* Thu Jun 06 14:22:16 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.28.2-1
+- Update to 0.28.2
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.27.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 28 2019 Pete Walter <pwalter@fedoraproject.org> - 0.27.8-1
+- Update to 0.27.8
+
+* Fri Oct 26 2018 Pete Walter <pwalter@fedoraproject.org> - 0.27.7-1
+- Update to 0.27.7
+
+* Mon Oct 08 2018 Pete Walter <pwalter@fedoraproject.org> - 0.27.5-1
+- Update to 0.27.5
+
+* Fri Aug 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.27.4-1
+- Update to 0.27.4
+- Update upstream URL
+
+* Tue Aug 07 2018 Pete Walter <pwalter@fedoraproject.org> - 0.26.6-1
+- Update to 0.26.6
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 0.26.5-1
+- Update to 0.26.5 (CVE-2018-10887, CVE-2018-10888)
+
+* Mon Jun 25 2018 Pete Walter <pwalter@fedoraproject.org> - 0.26.4-1
+- Update to 0.26.4 (CVE-2018-11235)
+
+* Mon Mar 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.3-1
+- Update to 0.26.3
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.0-4
+- Switch to %%ldconfig_scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Jul 08 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.0-1
+- Update to 0.26.0
+
+* Tue Feb 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.25.1-3
+- Backport patch to fix pkgconfig file under g-ir-scanner
+
+* Tue Feb 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.25.1-2
+- Bump release for rebuild
+
+* Tue Feb 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.25.1-1
+- Update to 0.25.1 (RHBZ #1395926)
+
+* Tue Jan 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.24.6-1
+- Update to 0.24.6 (RHBZ #1411857)
+
+* Thu Nov 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.3-1
+- Update to 0.24.3 (RHBZ #1391480)
+- Add support for OpenSSL 1.1.0 (RHBZ #1383753)
+
+* Mon Oct 10 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.2-2
+- Backport patch for CVE-2016-8568, CVE-2016-8569
+
+* Tue Oct 04 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.2-1
+- Update to 0.24.2 (RHBZ #1381398)
+
+* Wed Apr 13 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.24.1-1
+- Update to 0.24.1
+
+* Sun Mar 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.24.0-1
+- Update to 0.24.0 (RHBZ #1310638)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sun Nov 22 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.23.4-1
 - Update to 0.23.4 (RHBZ #1281633)
 

sources

@@ -1 +1 @@
-b7db3ab71dfa19fe1dc7fef76d6af216  libgit2-0.23.4.tar.gz
+SHA512 (libgit2-1.1.0.tar.gz) = 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8