Re: [PATCH] URL update to https

[Nathan Hartman]

On Fri, Aug 19, 2022 at 2:36 PM Daniel Sahlberg
 wrote:
>
> Nathan & Vincent,
>
> Great work both of you! Thanks for taking care of this!
>
> /Daniel


Thanks! And thanks for doing the same for the svn-book!

Cheers,
Nathan

Re: [PATCH] URL update to https

[Daniel Sahlberg]

Nathan & Vincent,

Great work both of you! Thanks for taking care of this!

/Daniel

Den fre 19 aug. 2022 19:01Nathan Hartman  skrev:

> On Fri, Aug 19, 2022 at 12:52 PM Nathan Hartman
>  wrote:
> > On Sun, Aug 14, 2022 at 7:02 AM Vincent Lefevre 
> wrote:
> > > * In tools/examples/svnlook.py, the anchor in
> > > https://subversion.apache.org/docs/community-guide/#docs
> > > no longer exists.
> >
> > This one will take a little bit of digging through the history to
> > figure out whether a #docs anchor ever existed and, if so, what
> > section of HACKING it referred to. That is, did it just refer to
> > HACKING as a whole, or to a section describing the delta editor?
>
> I see what happened. The anchor is OK, but the link was wrong. Fixed
> in r1903580.
>
> Cheers,
> Nathan
>

Re: [PATCH] URL update to https

[Nathan Hartman]

On Fri, Aug 19, 2022 at 12:52 PM Nathan Hartman
 wrote:
> On Sun, Aug 14, 2022 at 7:02 AM Vincent Lefevre  
> wrote:
> > * In tools/examples/svnlook.py, the anchor in
> > https://subversion.apache.org/docs/community-guide/#docs
> > no longer exists.
>
> This one will take a little bit of digging through the history to
> figure out whether a #docs anchor ever existed and, if so, what
> section of HACKING it referred to. That is, did it just refer to
> HACKING as a whole, or to a section describing the delta editor?

I see what happened. The anchor is OK, but the link was wrong. Fixed
in r1903580.

Cheers,
Nathan

Re: [PATCH] URL update to https

[Nathan Hartman]

On Wed, Aug 17, 2022 at 10:21 PM Vincent Lefevre  wrote:
>
> On 2022-08-17 13:16:42 -0400, Nathan Hartman wrote:
> > Looks good to me. Thanks for doing that. I'll commit it shortly.
> >
> > Is there anything in particular you'd like the log message to say (other
> > than credit for writing this patch of course)?
>
> Nothing particular. Thanks.

Committed in r1903577.

Also:

On Sun, Aug 14, 2022 at 7:02 AM Vincent Lefevre  wrote:
> * In the following files
> notes/commit-access-templates/full-committer.tmpl
> notes/commit-access-templates/partial-committer.tmpl
> notes/commit-access-templates/pmc-member.tmpl
> the anchor in https://www.apache.org/dev/new-committers-guide.html#cla
> no longer exists.

Fixed in r1903578.

> * In notes/api-errata/1.7/ra001.txt, change
>   
> https://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#_details
> to
>   
> https://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#details

Fixed in r1903579.

> * In tools/examples/svnlook.py, the anchor in
> https://subversion.apache.org/docs/community-guide/#docs
> no longer exists.

This one will take a little bit of digging through the history to
figure out whether a #docs anchor ever existed and, if so, what
section of HACKING it referred to. That is, did it just refer to
HACKING as a whole, or to a section describing the delta editor?

Cheers,
Nathan

Re: [PATCH] URL update to https

[Vincent Lefevre]

On 2022-08-17 13:16:42 -0400, Nathan Hartman wrote:
> Looks good to me. Thanks for doing that. I'll commit it shortly.
> 
> Is there anything in particular you'd like the log message to say (other
> than credit for writing this patch of course)?

Nothing particular. Thanks.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: [PATCH] URL update to https

