diff options
Diffstat (limited to 'user/subversion')
| -rw-r--r-- | user/subversion/APKBUILD | 13 | ||||
| -rw-r--r-- | user/subversion/apr-1.7.0.patch | 18 |
2 files changed, 8 insertions, 23 deletions
diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 9cb297aa6..f05892f09 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.12.0 -pkgrel=1 +pkgver=1.12.2 +pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" arch="all" @@ -18,10 +18,14 @@ makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet $pkgname-pl $pkgname-lang" source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 - apr-1.7.0.patch python3-bang.patch " +# secfixes: +# 1.12.2-r0: +# - CVE-2018-11782 +# - CVE-2019-0203 + build() { # this is only needed for autogen.sh _PATH=$PATH @@ -85,6 +89,5 @@ pl() { mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/ } -sha512sums="87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 subversion-1.12.0.tar.bz2 -71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch +sha512sums="b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/apr-1.7.0.patch b/user/subversion/apr-1.7.0.patch deleted file mode 100644 index a74e5e454..000000000 --- a/user/subversion/apr-1.7.0.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- subversion-1.11.1/build/ac-macros/swig.m4 -+++ subversion-1.11.1/build/ac-macros/swig.m4 -@@ -137,13 +137,13 @@ - AC_CACHE_CHECK([for apr_int64_t Python/C API format string], - [svn_cv_pycfmt_apr_int64_t], [ - if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], -+ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], - [#include <apr.h> - MaTcHtHiS APR_INT64_T_FMT EnDeNd], - [svn_cv_pycfmt_apr_int64_t="L"]) - fi - if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r -+ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r - [#include <apr.h> - MaTcHtHiS APR_INT64_T_FMT EnDeNd], - [svn_cv_pycfmt_apr_int64_t="l"]) |