Author: svn-role
Date: Sun Mar 27 18:03:44 2022
New Revision: 1899255
URL: http://svn.apache.org/viewvc?rev=1899255&view=rev
Log:
Merge r1886708 from trunk:
* r1886708
swig-py: Fix dependency of make copy-swig-py target.
Justification:
Fix a regression introduced between 1.13.0 and 1.14.0.
Votes:
+1: futatuki, jun66j5
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/Makefile.in
subversion/branches/1.14.x/STATUS
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1886708
Modified: subversion/branches/1.14.x/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1899255&r1=1899254&r2=1899255&view=diff
==============================================================================
--- subversion/branches/1.14.x/Makefile.in (original)
+++ subversion/branches/1.14.x/Makefile.in Sun Mar 27 18:03:44 2022
@@ -928,19 +928,19 @@ clean-swig-pl:
extraclean-swig-pl: clean-swig-pl
$(EXTRACLEAN_SWIG_PL)
+swig-py: autogen-swig-py
+
$(SWIG_PY_DIR)/libsvn:
mkdir $(SWIG_PY_DIR)/libsvn
-copy-swig-py: autogen-swig-py $(SWIG_PY_DIR)/libsvn
+copy-swig-py: autogen-swig-py swig-py $(SWIG_PY_DIR)/libsvn
@for f in $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/*.py; do \
! [ -f "$$f" ] || cp -pf $$f $(SWIG_PY_DIR)/libsvn; \
done
@cd $(SWIG_PY_DIR)/libsvn;ln -sf ../.libs/*.so .
@touch $(SWIG_PY_DIR)/libsvn/__init__.py
-swig-py: autogen-swig-py copy-swig-py
-
-check-swig-py: swig-py
+check-swig-py: swig-py copy-swig-py
$(TEST_SHLIB_VAR_SWIG_PY) \
cd $(SWIG_PY_DIR); \
$(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899255&r1=1899254&r2=1899255&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Mar 27 18:03:44 2022
@@ -116,13 +116,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1886708
- swig-py: Fix dependency of make copy-swig-py target.
- Justification:
- Fix a regression introduced between 1.13.0 and 1.14.0.
- Votes:
- +1: futatuki, jun66j5
-
* r1883838, r1883989, r1886460, r1886582
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
