[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Lars Wendler]

commit:     457b066c7b0068bd287180ad5bb0ab5dc3d95788
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 09:26:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May  3 09:47:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457b066c

dev-vcs/git: Fixed openrc init script shebang.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r1.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index b6ecfd9..df03162 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Mike Gilbert]

commit:     843954e66426a8e87c42a2c3d3d99ca6fa7d4744
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 19:59:36 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  8 19:59:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843954e6

dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon

Package-Manager: portage-2.2.28_p97

 dev-vcs/git/files/git-daemon_at.service | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
index 2a080d4..0a1bd14 100644
--- a/dev-vcs/git/files/git-daemon_at.service
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -5,9 +5,8 @@ Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
-EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Mike Gilbert]

commit:     e3d1d95bd9a6935fddfb0f4253d784c1b72564d3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 22:47:28 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  8 22:47:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d1d95b

Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon"

This reverts commit 843954e66426a8e87c42a2c3d3d99ca6fa7d4744.

 dev-vcs/git/files/git-daemon_at.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
index 0a1bd14..2a080d4 100644
--- a/dev-vcs/git/files/git-daemon_at.service
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -5,8 +5,9 @@ Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
+EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Robin H. Johnson]

commit:     e00b96011c71971123920187ca04dedff5cc1915
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Sun Nov 12 09:43:30 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 17:20:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00b9601

dev-vcs/git: update openrc init.d script

(cherry picked from commit 0b833f1e0a45466af5b1df0e302b9a64bfb3f757)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r1.initd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index da315cb3b09..78e5444ed4d 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -5,7 +5,8 @@
 pidfile="/var/run/git-daemon.pid"
 command="/usr/bin/git"
 command_args="daemon ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m"
 
 depend() {
 	use logger

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Aaron Bauman]

commit:     031b939d0b29fba6390863cad39fa3aefad3c05a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 16:47:40 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031b939d

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11269
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
deleted file mode 100644
index a874236dc65..00000000000
--- a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
---- git-2.5.1.orig/config.mak.uname	2015-08-28 15:37:13.000000000 -0400
-+++ git-2.5.1/config.mak.uname	2015-09-06 18:54:28.538437000 -0400
-@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
- 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
- endif
- ifeq ($(uname_S),FreeBSD)
--	NEEDS_LIBICONV = YesPlease
-+	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
-+		NEEDS_LIBICONV = YesPlease
-+	endif
- 	OLD_ICONV = YesPlease
- 	NO_MEMMEM = YesPlease
- 	BASIC_CFLAGS += -I/usr/local/include

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Sam James]

commit:     dc0e0cc69eb0aac984574a9be3ecf19eaca09806
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  1 23:42:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  1 23:43:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0e0cc6

dev-vcs/git: add missing patch

Fixes: 8421a765ad29bcf111da8f05bb74ff3df64d25c5
Bug: https://bugs.gentoo.org/751907
Closes: https://bugs.gentoo.org/811369
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
new file mode 100644
index 00000000000..fc6072bf733
--- /dev/null
+++ b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
@@ -0,0 +1,22 @@
+https://www.spinics.net/lists/git/msg417169.html
+https://bugs.gentoo.org/751907
+
+The test fails when ${D} is exported in the environment. It actually _shouldn't_
+be exported in src_test anyway, but Portage isn't yet fixed for this because
+it'll break misbehaving ebuilds (see e.g. pkgcheck's VariableScope warnings).
+
+Upstream are currently discussing other patches and work to find other cases
+of environment contamination.
+--- a/t/t5582-fetch-negative-refspec.sh
++++ b/t/t5582-fetch-negative-refspec.sh
+@@ -105,7 +105,6 @@ test_expect_success "fetch with negative pattern refspec does not expand prefix"
+ '
+
+ test_expect_success "fetch with negative refspec avoids duplicate conflict" '
+-	cd "$D" &&
+ 	(
+ 		cd one &&
+ 		git branch dups/a &&
+--
+2.30.2
+

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Lars Wendler]

commit:     5a4cc6f1b6146c6f07883aaa963fca2915abe1c9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 09:38:02 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 09:38:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4cc6f1

dev-vcs/git: Use /run for pidfile

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r2.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon-r2.initd b/dev-vcs/git/files/git-daemon-r2.initd
index 177458b27366..453fd608363f 100644
--- a/dev-vcs/git/files/git-daemon-r2.initd
+++ b/dev-vcs/git/files/git-daemon-r2.initd
@@ -2,7 +2,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-pidfile="/var/run/git-daemon.pid"
+pidfile="/run/git-daemon.pid"
 command="/usr/bin/git"
 command_args="daemon ${GITDAEMON_OPTS}"
 command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Robin H. Johnson]

