Re: "svn revert -R ." outputs spurious Reverted messages

2023-12-22 Thread Vincent Lefevre 
On 2023-12-23 03:49:04 +0100, Vincent Lefevre wrote:
> In one of my working copies:
> 
> qaa% svn st 
> qaa% svn revert -R .
> Reverted 'etc/apache2/conf-available/javascript-common.conf'
> Reverted 'etc/apache2/mods-available/dnssd.load'
> Reverted 'etc/apache2/mods-available/dnssd.conf'
> qaa% svn revert -R .
> Reverted 'etc/apache2/mods-available/dnssd.load'
> Reverted 'etc/apache2/mods-available/dnssd.conf'
> Reverted 'etc/apache2/conf-available/javascript-common.conf'
[...]

I've eventually found the cause: these files has owner root.
Perhaps a mistake I did when I copied the files (but I am
wondering how I could have done that). I've now fixed the
ownership and the messages have disappeared.

However, I don't see why I get such Reverted messages in the case
of an incorrect owner.

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

"svn revert -R ." outputs spurious Reverted messages

2023-12-22 Thread Vincent Lefevre 
In one of my working copies:

qaa% svn st 
qaa% svn revert -R .
Reverted 'etc/apache2/conf-available/javascript-common.conf'
Reverted 'etc/apache2/mods-available/dnssd.load'
Reverted 'etc/apache2/mods-available/dnssd.conf'
qaa% svn revert -R .
Reverted 'etc/apache2/mods-available/dnssd.load'
Reverted 'etc/apache2/mods-available/dnssd.conf'
Reverted 'etc/apache2/conf-available/javascript-common.conf'
qaa% svn revert -R .
Reverted 'etc/apache2/mods-available/dnssd.conf'
Reverted 'etc/apache2/mods-available/dnssd.load'
Reverted 'etc/apache2/conf-available/javascript-common.conf'
qaa% svn revert -R .
Reverted 'etc/apache2/conf-available/javascript-common.conf'
Reverted 'etc/apache2/mods-available/dnssd.load'
Reverted 'etc/apache2/mods-available/dnssd.conf'
qaa% svn revert -R .
Reverted 'etc/apache2/mods-available/dnssd.load'
Reverted 'etc/apache2/mods-available/dnssd.conf'
Reverted 'etc/apache2/conf-available/javascript-common.conf'

This occurs with the subversion 1.14.2-5+b1 Debian package under
Debian/unstable on one machine, but not on another one.

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

Re: Subversion 1.14.3 up for testing/signing

2023-12-22 Thread Johan Corveleyn 
On Sat, Dec 9, 2023 at 4:50 PM Nathan Hartman  wrote:
>
> The 1.14.3 release artifacts are now available for testing/signing.
> Please get the tarballs from
>   https://dist.apache.org/repos/dist/dev/subversion
> and add your signatures there.
>
> Thanks!

Summary
---
+1 to release (Windows)

Platform

Windows 10 x64 (Version 1903)
Microsoft Visual Studio 2019 Community Edition (Version 16.5.3)

Verified

Signature and sha512 for subversion-1.14.3.zip.

Contents of subversion-1.14.3.zip are identical to tags/1.14.3,
and to branches/1.14.x@1914484 (except for expected differences in
svn_version.h and svnpubsub, svnwcsub and nominate.pl (symlinks vs. file
contents), and generated files).

Tested
--
[ Release build x64 ] x [ fsfs ] x [ file | svn | http ]
javahl
swig-python

Results
---
All tests pass.

Dependencies

httpd 2.4.58 (apr 1.7.4, apr-util 1.6.3,
  pcre 8.45, expat 2.2.9, openssl 3.0.12)
apr 1.7.4
apr-util 1.6.3
openssl 3.0.12
serf 1.3.10
sqlite 3.44.2.0
zlib 1.3
python 3.9.1
py3c 1.4
swig 4.1.1
(bundled lz4 1.7.5)
(bundled utf8proc 2.1.0)

