[dev-vcs/subversion*,www-apache/mod_dav_svn] v. bump to 1.8.8
This commit is contained in:
Sławomir Nizio
@@ -1,3 +1,3 @@
|
||||
DIST subversion-1.7.14.tar.bz2 6045932 SHA256 c4ac8f37eb0ebd38901bfa6f1c7e4d7716d32d7460ee0cee520381ca2f5b120d SHA512 cc7df3a2d258cda65a3fefc1fb9bcc91f78ec817c8d32e561eae7cf59de3d1d5c843594150b63c60c724e4b3df88da319763f814f418d106461adcc78b323840 WHIRLPOOL 21d879775ed0bed15d17b83070eb26269f8d3cc0420be54e0d326b7b6f410b9fee11d2f8d2926f930c66c66a47a6396275ddf20120436b978c0a318bb963f0e0
|
||||
DIST subversion-1.8.5-Gentoo-patches.tar.gz 2904 SHA256 6ddf6a5b5e5cd2a466d5d3a03bf7990f027e8454a55429e9462239047f56a33b SHA512 3ab1c3af45d2c8639de1e87f68f0a775da051a455895cce32566e3e9e76b7ca6bbe648b5d55cbc74b98c78e95699ea21d20662d70e30a3c95c845a75a9ce6233 WHIRLPOOL 23f063ea3b29bed0796deafb382261925170b0a7b19acab3316147e0d991254d2e27d49ed0079e45a6e6e015e02b33dab93735a4e31247e52674b3e97d70ace0
|
||||
DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
|
||||
DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
|
||||
;;; subversion site-lisp configuration
|
||||
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(and (< emacs-major-version 22)
|
||||
(add-to-list 'load-path "@SITELISP@/compat"))
|
||||
(add-to-list 'vc-handled-backends 'SVN)
|
||||
|
||||
(defalias 'svn-examine 'svn-status)
|
||||
(autoload 'svn-status "dsvn" "Run `svn status'." t)
|
||||
(autoload 'svn-update "dsvn" "Run `svn update'." t)
|
||||
(autoload 'svn-status "psvn"
|
||||
"Examine the status of Subversion working copy in directory DIR." t)
|
||||
@@ -1,114 +0,0 @@
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:22:36 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:52:31 +0100
|
||||
@@ -49,6 +49,11 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+// This is bad, but better than nothing ;)
|
||||
+#if defined(__INTERIX)
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
+
|
||||
|
||||
|
||||
#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c subversion-1.5.4/subversion/bindings/swig/perl/native/core.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:53:40 +0100
|
||||
@@ -1733,7 +1733,10 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:54:17 +0100
|
||||
@@ -1872,6 +1872,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:54:28 +0100
|
||||
@@ -1745,6 +1745,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:54:41 +0100
|
||||
@@ -1818,6 +1818,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:54:52 +0100
|
||||
@@ -1661,6 +1661,10 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:55:05 +0100
|
||||
@@ -1792,6 +1792,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c
|
||||
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:22:37 +0100
|
||||
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:55:17 +0100
|
||||
@@ -1816,6 +1816,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# define strtoull strtoul
|
||||
+# define strtoll strtol
|
||||
+#endif
|
||||
|
||||
SWIGINTERN int
|
||||
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
|
||||
@@ -1,21 +0,0 @@
|
||||
On AIX, load shared libraries even when created with full aix-soname support:
|
||||
http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
|
||||
http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
|
||||
Once there is an agreement on that, this patch eventually is for upstream too.
|
||||
|
||||
--- subversion/libsvn_ra/ra_loader.c.orig 2009-04-28 14:53:35 +0200
|
||||
+++ subversion/libsvn_ra/ra_loader.c 2009-04-28 14:55:37 +0200
|
||||
@@ -164,6 +164,13 @@
|
||||
|
||||
/* find/load the specified library */
|
||||
SVN_ERR(svn_dso_load(&dso, libname));
|
||||
+#ifdef _AIX
|
||||
+ if (! dso) {
|
||||
+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)",
|
||||
+ ra_name, SVN_VER_MAJOR);
|
||||
+ SVN_ERR(svn_dso_load(&dso, libname));
|
||||
+ }
|
||||
+#endif
|
||||
if (! dso)
|
||||
return SVN_NO_ERROR;
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
--- subversion/libsvn_ra/ra_loader.c.orig 2009-07-20 14:46:02 +0200
|
||||
+++ subversion/libsvn_ra/ra_loader.c 2009-07-20 14:50:02 +0200
|
||||
@@ -154,8 +154,13 @@
|
||||
const char *compat_funcname;
|
||||
apr_status_t status;
|
||||
|
||||
+#if defined(__hpux) && defined(__hppa)
|
||||
+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
|
||||
+ ra_name, SVN_VER_MAJOR);
|
||||
+#else
|
||||
libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
|
||||
ra_name, SVN_VER_MAJOR);
|
||||
+#endif
|
||||
funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
|
||||
compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
# The commented variables in this file are the defaults that are used
|
||||
# in the init-script. You don't need to uncomment them except to
|
||||
# customize them to different values.
|
||||
|
||||
# Options for svnserve
|
||||
#SVNSERVE_OPTS="--root=/var/svn"
|
||||
|
||||
# User and group as which to run svnserve
|
||||
#SVNSERVE_USER="svn"
|
||||
#SVNSERVE_GROUP="svnusers"
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 2004 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd,v 1.1 2010/06/22 18:17:21 arfrever Exp $
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting svnserve"
|
||||
# Ensure that we run from a readable working dir, and that we do not
|
||||
# lock filesystems when being run from such a location.
|
||||
cd /
|
||||
start-stop-daemon --start --quiet --background --make-pidfile \
|
||||
--pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
|
||||
--chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
|
||||
--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping svnserve"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid
|
||||
eend $?
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
service svn
|
||||
{
|
||||
socket_type = stream
|
||||
wait = no
|
||||
user = apache
|
||||
group = apache
|
||||
umask = 002
|
||||
protocol = tcp
|
||||
log_on_failure += USERID HOST
|
||||
port = 3690
|
||||
server = /usr/bin/svnserve
|
||||
server_args = -i
|
||||
disable = yes
|
||||
}
|
||||
+17
-22
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
@@ -12,11 +12,12 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
|
||||
MY_SVN_CATEGORY="${CATEGORY}"
|
||||
|
||||
# note: java-pkg-2, not java-pkt-opt-2
|
||||
inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib
|
||||
SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.5-Gentoo-patches.tar.gz )
|
||||
inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib
|
||||
|
||||
DESCRIPTION="Java bindings for Subversion"
|
||||
HOMEPAGE="http://subversion.apache.org/"
|
||||
SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
|
||||
SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_SVN_P/_/-}"
|
||||
|
||||
LICENSE="Subversion"
|
||||
@@ -25,9 +26,12 @@ KEYWORDS="~amd64 ~arm ~x86"
|
||||
|
||||
IUSE="debug doc nls"
|
||||
|
||||
COMMON_DEPEND="~dev-vcs/subversion-${PV}"
|
||||
COMMON_DEPEND="~dev-vcs/subversion-${PV}
|
||||
>=dev-libs/apr-1.3:1
|
||||
>=dev-libs/apr-util-1.3:1"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
app-arch/bzip2
|
||||
>=virtual/jre-1.5"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=virtual/jdk-1.5"
|
||||
@@ -35,15 +39,15 @@ DEPEND="${COMMON_DEPEND}
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
|
||||
if use debug; then
|
||||
if use debug ; then
|
||||
append-cppflags -DSVN_DEBUG -DAP_DEBUG
|
||||
fi
|
||||
# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
|
||||
[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${MY_SVN_PN}-1.5.4-interix.patch \
|
||||
"${FILESDIR}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \
|
||||
"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch
|
||||
sab-patches_apply_all
|
||||
epatch_user
|
||||
|
||||
fperms +x build/transform_libtool_scripts.sh
|
||||
@@ -69,12 +73,6 @@ src_configure() {
|
||||
myconf+=" --without-swig"
|
||||
myconf+=" --without-junit"
|
||||
|
||||
if use nls; then
|
||||
myconf+=" --enable-nls"
|
||||
else
|
||||
myconf+=" --disable-nls"
|
||||
fi
|
||||
|
||||
case ${CHOST} in
|
||||
*-aix*)
|
||||
# avoid recording immediate path to sharedlibs into executables
|
||||
@@ -99,15 +97,13 @@ src_configure() {
|
||||
;;
|
||||
esac
|
||||
|
||||
#workaround for bug 387057
|
||||
has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
|
||||
|
||||
#version 1.7.7 again tries to link against the older installed version and fails, when trying to
|
||||
#compile for x86 on amd64, so workaround this issue again
|
||||
#check newer versions, if this is still/again needed
|
||||
myconf+=" --disable-disallowing-of-undefined-references"
|
||||
|
||||
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--without-apache-libexecdir \
|
||||
--without-apxs \
|
||||
--without-berkeley-db \
|
||||
--without-ctypesgen \
|
||||
@@ -116,8 +112,8 @@ src_configure() {
|
||||
--enable-javahl \
|
||||
--with-jdk="${JAVA_HOME}" \
|
||||
--without-kwallet \
|
||||
$(use_enable nls) \
|
||||
--without-sasl \
|
||||
--without-neon \
|
||||
--without-serf \
|
||||
${myconf} \
|
||||
--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
|
||||
@@ -125,14 +121,13 @@ src_configure() {
|
||||
--disable-experimental-libtool \
|
||||
--without-jikes \
|
||||
--disable-mod-activation \
|
||||
--disable-neon-version-check \
|
||||
--disable-static
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
|
||||
|
||||
if use doc; then
|
||||
if use doc ; then
|
||||
emake doc-javahl
|
||||
fi
|
||||
}
|
||||
@@ -146,9 +141,9 @@ src_install() {
|
||||
|
||||
mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die
|
||||
|
||||
if use doc; then
|
||||
if use doc ; then
|
||||
java-pkg_dojavadoc doc/javadoc
|
||||
fi
|
||||
|
||||
find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
|
||||
prune_libtool_files --all
|
||||
}
|
||||
Reference in New Issue
Block a user