From f8fab8e3ff8c9876bcbca7c41b763bb067aebfa6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 11 Sep 2020 09:08:47 +0200 Subject: [PATCH 1/4] serf: Add version 1.3.9 Apache Serf The serf library is a high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It is permissively licensed under the Apache License, v2. Key features: multiplexed, asynchronous connections SSL/TLS support full HTTP pipelining multiple authentication modes (Basic, Digest, Kerberos/NTLM) zero-copy support for increased throughput Serf is the default client library of Apache Subversion and Apache OpenOffice Requires SCons build system (available from PyPi) but this specific package requires python2, because the SContruct file (which is SCons' Makefile in python language) uses python2 syntax. SCons strictly doesn't require build_in_sourcedir (scons -Y), but I don't see the point of separate sources anyway, when we start each build from scratch. I recommend to run this bee file with unshare -U -r ./serf.be0 instead of sudo ./serf.be0 Well, I think that is better for ANY bee file, but here we invoke a downloaded PyPi package. --- serf.be0 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100755 serf.be0 diff --git a/serf.be0 b/serf.be0 new file mode 100755 index 000000000..b713d9635 --- /dev/null +++ b/serf.be0 @@ -0,0 +1,57 @@ +#!/usr/bin/env beesh + +# BEE_VERSION serf-1.3.9-0 + +# more info: https://serf.apache.org + +SRCURL[0]="https://www.apache.org/dist/serf/serf-${PKGVERSION}.tar.bz2" + +# requires SCons build system (available from PyPi) +# but this specific package requires python2, because +# the SContruct file (which is SCons' Makefile in python +# lanuage) uses python2 syntax. +# +# SCons strictly doesn't require build_in_sourcedir (scons -Y), but +# I don't see the point of separate sources anyway, when we start +# each build from scratch. + +# I recommend to run this bee file with +# unshare -U -r ./serf.be0 +# instead of +# sudo ./serf.be0 +# Well, I think that is better for ANY bee file, but here we +# invoke a downloaded PyPi package. + +# PATCHURL+=() + +build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +mee_build() { + start_cmd virtualenv2 venv0 + . venv0/bin/activate + start_cmd pip install scons + start_cmd scons PREFIX=$PREFIX + # start_cmd scons check +} + +mee_install() { + start_cmd scons install --install-sandbox=$D +} + +#mee_install_post() { +# exit +#} From 7f75f32dfa3120e6033777c82edeb7ea284fe072 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 9 Sep 2020 15:34:09 +0200 Subject: [PATCH 2/4] subversion: Upgrade from version 1.10.6 to 1.14.0 --- subversion.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion.be0 b/subversion.be0 index 21fb541a4..5b002082c 100755 --- a/subversion.be0 +++ b/subversion.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION subversion-1.10.6-0 +# BEE_VERSION subversion-1.14.0-0 # more info: https://subversion.apache.org From 533e535169bf83fb7c33a4a12330a2d84e851034 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 9 Sep 2020 15:41:10 +0200 Subject: [PATCH 3/4] subversion: Update URL --- subversion.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion.be0 b/subversion.be0 index 5b002082c..9cbbdb03b 100755 --- a/subversion.be0 +++ b/subversion.be0 @@ -4,7 +4,7 @@ # more info: https://subversion.apache.org -SRCURL[0]="http://ftp.halifax.rwth-aachen.de/apache/subversion/subversion-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://downloads.apache.org/subversion/subversion-${PKGVERSION}.tar.bz2" # PATCHURL+=() From 7fc6c925816cf6104ce3f9602f8206e72c71f0c9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 10 Sep 2020 14:40:09 +0200 Subject: [PATCH 4/4] subversion: Add -lserf Our current subversion install doesn't work at all: buczek@sigusr2:/scratch/local$ svn co https://svn.resourcespace.com/svn/rs/trunk/ svn: E170000: Unrecognized URL scheme for 'https://svn.resourcespace.com/svn/rs/trunk' buczek@sigusr2:/scratch/local$ svn co http://svn.resourcespace.com/svn/rs/trunk/ svn: E170000: Unrecognized URL scheme for 'http://svn.resourcespace.com/svn/rs/trunk' because subversion won't build with a client library for remote repositories. Add configuration for Apache Serf. --- subversion.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subversion.be0 b/subversion.be0 index 9cbbdb03b..36e3f9021 100755 --- a/subversion.be0 +++ b/subversion.be0 @@ -24,7 +24,8 @@ mee_configure() { bee_configure \ --disable-nls \ --with-lz4=internal \ - --with-utf8proc=internal + --with-utf8proc=internal \ + --with-serf } #mee_build() {