From 7f787cf63fa2a997c36707dc1cf9375a7ebaec9b Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 19 Aug 2023 04:37:35 +0300 Subject: [PATCH] upg libgit2 add LICENSE to all repos --- LICENSE | 9 ++++++--- libgit2/PKGBUILD | 29 +++++++++++++---------------- libgit2/PKGBUILD-arch | 25 +++++-------------------- libgit2/time | 8 +++++--- 4 files changed, 29 insertions(+), 42 deletions(-) diff --git a/LICENSE b/LICENSE index b075906..03dd86f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,12 @@ -ISC License: +ISC License modified: -Copyleft (c) 2021-2022 by joborun-linux joborun@disroot.org +Copyleft (c) 2021-2023 by joborun-linux joborun@disroot.org Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") Copyright (c) 1995-2003 by Internet Software Consortium -Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +Permission to use, copy, modify, and/or distribute this software for any purpose to individuals or collectives but not +to corporations or other "legal entities" with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +Any corporations or other "legal entities" must seek written approval for using, copying, modifying, and/or distributing, this software. THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + diff --git a/libgit2/PKGBUILD b/libgit2/PKGBUILD index fe12b4e..6e25ea3 100644 --- a/libgit2/PKGBUILD +++ b/libgit2/PKGBUILD @@ -6,24 +6,22 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libgit2 -pkgver=1.7.0 -pkgrel=03 +pkgver=1.7.1 +pkgrel=01 epoch=1 pkgdesc="A linkable library for Git" url="https://github.com/libgit2/libgit2" depends=(gcc-libs glibc http-parser zlib) makedepends=(cmake libssh2 openssl python pcre2) provides=(libgit2.so) -source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz - $pkgname-1.7.0-git_oidarray_include.patch - $pkgname-1.7.0-cleanup_grafts.patch::https://github.com/libgit2/libgit2/commit/9d4c550564ee254dda9e2620c4c1e32ebb529728.patch) +source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) -prepare() { +#prepare() { # add missing include needed when registering custom transports: https://github.com/libgit2/libgit2/issues/6607 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-git_oidarray_include.patch +# patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-git_oidarray_include.patch # make reuse of grafts "safe" - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-cleanup_grafts.patch -} +# patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-cleanup_grafts.patch +#} build() { local cmake_options=( @@ -79,15 +77,14 @@ arch=(x86_64) license=(GPL2) -sha256sums=(d9d0f84a86bf98b73e68997f5c1543cc5067d0ca9c7a5acaba3e8d117ecefef3 # libgit2-v1.7.0.tar.gz - b4a4897fd376ee94e30f3d695194614062fc87ec22ccb249c86d71afbc2c5d92 # libgit2-1.7.0-git_oidarray_include.patch - 1c921387370c10a08d8db0143b70f94be205cc1e4af7faf3626f673d244747da) # libgit2-1.7.0-cleanup_grafts.patch +sha256sums=(17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327) # libgit2-v1.7.1.tar.gz + +## c06759538a08e93c065956b17c8659e8d8a557c627fd0b9e2a673742e2b0464a libgit2-1_1.7.1-01-x86_64.pkg.tar.lz -## 2410e0bcc920f5b0b719d0720578eb587406c7d8ab43108950c223e0d65cd1b4 libgit2-1:1.7.0-03-x86_64.pkg.tar.lz # Note to packager: -ls -l *pkg.tar.lz -echo "you must rename this package to meet SF naming before you move to the repo" -mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log +#ls -l *pkg.tar.lz +#echo "you must rename this package to meet SF naming before you move to the repo" +#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log diff --git a/libgit2/PKGBUILD-arch b/libgit2/PKGBUILD-arch index a2d38fc..a33431a 100644 --- a/libgit2/PKGBUILD-arch +++ b/libgit2/PKGBUILD-arch @@ -6,8 +6,8 @@ pkgname=libgit2 # NOTE: add the following packages to rebuild TODOs on soname change (although they do not link against libgit2.so): # julia -pkgver=1.7.0 -pkgrel=3 +pkgver=1.7.1 +pkgrel=1 epoch=1 pkgdesc="A linkable library for Git" arch=(x86_64) @@ -27,24 +27,9 @@ makedepends=( python ) provides=(libgit2.so) -source=( - $url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz - $pkgname-1.7.0-git_oidarray_include.patch - $pkgname-1.7.0-cleanup_grafts.patch::https://github.com/libgit2/libgit2/commit/9d4c550564ee254dda9e2620c4c1e32ebb529728.patch -) -sha512sums=('68c8ed289de7daccaec17ea2ac49f4610325595cf90cddef763a31546a0a1c6bd400bf6180b68e2d3a8bdc3d031328efbbbaf3b61467dfc1b944e8cf3efcfd69' - 'c39992e337da29038784976ebcc37ee246870042c0342a4baa06ad0542df8bc20fcd8ad45ab4c45ab8074ce5905ae9d963d51a16f870afb59e8f6b71a357d4a5' - '0ec0580e08df3f08d8609b35f91eba9b665fdf2ad1eb6ca68b0745fbf7b86c344bef370b325211892ac6f5040e147241808994edbc10ff3822363c800857eb93') -b2sums=('3382efb1f82e5598eae9f72b145fc8cc19876d925ae94513e42e5e8bedfbb923387d3c5d4c80f1333fe6b07e5d96866d4d0776b2190a50f6929862f943815d8f' - '6b2cc62400816851c0e0b7b491aa78bb73fa8f15d37a31e816745a53c2a1a3d96fc724b5c9b050d2c4af7f31fc4856aa31c26c7b7a63525d008bb0a6d1bfdabf' - 'eb204485404ce55c0881a41b946c58b70e1814ee17e8accea786e802d4c8c3a069d63886615433f278277a8b4c67d9a3a6125fea78dafda4cbad3b5204f29245') - -prepare() { - # add missing include needed when registering custom transports: https://github.com/libgit2/libgit2/issues/6607 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-git_oidarray_include.patch - # make reuse of grafts "safe" - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.7.0-cleanup_grafts.patch -} +source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) +sha512sums=('08e60dde0cdf57006cf0c5f27a82220aba8d701bf7d6d709ffe312975ffa5dbef009ccb1e7cbe570b9502f4361d06ace44dbfd9a5f5f8ad08e9b0ca05bef765e') +b2sums=('9c50d3c25d1cc58e5fab60b4c438c91479dd57138a14a48a8b692bb6b43733f59759172043c94198df63fa1e4eb40c548bb78c94bc57fb99682059be57a5c3e2') build() { local cmake_options=( diff --git a/libgit2/time b/libgit2/time index ceb464c..da82f5c 100644 --- a/libgit2/time +++ b/libgit2/time @@ -1,4 +1,6 @@ -real 2m44.089s -user 2m54.741s -sys 0m26.889s + +real 5m4.770s +user 2m25.930s +sys 0m26.605s +