commit:     37305aa8f6bd146c01c41ae9aca55b52c82c5193
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 20:04:55 2023 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 16:39:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37305aa8

dev-vcs/git: cleanup patches

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../git/files/git-2.7.0-mediawiki-500pages.patch   | 46 ----------
 .../git/files/git-2.7.0-mediawiki-namespaces.patch | 97 ----------------------
 .../git/files/git-2.7.0-mediawiki-subpages.patch   | 48 -----------
 3 files changed, 191 deletions(-)

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
deleted file mode 100644
index 0ce706db99a6..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Searching for pages using the MediaWiki API returns at most 500 results
-(hi Patrick). To get a list of all pages in a larger wiki, we need to run
-repeated searches...
-
-Source: https://github.com/moy/Git-Mediawiki/issues/32
-Author: anarcat https://github.com/anarcat
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f2ce311 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -259,16 +259,29 @@ sub get_mw_tracked_categories {
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
--	my $mw_pages = $mediawiki->list({
-+	my $query = {
- 		action => 'query',
- 		list => 'allpages',
- 		aplimit => 'max'
--	});
--	if (!defined($mw_pages)) {
-+	};
-+	my $curpage;
-+	my $oldpage = '';
-+	while (1) {
-+	if (defined($curpage)) {
-+		if ($oldpage eq $curpage) {
-+		    last;
-+		}
-+		$query->{apfrom} = $curpage;
-+		$oldpage = $curpage;
-+	    }
-+	    my $mw_pages = $mediawiki->list($query);
-+	    if (!defined($mw_pages)) {
- 		fatal_mw_error("get the list of wiki pages");
--	}
--	foreach my $page (@{$mw_pages}) {
-+	    }
-+	    foreach my $page (@{$mw_pages}) {
- 		$pages->{$page->{title}} = $page;
-+		$curpage = $page->{title};
-+	    }
- 	}
- 	return;
- }

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
deleted file mode 100644
index 72ab2126fa9c..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-source:
-https://gist.github.com/anarcat/f821fa285c6b8b6b16a5
-https://github.com/moy/Git-Mediawiki/issues/10
-
-
-From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001
-From: Kevin <kevin@ki-ai.org>
-Date: Fri, 28 Aug 2015 15:53:37 -0500
-Subject: [PATCH] Add namespace support to git-mediawiki
-
-Signed-off-by: Kevin <kevin@ki-ai.org>
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..662a5b5 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -17,6 +17,7 @@ use Git;
- use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe
- 					EMPTY HTTP_CODE_OK);
- use DateTime::Format::ISO8601;
-+use Scalar::Util;
- use warnings;
- 
- # By default, use UTF-8 to communicate with Git and the user
-@@ -63,6 +64,10 @@ chomp(@tracked_pages);
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Just like @tracked_categories, but for MediaWiki namespaces.
-+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
-+chomp(@tracked_namespaces);
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -256,6 +261,23 @@ sub get_mw_tracked_categories {
- 	return;
- }
- 
-+sub get_mw_tracked_namespaces {
-+    my $pages = shift;
-+    foreach my $local_namespace (@tracked_namespaces) {
-+        my $mw_pages = $mediawiki->list( {
-+            action => 'query',
-+            list => 'allpages',
-+            apnamespace => get_mw_namespace_id($local_namespace),
-+            aplimit => 'max' } )
-+            || die $mediawiki->{error}->{code} . ': '
-+                . $mediawiki->{error}->{details} . "\n";
-+        foreach my $page (@{$mw_pages}) {
-+            $pages->{$page->{title}} = $page;
-+        }
-+    }
-+    return;
-+}
-+
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
-@@ -319,6 +341,10 @@ sub get_mw_pages {
- 		$user_defined = 1;
- 		get_mw_tracked_categories(\%pages);
- 	}
-+    if (@tracked_namespaces) {
-+        $user_defined = 1;
-+        get_mw_tracked_namespaces(\%pages);
-+    }
- 	if (!$user_defined) {
- 		get_mw_all_pages(\%pages);
- 	}
-@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id;
- sub get_mw_namespace_id {
- 	$mediawiki = connect_maybe($mediawiki, $remotename, $url);
- 	my $name = shift;
--
- 	if (!exists $namespace_id{$name}) {
- 		# Look at configuration file, if the record for that namespace is
- 		# already cached. Namespaces are stored in form:
-@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id {
- sub get_mw_namespace_id_for_page {
- 	my $namespace = shift;
- 	if ($namespace =~ /^([^:]*):/) {
--		return get_mw_namespace_id($namespace);
-+		my ($ns, $id) = split(/:/, $namespace);
-+		if (Scalar::Util::looks_like_number($id)) {
-+			return get_mw_namespace_id($ns);
-+		} else{
-+			return
-+		}
- 	} else {
- 		return;
- 	}
--- 
-2.5.0

diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
deleted file mode 100644
index c798a894d3f8..000000000000
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001
-From: Lyubomyr Shaydariv <lyubomyr-shaydariv@users.noreply.github.com>
-Date: Fri, 11 Sep 2015 00:41:17 +0300
-Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories
-
-This is a fix for https://github.com/moy/Git-Mediawiki/issues/22
-The subdirectories option is enabled using -c remote.origin.subpageDirs=true
-during the cloning and it is not recommended to be modified in or
-removed from .git/config after the cloning.
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f3624be 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -63,6 +63,11 @@
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Use subdirectories for subpages
-+my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs");
-+chomp($use_subpage_dirs);
-+$use_subpage_dirs = ($use_subpage_dirs eq 'true');
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -689,6 +694,9 @@ sub fe_escape_path {
-     $path =~ s/\\/\\\\/g;
-     $path =~ s/"/\\"/g;
-     $path =~ s/\n/\\n/g;
-+    if ($use_subpage_dirs) {
-+        $path =~ s/%2F/\//g;
-+    }
-     return qq("${path}");
- }
- 
-@@ -927,7 +935,7 @@ sub mw_import_revids {
- 		# If this is a revision of the media page for new version
- 		# of a file do one common commit for both file and media page.
- 		# Else do commit only for that page.
--		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n";
-+		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n";
- 		import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile);
- 	}
- 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Conrad Kostecki]

commit:     ef96c5e1938bc4370bdd9678ffa793f431891976
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 12 17:45:14 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:40:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef96c5e1

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/git-2.37.2-darwin-prefix-gettext.patch   | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
deleted file mode 100644
index af267347e65e..000000000000
--- a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Don't examine outside of the prefix for gettext on macOS/Darwin.
-https://bugs.gentoo.org/757309
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -148,17 +148,6 @@ ifeq ($(uname_S),Darwin)
- 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
- 	CSPRNG_METHOD = arc4random
- 
--	# Workaround for `gettext` being keg-only and not even being linked via
--	# `brew link --force gettext`, should be obsolete as of
--	# https://github.com/Homebrew/homebrew-core/pull/53489
--	ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
--		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
--		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
--		ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
--			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
--		endif
--	endif
--
- 	# The builtin FSMonitor on MacOS builds upon Simple-IPC.  Both require
- 	# Unix domain sockets and PThreads.
- 	ifndef NO_PTHREADS

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Sam James]

commit:     738f2b07de654a4e7d0eeaed0e679ab2e2ddc4ee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 03:43:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  8 03:43:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738f2b07

dev-vcs/git: add upstream ref for meson deps patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch b/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch
index c28112663a3d..533a8b10803c 100644
--- a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch
+++ b/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch
@@ -1,3 +1,17 @@
+https://lore.kernel.org/git/371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org/
+
+From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001
+Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Wed, 8 Jan 2025 03:40:55 +0000
+Subject: [PATCH] meson: fix perl dependencies
+
+`generate_perl_command` needs `depends: [git_version_file]` and the uses
+in top-level meson.build were fine, but the ones in perl/ weren't, causing
+parallel build failures in some cases as GIT-BUILD-OPTIONS wasn't yet
+available.
+
+Signed-off-by: Sam James <sam@gentoo.org>
 --- a/perl/FromCPAN/Mail/meson.build
 +++ b/perl/FromCPAN/Mail/meson.build
 @@ -4,4 +4,5 @@ test_dependencies += custom_target(
@@ -72,3 +86,6 @@
  )
  
  subdir('Git')
+-- 
+2.48.0.rc2.29.g7bab57bd98
+

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Ionen Wolkens]

