From d8e2857a740438a637417e3cb48f8b41ab8a9d1c Mon Sep 17 00:00:00 2001 From: krant Date: Mon, 5 Feb 2024 15:20:37 +0200 Subject: [PATCH] subversion: update to 1.14.3 - Adopt the package - Remove default configure options - Rebase the patch Signed-off-by: krant --- net/subversion/Makefile | 10 ++---- .../patches/301-cross-compilation-macos.patch | 36 ++++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/net/subversion/Makefile b/net/subversion/Makefile index c550424f40..0e733f284a 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=subversion -PKG_VERSION:=1.14.1 +PKG_VERSION:=1.14.3 PKG_RELEASE:=1 PKG_SOURCE_URL:=@APACHE/subversion PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 +PKG_HASH:=949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440 -PKG_MAINTAINER:=Val Kulkov +PKG_MAINTAINER:=Aleksey Vasilenko PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:apache:subversion @@ -80,11 +80,7 @@ define Package/subversion-server/conffiles endef CONFIGURE_ARGS += \ - --disable-mod-activation \ - --without-ruby-sitedir \ --without-swig \ - --without-jikes \ - --without-junit \ --without-berkeley-db \ --without-apxs \ --without-sasl \ diff --git a/net/subversion/patches/301-cross-compilation-macos.patch b/net/subversion/patches/301-cross-compilation-macos.patch index db25f68e65..a6303895a7 100644 --- a/net/subversion/patches/301-cross-compilation-macos.patch +++ b/net/subversion/patches/301-cross-compilation-macos.patch @@ -1,29 +1,33 @@ --- a/build/ac-macros/macosx.m4 +++ b/build/ac-macros/macosx.m4 -@@ -19,80 +19,3 @@ dnl ==================================== +@@ -18,84 +18,3 @@ dnl under the License. + dnl =================================================================== dnl dnl Mac OS X specific checks - +- -dnl SVN_LIB_MACHO_ITERATE -dnl Check for _dyld_image_name and _dyld_image_header availability -AC_DEFUN(SVN_LIB_MACHO_ITERATE, -[ -- AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -- #include -- #include -- ]],[[ -- const struct mach_header *header = _dyld_get_image_header(0); -- const char *name = _dyld_get_image_name(0); -- if (name && header) return 0; -- return 1; -- ]])],[ +- AC_CACHE_CHECK([for Mach-O dynamic module iteration functions], +- [ac_cv_mach_o_dynamic_module_iteration_works], [ +- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +- #include +- #include +- ]],[[ +- const struct mach_header *header = _dyld_get_image_header(0); +- const char *name = _dyld_get_image_name(0); +- if (name && header) return 0; +- return 1; +- ]])], +- [ac_cv_mach_o_dynamic_module_iteration_works=yes], +- [ac_cv_mach_o_dynamic_module_iteration_works=no], +- [ac_cv_mach_o_dynamic_module_iteration_works=no]) +- ]) +- if test "$ac_cv_mach_o_dynamic_module_iteration_works" = yes; then - AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], - [Is Mach-O low-level _dyld API available?]) -- AC_MSG_RESULT([yes]) -- ],[ -- AC_MSG_RESULT([no]) -- ]) +- fi -]) - -dnl SVN_LIB_MACOS_PLIST