From dmichelsen at users.sourceforge.net Wed Sep 1 13:57:28 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Sep 2021 11:57:28 +0000 Subject: SF.net SVN: gar:[26779] csw/mgar/pkg/scons/trunk Message-ID: <1630497448.699404.18695@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26779 http://sourceforge.net/p/gar/code/26779 Author: dmichelsen Date: 2021-09-01 11:57:28 +0000 (Wed, 01 Sep 2021) Log Message: ----------- scons/trunk: Update to 3.1.2 Modified Paths: -------------- csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums Modified: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile 2021-08-31 09:56:39 UTC (rev 26778) +++ csw/mgar/pkg/scons/trunk/Makefile 2021-09-01 11:57:28 UTC (rev 26779) @@ -1,7 +1,7 @@ # $Id$ NAME = scons -VERSION = 2.5.1 +VERSION = 3.1.2 CATEGORIES = python GARTYPE = v2 @@ -36,6 +36,7 @@ ARCHALL_CSWscons = 1 CHECKPKG_OVERRIDES_CSWscons += file-with-bad-content # We definitely need Python 2.7 +MODULATIONS_PYTHON_VERSION = 2_7 RUNTIME_DEP_PKGS_CSWscons += CSWpython27 CHECKPKG_OVERRIDES_CSWscons += surplus-dependency|CSWpython27 Modified: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums 2021-08-31 09:56:39 UTC (rev 26778) +++ csw/mgar/pkg/scons/trunk/checksums 2021-09-01 11:57:28 UTC (rev 26779) @@ -1 +1 @@ -aaaf09e1351a598f98d17b0cf1103e7a scons-2.5.1.tar.gz +77b2f8ac2661b7a4fad51c17cb7f1b25 scons-3.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 2 21:37:35 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Sep 2021 19:37:35 +0000 Subject: SF.net SVN: gar:[26780] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <1630611455.321659.9993@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26780 http://sourceforge.net/p/gar/code/26780 Author: dmichelsen Date: 2021-09-02 19:37:35 +0000 (Thu, 02 Sep 2021) Log Message: ----------- subversion/trunk: Enable legacy plaintext passwords Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-01 11:57:28 UTC (rev 26779) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-02 19:37:35 UTC (rev 26780) @@ -577,6 +577,10 @@ # No Keyring in 64 bit at all CONFIGURE_ARGS-5.10-64 += --without-gnome-keyring +# Add option to restore existing behaviour as discussed in +# http://lists.opencsw.org/pipermail/users/2021-September/010501.html +CONFIGURE_ARGS += --enable-plaintext-password-storage + CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL)) # Version from PYTHON modulation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 6 18:47:50 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 06 Sep 2021 16:47:50 +0000 Subject: SF.net SVN: gar:[26781] csw/mgar/pkg/gzip/trunk Message-ID: <1630946870.601580.12525@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26781 http://sourceforge.net/p/gar/code/26781 Author: dmichelsen Date: 2021-09-06 16:47:50 +0000 (Mon, 06 Sep 2021) Log Message: ----------- gzip/trunk: Update to 1.11 Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2021-09-02 19:37:35 UTC (rev 26780) +++ csw/mgar/pkg/gzip/trunk/Makefile 2021-09-06 16:47:50 UTC (rev 26781) @@ -3,8 +3,7 @@ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16876 NAME = gzip -#VERSION = 1.6 -VERSION = 1.10 +VERSION = 1.11 GARTYPE = v2 DESCRIPTION = GNU zip @@ -18,7 +17,7 @@ MASTER_SITES += $(GNU_MIRROR) MASTER_SITES += http://meyering.net/gzip/ -DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES += $(DISTNAME).tar.xz # From TODO: # - Add a block size (-b) option to improve error recovery in case of Modified: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums 2021-09-02 19:37:35 UTC (rev 26780) +++ csw/mgar/pkg/gzip/trunk/checksums 2021-09-06 16:47:50 UTC (rev 26781) @@ -1 +1 @@ -691b1221694c3394f1c537df4eee39d3 gzip-1.10.tar.xz +d1e93996dba00cab0caa7903cd01d454 gzip-1.11.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 8 12:49:23 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Sep 2021 10:49:23 +0000 Subject: SF.net SVN: gar:[26782] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <1631098163.235662.13448@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26782 http://sourceforge.net/p/gar/code/26782 Author: dmichelsen Date: 2021-09-08 10:49:21 +0000 (Wed, 08 Sep 2021) Log Message: ----------- subversion/trunk: Enable 64 bit Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-06 16:47:50 UTC (rev 26781) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-08 10:49:21 UTC (rev 26782) @@ -60,6 +60,9 @@ PYTHON = $(bindir)/python$(PYTHON_VERSION) MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all +MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only +MERGE_SCRIPTS_isa-default64-python_version-2.7 += copy-relocated-only +MERGE_DIRS_isa-default64-python_version-2.7 = $(bindir) $(sbindir) $(libexecdir) $(libdir) BUILD_DEP_PKGS += CSWlibexpat-dev BUILD_DEP_PKGS += CSWlibsqlite3-dev @@ -131,6 +134,8 @@ RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL)-$(GARCH)) +# There is no 64 bit gnome keyring yet +CHECKPKG_OVERRIDES_CSWlibsvn-auth-gnome-keyring1-0 += 64-bit-binaries-missing PACKAGES += CSWlibsvn-client1-0 SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0 @@ -350,7 +355,7 @@ PACKAGES += CSWap24-subversion SPKG_DESC_CSWap24-subversion = Subversion Modules for Apache 2.4 PKGFILES_CSWap24-subversion += $(sysconfdir)/apache2/.* -PKGFILES_CSWap24-subversion += $(libdir)/apache2/.* +PKGFILES_CSWap24-subversion += $(call baseisadirs,$(libdir),apache2/.*) PKGFILES_CSWap24-subversion += $(docdir)/$(CATALOGNAME_CSWap24-subversion)/changelog.CSW RUNTIME_DEP_PKGS_CSWap24-subversion += CSWapache24 RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibapr1-0 @@ -371,8 +376,9 @@ # Lets not factor that library out PKGFILES_CSWjavasvn += $(call pkgfiles_lib,libsvnjavahl-1.so.0) CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 -PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/svn-javahl.jar -PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/include.* +CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 +PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/svn-javahl.jar) +PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/include.*) PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWjavasvn-5.9 += CSWlibintl8 @@ -396,6 +402,7 @@ # Override for now as it is not harmful. CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/amd64|opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpm-subversion SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding @@ -421,6 +428,7 @@ RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl9 RUNTIME_DEP_PKGS_CSWpm-subversion += $(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GAROSREL)-$(GARCH)) +CHECKPKG_OVERRIDES_CSWpm-subversion += 64-bit-binaries-missing OBSOLETED_BY_CSWpm-subversion += CSWpmsvn CATALOGNAME_CSWpmsvn = pm_subversion_stub @@ -449,6 +457,7 @@ RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL)) RUNTIME_DEP_PKGS_CSWrb-subversion-5.10-sparc += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL)-$(GARCH)) +CHECKPKG_OVERRIDES_CSWrb-subversion += 64-bit-binaries-missing OBSOLETED_BY_CSWrb-subversion += CSWrbsvn @@ -479,9 +488,10 @@ RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH)) CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython - CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py26-files +CHECKPKG_OVERRIDES_CSWpy-subversion += 64-bit-binaries-missing + OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn # This is for /usr/share/lib/zoneinfo @@ -549,6 +559,7 @@ # There are lots of failing tests, needs more work # BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 #NODIRPATHS = --libdir --libexecdir #CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) @@ -612,9 +623,12 @@ include gar/category.mk # pygthon bindings do not link since svn-1.6.5 ... -BINDING_LANGS-5.9 = perl python ruby -BINDING_LANGS-5.10 = java perl python ruby -BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL))) +BINDING_LANGS-5.9-32 = perl python ruby +BINDING_LANGS-5.9-64 = perl python ruby +BINDING_LANGS-5.10-32 = java perl python ruby +# There is only 64 bit Java at the moment +BINDING_LANGS-5.10-64 = java +BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL)-$(MEMORYMODEL))) PI_DEPENDS += copy-templates #PI_DEPENDS += create-ra_dav-symlinks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 9 12:19:04 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Sep 2021 10:19:04 +0000 Subject: SF.net SVN: gar:[26783] csw/mgar/pkg/apr/trunk Message-ID: <1631182744.654557.18061@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26783 http://sourceforge.net/p/gar/code/26783 Author: dmichelsen Date: 2021-09-09 10:19:04 +0000 (Thu, 09 Sep 2021) Log Message: ----------- apr/trunk: Apply 64 bit patch from Franz Sirl Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apr/trunk/files/0001-Define-__EXTENSIONS__-so-that-also-all-apr.h-users-g.patch csw/mgar/pkg/apr/trunk/files/0002-Define-_FILE_OFFSET_BITS-64-so-that-subversion-can-a.patch csw/mgar/pkg/apr/trunk/files/apr.h Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2021-09-08 10:49:21 UTC (rev 26782) +++ csw/mgar/pkg/apr/trunk/Makefile 2021-09-09 10:19:04 UTC (rev 26783) @@ -11,10 +11,29 @@ MASTER_SITES = http://mirrors.ae-online.de/apache/apr/ DISTFILES = $(NAME)-$(VERSION).tar.gz +# apr.h needs PATH_MAX from limits.h defined, otherwise it will #error. +# So define __EXTENSIONS__ in build/apr_hints.m4 to make sure +# it is propagated to all users via 'apr-1-config --cppflags'. +# Acutually 'configure' checks for and enables __EXTENSIONS__, but it +# doesn't end up in 'apr-1-config --cppflags' without this patch. +PATCHFILES += 0001-Define-__EXTENSIONS__-so-that-also-all-apr.h-users-g.patch +# apr usually uses -D_LARGEFILE64_SOURCE to get support for large files +# on 32-bit OSes. +# Unfortunately this still doesn't support filesystems (eg. NFS) with +# 64-bit directory "cookies". For this to work we need +# to define _FILE_OFFSET_BITS=64 for apr and it's users via build/apr_hints.m4. +# (!!!) If you enable this patch, you need to also rebuild the whole +# dependency tree that depends on apr. +#PATCHFILES-32 += 0002-Define-_FILE_OFFSET_BITS-64-so-that-subversion-can-a.patch +PATCHFILES += $(PATCHFILES-$(MEMORYMODEL)) LICENSE = LICENSE VENDOR_URL = https://apr.apache.org/ +BUILD_DEP_PKGS += CSWautoconf +BUILD_DEP_PKGS += CSWautomake +BUILD_DEP_PKGS += CSWlibtool + PACKAGES += CSWlibapr1-0 SPKG_DESC_CSWlibapr1-0 = Apache portable runtime, libapr-1.so.0 PKGFILES_CSWlibapr1-0 += $(call pkgfiles_lib,libapr-1.so.0) @@ -48,8 +67,21 @@ EXTRA_MERGE_DIRS_isa-extra = $(libexecdir) +EXTRA_PAX_ARGS-32 = -s ",^\.$(includedir)/apr.h$$,.$(includedir)/apr-32.h,p" +EXTRA_PAX_ARGS-64 = -s ",^\.$(includedir)/apr.h$$,.$(includedir)/apr-64.h,p" +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) + include gar/category.mk +# trigger re-configuration because of the build/apr_hints.m4 changes +pre-configure-modulated: + @(cd $(WORKSRC); ./buildconf ) + @$(MAKECOOKIE) + +post-merge: + ginstall $(FILEDIR)/apr.h $(PKGROOT)$(includedir)/apr.h + @$(MAKECOOKIE) + post-install-modulated: perl -pi -e 's,/usr/local/lib,$(libdir),g;' \ -e 's,#! /bin/bash,#!$(bindir_install)/bash,g;' \ Added: csw/mgar/pkg/apr/trunk/files/0001-Define-__EXTENSIONS__-so-that-also-all-apr.h-users-g.patch =================================================================== --- csw/mgar/pkg/apr/trunk/files/0001-Define-__EXTENSIONS__-so-that-also-all-apr.h-users-g.patch (rev 0) +++ csw/mgar/pkg/apr/trunk/files/0001-Define-__EXTENSIONS__-so-that-also-all-apr.h-users-g.patch 2021-09-09 10:19:04 UTC (rev 26783) @@ -0,0 +1,26 @@ +From 5990f4150c662657a508ef3715378ab825707b3d Mon Sep 17 00:00:00 2001 +From: Franz Sirl +Date: Fri, 23 Apr 2021 12:42:57 +0200 +Subject: [PATCH 1/2] Define __EXTENSIONS__ so that also all apr.h users get + PATH_MAX from limits.h. + +--- + build/apr_hints.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 +index fd3d33d..ba53663 100644 +--- a/build/apr_hints.m4 ++++ b/build/apr_hints.m4 +@@ -236,7 +236,7 @@ dnl # Not a problem in 10.20. Otherwise, who knows? + ;; + *-solaris2*) + PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'` +- APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT]) ++ APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D__EXTENSIONS__]) + if test $PLATOSVERS -eq 10; then + # pthread_mutex_timedlock is broken on Solaris 10. + # It can block without timeout in case of EDEADLK. +-- +2.3.1 + Added: csw/mgar/pkg/apr/trunk/files/0002-Define-_FILE_OFFSET_BITS-64-so-that-subversion-can-a.patch =================================================================== --- csw/mgar/pkg/apr/trunk/files/0002-Define-_FILE_OFFSET_BITS-64-so-that-subversion-can-a.patch (rev 0) +++ csw/mgar/pkg/apr/trunk/files/0002-Define-_FILE_OFFSET_BITS-64-so-that-subversion-can-a.patch 2021-09-09 10:19:04 UTC (rev 26783) @@ -0,0 +1,26 @@ +From 840c0a96376c8028490e4cf04cc7046703b55a50 Mon Sep 17 00:00:00 2001 +From: Franz Sirl +Date: Fri, 23 Apr 2021 12:45:51 +0200 +Subject: [PATCH 2/2] Define _FILE_OFFSET_BITS=64 so that subversion can also + work against newer NFS servers. + +--- + build/apr_hints.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 +index ba53663..0c3437f 100644 +--- a/build/apr_hints.m4 ++++ b/build/apr_hints.m4 +@@ -236,7 +236,7 @@ dnl # Not a problem in 10.20. Otherwise, who knows? + ;; + *-solaris2*) + PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'` +- APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D__EXTENSIONS__]) ++ APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64]) + if test $PLATOSVERS -eq 10; then + # pthread_mutex_timedlock is broken on Solaris 10. + # It can block without timeout in case of EDEADLK. +-- +2.3.1 + Added: csw/mgar/pkg/apr/trunk/files/apr.h =================================================================== --- csw/mgar/pkg/apr/trunk/files/apr.h (rev 0) +++ csw/mgar/pkg/apr/trunk/files/apr.h 2021-09-09 10:19:04 UTC (rev 26783) @@ -0,0 +1,6 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +# include +#else +# include +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 13 11:14:46 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Sep 2021 09:14:46 +0000 Subject: SF.net SVN: gar:[26784] csw/mgar/pkg/libserf/trunk Message-ID: <1631524486.543310.16577@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26784 http://sourceforge.net/p/gar/code/26784 Author: dmichelsen Date: 2021-09-13 09:14:46 +0000 (Mon, 13 Sep 2021) Log Message: ----------- libserf/trunk: Fix runpath issue on libapr Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libserf/trunk/files/ csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2021-09-09 10:19:04 UTC (rev 26783) +++ csw/mgar/pkg/libserf/trunk/Makefile 2021-09-13 09:14:46 UTC (rev 26784) @@ -12,10 +12,12 @@ operation. endef -MASTER_SITES = http://mirror.serversupportforum.de/apache/serf/ +MASTER_SITES += https://www.apache.org/dist/serf/ DISTFILES += $(DISTNAME).tar.bz2 -#PATCHFILES += 0001-mark-solaris-as-posix-for-scons.patch +PATCHFILES += 0001-Always-use-SHLIBVERSION.patch +PATCHFILES += 0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch + LICENSE = LICENSE VENDOR_URL = https://serf.apache.org/ @@ -53,8 +55,6 @@ BUILD64 = 1 -EXTRA_LIB = $(prefix)/bdb48/lib - SCONS_FLAGS += APR=$(bindir)/apr-1-config SCONS_FLAGS += APU=$(bindir)/apu-1-config Added: csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch =================================================================== --- csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch (rev 0) +++ csw/mgar/pkg/libserf/trunk/files/0001-Always-use-SHLIBVERSION.patch 2021-09-13 09:14:46 UTC (rev 26784) @@ -0,0 +1,26 @@ +From 72cb92a806348a736ac2fcfefec125399ae49832 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 17 Nov 2016 13:02:31 +0100 +Subject: [PATCH] Always use SHLIBVERSION + +--- + SConstruct | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4358a23..9f32566 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -215,8 +215,7 @@ incdir = '$PREFIX/include/serf-$MAJOR' + # Unfortunately we can't set the .dylib compatibility_version option separately + # from current_version, so don't use the PATCH level to avoid that build and + # runtime patch levels have to be identical. +-if sys.platform != 'sunos5': +- env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) ++env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) + + LIBNAME = 'libserf-%d' % (MAJOR,) + if sys.platform != 'win32': +-- +2.4.0 + Added: csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch =================================================================== --- csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch (rev 0) +++ csw/mgar/pkg/libserf/trunk/files/0002-Do-not-include-libdir-to-runpath-as-this-is-done-thr.patch 2021-09-13 09:14:46 UTC (rev 26784) @@ -0,0 +1,28 @@ +From 841845c81df6dd65f759e9b131681c60c0b6ce6f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 13 Sep 2021 11:09:06 +0200 +Subject: [PATCH] Do not include libdir to runpath as this is done through + LDFLAGS + +--- + SConstruct | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 9f32566..df9e273 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -223,8 +223,8 @@ if sys.platform != 'win32': + else: + LIBNAMESTATIC = 'serf-${MAJOR}' + +-env.Append(RPATH=libdir, +- PDB='${TARGET.filebase}.pdb') ++#env.Append(RPATH=libdir, ++# PDB='${TARGET.filebase}.pdb') + + if sys.platform == 'darwin': + # linkflags.append('-Wl,-install_name, at executable_path/%s.dylib' % (LIBNAME,)) +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 13 11:28:27 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Sep 2021 09:28:27 +0000 Subject: SF.net SVN: gar:[26785] csw/mgar/pkg/tomcat-native/trunk Message-ID: <1631525307.228989.31607@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26785 http://sourceforge.net/p/gar/code/26785 Author: dmichelsen Date: 2021-09-13 09:28:26 +0000 (Mon, 13 Sep 2021) Log Message: ----------- tomcat-native/trunk: Update to 1.2.31 Modified Paths: -------------- csw/mgar/pkg/tomcat-native/trunk/Makefile csw/mgar/pkg/tomcat-native/trunk/checksums Modified: csw/mgar/pkg/tomcat-native/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat-native/trunk/Makefile 2021-09-13 09:14:46 UTC (rev 26784) +++ csw/mgar/pkg/tomcat-native/trunk/Makefile 2021-09-13 09:28:26 UTC (rev 26785) @@ -2,12 +2,12 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tomcat-native -VERSION = 1.2.23 +VERSION = 1.2.31 GARTYPE = v2 DESCRIPTION = Tomcat Native Java library -MASTER_SITES = http://www.us.apache.org/dist/tomcat/tomcat-connectors/native/$(VERSION)/source/ +MASTER_SITES += https://dlcdn.apache.org/tomcat/tomcat-connectors/native/$(VERSION)/source/ DISTNAME = $(NAME)-$(VERSION)-src DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/tomcat-native/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat-native/trunk/checksums 2021-09-13 09:14:46 UTC (rev 26784) +++ csw/mgar/pkg/tomcat-native/trunk/checksums 2021-09-13 09:28:26 UTC (rev 26785) @@ -1 +1 @@ -feb49fa49373423afae28c36b62d82df tomcat-native-1.2.23-src.tar.gz +a6943e123b1eca0795e106af132df93d tomcat-native-1.2.31-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 13 14:15:59 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Sep 2021 12:15:59 +0000 Subject: SF.net SVN: gar:[26786] csw/mgar/pkg/nxlog/trunk Message-ID: <1631535359.654830.22311@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26786 http://sourceforge.net/p/gar/code/26786 Author: dmichelsen Date: 2021-09-13 12:15:59 +0000 (Mon, 13 Sep 2021) Log Message: ----------- nxlog/trunk: Update to 2.11.2190 Modified Paths: -------------- csw/mgar/pkg/nxlog/trunk/Makefile csw/mgar/pkg/nxlog/trunk/checksums Modified: csw/mgar/pkg/nxlog/trunk/Makefile =================================================================== --- csw/mgar/pkg/nxlog/trunk/Makefile 2021-09-13 09:28:26 UTC (rev 26785) +++ csw/mgar/pkg/nxlog/trunk/Makefile 2021-09-13 12:15:59 UTC (rev 26786) @@ -2,7 +2,8 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = nxlog-ce -VERSION = 2.5.1089 +VERSION = 2.11.13 +FILEVERSION = 2.11.2190 GARTYPE = v2 DESCRIPTION = A multi-platform universal log collector and forwarder @@ -10,11 +11,11 @@ nxlog is a modular, multi-threaded, high-performance log management solution with multi-platform support. In concept it is similar to syslog-ng or rsyslog but is not limited to unix/syslog only. It can collect logs from files in various formats, receive logs from the network remotely over UDP, TCP or TLS/SSL . It supports platform specific sources such as the Windows Eventlog, Linux kernel logs, Android logs, local syslog etc. Writing and reading logs to/from databases is also supported. The collected logs can be stored into files, databases or forwarded to a remote log server using various protocols. The old BSD Syslog and the newer IETF syslog standard is fully supported by nxlog in addition to XML, JSON, GELF, CSV and custom formats. A key concept in nxlog is to be able to handle and preserve structured logs. No need to convert everything to syslog and parse these logs again at the other side. It has powerful message filtering, log rewrite and conversion capabilities. endef -VENDOR_URL = http://nxlog-ce.sourceforge.net/ -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = https://nxlog.co +MASTER_SITES += https://nxlog.co/system/files/products/files/348/ +DISTFILES += $(NAME)-$(FILEVERSION).tar.gz -GARCOMPILER = GCC4 +GARCOMPILER = GNU BUILD_DEP_PKGS += CSWlibdbi-dev BUILD_DEP_PKGS += CSWlibapr-dev @@ -30,23 +31,10 @@ RUNTIME_DEP_PKGS_CSWnxlog-ce += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWnxlog-ce += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWnxlog-ce += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWnxlog-ce += CSWlibnx0 -PACKAGES += CSWlibnx0 -CATALOGNAME_CSWlibnx0 = libnx0 -PKGFILES_CSWlibnx0 += $(call baseisadirs,$(libdir),libnx\.so\.0\.0\.0) -PKGFILES_CSWlibnx0 += $(call baseisadirs,$(libdir),libnx\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibnx0 += $(DESCRIPTION), libnx.so.0 -RUNTIME_DEP_PKGS_CSWlibnx0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibnx0 += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWlibnx0 += CSWlibpcre1 +OBSOLETED_BY_CSWnxlog-ce += CSWlibnx0 +OBSOLETED_BY_CSWnxlog-ce += CSWnxlog-ce-dev -PACKAGES += CSWnxlog-ce-dev -CATALOGNAME_CSWnxlog-ce-dev = nxlog_ce_dev -SPKG_DESC_CSWnxlog-ce-dev += $(DESCRIPTION), development files -PKGFILES_CSWnxlog-ce-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWnxlog-ce-dev += CSWlibnx0 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no Modified: csw/mgar/pkg/nxlog/trunk/checksums =================================================================== --- csw/mgar/pkg/nxlog/trunk/checksums 2021-09-13 09:28:26 UTC (rev 26785) +++ csw/mgar/pkg/nxlog/trunk/checksums 2021-09-13 12:15:59 UTC (rev 26786) @@ -1 +1 @@ -527795596da4f54793dae8f95b0e31e6 nxlog-ce-2.5.1089.tar.gz +5c78bf33a17a85eecdee867b724833d3 nxlog-ce-2.11.2190.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 13 14:39:34 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Sep 2021 12:39:34 +0000 Subject: SF.net SVN: gar:[26787] csw/mgar/pkg/ganglia-modules-solaris/trunk/ Makefile Message-ID: <1631536774.228734.16302@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26787 http://sourceforge.net/p/gar/code/26787 Author: dmichelsen Date: 2021-09-13 12:39:33 +0000 (Mon, 13 Sep 2021) Log Message: ----------- ganglia-modules-solaris/trunk: Makefile standardized Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2021-09-13 12:15:59 UTC (rev 26786) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2021-09-13 12:39:33 UTC (rev 26787) @@ -2,14 +2,6 @@ VERSION = 1.0.1 GARTYPE = v2 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -# Hardwired to skip the tests -ifeq ($(VERSION),1.0) -#TEST_TARGET = check -TEST_SCRIPTS = -endif - DESCRIPTION = Ganglia modules for IO and per-core CPU stats on Solaris define BLURB Ganglia is a distributed architecture for performance metrics. @@ -20,39 +12,29 @@ SF_PROJECT = gmod-solaris MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(PATCHFILES) -#DISTFILES += COPYING -DISTNAME = $(NAME)-$(VERSION) +DISTFILES += $(DISTNAME).tar.gz -EXTRA_DOCS = $(PATCHFILES) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - BUILD64_LIBS_ONLY = 1 -BUILD_DEP_PKGS = CSWlibapr1-0 CSWganglia-dev +BUILD_DEP_PKGS += CSWlibapr-dev +BUILD_DEP_PKGS += CSWganglia-dev -RUNTIME_DEP_PKGS = CSWlibapr1-0 CSWgangliaagent CSWlibganglia0 +PACKAGES += CSWganglia-modules-solaris +SPKG_DESC_CSWganglia-modules-solaris = CSWganglia-modules-solarisA +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWganglia-modules-solaris += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWganglia-modules-solaris += CSWgangliaagent +RUNTIME_DEP_PKGS_CSWganglia-modules-solaris += CSWlibganglia0 +CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWlibapr1-0 +CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWgangliaagent CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWlibganglia0 -CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWgangliaagent -CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWlibapr1-0 -PKGFILES = /opt/csw/lib/ganglia/modio.so -PKGFILES += /opt/csw/lib/ganglia/modmulticpu.so -PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_io.conf.CSW -PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_multicpu.conf.CSW - -PRESERVECONF = /etc/opt/csw/ganglia/conf.d/mod_io.conf +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/mod_io.conf PRESERVECONF += /etc/opt/csw/ganglia/conf.d/mod_multicpu.conf CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-nls +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --disable-nls include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 13 18:04:51 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Sep 2021 16:04:51 +0000 Subject: SF.net SVN: gar:[26788] csw/mgar/pkg/sudo/trunk Message-ID: <1631549091.234319.17227@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26788 http://sourceforge.net/p/gar/code/26788 Author: dmichelsen Date: 2021-09-13 16:04:50 +0000 (Mon, 13 Sep 2021) Log Message: ----------- sudo/trunk: Update to 1.9.8 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2021-09-13 12:39:33 UTC (rev 26787) +++ csw/mgar/pkg/sudo/trunk/Makefile 2021-09-13 16:04:50 UTC (rev 26788) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.9.7p2 +VERSION = 1.9.8 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -16,7 +16,9 @@ is not a replacement for the shell. endef -MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ +#MASTER_SITES += ftp://ftp.sudo.ws/pub/sudo/ +MASTER_SITES += https://www.sudo.ws/dist/ +MASTER_SITES += https://www.sudo.ws/dist/beta/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += sudo.conf.CSW DISTFILES += map.sudo Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2021-09-13 12:39:33 UTC (rev 26787) +++ csw/mgar/pkg/sudo/trunk/checksums 2021-09-13 16:04:50 UTC (rev 26788) @@ -1 +1 @@ -d6f8217bfd16649236e100c49e0a7cc4 sudo-1.9.7p2.tar.gz +0a38acd342112b86e8163a26818bdbbd sudo-1.9.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 14 08:46:04 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Sep 2021 06:46:04 +0000 Subject: SF.net SVN: gar:[26789] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <1631601964.558189.16028@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26789 http://sourceforge.net/p/gar/code/26789 Author: dmichelsen Date: 2021-09-14 06:46:03 +0000 (Tue, 14 Sep 2021) Log Message: ----------- subversion/trunk: Add sparcv9 overrides Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-13 16:04:50 UTC (rev 26788) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-14 06:46:03 UTC (rev 26789) @@ -377,6 +377,8 @@ PKGFILES_CSWjavasvn += $(call pkgfiles_lib,libsvnjavahl-1.so.0) CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 +CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjava +-0 PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/svn-javahl.jar) PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/include.*) PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW @@ -403,6 +405,7 @@ CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/amd64|opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/sparcv9|opt/csw/lib/sparcv9/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpm-subversion SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 14 08:55:17 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Sep 2021 06:55:17 +0000 Subject: SF.net SVN: gar:[26790] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <1631602518.5748.25956@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26790 http://sourceforge.net/p/gar/code/26790 Author: dmichelsen Date: 2021-09-14 06:55:17 +0000 (Tue, 14 Sep 2021) Log Message: ----------- subversion/trunk: Fix typo Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-14 06:46:03 UTC (rev 26789) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-14 06:55:17 UTC (rev 26790) @@ -377,8 +377,7 @@ PKGFILES_CSWjavasvn += $(call pkgfiles_lib,libsvnjavahl-1.so.0) CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 -CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjava --0 +CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0 PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/svn-javahl.jar) PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/include.*) PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 14 13:30:29 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Sep 2021 11:30:29 +0000 Subject: SF.net SVN: gar:[26791] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <1631619029.202245.3527@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26791 http://sourceforge.net/p/gar/code/26791 Author: dmichelsen Date: 2021-09-14 11:30:28 +0000 (Tue, 14 Sep 2021) Log Message: ----------- subversion/trunk: Enable ISAEXEC Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-14 06:55:17 UTC (rev 26790) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-14 11:30:28 UTC (rev 26791) @@ -560,8 +560,8 @@ GARCOMPILER += $(GARCOMPILER-$(GAROSREL)) # There are lots of failing tests, needs more work -# BUILD64_LIBS_ONLY = 1 BUILD64 = 1 +ISAEXEC = 1 #NODIRPATHS = --libdir --libexecdir #CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 15 12:06:01 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Sep 2021 10:06:01 +0000 Subject: SF.net SVN: gar:[26792] csw/mgar/pkg/curl/trunk Message-ID: <1631700361.296996.13308@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26792 http://sourceforge.net/p/gar/code/26792 Author: dmichelsen Date: 2021-09-15 10:06:00 +0000 (Wed, 15 Sep 2021) Log Message: ----------- curl/trunk: Update to 7.79.0 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2021-09-14 11:30:28 UTC (rev 26791) +++ csw/mgar/pkg/curl/trunk/Makefile 2021-09-15 10:06:00 UTC (rev 26792) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.77.0 +VERSION = 7.79.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -27,7 +27,6 @@ BUILD_DEP_PKGS += CSWlibssh2-dev BUILD_DEP_PKGS += CSWlibrtmp-dev BUILD_DEP_PKGS += CSWlibidn2-dev -BUILD_DEP_PKGS += CSWlibmetalink-dev BUILD_DEP_PKGS += CSWlibnghttp2-dev BUILD_DEP_PKGS += CSWlibbrotli-dev @@ -98,8 +97,6 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3 RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl9 # Linker anomaly @@ -123,7 +120,8 @@ EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps -EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink +# Support for Metalink was removed in 7.79.0 +# EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink # The problem is that krb5-config is taken from $GSSAPI_ROOT/bin/krb5-config which does not take # the isa-specific /opt/csw/bin/(sparcv9|amd64)/krb5-config into account. Use workaround until this is fixed: # https://sourceforge.net/p/curl/bugs/1486/ Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2021-09-14 11:30:28 UTC (rev 26791) +++ csw/mgar/pkg/curl/trunk/checksums 2021-09-15 10:06:00 UTC (rev 26792) @@ -1 +1 @@ -3cf78c539cae019cf96ba38571706e06 curl-7.77.0.tar.xz +24408ce0068de0ae7871039451ad6f97 curl-7.79.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 15 16:20:18 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Sep 2021 14:20:18 +0000 Subject: SF.net SVN: gar:[26793] csw/mgar/pkg/subversion/trunk Message-ID: <1631715618.74051.32178@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26793 http://sourceforge.net/p/gar/code/26793 Author: dmichelsen Date: 2021-09-15 14:20:17 +0000 (Wed, 15 Sep 2021) Log Message: ----------- subversion/trunk: Add backport for Python 2.7 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-15 10:06:00 UTC (rev 26792) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-15 14:20:17 UTC (rev 26793) @@ -48,6 +48,9 @@ # Use '__restrict' instead of 'restrict' when compiling the Java plugin with C++ PATCHFILES += 0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch +# Subversion 1.14.1 now requires at least Python 3.3, backport to 2.7 for now +PATCHFILES += 0001-Backport-to-Python-2.7.patch + VENDOR_URL = http://subversion.apache.org LICENSE = LICENSE @@ -58,9 +61,7 @@ # Subversion requires at least Python 2.7 MODULATIONS_PYTHON_VERSION = 2.7 PYTHON = $(bindir)/python$(PYTHON_VERSION) -MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all -MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only MERGE_SCRIPTS_isa-default64-python_version-2.7 += copy-relocated-only MERGE_DIRS_isa-default64-python_version-2.7 = $(bindir) $(sbindir) $(libexecdir) $(libdir) Added: csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch 2021-09-15 14:20:17 UTC (rev 26793) @@ -0,0 +1,1333 @@ +From e94c715780e95cd52f22cf6a5006940eb9b1ca2a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 15 Sep 2021 15:56:01 +0200 +Subject: [PATCH] Backport to Python 2.7 + +--- + subversion/bindings/swig/python/client.py | 510 +++++++++++++++--------------- + 1 file changed, 255 insertions(+), 255 deletions(-) + +diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py +index f094027..f5c53ae 100644 +--- a/subversion/bindings/swig/python/client.py ++++ b/subversion/bindings/swig/python/client.py +@@ -143,51 +143,51 @@ import libsvn.delta + import libsvn.wc + import libsvn.ra + +-def svn_client_version() -> "svn_version_t const *": ++def svn_client_version(): + """svn_client_version() -> svn_version_t const *""" + return _client.svn_client_version() + +-def svn_client_get_simple_prompt_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_simple_prompt_provider(*args): + """svn_client_get_simple_prompt_provider(svn_auth_simple_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" + return _client.svn_client_get_simple_prompt_provider(*args) + +-def svn_client_get_username_prompt_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_username_prompt_provider(*args): + """svn_client_get_username_prompt_provider(svn_auth_username_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" + return _client.svn_client_get_username_prompt_provider(*args) + +-def svn_client_get_simple_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_simple_provider(*args): + """svn_client_get_simple_provider(apr_pool_t pool)""" + return _client.svn_client_get_simple_provider(*args) + +-def svn_client_get_username_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_username_provider(*args): + """svn_client_get_username_provider(apr_pool_t pool)""" + return _client.svn_client_get_username_provider(*args) + +-def svn_client_get_ssl_server_trust_file_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_server_trust_file_provider(*args): + """svn_client_get_ssl_server_trust_file_provider(apr_pool_t pool)""" + return _client.svn_client_get_ssl_server_trust_file_provider(*args) + +-def svn_client_get_ssl_client_cert_file_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_client_cert_file_provider(*args): + """svn_client_get_ssl_client_cert_file_provider(apr_pool_t pool)""" + return _client.svn_client_get_ssl_client_cert_file_provider(*args) + +-def svn_client_get_ssl_client_cert_pw_file_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_client_cert_pw_file_provider(*args): + """svn_client_get_ssl_client_cert_pw_file_provider(apr_pool_t pool)""" + return _client.svn_client_get_ssl_client_cert_pw_file_provider(*args) + +-def svn_client_get_ssl_server_trust_prompt_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_server_trust_prompt_provider(*args): + """svn_client_get_ssl_server_trust_prompt_provider(svn_auth_ssl_server_trust_prompt_func_t prompt_func, apr_pool_t pool)""" + return _client.svn_client_get_ssl_server_trust_prompt_provider(*args) + +-def svn_client_get_ssl_client_cert_prompt_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_client_cert_prompt_provider(*args): + """svn_client_get_ssl_client_cert_prompt_provider(svn_auth_ssl_client_cert_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" + return _client.svn_client_get_ssl_client_cert_prompt_provider(*args) + +-def svn_client_get_ssl_client_cert_pw_prompt_provider(*args) -> "svn_auth_provider_object_t **": ++def svn_client_get_ssl_client_cert_pw_prompt_provider(*args): + """svn_client_get_ssl_client_cert_pw_prompt_provider(svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" + return _client.svn_client_get_ssl_client_cert_pw_prompt_provider(*args) + +-def svn_client_proplist_item_dup(*args) -> "svn_client_proplist_item_t *": ++def svn_client_proplist_item_dup(*args): + """svn_client_proplist_item_dup(svn_client_proplist_item_t const * item, apr_pool_t pool) -> svn_client_proplist_item_t *""" + return _client.svn_client_proplist_item_dup(*args) + class svn_client_commit_info_t(object): +@@ -603,19 +603,19 @@ svn_client_commit_item_t_swigregister = _client.svn_client_commit_item_t_swigreg + svn_client_commit_item_t_swigregister(svn_client_commit_item_t) + + +-def svn_client_commit_item3_create(*args) -> "svn_client_commit_item3_t *": ++def svn_client_commit_item3_create(*args): + """svn_client_commit_item3_create(apr_pool_t pool) -> svn_client_commit_item3_t""" + return _client.svn_client_commit_item3_create(*args) + +-def svn_client_commit_item_create(*args) -> "svn_client_commit_item3_t const **": ++def svn_client_commit_item_create(*args): + """svn_client_commit_item_create(apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit_item_create(*args) + +-def svn_client_commit_item3_dup(*args) -> "svn_client_commit_item3_t *": ++def svn_client_commit_item3_dup(*args): + """svn_client_commit_item3_dup(svn_client_commit_item3_t item, apr_pool_t pool) -> svn_client_commit_item3_t""" + return _client.svn_client_commit_item3_dup(*args) + +-def svn_client_commit_item2_dup(*args) -> "svn_client_commit_item2_t *": ++def svn_client_commit_item2_dup(*args): + """svn_client_commit_item2_dup(svn_client_commit_item2_t item, apr_pool_t pool) -> svn_client_commit_item2_t""" + return _client.svn_client_commit_item2_dup(*args) + svn_client_diff_summarize_kind_normal = _client.svn_client_diff_summarize_kind_normal +@@ -721,7 +721,7 @@ svn_client_diff_summarize_t_swigregister = _client.svn_client_diff_summarize_t_s + svn_client_diff_summarize_t_swigregister(svn_client_diff_summarize_t) + + +-def svn_client_diff_summarize_dup(*args) -> "svn_client_diff_summarize_t *": ++def svn_client_diff_summarize_dup(*args): + """svn_client_diff_summarize_dup(svn_client_diff_summarize_t diff, apr_pool_t pool) -> svn_client_diff_summarize_t""" + return _client.svn_client_diff_summarize_dup(*args) + class svn_client_ctx_t(object): +@@ -845,161 +845,161 @@ svn_client_ctx_t_swigregister = _client.svn_client_ctx_t_swigregister + svn_client_ctx_t_swigregister(svn_client_ctx_t) + + +-def svn_client_create_context2(*args) -> "svn_client_ctx_t **": ++def svn_client_create_context2(*args): + """svn_client_create_context2(apr_hash_t cfg_hash, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_create_context2(*args) + +-def svn_client_create_context(*args) -> "svn_client_ctx_t **": ++def svn_client_create_context(*args): + """svn_client_create_context(apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_create_context(*args) + SVN_CLIENT_AUTH_USERNAME = _client.SVN_CLIENT_AUTH_USERNAME + SVN_CLIENT_AUTH_PASSWORD = _client.SVN_CLIENT_AUTH_PASSWORD + +-def svn_client_args_to_target_array2(*args) -> "apr_array_header_t **": ++def svn_client_args_to_target_array2(*args): + """svn_client_args_to_target_array2(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, svn_boolean_t keep_last_origpath_on_truepath_collision, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_args_to_target_array2(*args) + +-def svn_client_args_to_target_array(*args) -> "apr_array_header_t **": ++def svn_client_args_to_target_array(*args): + """svn_client_args_to_target_array(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_args_to_target_array(*args) + +-def svn_client_checkout3(*args) -> "svn_revnum_t *": ++def svn_client_checkout3(*args): + """svn_client_checkout3(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_checkout3(*args) + +-def svn_client_checkout2(*args) -> "svn_revnum_t *": ++def svn_client_checkout2(*args): + """svn_client_checkout2(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_checkout2(*args) + +-def svn_client_checkout(*args) -> "svn_revnum_t *": ++def svn_client_checkout(*args): + """svn_client_checkout(char const * URL, char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_checkout(*args) + +-def svn_client_update4(*args) -> "apr_array_header_t **": ++def svn_client_update4(*args): + """svn_client_update4(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t make_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_update4(*args) + +-def svn_client_update3(*args) -> "apr_array_header_t **": ++def svn_client_update3(*args): + """svn_client_update3(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_update3(*args) + +-def svn_client_update2(*args) -> "apr_array_header_t **": ++def svn_client_update2(*args): + """svn_client_update2(apr_array_header_t paths, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_update2(*args) + +-def svn_client_update(*args) -> "svn_revnum_t *": ++def svn_client_update(*args): + """svn_client_update(char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_update(*args) + +-def svn_client_switch3(*args) -> "svn_revnum_t *": ++def svn_client_switch3(*args): + """svn_client_switch3(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t ignore_ancestry, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_switch3(*args) + +-def svn_client_switch2(*args) -> "svn_revnum_t *": ++def svn_client_switch2(*args): + """svn_client_switch2(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_switch2(*args) + +-def svn_client_switch(*args) -> "svn_revnum_t *": ++def svn_client_switch(*args): + """svn_client_switch(char const * path, char const * url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_switch(*args) + +-def svn_client__layout_list(*args) -> "svn_error_t *": ++def svn_client__layout_list(*args): + """svn_client__layout_list(char const * local_abspath, svn_client__layout_func_t layout, void * layout_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client__layout_list(*args) + +-def svn_client_add5(*args) -> "svn_error_t *": ++def svn_client_add5(*args): + """svn_client_add5(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_add5(*args) + +-def svn_client_add4(*args) -> "svn_error_t *": ++def svn_client_add4(*args): + """svn_client_add4(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_add4(*args) + +-def svn_client_add3(*args) -> "svn_error_t *": ++def svn_client_add3(*args): + """svn_client_add3(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_add3(*args) + +-def svn_client_add2(*args) -> "svn_error_t *": ++def svn_client_add2(*args): + """svn_client_add2(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_add2(*args) + +-def svn_client_add(*args) -> "svn_error_t *": ++def svn_client_add(*args): + """svn_client_add(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_add(*args) + +-def svn_client_mkdir4(*args) -> "svn_error_t *": ++def svn_client_mkdir4(*args): + """svn_client_mkdir4(apr_array_header_t paths, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mkdir4(*args) + +-def svn_client_mkdir3(*args) -> "svn_commit_info_t **": ++def svn_client_mkdir3(*args): + """svn_client_mkdir3(apr_array_header_t paths, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mkdir3(*args) + +-def svn_client_mkdir2(*args) -> "svn_commit_info_t **": ++def svn_client_mkdir2(*args): + """svn_client_mkdir2(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mkdir2(*args) + +-def svn_client_mkdir(*args) -> "svn_client_commit_info_t **": ++def svn_client_mkdir(*args): + """svn_client_mkdir(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mkdir(*args) + +-def svn_client_delete4(*args) -> "svn_error_t *": ++def svn_client_delete4(*args): + """svn_client_delete4(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_delete4(*args) + +-def svn_client_delete3(*args) -> "svn_commit_info_t **": ++def svn_client_delete3(*args): + """svn_client_delete3(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_delete3(*args) + +-def svn_client_delete2(*args) -> "svn_commit_info_t **": ++def svn_client_delete2(*args): + """svn_client_delete2(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_delete2(*args) + +-def svn_client_delete(*args) -> "svn_client_commit_info_t **": ++def svn_client_delete(*args): + """svn_client_delete(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_delete(*args) + +-def svn_client_import5(*args) -> "svn_error_t *": ++def svn_client_import5(*args): + """svn_client_import5(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_import_filter_func_t filter_callback, void * filter_baton, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_import5(*args) + +-def svn_client_import4(*args) -> "svn_error_t *": ++def svn_client_import4(*args): + """svn_client_import4(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_import4(*args) + +-def svn_client_import3(*args) -> "svn_commit_info_t **": ++def svn_client_import3(*args): + """svn_client_import3(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_import3(*args) + +-def svn_client_import2(*args) -> "svn_commit_info_t **": ++def svn_client_import2(*args): + """svn_client_import2(char const * path, char const * url, svn_boolean_t nonrecursive, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_import2(*args) + +-def svn_client_import(*args) -> "svn_client_commit_info_t **": ++def svn_client_import(*args): + """svn_client_import(char const * path, char const * url, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_import(*args) + +-def svn_client_commit6(*args) -> "svn_error_t *": ++def svn_client_commit6(*args): + """svn_client_commit6(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, svn_boolean_t include_file_externals, svn_boolean_t include_dir_externals, apr_array_header_t changelists, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit6(*args) + +-def svn_client_commit5(*args) -> "svn_error_t *": ++def svn_client_commit5(*args): + """svn_client_commit5(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, apr_array_header_t changelists, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit5(*args) + +-def svn_client_commit4(*args) -> "svn_commit_info_t **": ++def svn_client_commit4(*args): + """svn_client_commit4(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit4(*args) + +-def svn_client_commit3(*args) -> "svn_commit_info_t **": ++def svn_client_commit3(*args): + """svn_client_commit3(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit3(*args) + +-def svn_client_commit2(*args) -> "svn_client_commit_info_t **": ++def svn_client_commit2(*args): + """svn_client_commit2(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit2(*args) + +-def svn_client_commit(*args) -> "svn_client_commit_info_t **": ++def svn_client_commit(*args): + """svn_client_commit(apr_array_header_t targets, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_commit(*args) + class svn_client_status_t(object): +@@ -1130,259 +1130,259 @@ svn_client_status_t_swigregister = _client.svn_client_status_t_swigregister + svn_client_status_t_swigregister(svn_client_status_t) + + +-def svn_client_status_dup(*args) -> "svn_client_status_t *": ++def svn_client_status_dup(*args): + """svn_client_status_dup(svn_client_status_t status, apr_pool_t result_pool) -> svn_client_status_t""" + return _client.svn_client_status_dup(*args) + +-def svn_client_status6(*args) -> "svn_revnum_t *": ++def svn_client_status6(*args): + """svn_client_status6(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t check_out_of_date, svn_boolean_t check_working_copy, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_status6(*args) + +-def svn_client_status5(*args) -> "svn_revnum_t *": ++def svn_client_status5(*args): + """svn_client_status5(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_status5(*args) + +-def svn_client_status4(*args) -> "svn_revnum_t *": ++def svn_client_status4(*args): + """svn_client_status4(char const * path, svn_opt_revision_t revision, svn_wc_status_func3_t status_func, void * status_baton, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_status4(*args) + +-def svn_client_status3(*args) -> "svn_revnum_t *": ++def svn_client_status3(*args): + """svn_client_status3(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_status3(*args) + +-def svn_client_status2(*args) -> "svn_revnum_t *": ++def svn_client_status2(*args): + """svn_client_status2(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_status2(*args) + +-def svn_client_status(*args) -> "svn_revnum_t *": ++def svn_client_status(*args): + """svn_client_status(char const * path, svn_opt_revision_t revision, svn_wc_status_func_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_status(*args) + +-def svn_client_log5(*args) -> "svn_error_t *": ++def svn_client_log5(*args): + """svn_client_log5(apr_array_header_t targets, svn_opt_revision_t peg_revision, apr_array_header_t revision_ranges, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_log5(*args) + +-def svn_client_log4(*args) -> "svn_error_t *": ++def svn_client_log4(*args): + """svn_client_log4(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_log4(*args) + +-def svn_client_log3(*args) -> "svn_error_t *": ++def svn_client_log3(*args): + """svn_client_log3(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_log3(*args) + +-def svn_client_log2(*args) -> "svn_error_t *": ++def svn_client_log2(*args): + """svn_client_log2(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_log2(*args) + +-def svn_client_log(*args) -> "svn_error_t *": ++def svn_client_log(*args): + """svn_client_log(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_log(*args) + +-def svn_client_blame6(*args) -> "svn_revnum_t *, svn_revnum_t *": ++def svn_client_blame6(*args): + """svn_client_blame6(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver4_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame6(*args) + +-def svn_client_blame5(*args) -> "svn_error_t *": ++def svn_client_blame5(*args): + """svn_client_blame5(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver3_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame5(*args) + +-def svn_client_blame4(*args) -> "svn_error_t *": ++def svn_client_blame4(*args): + """svn_client_blame4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame4(*args) + +-def svn_client_blame3(*args) -> "svn_error_t *": ++def svn_client_blame3(*args): + """svn_client_blame3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame3(*args) + +-def svn_client_blame2(*args) -> "svn_error_t *": ++def svn_client_blame2(*args): + """svn_client_blame2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame2(*args) + +-def svn_client_blame(*args) -> "svn_error_t *": ++def svn_client_blame(*args): + """svn_client_blame(char const * path_or_url, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_blame(*args) + +-def svn_client_diff7(*args) -> "svn_error_t *": ++def svn_client_diff7(*args): + """svn_client_diff7(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff7(*args) + +-def svn_client_diff6(*args) -> "svn_error_t *": ++def svn_client_diff6(*args): + """svn_client_diff6(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff6(*args) + +-def svn_client_diff5(*args) -> "svn_error_t *": ++def svn_client_diff5(*args): + """svn_client_diff5(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff5(*args) + +-def svn_client_diff4(*args) -> "svn_error_t *": ++def svn_client_diff4(*args): + """svn_client_diff4(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff4(*args) + +-def svn_client_diff3(*args) -> "svn_error_t *": ++def svn_client_diff3(*args): + """svn_client_diff3(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff3(*args) + +-def svn_client_diff2(*args) -> "svn_error_t *": ++def svn_client_diff2(*args): + """svn_client_diff2(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff2(*args) + +-def svn_client_diff(*args) -> "svn_error_t *": ++def svn_client_diff(*args): + """svn_client_diff(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff(*args) + +-def svn_client_diff_peg7(*args) -> "svn_error_t *": ++def svn_client_diff_peg7(*args): + """svn_client_diff_peg7(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg7(*args) + +-def svn_client_diff_peg6(*args) -> "svn_error_t *": ++def svn_client_diff_peg6(*args): + """svn_client_diff_peg6(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg6(*args) + +-def svn_client_diff_peg5(*args) -> "svn_error_t *": ++def svn_client_diff_peg5(*args): + """svn_client_diff_peg5(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg5(*args) + +-def svn_client_diff_peg4(*args) -> "svn_error_t *": ++def svn_client_diff_peg4(*args): + """svn_client_diff_peg4(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg4(*args) + +-def svn_client_diff_peg3(*args) -> "svn_error_t *": ++def svn_client_diff_peg3(*args): + """svn_client_diff_peg3(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg3(*args) + +-def svn_client_diff_peg2(*args) -> "svn_error_t *": ++def svn_client_diff_peg2(*args): + """svn_client_diff_peg2(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg2(*args) + +-def svn_client_diff_peg(*args) -> "svn_error_t *": ++def svn_client_diff_peg(*args): + """svn_client_diff_peg(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_peg(*args) + +-def svn_client_diff_summarize2(*args) -> "svn_error_t *": ++def svn_client_diff_summarize2(*args): + """svn_client_diff_summarize2(char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_summarize2(*args) + +-def svn_client_diff_summarize(*args) -> "svn_error_t *": ++def svn_client_diff_summarize(*args): + """svn_client_diff_summarize(char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_summarize(*args) + +-def svn_client_diff_summarize_peg2(*args) -> "svn_error_t *": ++def svn_client_diff_summarize_peg2(*args): + """svn_client_diff_summarize_peg2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_summarize_peg2(*args) + +-def svn_client_diff_summarize_peg(*args) -> "svn_error_t *": ++def svn_client_diff_summarize_peg(*args): + """svn_client_diff_summarize_peg(char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_diff_summarize_peg(*args) + +-def svn_client_get_merging_summary(*args) -> "svn_boolean_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **": ++def svn_client_get_merging_summary(*args): + """svn_client_get_merging_summary(char const * source_path_or_url, svn_opt_revision_t source_revision, char const * target_path_or_url, svn_opt_revision_t target_revision, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_get_merging_summary(*args) + +-def svn_client_merge5(*args) -> "svn_error_t *": ++def svn_client_merge5(*args): + """svn_client_merge5(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge5(*args) + +-def svn_client_merge4(*args) -> "svn_error_t *": ++def svn_client_merge4(*args): + """svn_client_merge4(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge4(*args) + +-def svn_client_merge3(*args) -> "svn_error_t *": ++def svn_client_merge3(*args): + """svn_client_merge3(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge3(*args) + +-def svn_client_merge2(*args) -> "svn_error_t *": ++def svn_client_merge2(*args): + """svn_client_merge2(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge2(*args) + +-def svn_client_merge(*args) -> "svn_error_t *": ++def svn_client_merge(*args): + """svn_client_merge(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge(*args) + +-def svn_client_merge_reintegrate(*args) -> "svn_error_t *": ++def svn_client_merge_reintegrate(*args): + """svn_client_merge_reintegrate(char const * source_path_or_url, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_reintegrate(*args) + +-def svn_client_merge_peg5(*args) -> "svn_error_t *": ++def svn_client_merge_peg5(*args): + """svn_client_merge_peg5(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_peg5(*args) + +-def svn_client_merge_peg4(*args) -> "svn_error_t *": ++def svn_client_merge_peg4(*args): + """svn_client_merge_peg4(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_peg4(*args) + +-def svn_client_merge_peg3(*args) -> "svn_error_t *": ++def svn_client_merge_peg3(*args): + """svn_client_merge_peg3(char const * source, apr_array_header_t ranges_to_merge, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_peg3(*args) + +-def svn_client_merge_peg2(*args) -> "svn_error_t *": ++def svn_client_merge_peg2(*args): + """svn_client_merge_peg2(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_peg2(*args) + +-def svn_client_merge_peg(*args) -> "svn_error_t *": ++def svn_client_merge_peg(*args): + """svn_client_merge_peg(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_merge_peg(*args) + +-def svn_client_suggest_merge_sources(*args) -> "apr_array_header_t **": ++def svn_client_suggest_merge_sources(*args): + """svn_client_suggest_merge_sources(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_suggest_merge_sources(*args) + +-def svn_client_mergeinfo_get_merged(*args) -> "apr_hash_t **": ++def svn_client_mergeinfo_get_merged(*args): + """svn_client_mergeinfo_get_merged(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mergeinfo_get_merged(*args) + +-def svn_client_mergeinfo_log2(*args) -> "svn_error_t *": ++def svn_client_mergeinfo_log2(*args): + """svn_client_mergeinfo_log2(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_opt_revision_t source_start_revision, svn_opt_revision_t source_end_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_mergeinfo_log2(*args) + +-def svn_client_mergeinfo_log(*args) -> "svn_error_t *": ++def svn_client_mergeinfo_log(*args): + """svn_client_mergeinfo_log(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_mergeinfo_log(*args) + +-def svn_client_mergeinfo_log_merged(*args) -> "svn_error_t *": ++def svn_client_mergeinfo_log_merged(*args): + """svn_client_mergeinfo_log_merged(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mergeinfo_log_merged(*args) + +-def svn_client_mergeinfo_log_eligible(*args) -> "svn_error_t *": ++def svn_client_mergeinfo_log_eligible(*args): + """svn_client_mergeinfo_log_eligible(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_mergeinfo_log_eligible(*args) + +-def svn_client_vacuum(*args) -> "svn_error_t *": ++def svn_client_vacuum(*args): + """svn_client_vacuum(char const * dir_abspath, svn_boolean_t remove_unversioned_items, svn_boolean_t remove_ignored_items, svn_boolean_t fix_recorded_timestamps, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_vacuum(*args) + +-def svn_client_cleanup2(*args) -> "svn_error_t *": ++def svn_client_cleanup2(*args): + """svn_client_cleanup2(char const * dir_abspath, svn_boolean_t break_locks, svn_boolean_t fix_recorded_timestamps, svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_cleanup2(*args) + +-def svn_client_cleanup(*args) -> "svn_error_t *": ++def svn_client_cleanup(*args): + """svn_client_cleanup(char const * dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_cleanup(*args) + +-def svn_client_upgrade(*args) -> "svn_error_t *": ++def svn_client_upgrade(*args): + """svn_client_upgrade(char const * wcroot_dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_upgrade(*args) + +-def svn_client_relocate2(*args) -> "svn_error_t *": ++def svn_client_relocate2(*args): + """svn_client_relocate2(char const * wcroot_dir, char const * from_prefix, char const * to_prefix, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_relocate2(*args) + +-def svn_client_relocate(*args) -> "svn_error_t *": ++def svn_client_relocate(*args): + """svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_relocate(*args) + +-def svn_client_revert4(*args) -> "svn_error_t *": ++def svn_client_revert4(*args): + """svn_client_revert4(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_revert4(*args) + +-def svn_client_revert3(*args) -> "svn_error_t *": ++def svn_client_revert3(*args): + """svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revert3(*args) + +-def svn_client_revert2(*args) -> "svn_error_t *": ++def svn_client_revert2(*args): + """svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revert2(*args) + +-def svn_client_revert(*args) -> "svn_error_t *": ++def svn_client_revert(*args): + """svn_client_revert(apr_array_header_t paths, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revert(*args) + svn_client_conflict_option_undefined = _client.svn_client_conflict_option_undefined +@@ -1416,187 +1416,187 @@ svn_client_conflict_option_both_moved_file_move_merge = _client.svn_client_confl + svn_client_conflict_option_both_moved_dir_merge = _client.svn_client_conflict_option_both_moved_dir_merge + svn_client_conflict_option_both_moved_dir_move_merge = _client.svn_client_conflict_option_both_moved_dir_move_merge + +-def svn_client_conflict_option_set_merged_propval(option: 'svn_client_conflict_option_t *', merged_propval: 'svn_string_t const *') -> "void": ++def svn_client_conflict_option_set_merged_propval(option, merged_propval): + """svn_client_conflict_option_set_merged_propval(svn_client_conflict_option_t * option, svn_string_t const * merged_propval)""" + return _client.svn_client_conflict_option_set_merged_propval(option, merged_propval) + +-def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) -> "apr_array_header_t **": ++def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args): + """svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) + +-def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) -> "apr_array_header_t **": ++def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args): + """svn_client_conflict_option_get_moved_to_repos_relpath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) + +-def svn_client_conflict_option_set_moved_to_repos_relpath2(*args) -> "svn_error_t *": ++def svn_client_conflict_option_set_moved_to_repos_relpath2(*args): + """svn_client_conflict_option_set_moved_to_repos_relpath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_repos_relpath2(*args) + +-def svn_client_conflict_option_set_moved_to_repos_relpath(*args) -> "svn_error_t *": ++def svn_client_conflict_option_set_moved_to_repos_relpath(*args): + """svn_client_conflict_option_set_moved_to_repos_relpath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_repos_relpath(*args) + +-def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) -> "apr_array_header_t **": ++def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args): + """svn_client_conflict_option_get_moved_to_abspath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) + +-def svn_client_conflict_option_get_moved_to_abspath_candidates(*args) -> "apr_array_header_t **": ++def svn_client_conflict_option_get_moved_to_abspath_candidates(*args): + """svn_client_conflict_option_get_moved_to_abspath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_get_moved_to_abspath_candidates(*args) + +-def svn_client_conflict_option_set_moved_to_abspath2(*args) -> "svn_error_t *": ++def svn_client_conflict_option_set_moved_to_abspath2(*args): + """svn_client_conflict_option_set_moved_to_abspath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_abspath2(*args) + +-def svn_client_conflict_option_set_moved_to_abspath(*args) -> "svn_error_t *": ++def svn_client_conflict_option_set_moved_to_abspath(*args): + """svn_client_conflict_option_set_moved_to_abspath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_option_set_moved_to_abspath(*args) + +-def svn_client_conflict_option_find_by_id(options: 'apr_array_header_t', option_id: 'svn_client_conflict_option_id_t') -> "svn_client_conflict_option_t *": ++def svn_client_conflict_option_find_by_id(options, option_id): + """svn_client_conflict_option_find_by_id(apr_array_header_t options, svn_client_conflict_option_id_t option_id) -> svn_client_conflict_option_t *""" + return _client.svn_client_conflict_option_find_by_id(options, option_id) + +-def svn_client_conflict_get(*args) -> "svn_client_conflict_t **": ++def svn_client_conflict_get(*args): + """svn_client_conflict_get(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_get(*args) + +-def svn_client_conflict_walk(*args) -> "svn_error_t *": ++def svn_client_conflict_walk(*args): + """svn_client_conflict_walk(char const * local_abspath, svn_depth_t depth, svn_client_conflict_walk_func_t conflict_walk_func, void * conflict_walk_func_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_walk(*args) + +-def svn_client_conflict_get_conflicted(*args) -> "svn_boolean_t *, apr_array_header_t **, svn_boolean_t *": ++def svn_client_conflict_get_conflicted(*args): + """svn_client_conflict_get_conflicted(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_get_conflicted(*args) + +-def svn_client_conflict_prop_get_description(*args) -> "char const **": ++def svn_client_conflict_prop_get_description(*args): + """svn_client_conflict_prop_get_description(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_prop_get_description(*args) + +-def svn_client_conflict_tree_get_description(*args) -> "char const **, char const **": ++def svn_client_conflict_tree_get_description(*args): + """svn_client_conflict_tree_get_description(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_tree_get_description(*args) + +-def svn_client_conflict_text_get_resolution_options(*args) -> "apr_array_header_t **": ++def svn_client_conflict_text_get_resolution_options(*args): + """svn_client_conflict_text_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_text_get_resolution_options(*args) + +-def svn_client_conflict_prop_get_resolution_options(*args) -> "apr_array_header_t **": ++def svn_client_conflict_prop_get_resolution_options(*args): + """svn_client_conflict_prop_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_prop_get_resolution_options(*args) + +-def svn_client_conflict_tree_get_resolution_options(*args) -> "apr_array_header_t **": ++def svn_client_conflict_tree_get_resolution_options(*args): + """svn_client_conflict_tree_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_tree_get_resolution_options(*args) + +-def svn_client_conflict_tree_get_details(*args) -> "svn_error_t *": ++def svn_client_conflict_tree_get_details(*args): + """svn_client_conflict_tree_get_details(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_tree_get_details(*args) + +-def svn_client_conflict_option_get_id(option: 'svn_client_conflict_option_t *') -> "svn_client_conflict_option_id_t": ++def svn_client_conflict_option_get_id(option): + """svn_client_conflict_option_get_id(svn_client_conflict_option_t * option) -> svn_client_conflict_option_id_t""" + return _client.svn_client_conflict_option_get_id(option) + +-def svn_client_conflict_option_get_label(*args) -> "char const *": ++def svn_client_conflict_option_get_label(*args): + """svn_client_conflict_option_get_label(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *""" + return _client.svn_client_conflict_option_get_label(*args) + +-def svn_client_conflict_option_get_description(*args) -> "char const *": ++def svn_client_conflict_option_get_description(*args): + """svn_client_conflict_option_get_description(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *""" + return _client.svn_client_conflict_option_get_description(*args) + +-def svn_client_conflict_get_recommended_option_id(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": ++def svn_client_conflict_get_recommended_option_id(conflict): + """svn_client_conflict_get_recommended_option_id(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" + return _client.svn_client_conflict_get_recommended_option_id(conflict) + +-def svn_client_conflict_get_local_abspath(conflict: 'svn_client_conflict_t *') -> "char const *": ++def svn_client_conflict_get_local_abspath(conflict): + """svn_client_conflict_get_local_abspath(svn_client_conflict_t * conflict) -> char const *""" + return _client.svn_client_conflict_get_local_abspath(conflict) + +-def svn_client_conflict_get_operation(conflict: 'svn_client_conflict_t *') -> "svn_wc_operation_t": ++def svn_client_conflict_get_operation(conflict): + """svn_client_conflict_get_operation(svn_client_conflict_t * conflict) -> svn_wc_operation_t""" + return _client.svn_client_conflict_get_operation(conflict) + +-def svn_client_conflict_get_incoming_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_action_t": ++def svn_client_conflict_get_incoming_change(conflict): + """svn_client_conflict_get_incoming_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_action_t""" + return _client.svn_client_conflict_get_incoming_change(conflict) + +-def svn_client_conflict_get_local_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_reason_t": ++def svn_client_conflict_get_local_change(conflict): + """svn_client_conflict_get_local_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_reason_t""" + return _client.svn_client_conflict_get_local_change(conflict) + +-def svn_client_conflict_get_repos_info(*args) -> "char const **, char const **": ++def svn_client_conflict_get_repos_info(*args): + """svn_client_conflict_get_repos_info(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_get_repos_info(*args) + +-def svn_client_conflict_get_incoming_old_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *": ++def svn_client_conflict_get_incoming_old_repos_location(*args): + """svn_client_conflict_get_incoming_old_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_get_incoming_old_repos_location(*args) + +-def svn_client_conflict_get_incoming_new_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *": ++def svn_client_conflict_get_incoming_new_repos_location(*args): + """svn_client_conflict_get_incoming_new_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_get_incoming_new_repos_location(*args) + +-def svn_client_conflict_tree_get_victim_node_kind(conflict: 'svn_client_conflict_t *') -> "svn_node_kind_t": ++def svn_client_conflict_tree_get_victim_node_kind(conflict): + """svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t * conflict) -> svn_node_kind_t""" + return _client.svn_client_conflict_tree_get_victim_node_kind(conflict) + +-def svn_client_conflict_tree_resolve(*args) -> "svn_error_t *": ++def svn_client_conflict_tree_resolve(*args): + """svn_client_conflict_tree_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_tree_resolve(*args) + +-def svn_client_conflict_tree_resolve_by_id(*args) -> "svn_error_t *": ++def svn_client_conflict_tree_resolve_by_id(*args): + """svn_client_conflict_tree_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_tree_resolve_by_id(*args) + +-def svn_client_conflict_tree_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": ++def svn_client_conflict_tree_get_resolution(conflict): + """svn_client_conflict_tree_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" + return _client.svn_client_conflict_tree_get_resolution(conflict) + +-def svn_client_conflict_prop_get_reject_abspath(conflict: 'svn_client_conflict_t *') -> "char const *": ++def svn_client_conflict_prop_get_reject_abspath(conflict): + """svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t * conflict) -> char const *""" + return _client.svn_client_conflict_prop_get_reject_abspath(conflict) + +-def svn_client_conflict_prop_get_propvals(*args) -> "svn_string_t **, svn_string_t **, svn_string_t **, svn_string_t **": ++def svn_client_conflict_prop_get_propvals(*args): + """svn_client_conflict_prop_get_propvals(svn_client_conflict_t * conflict, char const * propname, apr_pool_t result_pool) -> svn_error_t""" + return _client.svn_client_conflict_prop_get_propvals(*args) + +-def svn_client_conflict_prop_resolve(*args) -> "svn_error_t *": ++def svn_client_conflict_prop_resolve(*args): + """svn_client_conflict_prop_resolve(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_prop_resolve(*args) + +-def svn_client_conflict_prop_resolve_by_id(*args) -> "svn_error_t *": ++def svn_client_conflict_prop_resolve_by_id(*args): + """svn_client_conflict_prop_resolve_by_id(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_prop_resolve_by_id(*args) + +-def svn_client_conflict_prop_get_resolution(conflict: 'svn_client_conflict_t *', propname: 'char const *') -> "svn_client_conflict_option_id_t": ++def svn_client_conflict_prop_get_resolution(conflict, propname): + """svn_client_conflict_prop_get_resolution(svn_client_conflict_t * conflict, char const * propname) -> svn_client_conflict_option_id_t""" + return _client.svn_client_conflict_prop_get_resolution(conflict, propname) + +-def svn_client_conflict_text_get_mime_type(conflict: 'svn_client_conflict_t *') -> "char const *": ++def svn_client_conflict_text_get_mime_type(conflict): + """svn_client_conflict_text_get_mime_type(svn_client_conflict_t * conflict) -> char const *""" + return _client.svn_client_conflict_text_get_mime_type(conflict) + +-def svn_client_conflict_text_get_contents(*args) -> "char const **, char const **, char const **, char const **": ++def svn_client_conflict_text_get_contents(*args): + """svn_client_conflict_text_get_contents(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_text_get_contents(*args) + +-def svn_client_conflict_text_resolve(*args) -> "svn_error_t *": ++def svn_client_conflict_text_resolve(*args): + """svn_client_conflict_text_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_text_resolve(*args) + +-def svn_client_conflict_text_resolve_by_id(*args) -> "svn_error_t *": ++def svn_client_conflict_text_resolve_by_id(*args): + """svn_client_conflict_text_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_conflict_text_resolve_by_id(*args) + +-def svn_client_conflict_text_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": ++def svn_client_conflict_text_get_resolution(conflict): + """svn_client_conflict_text_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" + return _client.svn_client_conflict_text_get_resolution(conflict) + +-def svn_client_resolved(*args) -> "svn_error_t *": ++def svn_client_resolved(*args): + """svn_client_resolved(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_resolved(*args) + +-def svn_client_resolve(*args) -> "svn_error_t *": ++def svn_client_resolve(*args): + """svn_client_resolve(char const * path, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_resolve(*args) + class svn_client_copy_source_t(object): +@@ -1697,211 +1697,211 @@ svn_client_copy_source_t_swigregister = _client.svn_client_copy_source_t_swigreg + svn_client_copy_source_t_swigregister(svn_client_copy_source_t) + + +-def svn_client_copy7(*args) -> "svn_error_t *": ++def svn_client_copy7(*args): + """svn_client_copy7(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, svn_boolean_t metadata_only, svn_boolean_t pin_externals, apr_hash_t externals_to_pin, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy7(*args) + +-def svn_client_copy6(*args) -> "svn_error_t *": ++def svn_client_copy6(*args): + """svn_client_copy6(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy6(*args) + +-def svn_client_copy5(*args) -> "svn_commit_info_t **": ++def svn_client_copy5(*args): + """svn_client_copy5(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy5(*args) + +-def svn_client_copy4(*args) -> "svn_commit_info_t **": ++def svn_client_copy4(*args): + """svn_client_copy4(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy4(*args) + +-def svn_client_copy3(*args) -> "svn_commit_info_t **": ++def svn_client_copy3(*args): + """svn_client_copy3(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy3(*args) + +-def svn_client_copy2(*args) -> "svn_commit_info_t **": ++def svn_client_copy2(*args): + """svn_client_copy2(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy2(*args) + +-def svn_client_copy(*args) -> "svn_client_commit_info_t **": ++def svn_client_copy(*args): + """svn_client_copy(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_copy(*args) + +-def svn_client_move7(*args) -> "svn_error_t *": ++def svn_client_move7(*args): + """svn_client_move7(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, svn_boolean_t allow_mixed_revisions, svn_boolean_t metadata_only, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move7(*args) + +-def svn_client_move6(*args) -> "svn_error_t *": ++def svn_client_move6(*args): + """svn_client_move6(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move6(*args) + +-def svn_client_move5(*args) -> "svn_commit_info_t **": ++def svn_client_move5(*args): + """svn_client_move5(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t force, svn_boolean_t move_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move5(*args) + +-def svn_client_move4(*args) -> "svn_commit_info_t **": ++def svn_client_move4(*args): + """svn_client_move4(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move4(*args) + +-def svn_client_move3(*args) -> "svn_commit_info_t **": ++def svn_client_move3(*args): + """svn_client_move3(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move3(*args) + +-def svn_client_move2(*args) -> "svn_client_commit_info_t **": ++def svn_client_move2(*args): + """svn_client_move2(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move2(*args) + +-def svn_client_move(*args) -> "svn_client_commit_info_t **": ++def svn_client_move(*args): + """svn_client_move(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_move(*args) + +-def svn_client_propset_remote(*args) -> "svn_error_t *": ++def svn_client_propset_remote(*args): + """svn_client_propset_remote(char const * propname, svn_string_t const * propval, char const * url, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_propset_remote(*args) + +-def svn_client_propset_local(*args) -> "svn_error_t *": ++def svn_client_propset_local(*args): + """svn_client_propset_local(char const * propname, svn_string_t const * propval, apr_array_header_t targets, svn_depth_t depth, svn_boolean_t skip_checks, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_propset_local(*args) + +-def svn_client_propset3(*args) -> "svn_commit_info_t **": ++def svn_client_propset3(*args): + """svn_client_propset3(char const * propname, svn_string_t const * propval, char const * target, svn_depth_t depth, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propset3(*args) + +-def svn_client_propset2(*args) -> "svn_error_t *": ++def svn_client_propset2(*args): + """svn_client_propset2(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, svn_boolean_t skip_checks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propset2(*args) + +-def svn_client_propset(*args) -> "svn_error_t *": ++def svn_client_propset(*args): + """svn_client_propset(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propset(*args) + +-def svn_client_revprop_set2(*args) -> "svn_revnum_t *": ++def svn_client_revprop_set2(*args): + """svn_client_revprop_set2(char const * propname, svn_string_t const * propval, svn_string_t const * original_propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revprop_set2(*args) + +-def svn_client_revprop_set(*args) -> "svn_revnum_t *": ++def svn_client_revprop_set(*args): + """svn_client_revprop_set(char const * propname, svn_string_t const * propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revprop_set(*args) + +-def svn_client_propget5(*args) -> "apr_hash_t **, apr_array_header_t **, svn_revnum_t *": ++def svn_client_propget5(*args): + """svn_client_propget5(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_propget5(*args) + +-def svn_client_propget4(*args) -> "apr_hash_t **, svn_revnum_t *": ++def svn_client_propget4(*args): + """svn_client_propget4(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_propget4(*args) + +-def svn_client_propget3(*args) -> "apr_hash_t **, svn_revnum_t *": ++def svn_client_propget3(*args): + """svn_client_propget3(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propget3(*args) + +-def svn_client_propget2(*args) -> "apr_hash_t **": ++def svn_client_propget2(*args): + """svn_client_propget2(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propget2(*args) + +-def svn_client_propget(*args) -> "apr_hash_t **": ++def svn_client_propget(*args): + """svn_client_propget(char const * propname, char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_propget(*args) + +-def svn_client_revprop_get(*args) -> "svn_string_t **, svn_revnum_t *": ++def svn_client_revprop_get(*args): + """svn_client_revprop_get(char const * propname, char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revprop_get(*args) + +-def svn_client_proplist4(*args) -> "svn_error_t *": ++def svn_client_proplist4(*args): + """svn_client_proplist4(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t get_target_inherited_props, svn_proplist_receiver2_t receiver, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_proplist4(*args) + +-def svn_client_proplist3(*args) -> "svn_error_t *": ++def svn_client_proplist3(*args): + """svn_client_proplist3(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_proplist_receiver_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_proplist3(*args) + +-def svn_client_proplist2(*args) -> "apr_array_header_t **": ++def svn_client_proplist2(*args): + """svn_client_proplist2(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_proplist2(*args) + +-def svn_client_proplist(*args) -> "apr_array_header_t **": ++def svn_client_proplist(*args): + """svn_client_proplist(char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_proplist(*args) + +-def svn_client_revprop_list(*args) -> "apr_hash_t **, svn_revnum_t *": ++def svn_client_revprop_list(*args): + """svn_client_revprop_list(char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_revprop_list(*args) + +-def svn_client_export5(*args) -> "svn_revnum_t *": ++def svn_client_export5(*args): + """svn_client_export5(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t ignore_keywords, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_export5(*args) + +-def svn_client_export4(*args) -> "svn_revnum_t *": ++def svn_client_export4(*args): + """svn_client_export4(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_export4(*args) + +-def svn_client_export3(*args) -> "svn_revnum_t *": ++def svn_client_export3(*args): + """svn_client_export3(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t recurse, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_export3(*args) + +-def svn_client_export2(*args) -> "svn_revnum_t *": ++def svn_client_export2(*args): + """svn_client_export2(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_export2(*args) + +-def svn_client_export(*args) -> "svn_revnum_t *": ++def svn_client_export(*args): + """svn_client_export(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_export(*args) + +-def svn_client_list4(*args) -> "svn_error_t *": ++def svn_client_list4(*args): + """svn_client_list4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, apr_array_header_t patterns, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_list4(*args) + +-def svn_client_list3(*args) -> "svn_error_t *": ++def svn_client_list3(*args): + """svn_client_list3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_list3(*args) + +-def svn_client_list2(*args) -> "svn_error_t *": ++def svn_client_list2(*args): + """svn_client_list2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_list2(*args) + +-def svn_client_list(*args) -> "svn_error_t *": ++def svn_client_list(*args): + """svn_client_list(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_list(*args) + +-def svn_client_ls3(*args) -> "apr_hash_t **, apr_hash_t **": ++def svn_client_ls3(*args): + """svn_client_ls3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_ls3(*args) + +-def svn_client_ls2(*args) -> "apr_hash_t **": ++def svn_client_ls2(*args): + """svn_client_ls2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_ls2(*args) + +-def svn_client_ls(*args) -> "apr_hash_t **": ++def svn_client_ls(*args): + """svn_client_ls(char const * path_or_url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_ls(*args) + +-def svn_client_cat3(*args) -> "apr_hash_t **": ++def svn_client_cat3(*args): + """svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t expand_keywords, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_cat3(*args) + +-def svn_client_cat2(*args) -> "svn_error_t *": ++def svn_client_cat2(*args): + """svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_cat2(*args) + +-def svn_client_cat(*args) -> "svn_error_t *": ++def svn_client_cat(*args): + """svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_cat(*args) + +-def svn_client_add_to_changelist(*args) -> "svn_error_t *": ++def svn_client_add_to_changelist(*args): + """svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_add_to_changelist(*args) + +-def svn_client_remove_from_changelists(*args) -> "svn_error_t *": ++def svn_client_remove_from_changelists(*args): + """svn_client_remove_from_changelists(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_remove_from_changelists(*args) + +-def svn_client_get_changelists(*args) -> "svn_error_t *": ++def svn_client_get_changelists(*args): + """svn_client_get_changelists(char const * path, apr_array_header_t changelists, svn_depth_t depth, svn_changelist_receiver_t callback_func, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_get_changelists(*args) + +-def svn_client_lock(*args) -> "svn_error_t *": ++def svn_client_lock(*args): + """svn_client_lock(apr_array_header_t targets, char const * comment, svn_boolean_t steal_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_lock(*args) + +-def svn_client_unlock(*args) -> "svn_error_t *": ++def svn_client_unlock(*args): + """svn_client_unlock(apr_array_header_t targets, svn_boolean_t break_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_unlock(*args) + class svn_info_t(object): +@@ -2026,7 +2026,7 @@ svn_info_t_swigregister = _client.svn_info_t_swigregister + svn_info_t_swigregister(svn_info_t) + + +-def svn_info_dup(*args) -> "svn_info_t *": ++def svn_info_dup(*args): + """svn_info_dup(svn_info_t info, apr_pool_t pool) -> svn_info_t""" + return _client.svn_info_dup(*args) + class svn_client_info2_t(object): +@@ -2135,71 +2135,71 @@ svn_client_info2_t_swigregister = _client.svn_client_info2_t_swigregister + svn_client_info2_t_swigregister(svn_client_info2_t) + + +-def svn_client_info2_dup(*args) -> "svn_client_info2_t *": ++def svn_client_info2_dup(*args): + """svn_client_info2_dup(svn_client_info2_t info, apr_pool_t pool) -> svn_client_info2_t""" + return _client.svn_client_info2_dup(*args) + +-def svn_client_info4(*args) -> "svn_error_t *": ++def svn_client_info4(*args): + """svn_client_info4(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, svn_boolean_t include_externals, apr_array_header_t changelists, svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_info4(*args) + +-def svn_client_info3(*args) -> "svn_error_t *": ++def svn_client_info3(*args): + """svn_client_info3(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, apr_array_header_t changelists, svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_info3(*args) + +-def svn_client_info2(*args) -> "svn_error_t *": ++def svn_client_info2(*args): + """svn_client_info2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_info2(*args) + +-def svn_client_info(*args) -> "svn_error_t *": ++def svn_client_info(*args): + """svn_client_info(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_info(*args) + +-def svn_client_get_wc_root(*args) -> "char const **": ++def svn_client_get_wc_root(*args): + """svn_client_get_wc_root(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_get_wc_root(*args) + +-def svn_client_min_max_revisions(*args) -> "svn_revnum_t *, svn_revnum_t *": ++def svn_client_min_max_revisions(*args): + """svn_client_min_max_revisions(char const * local_abspath, svn_boolean_t committed, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_min_max_revisions(*args) + +-def svn_client_patch(*args) -> "svn_error_t *": ++def svn_client_patch(*args): + """svn_client_patch(char const * patch_abspath, char const * wc_dir_abspath, svn_boolean_t dry_run, int strip_count, svn_boolean_t reverse, svn_boolean_t ignore_whitespace, svn_boolean_t remove_tempfiles, svn_client_patch_func_t patch_func, void * patch_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_patch(*args) + +-def svn_client_url_from_path2(*args) -> "char const **": ++def svn_client_url_from_path2(*args): + """svn_client_url_from_path2(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_url_from_path2(*args) + +-def svn_client_url_from_path(*args) -> "char const **": ++def svn_client_url_from_path(*args): + """svn_client_url_from_path(char const * path_or_url, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_url_from_path(*args) + +-def svn_client_get_repos_root(*args) -> "char const **, char const **": ++def svn_client_get_repos_root(*args): + """svn_client_get_repos_root(char const * abspath_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_get_repos_root(*args) + +-def svn_client_root_url_from_path(*args) -> "char const **": ++def svn_client_root_url_from_path(*args): + """svn_client_root_url_from_path(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_root_url_from_path(*args) + +-def svn_client_uuid_from_url(*args) -> "char const **": ++def svn_client_uuid_from_url(*args): + """svn_client_uuid_from_url(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_uuid_from_url(*args) + +-def svn_client_uuid_from_path2(*args) -> "char const **": ++def svn_client_uuid_from_path2(*args): + """svn_client_uuid_from_path2(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_uuid_from_path2(*args) + +-def svn_client_uuid_from_path(*args) -> "char const **": ++def svn_client_uuid_from_path(*args): + """svn_client_uuid_from_path(char const * path, svn_wc_adm_access_t * adm_access, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_uuid_from_path(*args) + +-def svn_client_open_ra_session2(*args) -> "svn_ra_session_t **": ++def svn_client_open_ra_session2(*args): + """svn_client_open_ra_session2(char const * url, char const * wri_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_client_open_ra_session2(*args) + +-def svn_client_open_ra_session(*args) -> "svn_ra_session_t **": ++def svn_client_open_ra_session(*args): + """svn_client_open_ra_session(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_open_ra_session(*args) + class svn_client_conflict_t(object): +@@ -2377,79 +2377,79 @@ svn_client_conflict_option_t_swigregister = _client.svn_client_conflict_option_t + svn_client_conflict_option_t_swigregister(svn_client_conflict_option_t) + + +-def svn_proplist_invoke_receiver2(*args) -> "svn_error_t *": ++def svn_proplist_invoke_receiver2(*args): + """svn_proplist_invoke_receiver2(svn_proplist_receiver2_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_array_header_t inherited_props, apr_pool_t scratch_pool) -> svn_error_t""" + return _client.svn_proplist_invoke_receiver2(*args) + +-def svn_proplist_invoke_receiver(*args) -> "svn_error_t *": ++def svn_proplist_invoke_receiver(*args): + """svn_proplist_invoke_receiver(svn_proplist_receiver_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_pool_t pool) -> svn_error_t""" + return _client.svn_proplist_invoke_receiver(*args) + +-def svn_client_invoke_get_commit_log3(*args) -> "char const **, char const **": ++def svn_client_invoke_get_commit_log3(*args): + """svn_client_invoke_get_commit_log3(svn_client_get_commit_log3_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_get_commit_log3(*args) + +-def svn_client_invoke_get_commit_log2(*args) -> "char const **, char const **": ++def svn_client_invoke_get_commit_log2(*args): + """svn_client_invoke_get_commit_log2(svn_client_get_commit_log2_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_get_commit_log2(*args) + +-def svn_client_invoke_get_commit_log(*args) -> "char const **, char const **": ++def svn_client_invoke_get_commit_log(*args): + """svn_client_invoke_get_commit_log(svn_client_get_commit_log_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_get_commit_log(*args) + +-def svn_client_invoke_blame_receiver4(*args) -> "svn_error_t *": ++def svn_client_invoke_blame_receiver4(*args): + """svn_client_invoke_blame_receiver4(svn_client_blame_receiver4_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, svn_string_t const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_blame_receiver4(*args) + +-def svn_client_invoke_blame_receiver3(*args) -> "svn_error_t *": ++def svn_client_invoke_blame_receiver3(*args): + """svn_client_invoke_blame_receiver3(svn_client_blame_receiver3_t _obj, void * baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, char const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_blame_receiver3(*args) + +-def svn_client_invoke_blame_receiver2(*args) -> "svn_error_t *": ++def svn_client_invoke_blame_receiver2(*args): + """svn_client_invoke_blame_receiver2(svn_client_blame_receiver2_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, svn_revnum_t merged_revision, char const * merged_author, char const * merged_date, char const * merged_path, char const * line, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_blame_receiver2(*args) + +-def svn_client_invoke_blame_receiver(*args) -> "svn_error_t *": ++def svn_client_invoke_blame_receiver(*args): + """svn_client_invoke_blame_receiver(svn_client_blame_receiver_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, char const * line, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_blame_receiver(*args) + +-def svn_client_invoke_diff_summarize_func(*args) -> "svn_error_t *": ++def svn_client_invoke_diff_summarize_func(*args): + """svn_client_invoke_diff_summarize_func(svn_client_diff_summarize_func_t _obj, svn_client_diff_summarize_t diff, void * baton, apr_pool_t pool) -> svn_error_t""" + return _client.svn_client_invoke_diff_summarize_func(*args) + +-def svn_client_invoke__layout_func(*args) -> "svn_error_t *": ++def svn_client_invoke__layout_func(*args): @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 17 09:44:30 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Sep 2021 07:44:30 +0000 Subject: SF.net SVN: gar:[26794] csw/mgar/pkg/apr-util/trunk/files/iconv.diff Message-ID: <1631864670.139744.8468@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26794 http://sourceforge.net/p/gar/code/26794 Author: dmichelsen Date: 2021-09-17 07:44:29 +0000 (Fri, 17 Sep 2021) Log Message: ----------- apr-util/trunk: Remove old patchfile Removed Paths: ------------- csw/mgar/pkg/apr-util/trunk/files/iconv.diff Deleted: csw/mgar/pkg/apr-util/trunk/files/iconv.diff =================================================================== --- csw/mgar/pkg/apr-util/trunk/files/iconv.diff 2021-09-15 14:20:17 UTC (rev 26793) +++ csw/mgar/pkg/apr-util/trunk/files/iconv.diff 2021-09-17 07:44:29 UTC (rev 26794) @@ -1,101 +0,0 @@ -diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/build/apu-iconv.m4 apr-util-1.2.2/build/apu-iconv.m4 ---- apr-util-1.2.2.orig/build/apu-iconv.m4 2005-12-12 00:44:56.159459000 -0500 -+++ apr-util-1.2.2/build/apu-iconv.m4 2005-12-12 00:42:15.630786000 -0500 -@@ -23,8 +23,8 @@ - #include - ], - [ -- iconv_t cd = iconv_open("", ""); -- iconv(cd, NULL, NULL, NULL, NULL); -+ libiconv_t cd = libiconv_open("", ""); -+ libiconv(cd, NULL, NULL, NULL, NULL); - ], [$1], [$2]) - ]) - -diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/xlate/xlate.c apr-util-1.2.2/xlate/xlate.c ---- apr-util-1.2.2.orig/xlate/xlate.c 2005-12-12 00:44:57.208323000 -0500 -+++ apr-util-1.2.2/xlate/xlate.c 2005-12-12 00:44:17.270321000 -0500 -@@ -59,7 +59,7 @@ - char *topage; - char *sbcs_table; - #if APU_HAVE_ICONV -- iconv_t ich; -+ libiconv_t ich; - #elif APU_HAVE_APR_ICONV - apr_iconv_t ich; - #endif -@@ -89,8 +89,8 @@ - } - - #elif APU_HAVE_ICONV -- if (old->ich != (iconv_t)-1) { -- if (iconv_close(old->ich)) { -+ if (old->ich != (libiconv_t)-1) { -+ if (libiconv_close(old->ich)) { - int rv = errno; - - /* Sometimes, iconv is not good about setting errno. */ -@@ -117,7 +117,7 @@ - } - - inbytes_left = outbytes_left = sizeof(inbuf); -- translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, -+ translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, - &inbytes_left, &outbufptr, &outbytes_left); - - if (translated != (apr_size_t)-1 -@@ -129,16 +129,16 @@ - - convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf)); - memcpy(convset->sbcs_table, outbuf, sizeof(outbuf)); -- iconv_close(convset->ich); -- convset->ich = (iconv_t)-1; -+ libiconv_close(convset->ich); -+ convset->ich = (libiconv_t)-1; - - /* TODO: add the table to the cache */ - } - else { - /* reset the iconv descriptor, since it's now in an undefined - * state. */ -- iconv_close(convset->ich); -- convset->ich = iconv_open(convset->topage, convset->frompage); -+ libiconv_close(convset->ich); -+ convset->ich = libiconv_open(convset->topage, convset->frompage); - } - } - #elif APU_HAVE_APR_ICONV -@@ -248,8 +248,8 @@ - - #elif APU_HAVE_ICONV - if (!found) { -- new->ich = iconv_open(topage, frompage); -- if (new->ich == (iconv_t)-1) { -+ new->ich = libiconv_open(topage, frompage); -+ if (new->ich == (libiconv_t)-1) { - int rv = errno; - /* Sometimes, iconv is not good about setting errno. */ - return rv ? rv : APR_EINVAL; -@@ -257,7 +257,7 @@ - found = 1; - check_sbcs(new); - } else -- new->ich = (iconv_t)-1; -+ new->ich = (libiconv_t)-1; - #endif /* APU_HAVE_ICONV */ - - if (found) { -@@ -336,11 +336,11 @@ - else - - #elif APU_HAVE_ICONV -- if (convset->ich != (iconv_t)-1) { -+ if (convset->ich != (libiconv_t)-1) { - const char *inbufptr = inbuf; - char *outbufptr = outbuf; - apr_size_t translated; -- translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, -+ translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, - inbytes_left, &outbufptr, outbytes_left); - - /* If everything went fine but we ran out of buffer, don't This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 17 10:19:54 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Sep 2021 08:19:54 +0000 Subject: SF.net SVN: gar:[26795] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <1631866794.748075.15084@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26795 http://sourceforge.net/p/gar/code/26795 Author: dmichelsen Date: 2021-09-17 08:19:54 +0000 (Fri, 17 Sep 2021) Log Message: ----------- libserf/trunk: Skip support for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2021-09-17 07:44:29 UTC (rev 26794) +++ csw/mgar/pkg/libserf/trunk/Makefile 2021-09-17 08:19:54 UTC (rev 26795) @@ -26,8 +26,8 @@ INSTALL_SCRIPTS = serf TEST_SCRIPTS = -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 BUILD_DEP_PKGS += CSWscons BUILD_DEP_PKGS += CSWlibapr-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 17 10:28:25 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Sep 2021 08:28:25 +0000 Subject: SF.net SVN: gar:[26796] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: <1631867305.318498.24483@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26796 http://sourceforge.net/p/gar/code/26796 Author: dmichelsen Date: 2021-09-17 08:28:24 +0000 (Fri, 17 Sep 2021) Log Message: ----------- libserf/trunk: Adjust dependencies Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2021-09-17 08:19:54 UTC (rev 26795) +++ csw/mgar/pkg/libserf/trunk/Makefile 2021-09-17 08:28:24 UTC (rev 26796) @@ -42,7 +42,10 @@ RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibserf1-1-5.9 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibserf1-1-5.10 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibserf1-1-5.10-sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibserf1-1-5.10-sparc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibserf1-1 += $(RUNTIME_DEP_PKGS_CSWlibserf1-1-$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWlibserf1-1 += $(RUNTIME_DEP_PKGS_CSWlibserf1-1-$(GAROSREL)-$(GARCH)) # Linker anomaly CHECKPKG_OVERRIDES_CSWlibserf1-1 += surplus-dependency|CSWlibintl8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 17 10:34:56 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Sep 2021 08:34:56 +0000 Subject: SF.net SVN: gar:[26797] csw/mgar/pkg/sudo/trunk Message-ID: <1631867696.257634.31646@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26797 http://sourceforge.net/p/gar/code/26797 Author: dmichelsen Date: 2021-09-17 08:34:55 +0000 (Fri, 17 Sep 2021) Log Message: ----------- sudo/trunk: Update to 1.9.8p1 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2021-09-17 08:28:24 UTC (rev 26796) +++ csw/mgar/pkg/sudo/trunk/Makefile 2021-09-17 08:34:55 UTC (rev 26797) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.9.8 +VERSION = 1.9.8p1 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2021-09-17 08:28:24 UTC (rev 26796) +++ csw/mgar/pkg/sudo/trunk/checksums 2021-09-17 08:34:55 UTC (rev 26797) @@ -1 +1 @@ -0a38acd342112b86e8163a26818bdbbd sudo-1.9.8.tar.gz +ae9c8b32268f27d05bcdcb8f0c04d461 sudo-1.9.8p1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 17 11:34:45 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 17 Sep 2021 09:34:45 +0000 Subject: SF.net SVN: gar:[26798] csw/mgar/pkg/apache24/trunk Message-ID: <1631871285.774678.453@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26798 http://sourceforge.net/p/gar/code/26798 Author: dmichelsen Date: 2021-09-17 09:34:45 +0000 (Fri, 17 Sep 2021) Log Message: ----------- apache24/trunk: Update to 2.4.49 Modified Paths: -------------- csw/mgar/pkg/apache24/trunk/Makefile csw/mgar/pkg/apache24/trunk/checksums Modified: csw/mgar/pkg/apache24/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache24/trunk/Makefile 2021-09-17 08:34:55 UTC (rev 26797) +++ csw/mgar/pkg/apache24/trunk/Makefile 2021-09-17 09:34:45 UTC (rev 26798) @@ -1,7 +1,7 @@ # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $ NAME = httpd -VERSION = 2.4.48 +VERSION = 2.4.49 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc Modified: csw/mgar/pkg/apache24/trunk/checksums =================================================================== --- csw/mgar/pkg/apache24/trunk/checksums 2021-09-17 08:34:55 UTC (rev 26797) +++ csw/mgar/pkg/apache24/trunk/checksums 2021-09-17 09:34:45 UTC (rev 26798) @@ -1 +1 @@ -033453c49c4b081e34acc3e1a4c23648 httpd-2.4.48.tar.gz +1edb1895661473ea530209e29b83a982 httpd-2.4.49.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 18 10:39:09 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 18 Sep 2021 08:39:09 +0000 Subject: SF.net SVN: gar:[26799] csw/mgar/pkg/subversion/trunk Message-ID: <1631954349.921076.5902@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26799 http://sourceforge.net/p/gar/code/26799 Author: dmichelsen Date: 2021-09-18 08:39:09 +0000 (Sat, 18 Sep 2021) Log Message: ----------- subversion/trunk: Backport to Python 2.7 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2021-09-17 09:34:45 UTC (rev 26798) +++ csw/mgar/pkg/subversion/trunk/Makefile 2021-09-18 08:39:09 UTC (rev 26799) @@ -49,7 +49,7 @@ PATCHFILES += 0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch # Subversion 1.14.1 now requires at least Python 3.3, backport to 2.7 for now -PATCHFILES += 0001-Backport-to-Python-2.7.patch +# This is now done in post-patch-modulated VENDOR_URL = http://subversion.apache.org LICENSE = LICENSE @@ -625,6 +625,19 @@ include gar/category.mk +# Backport to Python 2.7 by removing annotations +post-patch-modulated: + cd $(WORKSRC) && \ + perl -i.py33 -npe "if( /^\s*def / ) { s/:\s+'[^']*'//g; s/\s*->\s*\"[^\"]*\"// }" \ + subversion/bindings/swig/python/client.py \ + subversion/bindings/swig/python/core.py \ + subversion/bindings/swig/python/delta.py \ + subversion/bindings/swig/python/diff.py \ + subversion/bindings/swig/python/fs.py \ + subversion/bindings/swig/python/ra.py \ + subversion/bindings/swig/python/repos.py \ + subversion/bindings/swig/python/wc.py + # pygthon bindings do not link since svn-1.6.5 ... BINDING_LANGS-5.9-32 = perl python ruby BINDING_LANGS-5.9-64 = perl python ruby Deleted: csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch 2021-09-17 09:34:45 UTC (rev 26798) +++ csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch 2021-09-18 08:39:09 UTC (rev 26799) @@ -1,1333 +0,0 @@ -From e94c715780e95cd52f22cf6a5006940eb9b1ca2a Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 15 Sep 2021 15:56:01 +0200 -Subject: [PATCH] Backport to Python 2.7 - ---- - subversion/bindings/swig/python/client.py | 510 +++++++++++++++--------------- - 1 file changed, 255 insertions(+), 255 deletions(-) - -diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py -index f094027..f5c53ae 100644 ---- a/subversion/bindings/swig/python/client.py -+++ b/subversion/bindings/swig/python/client.py -@@ -143,51 +143,51 @@ import libsvn.delta - import libsvn.wc - import libsvn.ra - --def svn_client_version() -> "svn_version_t const *": -+def svn_client_version(): - """svn_client_version() -> svn_version_t const *""" - return _client.svn_client_version() - --def svn_client_get_simple_prompt_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_simple_prompt_provider(*args): - """svn_client_get_simple_prompt_provider(svn_auth_simple_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" - return _client.svn_client_get_simple_prompt_provider(*args) - --def svn_client_get_username_prompt_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_username_prompt_provider(*args): - """svn_client_get_username_prompt_provider(svn_auth_username_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" - return _client.svn_client_get_username_prompt_provider(*args) - --def svn_client_get_simple_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_simple_provider(*args): - """svn_client_get_simple_provider(apr_pool_t pool)""" - return _client.svn_client_get_simple_provider(*args) - --def svn_client_get_username_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_username_provider(*args): - """svn_client_get_username_provider(apr_pool_t pool)""" - return _client.svn_client_get_username_provider(*args) - --def svn_client_get_ssl_server_trust_file_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_server_trust_file_provider(*args): - """svn_client_get_ssl_server_trust_file_provider(apr_pool_t pool)""" - return _client.svn_client_get_ssl_server_trust_file_provider(*args) - --def svn_client_get_ssl_client_cert_file_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_client_cert_file_provider(*args): - """svn_client_get_ssl_client_cert_file_provider(apr_pool_t pool)""" - return _client.svn_client_get_ssl_client_cert_file_provider(*args) - --def svn_client_get_ssl_client_cert_pw_file_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_client_cert_pw_file_provider(*args): - """svn_client_get_ssl_client_cert_pw_file_provider(apr_pool_t pool)""" - return _client.svn_client_get_ssl_client_cert_pw_file_provider(*args) - --def svn_client_get_ssl_server_trust_prompt_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_server_trust_prompt_provider(*args): - """svn_client_get_ssl_server_trust_prompt_provider(svn_auth_ssl_server_trust_prompt_func_t prompt_func, apr_pool_t pool)""" - return _client.svn_client_get_ssl_server_trust_prompt_provider(*args) - --def svn_client_get_ssl_client_cert_prompt_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_client_cert_prompt_provider(*args): - """svn_client_get_ssl_client_cert_prompt_provider(svn_auth_ssl_client_cert_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" - return _client.svn_client_get_ssl_client_cert_prompt_provider(*args) - --def svn_client_get_ssl_client_cert_pw_prompt_provider(*args) -> "svn_auth_provider_object_t **": -+def svn_client_get_ssl_client_cert_pw_prompt_provider(*args): - """svn_client_get_ssl_client_cert_pw_prompt_provider(svn_auth_ssl_client_cert_pw_prompt_func_t prompt_func, int retry_limit, apr_pool_t pool)""" - return _client.svn_client_get_ssl_client_cert_pw_prompt_provider(*args) - --def svn_client_proplist_item_dup(*args) -> "svn_client_proplist_item_t *": -+def svn_client_proplist_item_dup(*args): - """svn_client_proplist_item_dup(svn_client_proplist_item_t const * item, apr_pool_t pool) -> svn_client_proplist_item_t *""" - return _client.svn_client_proplist_item_dup(*args) - class svn_client_commit_info_t(object): -@@ -603,19 +603,19 @@ svn_client_commit_item_t_swigregister = _client.svn_client_commit_item_t_swigreg - svn_client_commit_item_t_swigregister(svn_client_commit_item_t) - - --def svn_client_commit_item3_create(*args) -> "svn_client_commit_item3_t *": -+def svn_client_commit_item3_create(*args): - """svn_client_commit_item3_create(apr_pool_t pool) -> svn_client_commit_item3_t""" - return _client.svn_client_commit_item3_create(*args) - --def svn_client_commit_item_create(*args) -> "svn_client_commit_item3_t const **": -+def svn_client_commit_item_create(*args): - """svn_client_commit_item_create(apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit_item_create(*args) - --def svn_client_commit_item3_dup(*args) -> "svn_client_commit_item3_t *": -+def svn_client_commit_item3_dup(*args): - """svn_client_commit_item3_dup(svn_client_commit_item3_t item, apr_pool_t pool) -> svn_client_commit_item3_t""" - return _client.svn_client_commit_item3_dup(*args) - --def svn_client_commit_item2_dup(*args) -> "svn_client_commit_item2_t *": -+def svn_client_commit_item2_dup(*args): - """svn_client_commit_item2_dup(svn_client_commit_item2_t item, apr_pool_t pool) -> svn_client_commit_item2_t""" - return _client.svn_client_commit_item2_dup(*args) - svn_client_diff_summarize_kind_normal = _client.svn_client_diff_summarize_kind_normal -@@ -721,7 +721,7 @@ svn_client_diff_summarize_t_swigregister = _client.svn_client_diff_summarize_t_s - svn_client_diff_summarize_t_swigregister(svn_client_diff_summarize_t) - - --def svn_client_diff_summarize_dup(*args) -> "svn_client_diff_summarize_t *": -+def svn_client_diff_summarize_dup(*args): - """svn_client_diff_summarize_dup(svn_client_diff_summarize_t diff, apr_pool_t pool) -> svn_client_diff_summarize_t""" - return _client.svn_client_diff_summarize_dup(*args) - class svn_client_ctx_t(object): -@@ -845,161 +845,161 @@ svn_client_ctx_t_swigregister = _client.svn_client_ctx_t_swigregister - svn_client_ctx_t_swigregister(svn_client_ctx_t) - - --def svn_client_create_context2(*args) -> "svn_client_ctx_t **": -+def svn_client_create_context2(*args): - """svn_client_create_context2(apr_hash_t cfg_hash, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_create_context2(*args) - --def svn_client_create_context(*args) -> "svn_client_ctx_t **": -+def svn_client_create_context(*args): - """svn_client_create_context(apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_create_context(*args) - SVN_CLIENT_AUTH_USERNAME = _client.SVN_CLIENT_AUTH_USERNAME - SVN_CLIENT_AUTH_PASSWORD = _client.SVN_CLIENT_AUTH_PASSWORD - --def svn_client_args_to_target_array2(*args) -> "apr_array_header_t **": -+def svn_client_args_to_target_array2(*args): - """svn_client_args_to_target_array2(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, svn_boolean_t keep_last_origpath_on_truepath_collision, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_args_to_target_array2(*args) - --def svn_client_args_to_target_array(*args) -> "apr_array_header_t **": -+def svn_client_args_to_target_array(*args): - """svn_client_args_to_target_array(apr_getopt_t * os, apr_array_header_t known_targets, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_args_to_target_array(*args) - --def svn_client_checkout3(*args) -> "svn_revnum_t *": -+def svn_client_checkout3(*args): - """svn_client_checkout3(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_checkout3(*args) - --def svn_client_checkout2(*args) -> "svn_revnum_t *": -+def svn_client_checkout2(*args): - """svn_client_checkout2(char const * URL, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_checkout2(*args) - --def svn_client_checkout(*args) -> "svn_revnum_t *": -+def svn_client_checkout(*args): - """svn_client_checkout(char const * URL, char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_checkout(*args) - --def svn_client_update4(*args) -> "apr_array_header_t **": -+def svn_client_update4(*args): - """svn_client_update4(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t make_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_update4(*args) - --def svn_client_update3(*args) -> "apr_array_header_t **": -+def svn_client_update3(*args): - """svn_client_update3(apr_array_header_t paths, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_update3(*args) - --def svn_client_update2(*args) -> "apr_array_header_t **": -+def svn_client_update2(*args): - """svn_client_update2(apr_array_header_t paths, svn_opt_revision_t revision, svn_boolean_t recurse, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_update2(*args) - --def svn_client_update(*args) -> "svn_revnum_t *": -+def svn_client_update(*args): - """svn_client_update(char const * path, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_update(*args) - --def svn_client_switch3(*args) -> "svn_revnum_t *": -+def svn_client_switch3(*args): - """svn_client_switch3(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_boolean_t ignore_ancestry, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_switch3(*args) - --def svn_client_switch2(*args) -> "svn_revnum_t *": -+def svn_client_switch2(*args): - """svn_client_switch2(char const * path, char const * url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t ignore_externals, svn_boolean_t allow_unver_obstructions, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_switch2(*args) - --def svn_client_switch(*args) -> "svn_revnum_t *": -+def svn_client_switch(*args): - """svn_client_switch(char const * path, char const * url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_switch(*args) - --def svn_client__layout_list(*args) -> "svn_error_t *": -+def svn_client__layout_list(*args): - """svn_client__layout_list(char const * local_abspath, svn_client__layout_func_t layout, void * layout_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client__layout_list(*args) - --def svn_client_add5(*args) -> "svn_error_t *": -+def svn_client_add5(*args): - """svn_client_add5(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_add5(*args) - --def svn_client_add4(*args) -> "svn_error_t *": -+def svn_client_add4(*args): - """svn_client_add4(char const * path, svn_depth_t depth, svn_boolean_t force, svn_boolean_t no_ignore, svn_boolean_t add_parents, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_add4(*args) - --def svn_client_add3(*args) -> "svn_error_t *": -+def svn_client_add3(*args): - """svn_client_add3(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_add3(*args) - --def svn_client_add2(*args) -> "svn_error_t *": -+def svn_client_add2(*args): - """svn_client_add2(char const * path, svn_boolean_t recursive, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_add2(*args) - --def svn_client_add(*args) -> "svn_error_t *": -+def svn_client_add(*args): - """svn_client_add(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_add(*args) - --def svn_client_mkdir4(*args) -> "svn_error_t *": -+def svn_client_mkdir4(*args): - """svn_client_mkdir4(apr_array_header_t paths, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mkdir4(*args) - --def svn_client_mkdir3(*args) -> "svn_commit_info_t **": -+def svn_client_mkdir3(*args): - """svn_client_mkdir3(apr_array_header_t paths, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mkdir3(*args) - --def svn_client_mkdir2(*args) -> "svn_commit_info_t **": -+def svn_client_mkdir2(*args): - """svn_client_mkdir2(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mkdir2(*args) - --def svn_client_mkdir(*args) -> "svn_client_commit_info_t **": -+def svn_client_mkdir(*args): - """svn_client_mkdir(apr_array_header_t paths, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mkdir(*args) - --def svn_client_delete4(*args) -> "svn_error_t *": -+def svn_client_delete4(*args): - """svn_client_delete4(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_delete4(*args) - --def svn_client_delete3(*args) -> "svn_commit_info_t **": -+def svn_client_delete3(*args): - """svn_client_delete3(apr_array_header_t paths, svn_boolean_t force, svn_boolean_t keep_local, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_delete3(*args) - --def svn_client_delete2(*args) -> "svn_commit_info_t **": -+def svn_client_delete2(*args): - """svn_client_delete2(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_delete2(*args) - --def svn_client_delete(*args) -> "svn_client_commit_info_t **": -+def svn_client_delete(*args): - """svn_client_delete(apr_array_header_t paths, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_delete(*args) - --def svn_client_import5(*args) -> "svn_error_t *": -+def svn_client_import5(*args): - """svn_client_import5(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t no_autoprops, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_import_filter_func_t filter_callback, void * filter_baton, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_import5(*args) - --def svn_client_import4(*args) -> "svn_error_t *": -+def svn_client_import4(*args): - """svn_client_import4(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_import4(*args) - --def svn_client_import3(*args) -> "svn_commit_info_t **": -+def svn_client_import3(*args): - """svn_client_import3(char const * path, char const * url, svn_depth_t depth, svn_boolean_t no_ignore, svn_boolean_t ignore_unknown_node_types, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_import3(*args) - --def svn_client_import2(*args) -> "svn_commit_info_t **": -+def svn_client_import2(*args): - """svn_client_import2(char const * path, char const * url, svn_boolean_t nonrecursive, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_import2(*args) - --def svn_client_import(*args) -> "svn_client_commit_info_t **": -+def svn_client_import(*args): - """svn_client_import(char const * path, char const * url, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_import(*args) - --def svn_client_commit6(*args) -> "svn_error_t *": -+def svn_client_commit6(*args): - """svn_client_commit6(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, svn_boolean_t include_file_externals, svn_boolean_t include_dir_externals, apr_array_header_t changelists, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit6(*args) - --def svn_client_commit5(*args) -> "svn_error_t *": -+def svn_client_commit5(*args): - """svn_client_commit5(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, svn_boolean_t commit_as_operations, apr_array_header_t changelists, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit5(*args) - --def svn_client_commit4(*args) -> "svn_commit_info_t **": -+def svn_client_commit4(*args): - """svn_client_commit4(apr_array_header_t targets, svn_depth_t depth, svn_boolean_t keep_locks, svn_boolean_t keep_changelists, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit4(*args) - --def svn_client_commit3(*args) -> "svn_commit_info_t **": -+def svn_client_commit3(*args): - """svn_client_commit3(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit3(*args) - --def svn_client_commit2(*args) -> "svn_client_commit_info_t **": -+def svn_client_commit2(*args): - """svn_client_commit2(apr_array_header_t targets, svn_boolean_t recurse, svn_boolean_t keep_locks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit2(*args) - --def svn_client_commit(*args) -> "svn_client_commit_info_t **": -+def svn_client_commit(*args): - """svn_client_commit(apr_array_header_t targets, svn_boolean_t nonrecursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_commit(*args) - class svn_client_status_t(object): -@@ -1130,259 +1130,259 @@ svn_client_status_t_swigregister = _client.svn_client_status_t_swigregister - svn_client_status_t_swigregister(svn_client_status_t) - - --def svn_client_status_dup(*args) -> "svn_client_status_t *": -+def svn_client_status_dup(*args): - """svn_client_status_dup(svn_client_status_t status, apr_pool_t result_pool) -> svn_client_status_t""" - return _client.svn_client_status_dup(*args) - --def svn_client_status6(*args) -> "svn_revnum_t *": -+def svn_client_status6(*args): - """svn_client_status6(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t check_out_of_date, svn_boolean_t check_working_copy, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_status6(*args) - --def svn_client_status5(*args) -> "svn_revnum_t *": -+def svn_client_status5(*args): - """svn_client_status5(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_status5(*args) - --def svn_client_status4(*args) -> "svn_revnum_t *": -+def svn_client_status4(*args): - """svn_client_status4(char const * path, svn_opt_revision_t revision, svn_wc_status_func3_t status_func, void * status_baton, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_status4(*args) - --def svn_client_status3(*args) -> "svn_revnum_t *": -+def svn_client_status3(*args): - """svn_client_status3(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_status3(*args) - --def svn_client_status2(*args) -> "svn_revnum_t *": -+def svn_client_status2(*args): - """svn_client_status2(char const * path, svn_opt_revision_t revision, svn_wc_status_func2_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_status2(*args) - --def svn_client_status(*args) -> "svn_revnum_t *": -+def svn_client_status(*args): - """svn_client_status(char const * path, svn_opt_revision_t revision, svn_wc_status_func_t status_func, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_status(*args) - --def svn_client_log5(*args) -> "svn_error_t *": -+def svn_client_log5(*args): - """svn_client_log5(apr_array_header_t targets, svn_opt_revision_t peg_revision, apr_array_header_t revision_ranges, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_log5(*args) - --def svn_client_log4(*args) -> "svn_error_t *": -+def svn_client_log4(*args): - """svn_client_log4(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_boolean_t include_merged_revisions, apr_array_header_t revprops, svn_log_entry_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_log4(*args) - --def svn_client_log3(*args) -> "svn_error_t *": -+def svn_client_log3(*args): - """svn_client_log3(apr_array_header_t targets, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_log3(*args) - --def svn_client_log2(*args) -> "svn_error_t *": -+def svn_client_log2(*args): - """svn_client_log2(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, int limit, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_log2(*args) - --def svn_client_log(*args) -> "svn_error_t *": -+def svn_client_log(*args): - """svn_client_log(apr_array_header_t targets, svn_opt_revision_t start, svn_opt_revision_t end, svn_boolean_t discover_changed_paths, svn_boolean_t strict_node_history, svn_log_message_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_log(*args) - --def svn_client_blame6(*args) -> "svn_revnum_t *, svn_revnum_t *": -+def svn_client_blame6(*args): - """svn_client_blame6(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver4_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame6(*args) - --def svn_client_blame5(*args) -> "svn_error_t *": -+def svn_client_blame5(*args): - """svn_client_blame5(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver3_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame5(*args) - --def svn_client_blame4(*args) -> "svn_error_t *": -+def svn_client_blame4(*args): - """svn_client_blame4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_boolean_t include_merged_revisions, svn_client_blame_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame4(*args) - --def svn_client_blame3(*args) -> "svn_error_t *": -+def svn_client_blame3(*args): - """svn_client_blame3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_diff_file_options_t const * diff_options, svn_boolean_t ignore_mime_type, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame3(*args) - --def svn_client_blame2(*args) -> "svn_error_t *": -+def svn_client_blame2(*args): - """svn_client_blame2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame2(*args) - --def svn_client_blame(*args) -> "svn_error_t *": -+def svn_client_blame(*args): - """svn_client_blame(char const * path_or_url, svn_opt_revision_t start, svn_opt_revision_t end, svn_client_blame_receiver_t receiver, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_blame(*args) - --def svn_client_diff7(*args) -> "svn_error_t *": -+def svn_client_diff7(*args): - """svn_client_diff7(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff7(*args) - --def svn_client_diff6(*args) -> "svn_error_t *": -+def svn_client_diff6(*args): - """svn_client_diff6(apr_array_header_t diff_options, char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff6(*args) - --def svn_client_diff5(*args) -> "svn_error_t *": -+def svn_client_diff5(*args): - """svn_client_diff5(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff5(*args) - --def svn_client_diff4(*args) -> "svn_error_t *": -+def svn_client_diff4(*args): - """svn_client_diff4(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff4(*args) - --def svn_client_diff3(*args) -> "svn_error_t *": -+def svn_client_diff3(*args): - """svn_client_diff3(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff3(*args) - --def svn_client_diff2(*args) -> "svn_error_t *": -+def svn_client_diff2(*args): - """svn_client_diff2(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff2(*args) - --def svn_client_diff(*args) -> "svn_error_t *": -+def svn_client_diff(*args): - """svn_client_diff(apr_array_header_t diff_options, char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff(*args) - --def svn_client_diff_peg7(*args) -> "svn_error_t *": -+def svn_client_diff_peg7(*args): - """svn_client_diff_peg7(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, svn_boolean_t pretty_print_mergeinfo, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg7(*args) - --def svn_client_diff_peg6(*args) -> "svn_error_t *": -+def svn_client_diff_peg6(*args): - """svn_client_diff_peg6(apr_array_header_t diff_options, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_added, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t ignore_properties, svn_boolean_t properties_only, svn_boolean_t use_git_diff_format, char const * header_encoding, svn_stream_t * outstream, svn_stream_t * errstream, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg6(*args) - --def svn_client_diff_peg5(*args) -> "svn_error_t *": -+def svn_client_diff_peg5(*args): - """svn_client_diff_peg5(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t show_copies_as_adds, svn_boolean_t ignore_content_type, svn_boolean_t use_git_diff_format, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg5(*args) - --def svn_client_diff_peg4(*args) -> "svn_error_t *": -+def svn_client_diff_peg4(*args): - """svn_client_diff_peg4(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, char const * relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg4(*args) - --def svn_client_diff_peg3(*args) -> "svn_error_t *": -+def svn_client_diff_peg3(*args): - """svn_client_diff_peg3(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, char const * header_encoding, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg3(*args) - --def svn_client_diff_peg2(*args) -> "svn_error_t *": -+def svn_client_diff_peg2(*args): - """svn_client_diff_peg2(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg2(*args) - --def svn_client_diff_peg(*args) -> "svn_error_t *": -+def svn_client_diff_peg(*args): - """svn_client_diff_peg(apr_array_header_t diff_options, char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t outfile, apr_file_t errfile, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_peg(*args) - --def svn_client_diff_summarize2(*args) -> "svn_error_t *": -+def svn_client_diff_summarize2(*args): - """svn_client_diff_summarize2(char const * path_or_url1, svn_opt_revision_t revision1, char const * path_or_url2, svn_opt_revision_t revision2, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_summarize2(*args) - --def svn_client_diff_summarize(*args) -> "svn_error_t *": -+def svn_client_diff_summarize(*args): - """svn_client_diff_summarize(char const * path1, svn_opt_revision_t revision1, char const * path2, svn_opt_revision_t revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_summarize(*args) - --def svn_client_diff_summarize_peg2(*args) -> "svn_error_t *": -+def svn_client_diff_summarize_peg2(*args): - """svn_client_diff_summarize_peg2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_depth_t depth, svn_boolean_t ignore_ancestry, apr_array_header_t changelists, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_summarize_peg2(*args) - --def svn_client_diff_summarize_peg(*args) -> "svn_error_t *": -+def svn_client_diff_summarize_peg(*args): - """svn_client_diff_summarize_peg(char const * path, svn_opt_revision_t peg_revision, svn_opt_revision_t start_revision, svn_opt_revision_t end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void * summarize_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_diff_summarize_peg(*args) - --def svn_client_get_merging_summary(*args) -> "svn_boolean_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **, svn_revnum_t *, char const **": -+def svn_client_get_merging_summary(*args): - """svn_client_get_merging_summary(char const * source_path_or_url, svn_opt_revision_t source_revision, char const * target_path_or_url, svn_opt_revision_t target_revision, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_get_merging_summary(*args) - --def svn_client_merge5(*args) -> "svn_error_t *": -+def svn_client_merge5(*args): - """svn_client_merge5(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge5(*args) - --def svn_client_merge4(*args) -> "svn_error_t *": -+def svn_client_merge4(*args): - """svn_client_merge4(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge4(*args) - --def svn_client_merge3(*args) -> "svn_error_t *": -+def svn_client_merge3(*args): - """svn_client_merge3(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge3(*args) - --def svn_client_merge2(*args) -> "svn_error_t *": -+def svn_client_merge2(*args): - """svn_client_merge2(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge2(*args) - --def svn_client_merge(*args) -> "svn_error_t *": -+def svn_client_merge(*args): - """svn_client_merge(char const * source1, svn_opt_revision_t revision1, char const * source2, svn_opt_revision_t revision2, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge(*args) - --def svn_client_merge_reintegrate(*args) -> "svn_error_t *": -+def svn_client_merge_reintegrate(*args): - """svn_client_merge_reintegrate(char const * source_path_or_url, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_reintegrate(*args) - --def svn_client_merge_peg5(*args) -> "svn_error_t *": -+def svn_client_merge_peg5(*args): - """svn_client_merge_peg5(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_peg5(*args) - --def svn_client_merge_peg4(*args) -> "svn_error_t *": -+def svn_client_merge_peg4(*args): - """svn_client_merge_peg4(char const * source_path_or_url, apr_array_header_t ranges_to_merge, svn_opt_revision_t source_peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_peg4(*args) - --def svn_client_merge_peg3(*args) -> "svn_error_t *": -+def svn_client_merge_peg3(*args): - """svn_client_merge_peg3(char const * source, apr_array_header_t ranges_to_merge, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_peg3(*args) - --def svn_client_merge_peg2(*args) -> "svn_error_t *": -+def svn_client_merge_peg2(*args): - """svn_client_merge_peg2(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, apr_array_header_t merge_options, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_peg2(*args) - --def svn_client_merge_peg(*args) -> "svn_error_t *": -+def svn_client_merge_peg(*args): - """svn_client_merge_peg(char const * source, svn_opt_revision_t revision1, svn_opt_revision_t revision2, svn_opt_revision_t peg_revision, char const * target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_merge_peg(*args) - --def svn_client_suggest_merge_sources(*args) -> "apr_array_header_t **": -+def svn_client_suggest_merge_sources(*args): - """svn_client_suggest_merge_sources(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_suggest_merge_sources(*args) - --def svn_client_mergeinfo_get_merged(*args) -> "apr_hash_t **": -+def svn_client_mergeinfo_get_merged(*args): - """svn_client_mergeinfo_get_merged(char const * path_or_url, svn_opt_revision_t peg_revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mergeinfo_get_merged(*args) - --def svn_client_mergeinfo_log2(*args) -> "svn_error_t *": -+def svn_client_mergeinfo_log2(*args): - """svn_client_mergeinfo_log2(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_opt_revision_t source_start_revision, svn_opt_revision_t source_end_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_mergeinfo_log2(*args) - --def svn_client_mergeinfo_log(*args) -> "svn_error_t *": -+def svn_client_mergeinfo_log(*args): - """svn_client_mergeinfo_log(svn_boolean_t finding_merged, char const * target_path_or_url, svn_opt_revision_t target_peg_revision, char const * source_path_or_url, svn_opt_revision_t source_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, svn_depth_t depth, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_mergeinfo_log(*args) - --def svn_client_mergeinfo_log_merged(*args) -> "svn_error_t *": -+def svn_client_mergeinfo_log_merged(*args): - """svn_client_mergeinfo_log_merged(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mergeinfo_log_merged(*args) - --def svn_client_mergeinfo_log_eligible(*args) -> "svn_error_t *": -+def svn_client_mergeinfo_log_eligible(*args): - """svn_client_mergeinfo_log_eligible(char const * path_or_url, svn_opt_revision_t peg_revision, char const * merge_source_path_or_url, svn_opt_revision_t src_peg_revision, svn_log_entry_receiver_t receiver, svn_boolean_t discover_changed_paths, apr_array_header_t revprops, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_mergeinfo_log_eligible(*args) - --def svn_client_vacuum(*args) -> "svn_error_t *": -+def svn_client_vacuum(*args): - """svn_client_vacuum(char const * dir_abspath, svn_boolean_t remove_unversioned_items, svn_boolean_t remove_ignored_items, svn_boolean_t fix_recorded_timestamps, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_vacuum(*args) - --def svn_client_cleanup2(*args) -> "svn_error_t *": -+def svn_client_cleanup2(*args): - """svn_client_cleanup2(char const * dir_abspath, svn_boolean_t break_locks, svn_boolean_t fix_recorded_timestamps, svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_cleanup2(*args) - --def svn_client_cleanup(*args) -> "svn_error_t *": -+def svn_client_cleanup(*args): - """svn_client_cleanup(char const * dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_cleanup(*args) - --def svn_client_upgrade(*args) -> "svn_error_t *": -+def svn_client_upgrade(*args): - """svn_client_upgrade(char const * wcroot_dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_upgrade(*args) - --def svn_client_relocate2(*args) -> "svn_error_t *": -+def svn_client_relocate2(*args): - """svn_client_relocate2(char const * wcroot_dir, char const * from_prefix, char const * to_prefix, svn_boolean_t ignore_externals, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_relocate2(*args) - --def svn_client_relocate(*args) -> "svn_error_t *": -+def svn_client_relocate(*args): - """svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_relocate(*args) - --def svn_client_revert4(*args) -> "svn_error_t *": -+def svn_client_revert4(*args): - """svn_client_revert4(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_boolean_t added_keep_local, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_revert4(*args) - --def svn_client_revert3(*args) -> "svn_error_t *": -+def svn_client_revert3(*args): - """svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revert3(*args) - --def svn_client_revert2(*args) -> "svn_error_t *": -+def svn_client_revert2(*args): - """svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revert2(*args) - --def svn_client_revert(*args) -> "svn_error_t *": -+def svn_client_revert(*args): - """svn_client_revert(apr_array_header_t paths, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revert(*args) - svn_client_conflict_option_undefined = _client.svn_client_conflict_option_undefined -@@ -1416,187 +1416,187 @@ svn_client_conflict_option_both_moved_file_move_merge = _client.svn_client_confl - svn_client_conflict_option_both_moved_dir_merge = _client.svn_client_conflict_option_both_moved_dir_merge - svn_client_conflict_option_both_moved_dir_move_merge = _client.svn_client_conflict_option_both_moved_dir_move_merge - --def svn_client_conflict_option_set_merged_propval(option: 'svn_client_conflict_option_t *', merged_propval: 'svn_string_t const *') -> "void": -+def svn_client_conflict_option_set_merged_propval(option, merged_propval): - """svn_client_conflict_option_set_merged_propval(svn_client_conflict_option_t * option, svn_string_t const * merged_propval)""" - return _client.svn_client_conflict_option_set_merged_propval(option, merged_propval) - --def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) -> "apr_array_header_t **": -+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args): - """svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args) - --def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) -> "apr_array_header_t **": -+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args): - """svn_client_conflict_option_get_moved_to_repos_relpath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args) - --def svn_client_conflict_option_set_moved_to_repos_relpath2(*args) -> "svn_error_t *": -+def svn_client_conflict_option_set_moved_to_repos_relpath2(*args): - """svn_client_conflict_option_set_moved_to_repos_relpath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_set_moved_to_repos_relpath2(*args) - --def svn_client_conflict_option_set_moved_to_repos_relpath(*args) -> "svn_error_t *": -+def svn_client_conflict_option_set_moved_to_repos_relpath(*args): - """svn_client_conflict_option_set_moved_to_repos_relpath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_set_moved_to_repos_relpath(*args) - --def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) -> "apr_array_header_t **": -+def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args): - """svn_client_conflict_option_get_moved_to_abspath_candidates2(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_get_moved_to_abspath_candidates2(*args) - --def svn_client_conflict_option_get_moved_to_abspath_candidates(*args) -> "apr_array_header_t **": -+def svn_client_conflict_option_get_moved_to_abspath_candidates(*args): - """svn_client_conflict_option_get_moved_to_abspath_candidates(svn_client_conflict_option_t * option, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_get_moved_to_abspath_candidates(*args) - --def svn_client_conflict_option_set_moved_to_abspath2(*args) -> "svn_error_t *": -+def svn_client_conflict_option_set_moved_to_abspath2(*args): - """svn_client_conflict_option_set_moved_to_abspath2(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_set_moved_to_abspath2(*args) - --def svn_client_conflict_option_set_moved_to_abspath(*args) -> "svn_error_t *": -+def svn_client_conflict_option_set_moved_to_abspath(*args): - """svn_client_conflict_option_set_moved_to_abspath(svn_client_conflict_option_t * option, int preferred_move_target_idx, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_option_set_moved_to_abspath(*args) - --def svn_client_conflict_option_find_by_id(options: 'apr_array_header_t', option_id: 'svn_client_conflict_option_id_t') -> "svn_client_conflict_option_t *": -+def svn_client_conflict_option_find_by_id(options, option_id): - """svn_client_conflict_option_find_by_id(apr_array_header_t options, svn_client_conflict_option_id_t option_id) -> svn_client_conflict_option_t *""" - return _client.svn_client_conflict_option_find_by_id(options, option_id) - --def svn_client_conflict_get(*args) -> "svn_client_conflict_t **": -+def svn_client_conflict_get(*args): - """svn_client_conflict_get(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_get(*args) - --def svn_client_conflict_walk(*args) -> "svn_error_t *": -+def svn_client_conflict_walk(*args): - """svn_client_conflict_walk(char const * local_abspath, svn_depth_t depth, svn_client_conflict_walk_func_t conflict_walk_func, void * conflict_walk_func_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_walk(*args) - --def svn_client_conflict_get_conflicted(*args) -> "svn_boolean_t *, apr_array_header_t **, svn_boolean_t *": -+def svn_client_conflict_get_conflicted(*args): - """svn_client_conflict_get_conflicted(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_get_conflicted(*args) - --def svn_client_conflict_prop_get_description(*args) -> "char const **": -+def svn_client_conflict_prop_get_description(*args): - """svn_client_conflict_prop_get_description(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_prop_get_description(*args) - --def svn_client_conflict_tree_get_description(*args) -> "char const **, char const **": -+def svn_client_conflict_tree_get_description(*args): - """svn_client_conflict_tree_get_description(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_tree_get_description(*args) - --def svn_client_conflict_text_get_resolution_options(*args) -> "apr_array_header_t **": -+def svn_client_conflict_text_get_resolution_options(*args): - """svn_client_conflict_text_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_text_get_resolution_options(*args) - --def svn_client_conflict_prop_get_resolution_options(*args) -> "apr_array_header_t **": -+def svn_client_conflict_prop_get_resolution_options(*args): - """svn_client_conflict_prop_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_prop_get_resolution_options(*args) - --def svn_client_conflict_tree_get_resolution_options(*args) -> "apr_array_header_t **": -+def svn_client_conflict_tree_get_resolution_options(*args): - """svn_client_conflict_tree_get_resolution_options(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_tree_get_resolution_options(*args) - --def svn_client_conflict_tree_get_details(*args) -> "svn_error_t *": -+def svn_client_conflict_tree_get_details(*args): - """svn_client_conflict_tree_get_details(svn_client_conflict_t * conflict, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_tree_get_details(*args) - --def svn_client_conflict_option_get_id(option: 'svn_client_conflict_option_t *') -> "svn_client_conflict_option_id_t": -+def svn_client_conflict_option_get_id(option): - """svn_client_conflict_option_get_id(svn_client_conflict_option_t * option) -> svn_client_conflict_option_id_t""" - return _client.svn_client_conflict_option_get_id(option) - --def svn_client_conflict_option_get_label(*args) -> "char const *": -+def svn_client_conflict_option_get_label(*args): - """svn_client_conflict_option_get_label(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *""" - return _client.svn_client_conflict_option_get_label(*args) - --def svn_client_conflict_option_get_description(*args) -> "char const *": -+def svn_client_conflict_option_get_description(*args): - """svn_client_conflict_option_get_description(svn_client_conflict_option_t * option, apr_pool_t result_pool) -> char const *""" - return _client.svn_client_conflict_option_get_description(*args) - --def svn_client_conflict_get_recommended_option_id(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": -+def svn_client_conflict_get_recommended_option_id(conflict): - """svn_client_conflict_get_recommended_option_id(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" - return _client.svn_client_conflict_get_recommended_option_id(conflict) - --def svn_client_conflict_get_local_abspath(conflict: 'svn_client_conflict_t *') -> "char const *": -+def svn_client_conflict_get_local_abspath(conflict): - """svn_client_conflict_get_local_abspath(svn_client_conflict_t * conflict) -> char const *""" - return _client.svn_client_conflict_get_local_abspath(conflict) - --def svn_client_conflict_get_operation(conflict: 'svn_client_conflict_t *') -> "svn_wc_operation_t": -+def svn_client_conflict_get_operation(conflict): - """svn_client_conflict_get_operation(svn_client_conflict_t * conflict) -> svn_wc_operation_t""" - return _client.svn_client_conflict_get_operation(conflict) - --def svn_client_conflict_get_incoming_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_action_t": -+def svn_client_conflict_get_incoming_change(conflict): - """svn_client_conflict_get_incoming_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_action_t""" - return _client.svn_client_conflict_get_incoming_change(conflict) - --def svn_client_conflict_get_local_change(conflict: 'svn_client_conflict_t *') -> "svn_wc_conflict_reason_t": -+def svn_client_conflict_get_local_change(conflict): - """svn_client_conflict_get_local_change(svn_client_conflict_t * conflict) -> svn_wc_conflict_reason_t""" - return _client.svn_client_conflict_get_local_change(conflict) - --def svn_client_conflict_get_repos_info(*args) -> "char const **, char const **": -+def svn_client_conflict_get_repos_info(*args): - """svn_client_conflict_get_repos_info(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_get_repos_info(*args) - --def svn_client_conflict_get_incoming_old_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *": -+def svn_client_conflict_get_incoming_old_repos_location(*args): - """svn_client_conflict_get_incoming_old_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_get_incoming_old_repos_location(*args) - --def svn_client_conflict_get_incoming_new_repos_location(*args) -> "char const **, svn_revnum_t *, svn_node_kind_t *": -+def svn_client_conflict_get_incoming_new_repos_location(*args): - """svn_client_conflict_get_incoming_new_repos_location(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_get_incoming_new_repos_location(*args) - --def svn_client_conflict_tree_get_victim_node_kind(conflict: 'svn_client_conflict_t *') -> "svn_node_kind_t": -+def svn_client_conflict_tree_get_victim_node_kind(conflict): - """svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t * conflict) -> svn_node_kind_t""" - return _client.svn_client_conflict_tree_get_victim_node_kind(conflict) - --def svn_client_conflict_tree_resolve(*args) -> "svn_error_t *": -+def svn_client_conflict_tree_resolve(*args): - """svn_client_conflict_tree_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_tree_resolve(*args) - --def svn_client_conflict_tree_resolve_by_id(*args) -> "svn_error_t *": -+def svn_client_conflict_tree_resolve_by_id(*args): - """svn_client_conflict_tree_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_tree_resolve_by_id(*args) - --def svn_client_conflict_tree_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": -+def svn_client_conflict_tree_get_resolution(conflict): - """svn_client_conflict_tree_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" - return _client.svn_client_conflict_tree_get_resolution(conflict) - --def svn_client_conflict_prop_get_reject_abspath(conflict: 'svn_client_conflict_t *') -> "char const *": -+def svn_client_conflict_prop_get_reject_abspath(conflict): - """svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t * conflict) -> char const *""" - return _client.svn_client_conflict_prop_get_reject_abspath(conflict) - --def svn_client_conflict_prop_get_propvals(*args) -> "svn_string_t **, svn_string_t **, svn_string_t **, svn_string_t **": -+def svn_client_conflict_prop_get_propvals(*args): - """svn_client_conflict_prop_get_propvals(svn_client_conflict_t * conflict, char const * propname, apr_pool_t result_pool) -> svn_error_t""" - return _client.svn_client_conflict_prop_get_propvals(*args) - --def svn_client_conflict_prop_resolve(*args) -> "svn_error_t *": -+def svn_client_conflict_prop_resolve(*args): - """svn_client_conflict_prop_resolve(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_prop_resolve(*args) - --def svn_client_conflict_prop_resolve_by_id(*args) -> "svn_error_t *": -+def svn_client_conflict_prop_resolve_by_id(*args): - """svn_client_conflict_prop_resolve_by_id(svn_client_conflict_t * conflict, char const * propname, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_prop_resolve_by_id(*args) - --def svn_client_conflict_prop_get_resolution(conflict: 'svn_client_conflict_t *', propname: 'char const *') -> "svn_client_conflict_option_id_t": -+def svn_client_conflict_prop_get_resolution(conflict, propname): - """svn_client_conflict_prop_get_resolution(svn_client_conflict_t * conflict, char const * propname) -> svn_client_conflict_option_id_t""" - return _client.svn_client_conflict_prop_get_resolution(conflict, propname) - --def svn_client_conflict_text_get_mime_type(conflict: 'svn_client_conflict_t *') -> "char const *": -+def svn_client_conflict_text_get_mime_type(conflict): - """svn_client_conflict_text_get_mime_type(svn_client_conflict_t * conflict) -> char const *""" - return _client.svn_client_conflict_text_get_mime_type(conflict) - --def svn_client_conflict_text_get_contents(*args) -> "char const **, char const **, char const **, char const **": -+def svn_client_conflict_text_get_contents(*args): - """svn_client_conflict_text_get_contents(svn_client_conflict_t * conflict, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_text_get_contents(*args) - --def svn_client_conflict_text_resolve(*args) -> "svn_error_t *": -+def svn_client_conflict_text_resolve(*args): - """svn_client_conflict_text_resolve(svn_client_conflict_t * conflict, svn_client_conflict_option_t * option, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_text_resolve(*args) - --def svn_client_conflict_text_resolve_by_id(*args) -> "svn_error_t *": -+def svn_client_conflict_text_resolve_by_id(*args): - """svn_client_conflict_text_resolve_by_id(svn_client_conflict_t * conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_conflict_text_resolve_by_id(*args) - --def svn_client_conflict_text_get_resolution(conflict: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t": -+def svn_client_conflict_text_get_resolution(conflict): - """svn_client_conflict_text_get_resolution(svn_client_conflict_t * conflict) -> svn_client_conflict_option_id_t""" - return _client.svn_client_conflict_text_get_resolution(conflict) - --def svn_client_resolved(*args) -> "svn_error_t *": -+def svn_client_resolved(*args): - """svn_client_resolved(char const * path, svn_boolean_t recursive, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_resolved(*args) - --def svn_client_resolve(*args) -> "svn_error_t *": -+def svn_client_resolve(*args): - """svn_client_resolve(char const * path, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_resolve(*args) - class svn_client_copy_source_t(object): -@@ -1697,211 +1697,211 @@ svn_client_copy_source_t_swigregister = _client.svn_client_copy_source_t_swigreg - svn_client_copy_source_t_swigregister(svn_client_copy_source_t) - - --def svn_client_copy7(*args) -> "svn_error_t *": -+def svn_client_copy7(*args): - """svn_client_copy7(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, svn_boolean_t metadata_only, svn_boolean_t pin_externals, apr_hash_t externals_to_pin, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy7(*args) - --def svn_client_copy6(*args) -> "svn_error_t *": -+def svn_client_copy6(*args): - """svn_client_copy6(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy6(*args) - --def svn_client_copy5(*args) -> "svn_commit_info_t **": -+def svn_client_copy5(*args): - """svn_client_copy5(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy5(*args) - --def svn_client_copy4(*args) -> "svn_commit_info_t **": -+def svn_client_copy4(*args): - """svn_client_copy4(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy4(*args) - --def svn_client_copy3(*args) -> "svn_commit_info_t **": -+def svn_client_copy3(*args): - """svn_client_copy3(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy3(*args) - --def svn_client_copy2(*args) -> "svn_commit_info_t **": -+def svn_client_copy2(*args): - """svn_client_copy2(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy2(*args) - --def svn_client_copy(*args) -> "svn_client_commit_info_t **": -+def svn_client_copy(*args): - """svn_client_copy(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_copy(*args) - --def svn_client_move7(*args) -> "svn_error_t *": -+def svn_client_move7(*args): - """svn_client_move7(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, svn_boolean_t allow_mixed_revisions, svn_boolean_t metadata_only, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move7(*args) - --def svn_client_move6(*args) -> "svn_error_t *": -+def svn_client_move6(*args): - """svn_client_move6(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t move_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move6(*args) - --def svn_client_move5(*args) -> "svn_commit_info_t **": -+def svn_client_move5(*args): - """svn_client_move5(apr_array_header_t src_paths, char const * dst_path, svn_boolean_t force, svn_boolean_t move_as_child, svn_boolean_t make_parents, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move5(*args) - --def svn_client_move4(*args) -> "svn_commit_info_t **": -+def svn_client_move4(*args): - """svn_client_move4(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move4(*args) - --def svn_client_move3(*args) -> "svn_commit_info_t **": -+def svn_client_move3(*args): - """svn_client_move3(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move3(*args) - --def svn_client_move2(*args) -> "svn_client_commit_info_t **": -+def svn_client_move2(*args): - """svn_client_move2(char const * src_path, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move2(*args) - --def svn_client_move(*args) -> "svn_client_commit_info_t **": -+def svn_client_move(*args): - """svn_client_move(char const * src_path, svn_opt_revision_t src_revision, char const * dst_path, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_move(*args) - --def svn_client_propset_remote(*args) -> "svn_error_t *": -+def svn_client_propset_remote(*args): - """svn_client_propset_remote(char const * propname, svn_string_t const * propval, char const * url, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_propset_remote(*args) - --def svn_client_propset_local(*args) -> "svn_error_t *": -+def svn_client_propset_local(*args): - """svn_client_propset_local(char const * propname, svn_string_t const * propval, apr_array_header_t targets, svn_depth_t depth, svn_boolean_t skip_checks, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_propset_local(*args) - --def svn_client_propset3(*args) -> "svn_commit_info_t **": -+def svn_client_propset3(*args): - """svn_client_propset3(char const * propname, svn_string_t const * propval, char const * target, svn_depth_t depth, svn_boolean_t skip_checks, svn_revnum_t base_revision_for_url, apr_array_header_t changelists, apr_hash_t revprop_table, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propset3(*args) - --def svn_client_propset2(*args) -> "svn_error_t *": -+def svn_client_propset2(*args): - """svn_client_propset2(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, svn_boolean_t skip_checks, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propset2(*args) - --def svn_client_propset(*args) -> "svn_error_t *": -+def svn_client_propset(*args): - """svn_client_propset(char const * propname, svn_string_t const * propval, char const * target, svn_boolean_t recurse, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propset(*args) - --def svn_client_revprop_set2(*args) -> "svn_revnum_t *": -+def svn_client_revprop_set2(*args): - """svn_client_revprop_set2(char const * propname, svn_string_t const * propval, svn_string_t const * original_propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revprop_set2(*args) - --def svn_client_revprop_set(*args) -> "svn_revnum_t *": -+def svn_client_revprop_set(*args): - """svn_client_revprop_set(char const * propname, svn_string_t const * propval, char const * URL, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revprop_set(*args) - --def svn_client_propget5(*args) -> "apr_hash_t **, apr_array_header_t **, svn_revnum_t *": -+def svn_client_propget5(*args): - """svn_client_propget5(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_propget5(*args) - --def svn_client_propget4(*args) -> "apr_hash_t **, svn_revnum_t *": -+def svn_client_propget4(*args): - """svn_client_propget4(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_propget4(*args) - --def svn_client_propget3(*args) -> "apr_hash_t **, svn_revnum_t *": -+def svn_client_propget3(*args): - """svn_client_propget3(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propget3(*args) - --def svn_client_propget2(*args) -> "apr_hash_t **": -+def svn_client_propget2(*args): - """svn_client_propget2(char const * propname, char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propget2(*args) - --def svn_client_propget(*args) -> "apr_hash_t **": -+def svn_client_propget(*args): - """svn_client_propget(char const * propname, char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_propget(*args) - --def svn_client_revprop_get(*args) -> "svn_string_t **, svn_revnum_t *": -+def svn_client_revprop_get(*args): - """svn_client_revprop_get(char const * propname, char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revprop_get(*args) - --def svn_client_proplist4(*args) -> "svn_error_t *": -+def svn_client_proplist4(*args): - """svn_client_proplist4(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t get_target_inherited_props, svn_proplist_receiver2_t receiver, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_proplist4(*args) - --def svn_client_proplist3(*args) -> "svn_error_t *": -+def svn_client_proplist3(*args): - """svn_client_proplist3(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_array_header_t changelists, svn_proplist_receiver_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_proplist3(*args) - --def svn_client_proplist2(*args) -> "apr_array_header_t **": -+def svn_client_proplist2(*args): - """svn_client_proplist2(char const * target, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_proplist2(*args) - --def svn_client_proplist(*args) -> "apr_array_header_t **": -+def svn_client_proplist(*args): - """svn_client_proplist(char const * target, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_proplist(*args) - --def svn_client_revprop_list(*args) -> "apr_hash_t **, svn_revnum_t *": -+def svn_client_revprop_list(*args): - """svn_client_revprop_list(char const * URL, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_revprop_list(*args) - --def svn_client_export5(*args) -> "svn_revnum_t *": -+def svn_client_export5(*args): - """svn_client_export5(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t ignore_keywords, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_export5(*args) - --def svn_client_export4(*args) -> "svn_revnum_t *": -+def svn_client_export4(*args): - """svn_client_export4(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_depth_t depth, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_export4(*args) - --def svn_client_export3(*args) -> "svn_revnum_t *": -+def svn_client_export3(*args): - """svn_client_export3(char const * from_path_or_url, char const * to_path, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t overwrite, svn_boolean_t ignore_externals, svn_boolean_t recurse, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_export3(*args) - --def svn_client_export2(*args) -> "svn_revnum_t *": -+def svn_client_export2(*args): - """svn_client_export2(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, char const * native_eol, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_export2(*args) - --def svn_client_export(*args) -> "svn_revnum_t *": -+def svn_client_export(*args): - """svn_client_export(char const * from_path_or_url, char const * to_path, svn_opt_revision_t revision, svn_boolean_t force, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_export(*args) - --def svn_client_list4(*args) -> "svn_error_t *": -+def svn_client_list4(*args): - """svn_client_list4(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, apr_array_header_t patterns, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_list4(*args) - --def svn_client_list3(*args) -> "svn_error_t *": -+def svn_client_list3(*args): - """svn_client_list3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_boolean_t include_externals, svn_client_list_func2_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_list3(*args) - --def svn_client_list2(*args) -> "svn_error_t *": -+def svn_client_list2(*args): - """svn_client_list2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_list2(*args) - --def svn_client_list(*args) -> "svn_error_t *": -+def svn_client_list(*args): - """svn_client_list(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, apr_uint32_t dirent_fields, svn_boolean_t fetch_locks, svn_client_list_func_t list_func, void * baton, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_list(*args) - --def svn_client_ls3(*args) -> "apr_hash_t **, apr_hash_t **": -+def svn_client_ls3(*args): - """svn_client_ls3(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_ls3(*args) - --def svn_client_ls2(*args) -> "apr_hash_t **": -+def svn_client_ls2(*args): - """svn_client_ls2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_ls2(*args) - --def svn_client_ls(*args) -> "apr_hash_t **": -+def svn_client_ls(*args): - """svn_client_ls(char const * path_or_url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_ls(*args) - --def svn_client_cat3(*args) -> "apr_hash_t **": -+def svn_client_cat3(*args): - """svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t expand_keywords, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_cat3(*args) - --def svn_client_cat2(*args) -> "svn_error_t *": -+def svn_client_cat2(*args): - """svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_cat2(*args) - --def svn_client_cat(*args) -> "svn_error_t *": -+def svn_client_cat(*args): - """svn_client_cat(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_cat(*args) - --def svn_client_add_to_changelist(*args) -> "svn_error_t *": -+def svn_client_add_to_changelist(*args): - """svn_client_add_to_changelist(apr_array_header_t paths, char const * changelist, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_add_to_changelist(*args) - --def svn_client_remove_from_changelists(*args) -> "svn_error_t *": -+def svn_client_remove_from_changelists(*args): - """svn_client_remove_from_changelists(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_remove_from_changelists(*args) - --def svn_client_get_changelists(*args) -> "svn_error_t *": -+def svn_client_get_changelists(*args): - """svn_client_get_changelists(char const * path, apr_array_header_t changelists, svn_depth_t depth, svn_changelist_receiver_t callback_func, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_get_changelists(*args) - --def svn_client_lock(*args) -> "svn_error_t *": -+def svn_client_lock(*args): - """svn_client_lock(apr_array_header_t targets, char const * comment, svn_boolean_t steal_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_lock(*args) - --def svn_client_unlock(*args) -> "svn_error_t *": -+def svn_client_unlock(*args): - """svn_client_unlock(apr_array_header_t targets, svn_boolean_t break_lock, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_unlock(*args) - class svn_info_t(object): -@@ -2026,7 +2026,7 @@ svn_info_t_swigregister = _client.svn_info_t_swigregister - svn_info_t_swigregister(svn_info_t) - - --def svn_info_dup(*args) -> "svn_info_t *": -+def svn_info_dup(*args): - """svn_info_dup(svn_info_t info, apr_pool_t pool) -> svn_info_t""" - return _client.svn_info_dup(*args) - class svn_client_info2_t(object): -@@ -2135,71 +2135,71 @@ svn_client_info2_t_swigregister = _client.svn_client_info2_t_swigregister - svn_client_info2_t_swigregister(svn_client_info2_t) - - --def svn_client_info2_dup(*args) -> "svn_client_info2_t *": -+def svn_client_info2_dup(*args): - """svn_client_info2_dup(svn_client_info2_t info, apr_pool_t pool) -> svn_client_info2_t""" - return _client.svn_client_info2_dup(*args) - --def svn_client_info4(*args) -> "svn_error_t *": -+def svn_client_info4(*args): - """svn_client_info4(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, svn_boolean_t include_externals, apr_array_header_t changelists, svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_info4(*args) - --def svn_client_info3(*args) -> "svn_error_t *": -+def svn_client_info3(*args): - """svn_client_info3(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, apr_array_header_t changelists, svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_info3(*args) - --def svn_client_info2(*args) -> "svn_error_t *": -+def svn_client_info2(*args): - """svn_client_info2(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_info2(*args) - --def svn_client_info(*args) -> "svn_error_t *": -+def svn_client_info(*args): - """svn_client_info(char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_info_receiver_t receiver, svn_boolean_t recurse, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_info(*args) - --def svn_client_get_wc_root(*args) -> "char const **": -+def svn_client_get_wc_root(*args): - """svn_client_get_wc_root(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_get_wc_root(*args) - --def svn_client_min_max_revisions(*args) -> "svn_revnum_t *, svn_revnum_t *": -+def svn_client_min_max_revisions(*args): - """svn_client_min_max_revisions(char const * local_abspath, svn_boolean_t committed, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_min_max_revisions(*args) - --def svn_client_patch(*args) -> "svn_error_t *": -+def svn_client_patch(*args): - """svn_client_patch(char const * patch_abspath, char const * wc_dir_abspath, svn_boolean_t dry_run, int strip_count, svn_boolean_t reverse, svn_boolean_t ignore_whitespace, svn_boolean_t remove_tempfiles, svn_client_patch_func_t patch_func, void * patch_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_patch(*args) - --def svn_client_url_from_path2(*args) -> "char const **": -+def svn_client_url_from_path2(*args): - """svn_client_url_from_path2(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_url_from_path2(*args) - --def svn_client_url_from_path(*args) -> "char const **": -+def svn_client_url_from_path(*args): - """svn_client_url_from_path(char const * path_or_url, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_url_from_path(*args) - --def svn_client_get_repos_root(*args) -> "char const **, char const **": -+def svn_client_get_repos_root(*args): - """svn_client_get_repos_root(char const * abspath_or_url, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_get_repos_root(*args) - --def svn_client_root_url_from_path(*args) -> "char const **": -+def svn_client_root_url_from_path(*args): - """svn_client_root_url_from_path(char const * path_or_url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_root_url_from_path(*args) - --def svn_client_uuid_from_url(*args) -> "char const **": -+def svn_client_uuid_from_url(*args): - """svn_client_uuid_from_url(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_uuid_from_url(*args) - --def svn_client_uuid_from_path2(*args) -> "char const **": -+def svn_client_uuid_from_path2(*args): - """svn_client_uuid_from_path2(char const * local_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_uuid_from_path2(*args) - --def svn_client_uuid_from_path(*args) -> "char const **": -+def svn_client_uuid_from_path(*args): - """svn_client_uuid_from_path(char const * path, svn_wc_adm_access_t * adm_access, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_uuid_from_path(*args) - --def svn_client_open_ra_session2(*args) -> "svn_ra_session_t **": -+def svn_client_open_ra_session2(*args): - """svn_client_open_ra_session2(char const * url, char const * wri_abspath, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_client_open_ra_session2(*args) - --def svn_client_open_ra_session(*args) -> "svn_ra_session_t **": -+def svn_client_open_ra_session(*args): - """svn_client_open_ra_session(char const * url, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_open_ra_session(*args) - class svn_client_conflict_t(object): -@@ -2377,79 +2377,79 @@ svn_client_conflict_option_t_swigregister = _client.svn_client_conflict_option_t - svn_client_conflict_option_t_swigregister(svn_client_conflict_option_t) - - --def svn_proplist_invoke_receiver2(*args) -> "svn_error_t *": -+def svn_proplist_invoke_receiver2(*args): - """svn_proplist_invoke_receiver2(svn_proplist_receiver2_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_array_header_t inherited_props, apr_pool_t scratch_pool) -> svn_error_t""" - return _client.svn_proplist_invoke_receiver2(*args) - --def svn_proplist_invoke_receiver(*args) -> "svn_error_t *": -+def svn_proplist_invoke_receiver(*args): - """svn_proplist_invoke_receiver(svn_proplist_receiver_t _obj, void * baton, char const * path, apr_hash_t prop_hash, apr_pool_t pool) -> svn_error_t""" - return _client.svn_proplist_invoke_receiver(*args) - --def svn_client_invoke_get_commit_log3(*args) -> "char const **, char const **": -+def svn_client_invoke_get_commit_log3(*args): - """svn_client_invoke_get_commit_log3(svn_client_get_commit_log3_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_get_commit_log3(*args) - --def svn_client_invoke_get_commit_log2(*args) -> "char const **, char const **": -+def svn_client_invoke_get_commit_log2(*args): - """svn_client_invoke_get_commit_log2(svn_client_get_commit_log2_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_get_commit_log2(*args) - --def svn_client_invoke_get_commit_log(*args) -> "char const **, char const **": -+def svn_client_invoke_get_commit_log(*args): - """svn_client_invoke_get_commit_log(svn_client_get_commit_log_t _obj, apr_array_header_t commit_items, void * baton, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_get_commit_log(*args) - --def svn_client_invoke_blame_receiver4(*args) -> "svn_error_t *": -+def svn_client_invoke_blame_receiver4(*args): - """svn_client_invoke_blame_receiver4(svn_client_blame_receiver4_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, svn_string_t const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_blame_receiver4(*args) - --def svn_client_invoke_blame_receiver3(*args) -> "svn_error_t *": -+def svn_client_invoke_blame_receiver3(*args): - """svn_client_invoke_blame_receiver3(svn_client_blame_receiver3_t _obj, void * baton, svn_revnum_t start_revnum, svn_revnum_t end_revnum, apr_int64_t line_no, svn_revnum_t revision, apr_hash_t rev_props, svn_revnum_t merged_revision, apr_hash_t merged_rev_props, char const * merged_path, char const * line, svn_boolean_t local_change, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_blame_receiver3(*args) - --def svn_client_invoke_blame_receiver2(*args) -> "svn_error_t *": -+def svn_client_invoke_blame_receiver2(*args): - """svn_client_invoke_blame_receiver2(svn_client_blame_receiver2_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, svn_revnum_t merged_revision, char const * merged_author, char const * merged_date, char const * merged_path, char const * line, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_blame_receiver2(*args) - --def svn_client_invoke_blame_receiver(*args) -> "svn_error_t *": -+def svn_client_invoke_blame_receiver(*args): - """svn_client_invoke_blame_receiver(svn_client_blame_receiver_t _obj, void * baton, apr_int64_t line_no, svn_revnum_t revision, char const * author, char const * date, char const * line, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_blame_receiver(*args) - --def svn_client_invoke_diff_summarize_func(*args) -> "svn_error_t *": -+def svn_client_invoke_diff_summarize_func(*args): - """svn_client_invoke_diff_summarize_func(svn_client_diff_summarize_func_t _obj, svn_client_diff_summarize_t diff, void * baton, apr_pool_t pool) -> svn_error_t""" - return _client.svn_client_invoke_diff_summarize_func(*args) - @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 20 08:38:02 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 20 Sep 2021 06:38:02 +0000 Subject: SF.net SVN: gar:[26800] csw/mgar/pkg/help2man/trunk Message-ID: <1632119882.348888.7826@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26800 http://sourceforge.net/p/gar/code/26800 Author: dmichelsen Date: 2021-09-20 06:38:01 +0000 (Mon, 20 Sep 2021) Log Message: ----------- help2man/trunk: Update to 1.48.5 Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2021-09-18 08:39:09 UTC (rev 26799) +++ csw/mgar/pkg/help2man/trunk/Makefile 2021-09-20 06:38:01 UTC (rev 26800) @@ -1,5 +1,5 @@ NAME = help2man -VERSION = 1.47.5 +VERSION = 1.48.5 GARTYPE = v2 DESCRIPTION = A tool for automatically generating simple manual pages from program output Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2021-09-18 08:39:09 UTC (rev 26799) +++ csw/mgar/pkg/help2man/trunk/checksums 2021-09-20 06:38:01 UTC (rev 26800) @@ -1 +1 @@ -1c886063c9e0ab463906de804596aa2f help2man-1.47.5.tar.xz +6bf2cc2c943f9fddc000ffc3925d43c7 help2man-1.48.5.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 22 08:54:04 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Sep 2021 06:54:04 +0000 Subject: SF.net SVN: gar:[26801] csw/mgar/pkg/sudo/trunk Message-ID: <1632293644.763678.28770@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26801 http://sourceforge.net/p/gar/code/26801 Author: dmichelsen Date: 2021-09-22 06:54:04 +0000 (Wed, 22 Sep 2021) Log Message: ----------- sudo/trunk: Update to 1.9.8p2 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2021-09-20 06:38:01 UTC (rev 26800) +++ csw/mgar/pkg/sudo/trunk/Makefile 2021-09-22 06:54:04 UTC (rev 26801) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.9.8p1 +VERSION = 1.9.8p2 GARTYPE = v2 EXTRA_MODULATORS = LDAP Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2021-09-20 06:38:01 UTC (rev 26800) +++ csw/mgar/pkg/sudo/trunk/checksums 2021-09-22 06:54:04 UTC (rev 26801) @@ -1 +1 @@ -ae9c8b32268f27d05bcdcb8f0c04d461 sudo-1.9.8p1.tar.gz +f831c1d62835cde89c261465d9c781e4 sudo-1.9.8p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 22 09:18:18 2021 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 22 Sep 2021 07:18:18 +0000 Subject: SF.net SVN: gar:[26802] csw/mgar/pkg/curl/trunk Message-ID: <1632295098.194906.23213@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26802 http://sourceforge.net/p/gar/code/26802 Author: dmichelsen Date: 2021-09-22 07:18:17 +0000 (Wed, 22 Sep 2021) Log Message: ----------- curl/trunk: Update to 7.79.1 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2021-09-22 06:54:04 UTC (rev 26801) +++ csw/mgar/pkg/curl/trunk/Makefile 2021-09-22 07:18:17 UTC (rev 26802) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.79.0 +VERSION = 7.79.1 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2021-09-22 06:54:04 UTC (rev 26801) +++ csw/mgar/pkg/curl/trunk/checksums 2021-09-22 07:18:17 UTC (rev 26802) @@ -1 +1 @@ -24408ce0068de0ae7871039451ad6f97 curl-7.79.0.tar.xz +74d3c4ca8aaa6c0619806d6e246e65fb curl-7.79.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.