Manually applied sqlite fix for incomplete #ifdef checks related to the
definition of sqlite3PagerWalSystemErrno
(https://sqlite.org/src/info/7374c2342e66b352)

Other tools
---
perl 5.38.0.1 (Strawberry Perl)
python 3.9.1
Oracle JDK 21.0.1
junit 4.13.2

Signature
-

subversion-1.14.3.zip:
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEiqLBDuqtRPlpcnrqtZzm1gEMiq0FAmWGGiwACgkQtZzm1gEM
iq1nTBAArXjdcjZwEkAJ+naXAEbpE9jdsFCA6VpRtjcwsWS15hyXk+PpmNFeARs6
+CUTSZA4JiUp68tMYNOuto9lpK6tMpr+XMKldz/k+mUWUOzRG6ONTriEkB1iH3/x
jocYw74F1OsjeHsUyFSMhridXRDOIDQw8B/Zmh4lMjTar3jCrTkG2RjofwiRPj4f
MAFlyLTLSsdZvhflUkuRWMdg3yBEg+4qukzmnEijZpnXLhGEp6k7rD7jiiIJHFtr
Zq6nG2oOkf+eXZcszy0EIw8297FC4yRJdaDEkWzXlV9hyqEwfBpGeZM3dkv6T13f
RxDQ+ctNN9EgNjEI1RXwBhFLSvodWVT4ulmwh6bNh63NTSI/6xBx0mpBn2Kl21sL
dSlh+qXMBa9Kuguxmipymrmh83N44NjOJmI1tq3iPdNCy+BZxO3GhdTE/oHH6X8l
ppvA5SW5fZAMKFHafgXcTkqqn2xyjxZJ2aiZcfiA9nOjxtfgEYwFnAbYZ2lfbcls
lh9mI3XMa6OSV1hEJSJ6jlvjftVv9XhwdUEPs6JM7gGiAuZ7YT/HFc5QZXJUJ6EW
V3CHGYulctHKwWj/FDzmE9W2OmrCezSPLbMizKARHo5OcosF9VeUq2V6s4W7+5MR
zS6U4LDxFPdE6cMYQUjuR5mnhL3XKoWw5bwAve93710ld3/SoLo=
=0Ogy
-END PGP SIGNATURE-

-- 
Johan

Re: Subversion 1.14.3 up for testing/signing

2023-12-22 Thread Johan Corveleyn 
On Fri, Dec 22, 2023 at 7:46 AM Daniel Sahlberg
 wrote:
> Den fre 22 dec. 2023 kl 02:49 skrev Johan Corveleyn :
...
>> Then, regardless of the above error, when I start building with
>> msbuild, I run into following error:
>> [[[
>> C:\research\svn\dev\deps64\src\sqlite-amalgamation-3.44.2.0\sqlite3.c(34597,42):
>> error C4013: 'sqlite3PagerWalSystemErrno' undefined; assuming extern
>> returning
>>  int 
>> [C:\research\svn\dev\subversion-1.14.3\build\win32\vcnet-vcproj\libsvn_subr.vcxproj]
>> ]]]
>
>
> The declaration is guarded by:
> #if defined(SQLITE_USE_SEH) && !defined(SQLITE_OMIT_WAL)
>
> While the actual use seems to be guarded by
> #ifdef SQLITE_USE_SEH
>
> In our code we have
> $ grep -r SQLITE_OMIT_WAL
> subversion/libsvn_subr/sqlite3wrapper.c:#  define SQLITE_OMIT_WAL 1
>
> I assume we trigger some bug in SQLite but I don't have time to dig into the 
> SQLite source code. It's not the first time we've hit errors with OMIT_WAL

Googling around I saw that you already reported this issue to sqlite
[1], and it has since been fixed in their repository [2]. Thanks for
that!

After manually applying that patch here the problem is gone, so I was
able to continue with sqlite 3.44.2.

I went on to fix a couple of linking issues locally (possibly I'm
building some dependencies in other ways than the SVN buildscripts on
Windows expect them -- or our buildscripts simply are not adapted to
recent changes in apr, apr-util and openssl, not sure -- the path of
least resistance was copying some *.dll and *.lib files to where our
scripts look for them).

Now everything has been built successfully, and I'm running tests ...
I hope to finish up and commit my signature later tonight or tomorrow
morning. I'll send a transcript of my build steps in a new thread
later.

[1] https://sqlite.org/forum/info/9819032aac
[2] https://sqlite.org/src/info/7374c2342e66b352

-- 
Johan

Meet our keynote speakers and register to Community Over Code EU!

2023-12-22 Thread Ryan Skraba 
[Note: You're receiving this email because you are subscribed to one or
more project dev@ mailing lists at the Apache Software Foundation.]











*
Merge
with the ASF EUniverse!The registration for Community Over Code Europe is
finally open! Get your tickets now and save your spot!
We are happy to announce that we
have confirmed the first featured speakers
!  - Asim Hussain, Executive
Director at Green Software Foundation- Dirk-Willem Van Gulik, VP of Public
Policy at The Apache Software Foundation- Ruth Ikega, Community Lead at
CHAOSS Africa Visit our website
 to learn more about this
amazing lineup.CFP is openWe are looking forward to hearing all you have to
share with the Apache Community. Please submit your talk proposal
 before January 12, 2024.Interested in
boosting your brand?Take a look at our prospectus

and find out the opportunities we have for you. Be one step ahead and book
your room at the hotel venueWe have a special rate for you at the Radisson
Blu Carlton, the hotel that will hold Community Over Code EU. Learn more
about the location and venue 
and book your accommodation. Should you have any questions, please do not
hesitate to contact us. We wish you Happy Holidays in the company of your
loved ones! See you in Bratislava next year!Community Over Code EU
Organizer Committee*

Re: Python 3 compatibility issue in tools/hook-scripts/mailer/mailer.py

2023-12-22 Thread Ruediger Pluem 



On 12/11/23 4:54 AM, Yasuhito FUTATSUKI wrote:
> On 2023/12/10 4:22, Yasuhito FUTATSUKI wrote:
>> Hi,
>>
>> On 2023/12/09 0:04, Daniel Sahlberg wrote:
>>
>>> Den fre 8 dec. 2023 kl 05:40 skrev Yasuhito FUTATSUKI <
>>> futat...@yf.bsdclub.org>:
>>

 Index: tools/hook-scripts/mailer/mailer.py
 ===
 --- tools/hook-scripts/mailer/mailer.py (revision 1913728)
 +++ tools/hook-scripts/mailer/mailer.py (working copy)
 @@ -488,7 +488,7 @@
  # collect the set of groups and the unique sets of params for the
 options
  self.groups = { }
  for path, change in self.changelist:
 -  for (group, params) in self.cfg.which_groups(path, log):
 +  for (group, params) in self.cfg.which_groups(to_str(path), log):
  # turn the params into a hashable object and stash it away
  param_list = sorted(params.items())
  # collect the set of paths belonging to this group
 @@ -1486,9 +1486,9 @@
  "Return the path's associated groups."
  groups = []
  for group, pattern, exclude_pattern, repos_params, search_logmsg_re
 in self._group_re:
 -  match = pattern.match(to_str(path))
 +  match = pattern.match(path)
if match:
 -if exclude_pattern and exclude_pattern.match(to_str(path)):
 +if exclude_pattern and exclude_pattern.match(path):
continue
  params = repos_params.copy()
  params.update(match.groupdict())
 ]]]

 Cheers,
 --
 Yasuhito FUTATSUKI 

