You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2022/11/18 13:43:08 UTC
svn commit: r1905381 [7/7] - in /subversion/branches/pristines-on-demand-on-mwf: ./ build/ac-macros/ build/generator/ build/win32/ contrib/client-side/emacs/ contrib/hook-scripts/ contrib/server-side/ doc/ doc/user/ notes/ notes/api-errata/1.7/ notes/c...
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c Fri Nov 18 13:43:05 2022
@@ -65,7 +65,7 @@ svn_min__help(apr_getopt_t *os,
char help_footer[] =
N_("Subversion is a tool for version control.\n"
- "For additional information, see http://subversion.apache.org/\n");
+ "For additional information, see https://subversion.apache.org/\n");
const char *ra_desc_start
= _("The following repository access (RA) modules are available:\n\n");
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnconflict/svnconflict.c?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnconflict/svnconflict.c Fri Nov 18 13:43:05 2022
@@ -287,7 +287,7 @@ svnconflict_help(apr_getopt_t *os, void
"\nAvailable subcommands:\n");
char help_footer[] =
N_("Subversion is a tool for version control.\n"
- "For additional information, see http://subversion.apache.org/\n");
+ "For additional information, see https://subversion.apache.org/\n");
const char *ra_desc_start
= _("The following repository access (RA) modules are available:\n\n");
svn_stringbuf_t *version_footer = svn_stringbuf_create_empty(pool);
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnviewspec_test.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnviewspec_test.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnviewspec_test.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnviewspec_test.py Fri Nov 18 13:43:05 2022
@@ -6,7 +6,7 @@
# py.test svnviewspec_test.py
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/copy_repo.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/copy_repo.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/copy_repo.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/copy_repo.py Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@
# copy_repo.py: create multiple, interleaved copies of a set of repositories.
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/win_repo_bench.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@
# win_repo_bench.py: run repository / server performance tests on Windows.
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dev/contribulyze.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dev/contribulyze.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dev/contribulyze.py Fri Nov 18 13:43:05 2022
@@ -28,7 +28,7 @@
#
# Some Subversion project log messages include parseable data to help
# track who's contributing what. The exact syntax is described in
-# http://subversion.apache.org/docs/community-guide/conventions.html#crediting,
+# https://subversion.apache.org/docs/community-guide/conventions.html#crediting,
# but here's an example, indented by three spaces, i.e., the "Patch by:"
# starts at the beginning of a line:
#
@@ -620,7 +620,7 @@ to help us keep track of whom to conside
was generated from "svn log" output by <a
href="http://svn.apache.org/repos/asf/subversion/trunk/tools/dev/contribulyze.py"
>contribulyze.py</a>, which looks for log messages that use the <a
-href="http://subversion.apache.org/docs/community-guide/conventions.html#crediting"
+href="https://subversion.apache.org/docs/community-guide/conventions.html#crediting"
>special contribution format</a>.</p>
<p><i>Please do not use this list as a generic guide to who has
@@ -734,8 +734,8 @@ def usage():
print('Create HTML files in the current directory, rooted at index.html,')
print('in which you can browse to see who contributed what.')
print('')
- print('The log input should use the contribution-tracking format defined')
- print('in http://subversion.apache.org/docs/community-guide/conventions.html#crediting.')
+ print('The log input should use the contribution-tracking format defined in')
+ print('https://subversion.apache.org/docs/community-guide/conventions.html#crediting.')
print('')
print('Options:')
print('')
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dev/svn-dev.el
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dev/svn-dev.el?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dev/svn-dev.el (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dev/svn-dev.el Fri Nov 18 13:43:05 2022
@@ -194,7 +194,7 @@ the resulting URL."
(insert (format "http://svn.apache.org/viewcvs?view=revision&revision=%s"
rev)))
-(defconst svn-url-base "http://subversion.apache.org/")
+(defconst svn-url-base "https://subversion.apache.org/")
(defconst svn-faq-url (concat svn-url-base "faq.html"))
(defconst svn-hacking-url (concat svn-url-base
"docs/community-guide/community-guide.html"))
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/advisory.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/advisory.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/advisory.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/advisory.py Fri Nov 18 13:43:05 2022
@@ -21,7 +21,7 @@
"""
Send GPG-signed security advisory e-mails from an @apache.org address
to a known list of recipients, or write the advisory text in a form
-suitable for publishing on http://subversion.apache.org/.
+suitable for publishing on https://subversion.apache.org/.
Usage: cd to the root directory of the advisory descriptions, then:
@@ -68,7 +68,7 @@ def parse_args(argv):
description="""\
Send GPG-signed security advisory e-mails from an @apache.org address
to a known list of recipients, or write the advisory text in a form
-suitable for publishing on http://subversion.apache.org/.
+suitable for publishing on https://subversion.apache.org/.
""")
parser.add_argument(
'command', action='store',
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests.py Fri Nov 18 13:43:05 2022
@@ -4,7 +4,7 @@
# backport_tests.py: Test backport.pl or backport.py
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_pl.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_pl.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_pl.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_pl.py Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@
# backport_tests_pl.py: Test backport.pl
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_py.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_py.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_py.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_py.py Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@
# backport_tests_py.py: Test backport.py
#
# Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/release.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/release.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/release.py Fri Nov 18 13:43:05 2022
@@ -98,7 +98,6 @@ dist_release_url = dist_repos + '/releas
dist_archive_url = 'https://archive.apache.org/dist/subversion'
buildbot_repos = os.getenv('SVN_RELEASE_BUILDBOT_REPOS',
'https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster')
-KEYS = 'https://people.apache.org/keys/group/subversion.asc'
extns = ['zip', 'tar.gz', 'tar.bz2']
@@ -658,7 +657,7 @@ def update_backport_bot(args):
Ask someone with appropriate access to add the %s.x branch
to the backport merge bot. See
- http://subversion.apache.org/docs/community-guide/releasing.html#backport-merge-bot
+ https://subversion.apache.org/docs/community-guide/releasing.html#backport-merge-bot
***
@@ -980,7 +979,12 @@ def roll_tarballs(args):
# from a committer's LDAP profile down the road)
basename = 'subversion-%s.KEYS' % (str(args.version),)
filepath = os.path.join(get_tempdir(args.base_dir), basename)
- download_file(KEYS, filepath, None)
+ # The following code require release.py to be executed within a
+ # complete wc, not a shallow wc as indicated in HACKING as one option.
+ # We /could/ download COMMITTERS from /trunk if it doesn't exist...
+ subprocess.check_call([os.path.dirname(__file__) + '/make-keys.sh',
+ '-c', os.path.dirname(__file__) + '/../..',
+ '-o', filepath])
shutil.move(filepath, get_target(args))
# And we're done!
@@ -1323,9 +1327,13 @@ PUBLIC_KEY_ALGORITHMS = {
# These values are taken from the RFC's registry at:
# https://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-12
#
- # The values are callables that produce gpg1-like key length and type
- # indications, e.g., "4096R" for a 4096-bit RSA key.
- 1: (lambda keylen: str(keylen) + 'R'), # RSA
+ # The values are callables that produce gpg2-like key length and type
+ # indications, e.g., "rsa4096" for a 4096-bit RSA key.
+ 1: lambda keylen, _: 'rsa' + str(keylen), # RSA
+ 3: lambda keylen, _: 'rsa' + str(keylen), # RSA Sign Only
+ 17: lambda keylen, _: 'dsa' + str(keylen), # DSA
+ # This index is not registered with IANA but is used by gpg2
+ 22: lambda _, parts: parts[16], # EdDSA
}
def _make_human_readable_fingerprint(fingerprint):
@@ -1419,7 +1427,7 @@ def get_siginfo(args, quiet=False):
keytype = int(parts[3])
formatter = PUBLIC_KEY_ALGORITHMS[keytype]
long_key_id = parts[4]
- length_and_type = formatter(keylen) + '/' + long_key_id
+ length_and_type = formatter(keylen, parts) + '/' + long_key_id
del keylen, keytype, formatter, long_key_id
break
else:
@@ -1461,12 +1469,13 @@ def check_sigs(args):
def get_keys(args):
'Import the LDAP-based KEYS file to gpg'
- # We use a tempfile because urlopen() objects don't have a .fileno()
- with tempfile.SpooledTemporaryFile() as fd:
- fd.write(urlopen(KEYS).read())
- fd.flush()
- fd.seek(0)
- subprocess.check_call(['gpg', '--import'], stdin=fd)
+ with tempfile.NamedTemporaryFile() as keysfile:
+ subprocess.check_call([
+ os.path.dirname(__file__) + '/make-keys.sh',
+ '-c', os.path.dirname(__file__) + '/../../COMMITTERS',
+ '-o', keysfile.name,
+ ])
+ subprocess.check_call(['gpg', '--import', keysfile.name])
def add_to_changes_dict(changes_dict, audience, section, change, revision):
# Normalize arguments
@@ -1909,7 +1918,10 @@ def main():
os.environ['TZ'] = 'UTC'
# finally, run the subcommand, and give it the parsed arguments
- args.func(args)
+ try:
+ args.func(args)
+ except AttributeError:
+ parser.print_help()
if __name__ == '__main__':
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/STATUS.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/STATUS.ezt?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/STATUS.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/STATUS.ezt Fri Nov 18 13:43:05 2022
@@ -6,7 +6,7 @@
This file tracks the status of releases in the [major-minor].x line.
-See http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
+See https://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt Fri Nov 18 13:43:05 2022
@@ -74,7 +74,7 @@ available unless both client and server
also cases where a new feature will work but will run less efficiently if
the client is new and the server old.</p>
-<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+<p>There is <strong>no need</strong> to <a href="https://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
>dump and reload</a> your repositories.
Subversion [major-minor] servers can read and write to repositories created by
earlier versions. To upgrade an existing server installation, just install the
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt Fri Nov 18 13:43:05 2022
@@ -74,7 +74,7 @@ available unless both client and server
also cases where a new feature will work but will run less efficiently if
the client is new and the server old.</p>
-<p>There is <strong>no need</strong> to <a href="http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
+<p>There is <strong>no need</strong> to <a href="https://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate.svnadmin"
>dump and reload</a> your repositories.
Subversion [major-minor] servers can read and write to repositories created by
earlier versions. To upgrade an existing server installation, just install the
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/stable-release-ann.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/stable-release-ann.ezt?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/stable-release-ann.ezt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/stable-release-ann.ezt Fri Nov 18 13:43:05 2022
@@ -1,7 +1,7 @@
From: ...@apache.org
To: announce@subversion.apache.org, users@subversion.apache.org, dev@subversion.apache.org
Reply-To: users@subversion.apache.org
-[if-any security]Cc: security@apache.org, oss-security@lists.openwall.com, bugtraq@securityfocus.com
+[if-any security]Cc: security@apache.org, oss-security@lists.openwall.com
[end][if-any security]Subject: [[]SECURITY][[]ANNOUNCE] Apache Subversion [version] released
[else]Subject: [[]ANNOUNCE] Apache Subversion [version] released
[end]
Modified: subversion/branches/pristines-on-demand-on-mwf/tools/examples/svnlook.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/tools/examples/svnlook.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/tools/examples/svnlook.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/tools/examples/svnlook.py Fri Nov 18 13:43:05 2022
@@ -237,7 +237,7 @@ class SVNLook(object):
# ---------------------------------------------------------
# Delta Editors. For documentation see:
-# http://subversion.apache.org/docs/community-guide/#docs
+# https://subversion.apache.org/docs/community-guide/community-guide.html#docs
# this one doesn't process delete_entry, change_dir_prop, apply_text_delta,
# change_file_prop, close_file, close_edit, abort_edit