Gleydson Soares said:
> Just a slight slight slight tweak ;)
>
>> find ${PREFIX}/share/examples/subversion -type f | xargs perl -pi \
>
> move to use `sed -i' instead of depending on perl.
I am not sure I understand the rationale, but if you say so...
P.S.: it is more like a job for MOD{PY,RUBY}_BIN_ADJ (which still use
perl BTW), but that would require either sorting the tools or walking
the list twice... I leave this to stsp@.
--
Dmitrij D. Czarkoff
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.148
diff -u -p -r1.148 Makefile
--- Makefile 29 May 2016 17:42:22 -0000 1.148
+++ Makefile 30 May 2016 17:11:22 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.148 2016/05/29 17:42:22 jung Exp $
+# $OpenBSD: Makefile,v 1.147 2016/04/28 16:03:01 stsp Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@@ -7,7 +7,7 @@ COMMENT-ruby= ruby interface to subvers
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.8.15
+VERSION= 1.9.4
DISTNAME= subversion-${VERSION}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl= p5-SVN-${VERSION}
@@ -21,14 +21,10 @@ FULLPKGPATH-ap2= devel/subversion,-ap2
FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
-REVISION-main= 1
-REVISION-ruby= 0
-REVISION-ap2= 0
-
-SO_VERSION= 1.4
+SO_VERSION= 1.5
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
- svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 \
- svn_ra_serf-1 svn_ra_local-1 \
+ svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1 \
+ svn_ra-1 svn_ra_serf-1 svn_ra_local-1 \
svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1
SVN_EXT_LIBS= svn_swig_perl-1 svn_swig_py-1 svn_swig_ruby-1 \
svn_auth_gnome_keyring-1
@@ -83,7 +79,8 @@ TOOLS_HOOK_SCRIPTS= commit-access-contro
# There's also 'mailer', but we handle it separately, see post-install
TOOLS_CLIENT_SIDE_SCRIPTS= bash_completion change-svn-wc-format.py \
- server-version.py showchange.pl svn-graph.pl
+ detach.py mergeinfo-sanitizer.py server-version.py svn-graph.pl \
+ svn-ssl-fingerprints.sh svn-vendor.py svn-viewspec.py wcfind
WANTLIB-ap2= ${WANTLIB} apr-1 aprutil-1 db sqlite3
LIB_DEPENDS-ap2= ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC}
@@ -298,9 +295,12 @@ post-install:
${PREFIX}/share/examples/subversion/hook-scripts/mailer
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/* \
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
- find ${PREFIX}/share/examples/subversion -type f | xargs perl -pi \
- -e "s,.*/usr/bin/python.*,#!${MODPY_BIN},;" \
- -e "s,.*env python.*,#!${MODPY_BIN},;"
+ find ${PREFIX}/share/examples/subversion -type f -exec sed -Ei \
+ -e "s,.*/usr/bin/ruby.*,#!${RUBY}," \
+ -e "s,.*env ruby.*,#!${RUBY}," \
+ -e "s,.*/usr/bin/python.*,#!${MODPY_BIN}," \
+ -e "s,.*env python.*,#!${MODPY_BIN}," \
+ {} +
find ${PREFIX}/share/examples/subversion -type f -name '*\.orig' \
-exec rm -f {} \;
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo 16 Dec 2015 10:21:52 -0000 1.51
+++ distinfo 30 May 2016 07:54:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (subversion-1.8.15.tar.bz2) =
z5ih92hs/WoVy83oN58Vcw/V4Ao1c82wNaZJHbzMyCw=
-SIZE (subversion-1.8.15.tar.bz2) = 6917489
+SHA256 (subversion-1.9.4.tar.bz2) =
Emf54quYPyYGI77oQebJzEWL9L93YjjtXxAJg/eekpk=
+SIZE (subversion-1.9.4.tar.bz2) = 7911473
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Makefile_in
--- patches/patch-Makefile_in 28 Apr 2016 16:03:01 -0000 1.14
+++ patches/patch-Makefile_in 30 May 2016 07:54:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.14 2016/04/28 16:03:01 stsp Exp $
---- Makefile.in.orig Mon Jul 27 02:23:40 2015
-+++ Makefile.in Thu Apr 28 17:16:21 2016
-@@ -81,11 +81,11 @@ swig_pl_libdir = @libdir@
+--- Makefile.in.orig Thu Dec 10 05:00:15 2015
++++ Makefile.in Thu May 5 15:04:58 2016
+@@ -82,11 +82,11 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
@@ -14,9 +14,9 @@ $OpenBSD: patch-Makefile_in,v 1.14 2016/
-toolsdir = @bindir@/svn-tools
+toolsdir = @bindir@
- javahl_javadir = @libdir@/svn-javahl
- javahl_javahdir = @libdir@/svn-javahl/include
-@@ -135,13 +135,13 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+ # where to install pkg-config files
+ pkgconfig_dir = $(datadir)/pkgconfig
+@@ -142,13 +142,13 @@ GMOCK_INCLUDES = -I@GMOCK_SRCDIR@
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure_ac,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure_ac
--- patches/patch-configure_ac 28 Apr 2016 16:03:01 -0000 1.9
+++ patches/patch-configure_ac 30 May 2016 07:54:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.9 2016/04/28 16:03:01 stsp Exp $
---- configure.ac.orig Sat Feb 14 05:00:33 2015
-+++ configure.ac Thu Apr 28 17:16:21 2016
+--- configure.ac.orig Mon Jul 27 01:03:10 2015
++++ configure.ac Thu May 5 15:04:58 2016
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
dnl Get the version of Subversion, using m4's esyscmd() command to do this
dnl at m4-time, since AC_INIT() requires it then.
@@ -10,12 +10,12 @@ $OpenBSD: patch-configure_ac,v 1.9 2016/
[http://subversion.apache.org/])
AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
-@@ -1225,7 +1225,7 @@ AS_HELP_STRING([--enable-gprof],
+@@ -1271,7 +1271,7 @@ AS_HELP_STRING([--enable-gprof],
# Python: Used for testsuite, and bindings
-PYTHON="`$abs_srcdir/build/find_python.sh`"
+PYTHON=${MODPY_BIN}
if test -z "$PYTHON"; then
- AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
+ AC_MSG_WARN([Python 2.7 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
Index: patches/patch-subversion_libsvn_subr_auth_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_libsvn_subr_auth_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-subversion_libsvn_subr_auth_c
--- patches/patch-subversion_libsvn_subr_auth_c 28 Apr 2016 16:03:01 -0000
1.8
+++ patches/patch-subversion_libsvn_subr_auth_c 30 May 2016 07:54:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.8 2016/04/28 16:03:01 stsp
Exp $
---- subversion/libsvn_subr/auth.c.orig Wed Feb 5 05:05:22 2014
-+++ subversion/libsvn_subr/auth.c Thu Apr 28 17:16:21 2016
-@@ -455,9 +455,9 @@ svn_auth_get_platform_specific_provider(svn_auth_provi
+--- subversion/libsvn_subr/auth.c.orig Fri Oct 2 06:00:22 2015
++++ subversion/libsvn_subr/auth.c Thu May 5 15:04:58 2016
+@@ -511,9 +511,9 @@ svn_auth_get_platform_specific_provider(svn_auth_provi
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,
Index: patches/patch-subversion_mod_authz_svn_mod_authz_svn_c
===================================================================
RCS file: patches/patch-subversion_mod_authz_svn_mod_authz_svn_c
diff -N patches/patch-subversion_mod_authz_svn_mod_authz_svn_c
--- patches/patch-subversion_mod_authz_svn_mod_authz_svn_c 28 Apr 2016
16:03:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-subversion_mod_authz_svn_mod_authz_svn_c,v 1.2 2016/04/28
16:03:01 stsp Exp $
-CVE-2016-2168
---- subversion/mod_authz_svn/mod_authz_svn.c.orig Tue Sep 8 06:00:11 2015
-+++ subversion/mod_authz_svn/mod_authz_svn.c Thu Apr 28 17:16:44 2016
-@@ -628,6 +628,8 @@ req_check_access(request_rec *r,
-
- if (r->method_number == M_MOVE || r->method_number == M_COPY)
- {
-+ apr_status_t status;
-+
- dest_uri = apr_table_get(r->headers_in, "Destination");
-
- /* Decline MOVE or COPY when there is no Destination uri, this will
-@@ -636,7 +638,19 @@ req_check_access(request_rec *r,
- if (!dest_uri)
- return DECLINED;
-
-- apr_uri_parse(r->pool, dest_uri, &parsed_dest_uri);
-+ status = apr_uri_parse(r->pool, dest_uri, &parsed_dest_uri);
-+ if (status)
-+ {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
-+ "Invalid URI in Destination header");
-+ return HTTP_BAD_REQUEST;
-+ }
-+ if (!parsed_dest_uri.path)
-+ {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-+ "Invalid URI in Destination header");
-+ return HTTP_BAD_REQUEST;
-+ }
-
- ap_unescape_url(parsed_dest_uri.path);
- dest_uri = parsed_dest_uri.path;
Index: patches/patch-subversion_svnserve_cyrus_auth_c
===================================================================
RCS file: patches/patch-subversion_svnserve_cyrus_auth_c
diff -N patches/patch-subversion_svnserve_cyrus_auth_c
--- patches/patch-subversion_svnserve_cyrus_auth_c 28 Apr 2016 16:03:01
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-subversion_svnserve_cyrus_auth_c,v 1.1 2016/04/28 16:03:01
stsp Exp $
-CVE-2016-2167
---- subversion/svnserve/cyrus_auth.c.orig Thu Apr 11 16:38:20 2013
-+++ subversion/svnserve/cyrus_auth.c Thu Apr 28 17:16:41 2016
-@@ -74,6 +74,8 @@ static int canonicalize_username(sasl_conn_t *conn,
- {
- /* The only valid realm is user_realm (i.e. the repository's realm).
- If the user gave us another realm, complain. */
-+ if (realm_len != inlen-(pos-in+1))
-+ return SASL_BADPROT;
- if (strncmp(pos+1, user_realm, inlen-(pos-in+1)) != 0)
- return SASL_BADPROT;
- }
Index: pkg/PLIST-gnome-keyring
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-gnome-keyring,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-gnome-keyring
--- pkg/PLIST-gnome-keyring 28 Apr 2012 09:53:38 -0000 1.3
+++ pkg/PLIST-gnome-keyring 30 May 2016 07:54:29 -0000
@@ -4,3 +4,4 @@
@comment lib/libsvn_auth_gnome_keyring-1.a
@comment lib/libsvn_auth_gnome_keyring-1.la
@lib lib/libsvn_auth_gnome_keyring-1.so.${LIBsvn_auth_gnome_keyring-1_VERSION}
+share/pkgconfig/libsvn_auth_gnome_keyring.pc
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- pkg/PLIST-main 29 May 2016 17:42:22 -0000 1.15
+++ pkg/PLIST-main 30 May 2016 07:54:29 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.15 2016/05/29 17:42:22 jung Exp $
+@comment $OpenBSD: PLIST-main,v 1.14 2015/03/19 20:25:26 naddy Exp $
@pkgpath devel/subversion,no_bindings
@pkgpath devel/subversion,-main,gnome_keyring
@pkgpath devel/subversion
@@ -7,16 +7,14 @@
@comment @bin bin/diff3
@comment @bin bin/diff4
@bin bin/fsfs-access-map
-@bin bin/fsfs-reorg
-@bin bin/fsfs-stats
@bin bin/svn
-@bin bin/svn-bench
@bin bin/svn-populate-node-origins-index
-@bin bin/svn-rep-sharing-stats
@bin bin/svnadmin
@bin bin/svnauthz
@bin bin/svnauthz-validate
+@bin bin/svnbench
@bin bin/svndumpfilter
+@bin bin/svnfsfs
@bin bin/svnlook
@bin bin/svnmucc
@bin bin/svnraisetreeconflict
@@ -24,6 +22,7 @@
@bin bin/svnserve
@bin bin/svnsync
@bin bin/svnversion
+@bin bin/x509-parser
include/subversion-1/
include/subversion-1/svn-revision.txt
include/subversion-1/svn_auth.h
@@ -66,6 +65,7 @@ include/subversion-1/svn_user.h
include/subversion-1/svn_utf.h
include/subversion-1/svn_version.h
include/subversion-1/svn_wc.h
+include/subversion-1/svn_x509.h
include/subversion-1/svn_xml.h
@comment lib/apache2/
lib/libsvn_client-1.a
@@ -89,6 +89,9 @@ lib/libsvn_fs_fs-1.la
lib/libsvn_fs_util-1.a
lib/libsvn_fs_util-1.la
@lib lib/libsvn_fs_util-1.so.${LIBsvn_fs_util-1_VERSION}
+lib/libsvn_fs_x-1.a
+lib/libsvn_fs_x-1.la
+@lib lib/libsvn_fs_x-1.so.${LIBsvn_fs_x-1_VERSION}
lib/libsvn_ra-1.a
lib/libsvn_ra-1.la
@lib lib/libsvn_ra-1.so.${LIBsvn_ra-1_VERSION}
@@ -128,6 +131,9 @@ lib/libsvn_wc-1.la
@man man/man8/svnserve.8
share/examples/subversion/
@sample ${SYSCONFDIR}/subversion/
+share/examples/subversion/ExampleAuthn.java
+share/examples/subversion/ExampleAuthnOld.java
+share/examples/subversion/ExampleAuthnVeryOld.java
share/examples/subversion/SvnCLBrowse
share/examples/subversion/backup/
share/examples/subversion/backup/hot-backup.py
@@ -143,19 +149,23 @@ share/examples/subversion/check-modified
share/examples/subversion/client-side/
share/examples/subversion/client-side/bash_completion
share/examples/subversion/client-side/change-svn-wc-format.py
+share/examples/subversion/client-side/detach.py
share/examples/subversion/client-side/emacs/
+share/examples/subversion/client-side/mergeinfo-sanitizer.py
share/examples/subversion/client-side/server-version.py
-share/examples/subversion/client-side/showchange.pl
share/examples/subversion/client-side/svn-graph.pl
+share/examples/subversion/client-side/svn-ssl-fingerprints.sh
+share/examples/subversion/client-side/svn-vendor.py
+share/examples/subversion/client-side/svn-viewspec.py
share/examples/subversion/client-side/svn2cl/
share/examples/subversion/client-side/svn_load_dirs/
+share/examples/subversion/client-side/wcfind
share/examples/subversion/dumpprops.py
share/examples/subversion/get-location-segments.py
share/examples/subversion/getfile.py
share/examples/subversion/getlocks_test.c
share/examples/subversion/geturl.py
share/examples/subversion/headrev.c
-share/examples/subversion/info.rb
share/examples/subversion/hook-scripts/
share/examples/subversion/hook-scripts/commit-access-control.cfg.example
share/examples/subversion/hook-scripts/commit-access-control.pl
@@ -175,6 +185,7 @@ share/examples/subversion/hook-scripts/s
share/examples/subversion/hook-scripts/svnperms.conf.example
share/examples/subversion/hook-scripts/svnperms.py
share/examples/subversion/hook-scripts/verify-po.py
+share/examples/subversion/info.rb
share/examples/subversion/minimal_client.c
share/examples/subversion/putfile.py
share/examples/subversion/revplist.py
@@ -211,4 +222,19 @@ share/locale/pt_BR/LC_MESSAGES/subversio
share/locale/sv/LC_MESSAGES/subversion.mo
share/locale/zh_CN/LC_MESSAGES/subversion.mo
share/locale/zh_TW/LC_MESSAGES/subversion.mo
+share/pkgconfig/libsvn_client.pc
+share/pkgconfig/libsvn_delta.pc
+share/pkgconfig/libsvn_diff.pc
+share/pkgconfig/libsvn_fs.pc
+share/pkgconfig/libsvn_fs_base.pc
+share/pkgconfig/libsvn_fs_fs.pc
+share/pkgconfig/libsvn_fs_util.pc
+share/pkgconfig/libsvn_fs_x.pc
+share/pkgconfig/libsvn_ra.pc
+share/pkgconfig/libsvn_ra_local.pc
+share/pkgconfig/libsvn_ra_serf.pc
+share/pkgconfig/libsvn_ra_svn.pc
+share/pkgconfig/libsvn_repos.pc
+share/pkgconfig/libsvn_subr.pc
+share/pkgconfig/libsvn_wc.pc
@rcscript ${RCDIR}/svnserve