commit:     1a95f5bad210d7dcafbc1160c8e6197bbf3732bf
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan 10 15:58:32 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 21:41:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a95f5ba

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-vcs/git/files/git-2.47.0-maintenance.patch | 85 --------------------------
 1 file changed, 85 deletions(-)

diff --git a/dev-vcs/git/files/git-2.47.0-maintenance.patch b/dev-vcs/git/files/git-2.47.0-maintenance.patch
deleted file mode 100644
index 085d4adac33f..000000000000
--- a/dev-vcs/git/files/git-2.47.0-maintenance.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://lore.kernel.org/git/CAG=Um+0mJW-oAH+YLC3dWEU64JwS-zMkkTiFWYBe4g6HMbe-iA@mail.gmail.com/
-https://github.com/git/git/commit/c95547a394a35dc26afa686454086d2db6e51ea4
-
-From c95547a394a35dc26afa686454086d2db6e51ea4 Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@pks.im>
-Date: Thu, 10 Oct 2024 07:33:01 +0200
-Subject: [PATCH] builtin/gc: fix crash when running `git maintenance start`
-
-It was reported on the mailing list that running `git maintenance start`
-immediately segfaults starting with b6c3f8e12c (builtin/maintenance: fix
-leak in `get_schedule_cmd()`, 2024-09-26). And indeed, this segfault is
-trivial to reproduce up to a point where one is scratching their head
-why we didn't catch this regression in our test suite.
-
-The root cause of this error is `get_schedule_cmd()`, which does not
-populate the `out` parameter in all cases anymore starting with the
-mentioned commit. Callers do assume it to always be populated though and
-will e.g. call `strvec_split()` on the returned value, which will of
-course segfault when the variable is uninitialized.
-
-So why didn't we catch this trivial regression? The reason is that our
-tests always set up the "GIT_TEST_MAINT_SCHEDULER" environment variable
-via "t/test-lib.sh", which allows us to override the scheduler command
-with a custom one so that we don't accidentally modify the developer's
-system. But the faulty code where we don't set the `out` parameter will
-only get hit in case that environment variable is _not_ set, which is
-never the case when executing our tests.
-
-Fix the regression by again unconditionally allocating the value in the
-`out` parameter, if provided. Add a test that unsets the environment
-variable to catch future regressions in this area.
-
-Reported-by: Shubham Kanodia <shubham.kanodia10@gmail.com>
-Signed-off-by: Patrick Steinhardt <ps@pks.im>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
---- a/builtin/gc.c
-+++ b/builtin/gc.c
-@@ -1794,7 +1794,7 @@ static const char *get_frequency(enum schedule_priority schedule)
-  *     | Input |                     Output                      |
-  *     | *cmd  | return code |       *out        | *is_available |
-  *     +-------+-------------+-------------------+---------------+
-- *     | "foo" |    false    | NULL              |  (unchanged)  |
-+ *     | "foo" |    false    | "foo" (allocated) |  (unchanged)  |
-  *     +-------+-------------+-------------------+---------------+
-  *
-  *   GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh”
-@@ -1812,8 +1812,11 @@ static int get_schedule_cmd(const char *cmd, int *is_available, char **out)
- 	struct string_list_item *item;
- 	struct string_list list = STRING_LIST_INIT_NODUP;
- 
--	if (!testing)
-+	if (!testing) {
-+		if (out)
-+			*out = xstrdup(cmd);
- 		return 0;
-+	}
- 
- 	if (is_available)
- 		*is_available = 0;
---- a/t/t7900-maintenance.sh
-+++ b/t/t7900-maintenance.sh
-@@ -646,6 +646,22 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' '
- 		maintenance.repo "$(pwd)/$META"
- '
- 
-+test_expect_success 'start without GIT_TEST_MAINT_SCHEDULER' '
-+	test_when_finished "rm -rf systemctl.log script repo" &&
-+	mkdir script &&
-+	write_script script/systemctl <<-\EOF &&
-+	echo "$*" >>../systemctl.log
-+	EOF
-+	git init repo &&
-+	(
-+		cd repo &&
-+		sane_unset GIT_TEST_MAINT_SCHEDULER &&
-+		PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd
-+	) &&
-+	test_grep -- "--user list-timers" systemctl.log &&
-+	test_grep -- "enable --now git-maintenance@" systemctl.log
-+'
-+
- test_expect_success 'start --scheduler=<scheduler>' '
- 	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
- 	test_grep "unrecognized --scheduler argument" err &&
-

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Sam James]