>>>
>>> This looks good to me! Thanks for the detailed explaination!
>>
>> Thank you for the review. However, it turned out that even with this
>> patch, mailer.py did not work for post-revprop-change hook.
>> It caused exception like
>>
>> [[[
>> svn: E165001: post-revprop-change hook failed (exit code 1) with output:
>> Traceback (most recent call last):
>>   File 
>> "/home/futatuki/tmp/svn-test/mailer_test/repo-smtpoutput/hooks/mailer.py", 
>> line 1593, in 
>> ret = svn.core.run_app(main, cmd, config_fname, repos_dir,
>>   File "/usr/local/lib/python3.9/site-packages/svn/core.py", line 324, in 
>> run_app
>> return func(application_pool, *args, **kw)
>>   File 
>> "/home/futatuki/tmp/svn-test/mailer_test/repo-smtpoutput/hooks/mailer.py", 
>> line 148, in main
>> return messenger.generate(output, pool)
>>   File 
>> "/home/futatuki/tmp/svn-test/mailer_test/repo-smtpoutput/hooks/mailer.py", 
>> line 601, in generate
>> output.run(self.cfg.get_diff_cmd(group, {
>>   File 
>> "/home/futatuki/tmp/svn-test/mailer_test/repo-smtpoutput/hooks/mailer.py", 
>> line 224, in run
>> self.write_binary(buf)
>> AttributeError: 'SMTPOutput' object has no attribute 'write_binary'
>> ]]]
>>
>> On 1.14.x branch, the patch can be applied clearly, and it worked
>> for post-revprop-change hook.
> 
> On 1.14.x without this patch, it mailer.py does not work for revprop-change,
> lock, and unlock if at least one group definithion with "for_paths" in
> mailer.conf, and the patch fixes it.
> 
> (My non-generalized test script did not checked the case that mailer.py
> contains for_paths definitions. That is why I missed it.)
> 
> So I'll commit it and nominate for backport, although it is too late
> 1.14.3.

Thanks this patch did the trick.

Regards

Rüdiger

Re: Subversion 1.14.3 up for testing/signing

2023-12-22 Thread Daniel Sahlberg 
Den fre 22 dec. 2023 kl 10:04 skrev Johan Corveleyn :

> On Fri, Dec 22, 2023 at 3:07 AM Yasuhito FUTATSUKI 
> wrote:
> >
> > Hi,
> >
> > On 2023/12/22 10:49, Johan Corveleyn wrote:
> ...
> > > Finally, did some tweaks to get gen_win_dependencies.py to run, but
> > > then ran into following error:
> > > [[[
> > > python gen-make.py --release
> > > --with-swig=C:\research\swigwin-4.1.1 --with-py3c=C:\research\py3c-1.4
> > > --with-junit=C:\research\svn\dev\deps64\src\junit-4.13.2\junit.jar
> > > --with-jdk="C:\Program Files\Java\jdk-21" --with-httpd=C:\Apache2.4.58
> > > --with-serf=C:\research\svn\dev\deps64\src\serf-1.3.10
> > > --with-openssl=C:\research\svn\dev\deps64\src\openssl-3.0.12
> > >
> --with-sqlite=C:\research\svn\dev\deps64\src\sqlite-amalgamation-3.44.2.0
> > > --with-zlib=C:\research\svn\dev\deps64\src\zlib-1.3
> > > --vsnet-version=2019 -t vcproj 2>&1 | tee log.gen-make
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:233:
> > > SyntaxWarning: invalid escape sequence '\.'
> > >   if val == '2002' or re.match('^7(\.\d+)?$', val):
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:238:
> > > SyntaxWarning: invalid escape sequence '\.'
> > >   elif val == '2003' or re.match('^8(\.\d+)?$', val):
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:243:
> > > SyntaxWarning: invalid escape sequence '\.'
> > >   elif val == '2005' or re.match('^9(\.\d+)?$', val):
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:248:
> > > SyntaxWarning: invalid escape sequence '\.'
> > >   elif val == '2008' or re.match('^10(\.\d+)?$', val):
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:283:
> > > SyntaxWarning: invalid escape sequence '\d'
> > >   elif re.match('^20\d+$', val):
> > >
> C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:290:
> > > SyntaxWarning: invalid escape sequence '\d'
> > >   elif re.match('^1\d+$', val):
> > > C:\research\svn\dev\subversion-1.14.3\build\transform_sql.py:53:
> > > SyntaxWarning: invalid escape sequence '\('
> > >   re_statement = re.compile('-- *STMT_([A-Z_0-9]+)( +\(([^\)]*)\))?')
> > > Generating for Visual Studio 2019
> > > ]]]
> > >
> > > That is using Python 3.12.1.
> > >
> > > When downgrading to Python 3.9 those errors are gone. Just wanted to
> > > let you guys know ...
> >
> > Should we backport r1912632?
>
> Ah, thanks. I missed that. Thanks for pointing it out.
>
> Agreed that we should probably backport this to 1.14.x (but as Daniel
> said: not a blocker for this release).
>
> --
> Johan
>

Nominated as r1914846.

Kind regards,
Daniel

Re: Subversion 1.14.3 up for testing/signing

2023-12-22 Thread Johan Corveleyn 
On Fri, Dec 22, 2023 at 3:07 AM Yasuhito FUTATSUKI  wrote:
>
> Hi,
>
> On 2023/12/22 10:49, Johan Corveleyn wrote:
...
> > Finally, did some tweaks to get gen_win_dependencies.py to run, but
> > then ran into following error:
> > [[[
> > python gen-make.py --release
> > --with-swig=C:\research\swigwin-4.1.1 --with-py3c=C:\research\py3c-1.4
> > --with-junit=C:\research\svn\dev\deps64\src\junit-4.13.2\junit.jar
> > --with-jdk="C:\Program Files\Java\jdk-21" --with-httpd=C:\Apache2.4.58
> > --with-serf=C:\research\svn\dev\deps64\src\serf-1.3.10
> > --with-openssl=C:\research\svn\dev\deps64\src\openssl-3.0.12
> > --with-sqlite=C:\research\svn\dev\deps64\src\sqlite-amalgamation-3.44.2.0
> > --with-zlib=C:\research\svn\dev\deps64\src\zlib-1.3
> > --vsnet-version=2019 -t vcproj 2>&1 | tee log.gen-make
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:233:
> > SyntaxWarning: invalid escape sequence '\.'
> >   if val == '2002' or re.match('^7(\.\d+)?$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:238:
> > SyntaxWarning: invalid escape sequence '\.'
> >   elif val == '2003' or re.match('^8(\.\d+)?$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:243:
> > SyntaxWarning: invalid escape sequence '\.'
> >   elif val == '2005' or re.match('^9(\.\d+)?$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:248:
> > SyntaxWarning: invalid escape sequence '\.'
> >   elif val == '2008' or re.match('^10(\.\d+)?$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:283:
> > SyntaxWarning: invalid escape sequence '\d'
> >   elif re.match('^20\d+$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\generator\gen_win_dependencies.py:290:
> > SyntaxWarning: invalid escape sequence '\d'
> >   elif re.match('^1\d+$', val):
> > C:\research\svn\dev\subversion-1.14.3\build\transform_sql.py:53:
> > SyntaxWarning: invalid escape sequence '\('
> >   re_statement = re.compile('-- *STMT_([A-Z_0-9]+)( +\(([^\)]*)\))?')
> > Generating for Visual Studio 2019
> > ]]]
> >
> > That is using Python 3.12.1.
> >
> > When downgrading to Python 3.9 those errors are gone. Just wanted to
> > let you guys know ...
>
> Should we backport r1912632?

Ah, thanks. I missed that. Thanks for pointing it out.

Agreed that we should probably backport this to 1.14.x (but as Daniel
said: not a blocker for this release).

-- 
Johan