Author: svn-role
Date: Thu Jul 16 04:00:19 2026
New Revision: 1936188
Log:
Merge the r1936038 group from trunk:
* r1936038, r1936039
Don't use full path in the header of the generated config_keys.inc file
Justification:
Do not leak full path from the build environment into release tarballs.
Notes:
This is a long-standing existing issue, but fixing it prevents a local path
leak and makes content of the config_keys.inc file in the release tarballs
reproducible.
Votes:
+1: kotkov, ivan, dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/build/generator/gen_base.py
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Thu Jul 16 04:00:10 2026
(r1936187)
+++ subversion/branches/1.15.x/STATUS Thu Jul 16 04:00:19 2026
(r1936188)
@@ -59,14 +59,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1936038, r1936039
- Don't use full path in the header of the generated config_keys.inc file
- Justification:
- Do not leak full path from the build environment into release tarballs.
- Notes:
- This is a long-standing existing issue, but fixing it prevents a local
path
- leak and makes content of the config_keys.inc file in the release tarballs
- reproducible.
- Votes:
- +1: kotkov, ivan, dsahlberg
Modified: subversion/branches/1.15.x/build/generator/gen_base.py
==============================================================================
--- subversion/branches/1.15.x/build/generator/gen_base.py Thu Jul 16
04:00:10 2026 (r1936187)
+++ subversion/branches/1.15.x/build/generator/gen_base.py Thu Jul 16
04:00:19 2026 (r1936188)
@@ -397,8 +397,7 @@ class GeneratorBase:
empty_sections.append(macro)
lines = []
- lines.append('/* Automatically generated by %s:write_config_keys() */'
- % (__file__,))
+ lines.append('/* This file was generated by build/generator/gen_base.py
*/')
lines.append('')
for kind in ('file', 'section', 'option'):