commit:     447c784b7f6275099d1f61518de08faa9724d528
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 06:39:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 06:39:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447c784b

dev-vcs/git: add upstream ref to patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/files/git-2.48.0-doc-deps.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dev-vcs/git/files/git-2.48.0-doc-deps.patch b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
index 83efd62ab38d..847e96368f08 100644
--- a/dev-vcs/git/files/git-2.48.0-doc-deps.patch
+++ b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
@@ -1,3 +1,24 @@
+https://lore.kernel.org/git/79de1bcf31f708960a889066ce3d986e55155ad8.1736577530.git.sam@gentoo.org/
+
+From 79de1bcf31f708960a889066ce3d986e55155ad8 Mon Sep 17 00:00:00 2001
+Message-ID: <79de1bcf31f708960a889066ce3d986e55155ad8.1736577546.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 11 Jan 2025 06:37:48 +0000
+Subject: [PATCH] meson: fix perl dependencies for Documentation
+
+We need an explicit `depends: documentation_deps` so that all of our
+Documentation targets know they require asciidoc.conf. This shows up
+as parallel build failures with it not yet being available.
+
+Other targets look OK already.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Documentation/technical/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
+index 21dfb8b5c9..8c93da3566 100644
 --- a/Documentation/technical/meson.build
 +++ b/Documentation/technical/meson.build
 @@ -42,6 +42,7 @@ api_index = custom_target(
@@ -16,3 +37,6 @@
      install: true,
      install_dir: get_option('datadir') / 'doc/git-doc/technical',
    )
