Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gitolite for openSUSE:Factory
checked in at 2023-07-28 22:20:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gitolite (Old)
and /work/SRC/openSUSE:Factory/.gitolite.new.32662 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitolite"
Fri Jul 28 22:20:33 2023 rev:12 rq:1101158 version:3.6.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/gitolite/gitolite.changes 2022-07-18
18:33:13.493696681 +0200
+++ /work/SRC/openSUSE:Factory/.gitolite.new.32662/gitolite.changes
2023-07-28 22:20:37.113291444 +0200
@@ -1,0 +2,8 @@
+Fri Jul 21 15:23:41 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 3.6.13:
+ * remove the "description" file on new repos, to fix a bug
+ created by an optimisation made 6 years ago in 3.6.8 (and
+ was caught only in 2022 or so!)
+
+-------------------------------------------------------------------
Old:
----
gitolite-3.6.12.tar.gz
New:
----
gitolite-3.6.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gitolite.spec ++++++
--- /var/tmp/diff_new_pack.PFbU5v/_old 2023-07-28 22:20:37.793295578 +0200
+++ /var/tmp/diff_new_pack.PFbU5v/_new 2023-07-28 22:20:37.797295602 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gitolite
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define gitolite_homedir /srv/gitolite
%define git_user git
Name: gitolite
-Version: 3.6.12
+Version: 3.6.13
Release: 0
Summary: Server for git directory version tracker
License: GPL-2.0-or-later
++++++ gitolite-3.6.12.tar.gz -> gitolite-3.6.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/CHANGELOG
new/gitolite-3.6.13/CHANGELOG
--- old/gitolite-3.6.12/CHANGELOG 2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/CHANGELOG 2023-07-14 05:02:24.000000000 +0200
@@ -1,4 +1,10 @@
-2020-08-04 v3.6.12 mirroring terminoligy changes
+2023-07-14 v3.6.13 only one important fix:
+
+ remove the "description" file on new repos, to fix a bug
+ created by an optimisation made 6 years ago in 3.6.8 (and
+ was caught only in 2022 or so!)
+
+2020-08-04 v3.6.12 mirroring terminology changes
install script can now modify #! lines when using a custom
perl executable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/CONTRIBUTING
new/gitolite-3.6.13/CONTRIBUTING
--- old/gitolite-3.6.12/CONTRIBUTING 2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/CONTRIBUTING 2023-07-14 05:02:24.000000000 +0200
@@ -1,4 +1,4 @@
-Go to http://gitolite.com/gitolite/index.html#contact for information on
+Go to http://gitolite.com/gitolite/index.html#contactsupport for information on
contacting me, the mailing list, and IRC channel. *Unless you are reporting
what you think is a security issue, I prefer you send to the mailing list,
not to me directly.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/contrib/commands/ukm
new/gitolite-3.6.13/contrib/commands/ukm
--- old/gitolite-3.6.12/contrib/commands/ukm 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/contrib/commands/ukm 2023-07-14 05:02:24.000000000
+0200
@@ -10,8 +10,8 @@
=for usage
Usage for this command is not that simple. Please read the full
documentation in
-https://github.com/sitaramc/gitolite-doc/blob/master/contrib/ukm.mkd
-or online at http://gitolite.com/gitolite/ukm.html.
+https://github.com/sitaramc/gitolite-doc/blob/master/docs/contrib/ukm.mkd
+or online at http://gitolite.com/gitolite/contrib/ukm.html.
=cut
usage() if @ARGV and $ARGV[0] eq '-h';
@@ -293,7 +293,7 @@
# This function is only relavant for guest key managers.
# It returns true if the pattern is OK and false otherwise.
sub required_guest_keyid {
- my ($_) = @_;
+ local ($_) = @_;
/$required_guest_pattern/ and ! /$forbidden_guest_pattern/;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gitolite-3.6.12/contrib/hooks/repo-specific/save-push-signatures
new/gitolite-3.6.13/contrib/hooks/repo-specific/save-push-signatures
--- old/gitolite-3.6.12/contrib/hooks/repo-specific/save-push-signatures
2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/contrib/hooks/repo-specific/save-push-signatures
2023-07-14 05:02:24.000000000 +0200
@@ -25,10 +25,10 @@
# Relevant gitolite doc links:
# repo-specific environment variables
-# http://gitolite.com/gitolite/dev-notes.html#rsev
+#
http://gitolite.com/gitolite/dev-notes.html#appendix-1-repo-specific-environment-variables
# repo-specific hooks
-# http://gitolite.com/gitolite/non-core.html#rsh
-#
http://gitolite.com/gitolite/cookbook.html#v3.6-variation-repo-specific-hooks
+# http://gitolite.com/gitolite/non-core.html#repo-specific-hooks
+#
http://gitolite.com/gitolite/cookbook.html#v36-variation-repo-specific-hooks
# Environment:
# GIT_PUSH_CERT_NONCE_STATUS should be "OK" (as mentioned above)
@@ -143,7 +143,42 @@
GIT_INDEX_FILE=push_certs_index; export GIT_INDEX_FILE
# prepare the special ref to receive commits
- PUSH_CERTS=refs/push-certs
+ # historically this hook put the certs in a ref named refs/push-certs
+ # however, git does *NOT* replicate single-level refs
+ # trying to push them explicitly causes this error:
+ # remote: error: refusing to create funny ref 'refs/push-certs' remotely
+ #
https://lore.kernel.org/git/robbat2-20211115t063838-6127924...@orbis-terrarum.net/
+ #
+ # As a good-enough solution, use the namespace of meta/ for the refs.
+ # This is already used in other systems:
+ # - kernel.org refs/meta/cgit
+ # - gerrit refs/meta/config
+ # - GitBlit reflog: refs/meta/gitblit
https://www.gitblit.com/administration.html#H12
+ # - cc-utils refs/meta/ci
+ # - JGit refs/meta/push-certs
https://www.ibm.com/docs/en/radfws/9.6.1?topic=SSRTLW_9.6.1/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/4.1.htm
+ #
+ # To migrate from old to new, for each repo:
+ # git update-ref refs/meta/push-certs refs/push-certs
+ PUSH_CERTS_EXTRA_REFS='' PUSH_CERTS='' # These vars will be populated
after checks.
+ # others vars are temp
+ _OLD_PUSH_CERTS=refs/push-certs
+ _NEW_PUSH_CERTS=refs/meta/push-certs
+ _OLD_PUSH_CERTS_EXISTS=0
+ _NEW_PUSH_CERTS_EXISTS=0
+ git show-ref --verify --quiet -- "$_OLD_PUSH_CERTS" &&
_OLD_PUSH_CERTS_EXISTS=1
+ git show-ref --verify --quiet -- "$_NEW_PUSH_CERTS" &&
_NEW_PUSH_CERTS_EXISTS=1
+ case "${_OLD_PUSH_CERTS_EXISTS}${_NEW_PUSH_CERTS_EXISTS}" in
+ # neither or new only:
+ # let's push to the NEW name only
+ '00'|'01') PUSH_CERTS=$_NEW_PUSH_CERTS ;;
+ # old-only: stick to the same, the migration is opt-in
+ '10') PUSH_CERTS=$_OLD_PUSH_CERTS ;;
+ # Both: Push to the old name, duplicate to the new name
+ '11') PUSH_CERTS=$_OLD_PUSH_CERTS
PUSH_CERTS_EXTRA_REFS=$_NEW_PUSH_CERTS ;;
+ esac
+ # cleanup vars
+ unset _OLD_PUSH_CERTS_EXISTS _NEW_PUSH_CERTS_EXISTS _OLD_PUSH_CERTS
_NEW_PUSH_CERTS
+
if git rev-parse -q --verify $PUSH_CERTS >/dev/null
then
git read-tree $PUSH_CERTS
@@ -151,7 +186,9 @@
git read-tree --empty
T=$(git write-tree)
C=$(echo 'start' | git commit-tree $T)
- git update-ref $PUSH_CERTS $C
+ for _ref in $PUSH_CERTS $PUSH_CERTS_EXTRA_REFS ; do
+ git update-ref "${_ref}" "${C}"
+ done
fi
# for each cert blob...
@@ -179,7 +216,9 @@
T=$(git write-tree)
C=$( git commit-tree -p $PUSH_CERTS $T < $cf )
- git update-ref $PUSH_CERTS $C
+ for _ref in $PUSH_CERTS $PUSH_CERTS_EXTRA_REFS ; do
+ git update-ref "${_ref}" "${C}"
+ done
rm -f $cf
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gitolite-3.6.12/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm
new/gitolite-3.6.13/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm
--- old/gitolite-3.6.12/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm
2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm
2023-07-14 05:02:24.000000000 +0200
@@ -27,7 +27,7 @@
* add this code as lib/Gitolite/Triggers/RedmineUserAlias.pm to your
site-local code directory; see this link for how:
- http://gitolite.com/gitolite/non-core.html#ncloc
+ http://gitolite.com/gitolite/non-core.html#locations
* add the following to the rc file, just before the ENABLE section (don't
forget the trailing comma):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/contrib/triggers/IP-check
new/gitolite-3.6.13/contrib/triggers/IP-check
--- old/gitolite-3.6.12/contrib/triggers/IP-check 2020-08-04
15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/contrib/triggers/IP-check 2023-07-14
05:02:24.000000000 +0200
@@ -8,12 +8,12 @@
# Notice how repo-specific information is being passed to this code (bullet 3
# below). For more on that, see:
-#
https://gitolite.com/gitolite/dev-notes/#appendix-1-repo-specific-environment-variables
+#
https://gitolite.com/gitolite/dev-notes#appendix-1-repo-specific-environment-variables
# Instructions:
# 1. put this in an appropriate triggers directory (read about non-core
-# code at http://gitolite.com/gitolite/non-core/ for more on this; the
+# code at http://gitolite.com/gitolite/non-core for more on this; the
# cookbook may also help here).
# 2. add a line:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/contrib/utils/ad_groups.sh
new/gitolite-3.6.13/contrib/utils/ad_groups.sh
--- old/gitolite-3.6.12/contrib/utils/ad_groups.sh 2020-08-04
15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/contrib/utils/ad_groups.sh 2023-07-14
05:02:24.000000000 +0200
@@ -6,7 +6,7 @@
# Given a username,
# Provides a space-separated list of groups that the user is a member of.
#
-# see http://gitolite.com/gitolite/conf.html#ldap
+# see http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap
# GROUPLIST_PGM => /path/to/ldap_groups.sh
# Be sure to add your domain CA to the trusted certificates in
/etc/openldap/ldap.conf using the TLS_CACERT option or you'll get certificate
validation errors
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/contrib/utils/ldap_groups.sh
new/gitolite-3.6.13/contrib/utils/ldap_groups.sh
--- old/gitolite-3.6.12/contrib/utils/ldap_groups.sh 2020-08-04
15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/contrib/utils/ldap_groups.sh 2023-07-14
05:02:24.000000000 +0200
@@ -5,7 +5,7 @@
# Given a username,
# Provides a space-separated list of groups that the user is a member of.
#
-# see http://gitolite.com/gitolite/conf.html#ldap
+# see http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap
# GROUPLIST_PGM => /path/to/ldap_groups.sh
ldap_groups() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/commands/help
new/gitolite-3.6.13/src/commands/help
--- old/gitolite-3.6.12/src/commands/help 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/src/commands/help 2023-07-14 05:02:24.000000000
+0200
@@ -12,7 +12,12 @@
Prints a list of custom commands available at this gitolite installation.
-Each command has its own help, accessed by passing it '-h' again.
+Each command has (or should have!) its own help, accessed by passing it the
+'-h' option; e.g., "gitolite access -h".
+
+NOTE: These commands are found in the commands subdirectory (see the page on
+"core and non-core gitolite" in the documentation). Gitolite also has some
+built-in commands; run just "gitolite", with no arguments, to see those.
=cut
usage() if @ARGV;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/commands/option
new/gitolite-3.6.13/src/commands/option
--- old/gitolite-3.6.12/src/commands/option 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/src/commands/option 2023-07-14 05:02:24.000000000
+0200
@@ -31,7 +31,7 @@
# gitolite "options"
# http://gitolite.com/gitolite/options.html
# the "include" statement
-# http://gitolite.com/gitolite/conf.html#include
+# http://gitolite.com/gitolite/conf.html#include-files
# setup:
# 1. Enable the command by adding it to the ENABLE list in the rc file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/commands/sskm
new/gitolite-3.6.13/src/commands/sskm
--- old/gitolite-3.6.12/src/commands/sskm 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/src/commands/sskm 2023-07-14 05:02:24.000000000
+0200
@@ -8,7 +8,7 @@
=for usage
Usage for this command is not that simple. Please read the full documentation
-in doc/sskm.mkd or online at http://gitolite.com/gitolite/sskm.html.
+in doc/sskm.mkd or online at http://gitolite.com/gitolite/contrib/sskm.html.
=cut
usage() if @ARGV and $ARGV[0] eq '-h';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/lib/Gitolite/Conf/Load.pm
new/gitolite-3.6.13/src/lib/Gitolite/Conf/Load.pm
--- old/gitolite-3.6.12/src/lib/Gitolite/Conf/Load.pm 2020-08-04
15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/src/lib/Gitolite/Conf/Load.pm 2023-07-14
05:02:24.000000000 +0200
@@ -662,7 +662,7 @@
in your rc file[1], gitolite cannot expand group names completely; only your
external database can.
-[1]: http://gitolite.com/gitolite/conf.html#ldap
+[1]: http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/lib/Gitolite/Conf/Store.pm
new/gitolite-3.6.13/src/lib/Gitolite/Conf/Store.pm
--- old/gitolite-3.6.12/src/lib/Gitolite/Conf/Store.pm 2020-08-04
15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/src/lib/Gitolite/Conf/Store.pm 2023-07-14
05:02:24.000000000 +0200
@@ -209,6 +209,7 @@
_mkdir("$repo.git");
_chdir("$repo.git");
_system("git init --bare >&2");
+ unlink "description";
_chdir( $rc{GL_REPO_BASE} );
hook_1($repo);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/src/lib/Gitolite/Rc.pm
new/gitolite-3.6.13/src/lib/Gitolite/Rc.pm
--- old/gitolite-3.6.12/src/lib/Gitolite/Rc.pm 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/src/lib/Gitolite/Rc.pm 2023-07-14 05:02:24.000000000
+0200
@@ -564,7 +564,7 @@
# or you can use this, which lets you put everything in a subdirectory
# called "local" in your gitolite-admin repo. For a SECURITY WARNING
- # on this, see http://gitolite.com/gitolite/non-core.html#pushcode
+ # on this, see
http://gitolite.com/gitolite/non-core.html#using-the-gitolite-admin-repo-to-manage-non-core-code
# LOCAL_CODE => "$rc{GL_ADMIN_BASE}/local",
# ------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/t/README new/gitolite-3.6.13/t/README
--- old/gitolite-3.6.12/t/README 2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/t/README 2023-07-14 05:02:24.000000000 +0200
@@ -29,7 +29,7 @@
GITOLITE_TEST=y prove
http://gitolite.com/gitolite/testing.html has more details. Alternatively,
-http://gitolite.com/gitolite/req.html#trying will help you try out gitolite if
+https://gitolite.com/gitolite/install.html#trying-out-gitolite-safely will
help you try out gitolite if
you want to play with gitolite safely.
# RUNNING THE HTTP AND MIRROR TESTS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/t/git-config.t
new/gitolite-3.6.13/t/git-config.t
--- old/gitolite-3.6.12/t/git-config.t 2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/t/git-config.t 2023-07-14 05:02:24.000000000 +0200
@@ -64,7 +64,7 @@
my $rb = `gitolite query-rc -n GL_REPO_BASE`;
try "
cd $rb; ok
- egrep foo\\|bar *.git/config
+ grep -E foo\\|bar *.git/config
";
$t = join("\n", sort (lines()));
@@ -100,7 +100,7 @@
try "
cd $rb; ok
- egrep foo\\|bar *.git/config
+ grep -E foo\\|bar *.git/config
";
$t = join("\n", sort (lines()));
@@ -132,7 +132,7 @@
try "
cd $rb; ok
- egrep foo\\|bar *.git/config
+ grep -E foo\\|bar *.git/config
";
$t = join("\n", sort (lines()));
@@ -172,7 +172,7 @@
try "
cd $rb; ok
- find . -name config | xargs egrep foo\\|bar
+ find . -name config | xargs grep -E foo\\|bar
";
$t = join("\n", sort (lines()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/t/merge-check.t
new/gitolite-3.6.13/t/merge-check.t
--- old/gitolite-3.6.12/t/merge-check.t 2020-08-04 15:30:21.000000000 +0200
+++ new/gitolite-3.6.13/t/merge-check.t 2023-07-14 05:02:24.000000000 +0200
@@ -43,7 +43,7 @@
test-commit bb cc; ok
checkout master; ok; /Switched to branch 'master'/
test-commit dd ee; ok
- git merge new; ok; /Merge made.*recursive/
+ git merge new; ok; /Merge made/
test-commit ff; ok
tag end; ok
";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gitolite-3.6.12/t/partial-copy.t
new/gitolite-3.6.13/t/partial-copy.t
--- old/gitolite-3.6.12/t/partial-copy.t 2020-08-04 15:30:21.000000000
+0200
+++ new/gitolite-3.6.13/t/partial-copy.t 2023-07-14 05:02:24.000000000
+0200
@@ -90,20 +90,20 @@
tc u4n1 u4n2
PUSH u4 next; ok
/To .*/foo.git/
- /new branch\\] ca3787119b7e8b9914bc22c939cefc443bc308da ->
refs/partial/br-\\d+/
+ /new reference\\] ca3787119b7e8b9914bc22c939cefc443bc308da ->
refs/partial/br-\\d+/
/file:///foo-pc/
/52c7716..ca37871 next -> next/
tag u4/nexttag; glt push u4 --tags
/To file:///foo-pc/
/\\[new tag\\] u4/nexttag +-> +u4/nexttag/
- /\\[new branch\\] ca3787119b7e8b9914bc22c939cefc443bc308da ->
refs/partial/br-\\d+/
+ /\\[new reference\\] ca3787119b7e8b9914bc22c939cefc443bc308da ->
refs/partial/br-\\d+/
checkout master
checkout -b dev/u4/u4master
tc devu4m1 devu4m2
PUSH u4 HEAD; ok
/To .*/foo.git/
- /new branch\\] 228353950557ed1eb13679c1fce4d2b4718a2060 ->
refs/partial/br-\\d+/
+ /new reference\\] 228353950557ed1eb13679c1fce4d2b4718a2060 ->
refs/partial/br-\\d+/
/file:///foo-pc/
/new branch.* HEAD -> dev/u4/u4master/
