[arch-commits] Commit in ruby-rugged/trunk (2 files)
David Runge
dvzrv at archlinux.org
Tue Mar 10 15:01:49 UTC 2020
Date: Tuesday, March 10, 2020 @ 15:01:47
Author: dvzrv
Revision: 593642
upgpkg: ruby-rugged 0.99.0-1: Upgrading to 0.99.0. Removing patch to remove failing tests.
Update lines to remove in ext/rugged/extconf.rb to be bale to build against an system provided libgit2.
Modified:
ruby-rugged/trunk/PKGBUILD
Deleted:
ruby-rugged/trunk/ruby-rugged-0.28.4.1-failing_tests.patch
------------------------------------------+
PKGBUILD | 21 ++----
ruby-rugged-0.28.4.1-failing_tests.patch | 100 -----------------------------
2 files changed, 9 insertions(+), 112 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-10 15:00:34 UTC (rev 593641)
+++ PKGBUILD 2020-03-10 15:01:47 UTC (rev 593642)
@@ -4,10 +4,10 @@
_name=rugged
# ideally this should match $pkgver, as package() might fail otherwise. thanks, github
-_libgit2_pkgver=0.28.4
+_libgit2_pkgver=0.99.0
pkgname=ruby-rugged
-pkgver=0.28.4.1
-pkgrel=4
+pkgver=0.99.0
+pkgrel=1
pkgdesc='A Ruby binding to the libgit2 linkable library'
arch=('x86_64')
url="https://github.com/libgit2/rugged"
@@ -17,22 +17,18 @@
checkdepends=('git')
options=(!emptydirs)
source=("${_name}-${pkgver}.tar.gz::https://github.com/libgit2/${_name}/archive/v${pkgver}.tar.gz"
- "libgit2-${_libgit2_pkgver}.tar.gz::https://github.com/libgit2/libgit2/archive/v${_libgit2_pkgver}.tar.gz"
- "${pkgname}-0.28.4.1-failing_tests.patch")
-sha512sums=('4a4d1729dcad510a735d97e3eae75496f1d09cbf6c7836dcc0f98e6ca9b5e60a0d848cf6d4ff9b7372a5f10d3d8ced7aad5de6510910ce6193ade94a5f940247'
- 'b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15'
- 'd5450787e21e9829f4e5e87501b101b53e36e3e1d366df46a9664ffc730bfabbffdbb68e43a303ab0d57c8084345520dd78c58052945ae79520557592de79099')
+ "libgit2-${_libgit2_pkgver}.tar.gz::https://github.com/libgit2/libgit2/archive/v${_libgit2_pkgver}.tar.gz")
+sha512sums=('6463c481977a11f4a4c8e245304a1209c7e99ddb601417735229ea24791f3bec7457e7890b17a21406e1cc59fc2186e8acd7a6df180a6251cbc883cd2f1ae86b'
+ 'e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b')
prepare() {
mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
cd ${pkgname}-${pkgver}
- # removing failing tests https://github.com/libgit2/rugged/issues/833
- patch -Np1 -i "../${pkgname}-0.28.4.1-failing_tests.patch"
# we don't do version pinning
sed -r 's|~>|>=|g' -i ${_name}.gemspec
# remove broken and useless libgit2 "version check":
# https://github.com/libgit2/rugged/issues/698
- sed '68,88d' -i ext/rugged/extconf.rb
+ sed '68,90d' -i ext/rugged/extconf.rb
# source tarball doesn't include vendored libgit2 version, which is only
# needed for test fixtures (resources): https://github.com/libgit2/rugged/issues/801
mv -v ../libgit2-${_libgit2_pkgver}/* vendor/libgit2
@@ -49,7 +45,8 @@
check(){
cd "${pkgname}-${pkgver}"
- # ConfigTest#test_read_global_config_file fails, if no gitconfig is set for user...
+ # ConfigTest#test_read_global_config_file fails, if no gitconfig is set for
+ # user...
# https://github.com/libgit2/rugged/issues/432
git config --global user.name "Foo Bar"
rake test
Deleted: ruby-rugged-0.28.4.1-failing_tests.patch
===================================================================
--- ruby-rugged-0.28.4.1-failing_tests.patch 2020-03-10 15:00:34 UTC (rev 593641)
+++ ruby-rugged-0.28.4.1-failing_tests.patch 2020-03-10 15:01:47 UTC (rev 593642)
@@ -1,100 +0,0 @@
-diff -ruN a/test/commit_test.rb b/test/commit_test.rb
---- a/test/commit_test.rb 2019-12-11 12:44:48.000000000 +0100
-+++ b/test/commit_test.rb 2020-02-26 13:49:04.120935531 +0100
-@@ -281,74 +281,6 @@
- assert_raises(Rugged::OdbError) { Rugged::Commit.extract_signature(@repo, "181037049a54a1eb5fab404658a3a250b44335d8") }
- end
-
-- def test_create_with_signature
-- signed_commit = <<-COMMIT
--tree 6b79e22d69bf46e289df0345a14ca059dfc9bdf6
--parent 34734e478d6cf50c27c9d69026d93974d052c454
--author Ben Burkert <ben at benburkert.com> 1358451456 -0800
--committer Ben Burkert <ben at benburkert.com> 1358451456 -0800
--gpgsig -----BEGIN PGP SIGNATURE-----
-- Version: GnuPG v1.4.12 (Darwin)
--
-- iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al
-- o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8
-- JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq
-- AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq
-- SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW
-- who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok
-- 6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG
-- cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu
-- c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9
-- ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J
-- 7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc
-- cpxtDQQMGYFpXK/71stq
-- =ozeK
-- -----END PGP SIGNATURE-----
--
--a simple commit which works
--COMMIT
--
-- signature = <<-SIGNATURE.strip
-------BEGIN PGP SIGNATURE-----
--Version: GnuPG v1.4.12 (Darwin)
--
--iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al
--o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8
--JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq
--AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq
--SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW
--who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok
--6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG
--cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu
--c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9
--ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J
--7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc
--cpxtDQQMGYFpXK/71stq
--=ozeK
-------END PGP SIGNATURE-----
--SIGNATURE
--
-- base_data = <<-SIGNEDDATA
--tree 6b79e22d69bf46e289df0345a14ca059dfc9bdf6
--parent 34734e478d6cf50c27c9d69026d93974d052c454
--author Ben Burkert <ben at benburkert.com> 1358451456 -0800
--committer Ben Burkert <ben at benburkert.com> 1358451456 -0800
--
--a simple commit which works
--SIGNEDDATA
--
-- id1 = Rugged::Commit::create_with_signature(@repo, base_data, signature, "gpgsig")
-- id2 = Rugged::Commit::create_with_signature(@repo, base_data, signature)
-- sig, data = Rugged::Commit::extract_signature(@repo, id1)
--
-- assert_equal id1, id2
-- assert_equal base_data, data
-- assert_equal signature, sig
--
-- raw_commit = Rugged::Commit::lookup(@repo, id1).read_raw.data
-- assert_equal signed_commit, raw_commit
-- end
--
- def test_commit_summary
- person = {:name => 'Scott', :email => 'schacon at gmail.com', :time => Time.now }
-
-diff -ruN a/test/online/fetch_test.rb b/test/online/fetch_test.rb
---- a/test/online/fetch_test.rb 2019-12-11 12:44:48.000000000 +0100
-+++ b/test/online/fetch_test.rb 2020-02-26 13:49:28.654033711 +0100
-@@ -45,18 +45,6 @@
- assert_equal({ valid: true, host: "github.com" }, args)
- end
-
-- def test_fetch_over_https_with_certificate_callback_fail
-- @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
--
-- exception = assert_raises Rugged::NetworkError do
-- @repo.fetch("origin", {
-- certificate_check: lambda { |valid, host| false }
-- })
-- end
--
-- assert_equal "user rejected certificate for github.com", exception.message
-- end
--
- def test_fetch_over_https_with_certificate_callback_exception
- @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
-
More information about the arch-commits
mailing list