+-- 
+2.48.0.rc2
+

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/files/

[Conrad Kostecki]

commit:     32651200e51f48cbaa457776b3820679e08a6252
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jan 15 18:51:42 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:48:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32651200

dev-vcs/git: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch | 91 -----------------------
 1 file changed, 91 deletions(-)

diff --git a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch b/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch
deleted file mode 100644
index 533a8b10803c..000000000000
--- a/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://lore.kernel.org/git/371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org/
-
-From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001
-Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Wed, 8 Jan 2025 03:40:55 +0000
-Subject: [PATCH] meson: fix perl dependencies
-
-`generate_perl_command` needs `depends: [git_version_file]` and the uses
-in top-level meson.build were fine, but the ones in perl/ weren't, causing
-parallel build failures in some cases as GIT-BUILD-OPTIONS wasn't yet
-available.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/perl/FromCPAN/Mail/meson.build
-+++ b/perl/FromCPAN/Mail/meson.build
-@@ -4,4 +4,5 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail',
-+  depends: [git_version_file],
- )
---- a/perl/FromCPAN/meson.build
-+++ b/perl/FromCPAN/meson.build
-@@ -4,6 +4,7 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5/FromCPAN',
-+  depends: [git_version_file],
- )
- 
- subdir('Mail')
---- a/perl/Git/LoadCPAN/Mail/meson.build
-+++ b/perl/Git/LoadCPAN/Mail/meson.build
-@@ -4,4 +4,5 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail',
-+  depends: [git_version_file],
- )
---- a/perl/Git/LoadCPAN/meson.build
-+++ b/perl/Git/LoadCPAN/meson.build
-@@ -4,6 +4,7 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN',
-+  depends: [git_version_file],
- )
- 
- subdir('Mail')
---- a/perl/Git/SVN/Memoize/meson.build
-+++ b/perl/Git/SVN/Memoize/meson.build
-@@ -4,4 +4,5 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5/Git/SVN',
-+  depends: [git_version_file],
- )
---- a/perl/Git/SVN/meson.build
-+++ b/perl/Git/SVN/meson.build
-@@ -14,6 +14,7 @@ foreach source : [
-     command: generate_perl_command,
-     install: true,
-     install_dir: get_option('datadir') / 'perl5/Git/SVN',
-+    depends: [git_version_file],
-   )
- endforeach
- 
---- a/perl/Git/meson.build
-+++ b/perl/Git/meson.build
-@@ -11,6 +11,7 @@ foreach source : [
-     command: generate_perl_command,
-     install: true,
-     install_dir: get_option('datadir') / 'perl5/Git',
-+    depends: [git_version_file],
-   )
- endforeach
- 
---- a/perl/meson.build
-+++ b/perl/meson.build
-@@ -4,6 +4,7 @@ test_dependencies += custom_target(
-   command: generate_perl_command,
-   install: true,
-   install_dir: get_option('datadir') / 'perl5',
-+  depends: [git_version_file],
- )
- 
- subdir('Git')
--- 
-2.48.0.rc2.29.g7bab57bd98
-