Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
cgit
Commits:
84603986 by Christian Hesse at 2024-11-25T12:56:26+01:00
upgpkg: 1.2.3.r70.g09d24d7-4: build with git 2.47.1
- - - - -
3 changed files:
- .SRCINFO
- 0001-for-jason.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = cgit
pkgdesc = A web interface for git written in plain C
pkgver = 1.2.3.r70.g09d24d7
- pkgrel = 3
+ pkgrel = 4
url = https://git.zx2c4.com/cgit/
install = cgit.install
arch = x86_64
@@ -31,7 +31,7 @@ pkgbase = cgit
validpgpkeys = AB9942E6D4A4CFC3412620A749FC7012A5DE03AE
sha256sums =
423a95f4fee9bdc5a50e332703d5e5f5289f523f620e275d26b950d92ae5a836
sha256sums = SKIP
- sha256sums =
2c0fcd821015f7d27e2086fd4b7765bcfb51f6604486846a7122436c8a777e7c
+ sha256sums =
dd9b5eeb638bacbda1433fc414df9a8c3657dd7feec72aa10e99658dcecf01e2
sha256sums =
4004b72d433e5810b046fc6019171a11a0dae3e9c6b29a44f16ed41705c46c3d
sha256sums =
89927d462c0504863c163eb8a210e5d65db30ee6e4300ff6a2f92460e4f20a62
=====================================
0001-for-jason.patch
=====================================
@@ -1,7 +1,7 @@
From 87fdb57d6040a71f261b2e87112492c281cd5246 Mon Sep 17 00:00:00 2001
From: Christian Hesse <[email protected]>
Date: Sat, 14 Sep 2024 21:51:14 +0200
-Subject: [PATCH] git: update to v2.46.1
+Subject: [PATCH 1/4] git: update to v2.46.1
Update to git version v2.46.1, no additional changes required.
@@ -35,7 +35,7 @@ index 39bf06a..a731929 160000
From 1cb701a9b615acf2d4a9f5c6c2668cd11343e124 Mon Sep 17 00:00:00 2001
From: Christian Hesse <[email protected]>
Date: Tue, 24 Sep 2024 07:49:00 +0200
-Subject: [PATCH] git: update to v2.46.2
+Subject: [PATCH 2/4] git: update to v2.46.2
Update to git version v2.46.2, no additional changes required.
@@ -69,7 +69,7 @@ index a731929..4f71522 160000
From c1733e28d91bea5647e11fe099751fbc839669d7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <[email protected]>
Date: Thu, 26 Sep 2024 19:41:29 +0200
-Subject: [PATCH] git: update to v2.47.0
+Subject: [PATCH 3/4] git: update to v2.47.0
Update to git version v2.47.0, this requires changes for these
upstream commits:
@@ -183,3 +183,37 @@ index 6fae72d..4250b89 100644
{
char *name = (char *)refname;
html_option(name, name, ctx.qry.head);
+
+From 99a2f47c96b1d01c642d4bad0f7e2a6d27f5df99 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Mon, 25 Nov 2024 10:04:00 +0100
+Subject: [PATCH 4/4] git: update to v2.47.1
+
+Update to git version v2.47.1, no additional changes required.
+
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ Makefile | 2 +-
+ git | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 27b50ee..1cc9b86 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ htmldir = $(docdir)
+ pdfdir = $(docdir)
+ mandir = $(prefix)/share/man
+ SHA1_HEADER = <openssl/sha.h>
+-GIT_VER = 2.47.0
++GIT_VER = 2.47.1
+ GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+ INSTALL = install
+ COPYTREE = cp -r
+diff --git a/git b/git
+index 777489f..92999a4 160000
+--- a/git
++++ b/git
+@@ -1 +1 @@
+-Subproject commit 777489f9e09c8d0dd6b12f9d90de6376330577a2
++Subproject commit 92999a42db1c5f43f330e4f2bca4026b5b81576f
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@
pkgname=cgit
_commit='09d24d7cd0b7e85633f2f43808b12871bb209d69'
pkgver=1.2.3.r70.g09d24d7
-pkgrel=3
+pkgrel=4
pkgdesc='A web interface for git written in plain C'
arch=('x86_64')
url='https://git.zx2c4.com/cgit/'
@@ -35,7 +35,7 @@ source=("git+https://git.zx2c4.com/cgit.git#commit=${_commit}";
'apache.example.conf')
sha256sums=('423a95f4fee9bdc5a50e332703d5e5f5289f523f620e275d26b950d92ae5a836'
'SKIP'
- '2c0fcd821015f7d27e2086fd4b7765bcfb51f6604486846a7122436c8a777e7c'
+ 'dd9b5eeb638bacbda1433fc414df9a8c3657dd7feec72aa10e99658dcecf01e2'
'4004b72d433e5810b046fc6019171a11a0dae3e9c6b29a44f16ed41705c46c3d'
'89927d462c0504863c163eb8a210e5d65db30ee6e4300ff6a2f92460e4f20a62')
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cgit/-/commit/84603986d2dbf3951aedf42c999316aa9619e587
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cgit/-/commit/84603986d2dbf3951aedf42c999316aa9619e587
You're receiving this email because of your account on gitlab.archlinux.org.