[Nathan Hartman]

On Wed, Aug 17, 2022 at 9:55 AM Vincent Lefevre 
wrote:

> On 2022-08-14 10:56:07 -0400, Nathan Hartman wrote:
> > I'm attaching an updated patch with the following changes:
> >
> > (1) Revert LICENSE
> > (2) Revert the license headers
>
> Your patch adds a trailing newline to 2 files:
>   subversion/tests/cmdline/svneditor.bat
>   tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd



Ironic that when I removed that from the other four files, I added it to
these two. Good catch!


I've attached a new patch obtained with
>
>   perl -pi -e \
> 's[http://(subversion\.apache\.org|svnbook\.red-bean\.com)]
>   [https://\1];
>  s[http://(www.apache.org)(?!/licenses)]
>   [https://\1]' **/*(.)
>
> and the manual formatting improvements on
>
>   subversion/libsvn_repos/repos.c
>   tools/dev/contribulyze.py
>
> This corresponds to your patch without the added trailing newlines.



Looks good to me. Thanks for doing that. I'll commit it shortly.

Is there anything in particular you'd like the log message to say (other
than credit for writing this patch of course)?

Cheers,
Nathan

Re: [PATCH] URL update to https

[Vincent Lefevre]

On 2022-08-14 10:56:07 -0400, Nathan Hartman wrote:
> I'm attaching an updated patch with the following changes:
> 
> (1) Revert LICENSE
> (2) Revert the license headers

Your patch adds a trailing newline to 2 files:
  subversion/tests/cmdline/svneditor.bat
  tools/buildbot/slaves/win32-vcpkg/svntest-build.cmd

I've attached a new patch obtained with

  perl -pi -e \
's[http://(subversion\.apache\.org|svnbook\.red-bean\.com)]
  [https://\1];
 s[http://(www.apache.org)(?!/licenses)]
  [https://\1]' **/*(.)

and the manual formatting improvements on

  subversion/libsvn_repos/repos.c
  tools/dev/contribulyze.py

This corresponds to your patch without the added trailing newlines.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)


subversion-url-v3.patch.xz
Description: Binary data

Re: [PATCH] URL update to https

[Nathan Hartman]

On Sun, Aug 14, 2022 at 11:57 AM Vincent Lefevre  wrote:
> > [1] Those files are:
> > build/generator/templates/svn_config.vcxproj.ezt
> > build/generator/templates/svn_locale.vcxproj.ezt
> > build/generator/templates/vcnet_vcxproj_filters.ezt
> > subversion/libsvn_subr/win32_crashrpt_dll.h
>
> Are you sure? I cannot see any such change in my patch.
> Couldn't this be the result of the revert of the licence
> headers?


This is weird.

Looking inside your original patch, in fact the patch does not change
those last lines.

But applying your original patch to a clean working copy and then
running 'svn diff' does show it -- note the - and + of  and
"\ No newline at end of file" at the end of the output:

[[[

$ svn patch --quiet subversion-url.patch
$ svn diff build/generator/templates/svn_config.vcxproj.ezt
Index: build/generator/templates/svn_config.vcxproj.ezt
===
--- build/generator/templates/svn_config.vcxproj.ezt (revision 1903314)
+++ build/generator/templates/svn_config.vcxproj.ezt (working copy)
@@ -8,7 +8,7 @@
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at

-   http://www.apache.org/licenses/LICENSE-2.0
+   https://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
@@ -78,4 +78,4 @@
   
   
   
-
\ No newline at end of file
+

]]]

That looks like a bug in SVN. This machine (the one I'm using now) has
1.13.0 so I'll try this with 1.14.2 later...

Cheers,
Nathan

Re: [PATCH] URL update to https

[Vincent Lefevre]

On 2022-08-14 10:56:07 -0400, Nathan Hartman wrote:
> Regarding LICENSE, I also think it should remain identical.

OK (if a change is needed, perhaps Apache could do it first, like
what the FSF did for GPLv3, in 2017 IIRC). However, I think that
there would be no problems to update the license location in
source files.

> Regarding URLs that became incorrect for other reasons, e.g.,
> https://www.apache.org/dev/new-committers-guide.html#cla, I think
> those should be addressed in separate patches...
[...]
This is also what I think.

> I'm attaching an updated patch with the following changes:
> 
> (1) Revert LICENSE
> (2) Revert the license headers
> (3) In a few files [1], no URLs were changed but a newline was added
> to the end of the file, which wasn't there before. I think this should
> be done in a separate patch.
> 
> Please check the updated patch...

I'll look at it later.

> [1] Those files are:
> build/generator/templates/svn_config.vcxproj.ezt
> build/generator/templates/svn_locale.vcxproj.ezt
> build/generator/templates/vcnet_vcxproj_filters.ezt
> subversion/libsvn_subr/win32_crashrpt_dll.h

Are you sure? I cannot see any such change in my patch.
Couldn't this be the result of the revert of the licence
headers?

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: [PATCH] URL update to https

[Yasuhito FUTATSUKI]

Hello,

On 2022/08/14 20:02, Vincent Lefevre wrote:
> Hi,
> 
> Following the thread "http URLs should be updated to https",
> I've attached a patch that changes the http URLs to https for
> the following hostnames:
> 
>   subversion.apache.org
>   www.apache.org
>   svnbook.red-bean.com
> 
> This has been done with
> 
>   perl -pi -e \
> 's[http://((subversion|www)\.apache\.org|svnbook\.red-bean\.com)]
>   [https://\1]' **/*(.)
> 
> from the working copy (trunk), thus including the po files.

I think the first part of LICENSE file shoud be equal to
https://www.apache.org/licenses/LICENSE-2.0.txt, so we should not
change the URLs in it.

(I didn't check wheter other changes are safe or not.)

Cheers,
-- 
Yasuhito FUTATSUKI 

[PATCH] URL update to https

[Vincent Lefevre]

Hi,

Following the thread "http URLs should be updated to https",
I've attached a patch that changes the http URLs to https for
the following hostnames:

  subversion.apache.org
  www.apache.org
  svnbook.red-bean.com

This has been done with

  perl -pi -e \
's[http://((subversion|www)\.apache\.org|svnbook\.red-bean\.com)]
  [https://\1]' **/*(.)

from the working copy (trunk), thus including the po files.

In addition to these changes, I have corrected the alignment of NL in
subversion/libsvn_repos/repos.c for the 2 concerned URLs and slightly
reformatted the text in tools/dev/contribulyze.py so that the
corresponding output fits again in 80 columns.

Note that the URLs of the LICENSE file are updated in this patch
while they haven't changed upstream. But since this doesn't change
the license itself, I suppose that this is correct.

I haven't changed the quoted http URL from tools/dev/check-license.py
manually ("http://www\.apache\.org/licenses/LICENSE-2\.0;, not matched
by the above regexp) because this appears to be obsolete.

A "make check" here gives

Summary of test results:
  2554 tests PASSED
  162 tests SKIPPED
  81 tests XFAILED (17 WORK-IN-PROGRESS)

In my checks, I've also found URL anchors that became incorrect in
the past (this is unrelated to this patch) and could be fixed in a
separate commit:

* In notes/api-errata/1.7/ra001.txt, change
  
https://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#_details
to
  
https://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#details

* In the following files
notes/commit-access-templates/full-committer.tmpl
notes/commit-access-templates/partial-committer.tmpl
notes/commit-access-templates/pmc-member.tmpl
the anchor in https://www.apache.org/dev/new-committers-guide.html#cla
no longer exists.

* In tools/examples/svnlook.py, the anchor in
https://subversion.apache.org/docs/community-guide/#docs
no longer exists.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)


subversion-url.patch.xz
Description: application/xz