From patchwork Sun Sep 29 18:34:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1169082 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46hDjC6KKJz9sP7 for ; Mon, 30 Sep 2019 04:34:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A99E8758A; Sun, 29 Sep 2019 18:34:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SnsTLMHpVK1m; Sun, 29 Sep 2019 18:34:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BBCEC87430; Sun, 29 Sep 2019 18:34:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 15BC11BF5A1 for ; Sun, 29 Sep 2019 18:34:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 088528712D for ; Sun, 29 Sep 2019 18:34:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q7-VUv8nMmEr for ; Sun, 29 Sep 2019 18:34:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by hemlock.osuosl.org (Postfix) with ESMTPS id AA0AB86FB0 for ; Sun, 29 Sep 2019 18:34:28 +0000 (UTC) Received: from fwd04.aul.t-online.de (fwd04.aul.t-online.de [172.20.26.149]) by mailout03.t-online.de (Postfix) with SMTP id D17D4427FE26; Sun, 29 Sep 2019 20:34:26 +0200 (CEST) Received: from fli4l.lan.fli4l (Sx5h9TZSwhH2mbK98IYmJZ6jKK9yLr0pKMx-QB3JZOpEvsyT116RYlvVn8Sl1bTwp6@[91.58.11.187]) by fwd04.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iEe1N-0KcOMy0; Sun, 29 Sep 2019 20:34:13 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:49148) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iEe1M-0001Ip-P4; Sun, 29 Sep 2019 20:34:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 29 Sep 2019 20:34:12 +0200 Message-Id: <20190929183412.11686-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: Sx5h9TZSwhH2mbK98IYmJZ6jKK9yLr0pKMx-QB3JZOpEvsyT116RYlvVn8Sl1bTwp6 X-TOI-MSGID: 65930aa0-e290-4aec-bb24-5d0d5b58bfac Subject: [Buildroot] [PATCH 1/1] package/subversion: bump version to 1.12.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rico Bachmann Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added dependencies to lz4 and utf8proc, the latter needs http://patchwork.ozlabs.org/patch/1169012/ Added patch to fix build error because macos-specific variables were not addressed by AC_SUBST. Updated license hash after various upstream commits: https://github.com/apache/subversion/commits/trunk/LICENSE Signed-off-by: Bernd Kuhls --- .../0003-cross-compilation-macos.patch | 103 ++++++++++++++++++ package/subversion/Config.in | 2 + package/subversion/subversion.hash | 6 +- package/subversion/subversion.mk | 6 +- 4 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 package/subversion/0003-cross-compilation-macos.patch diff --git a/package/subversion/0003-cross-compilation-macos.patch b/package/subversion/0003-cross-compilation-macos.patch new file mode 100644 index 0000000000..f8fa21931d --- /dev/null +++ b/package/subversion/0003-cross-compilation-macos.patch @@ -0,0 +1,103 @@ +Disable Mac-specific stuff to prevent build error + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/subversion/patches/301-cross-compilation-macos.patch + +Signed-off-by: Bernd Kuhls + +--- a/build/ac-macros/macosx.m4 ++++ b/build/ac-macros/macosx.m4 +@@ -19,80 +19,3 @@ 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_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], +- [Is Mach-O low-level _dyld API available?]) +- AC_MSG_RESULT([yes]) +- ],[ +- AC_MSG_RESULT([no]) +- ]) +-]) +- +-dnl SVN_LIB_MACOS_PLIST +-dnl Assign variables for Mac OS property list support +-AC_DEFUN(SVN_LIB_MACOS_PLIST, +-[ +- AC_MSG_CHECKING([for Mac OS property list utilities]) +- +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +- #include +- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ +- || !defined(MAC_OS_X_VERSION_10_0) \ +- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) +- #error ProperyList API unavailable. +- #endif +- ]],[[]])],[ +- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" +- AC_SUBST(SVN_MACOS_PLIST_LIBS) +- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], +- [Is Mac OS property list API available?]) +- AC_MSG_RESULT([yes]) +- ],[ +- AC_MSG_RESULT([no]) +- ]) +-]) +- +-dnl SVN_LIB_MACOS_KEYCHAIN +-dnl Check configure options and assign variables related to Keychain support +- +-AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN, +-[ +- AC_ARG_ENABLE(keychain, +- AS_HELP_STRING([--disable-keychain], +- [Disable use of Mac OS KeyChain for auth credentials]), +- [enable_keychain=$enableval],[enable_keychain=yes]) +- +- AC_MSG_CHECKING([for Mac OS KeyChain Services]) +- +- if test "$enable_keychain" = "yes"; then +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +- #include +- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ +- || !defined(MAC_OS_X_VERSION_10_2) \ +- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2) +- #error KeyChain API unavailable. +- #endif +- ]],[[]])],[ +- SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices" +- AC_SUBST(SVN_MACOS_KEYCHAIN_LIBS) +- AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?]) +- AC_MSG_RESULT([yes]) +- ],[ +- enable_keychain=no +- AC_MSG_RESULT([no]) +- ]) +- fi +-]) +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,8 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@ + SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ + SVN_LZ4_LIBS = @SVN_LZ4_LIBS@ + SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@ +-SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@ +-SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@ ++SVN_MACOS_PLIST_LIBS = ++SVN_MACOS_KEYCHAIN_LIBS = + + LIBS = @LIBS@ + diff --git a/package/subversion/Config.in b/package/subversion/Config.in index ecac51814e..43e7dcca33 100644 --- a/package/subversion/Config.in +++ b/package/subversion/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_SUBVERSION select BR2_PACKAGE_APR select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LZ4 + select BR2_PACKAGE_UTF8PROC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_SQLITE help diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 7f94631f89..581834f98d 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.9.10.tar.bz2.sha512 -sha512 08a5c6c0233cc1dbd992180d2077eb1c67725682c457d3f67ebb6d22db0f6b64002a699ab828d435b708340ce6fb07bb1f03d11daefb887053c427ed75ad2de7 subversion-1.9.12.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.12.2.tar.bz2.sha512 +sha512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 # Locally calculated -sha256 3202942c1aba495fd17390618dedc1d3542815c5bc11958da7fd98c985abc11a LICENSE +sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index 1013f1fc55..2044a6420f 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.9.12 +SUBVERSION_VERSION = 1.12.2 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion SUBVERSION_LICENSE = Apache-2.0 @@ -14,6 +14,8 @@ SUBVERSION_DEPENDENCIES = \ apr \ apr-util \ expat \ + lz4 \ + utf8proc \ zlib \ sqlite \ $(TARGET_NLS_DEPENDENCIES) @@ -22,6 +24,8 @@ SUBVERSION_CONF_OPTS = \ --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ + --with-lz4=$(STAGING_DIR)/usr \ + --with-utf8proc=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr \ --without-serf \ --without-apxs \