serf: 1.3.9 -> 1.3.10
This commit is contained in:
parent
ce4eb9091e
commit
247d99fb2e
|
@ -1,14 +1,24 @@
|
||||||
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5
|
{ lib
|
||||||
, pkg-config, libiconv
|
, stdenv
|
||||||
, fetchpatch }:
|
, fetchurl
|
||||||
|
, apr
|
||||||
|
, scons
|
||||||
|
, openssl
|
||||||
|
, aprutil
|
||||||
|
, zlib
|
||||||
|
, libkrb5
|
||||||
|
, pkg-config
|
||||||
|
, libiconv
|
||||||
|
, fetchpatch
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "serf";
|
pname = "serf";
|
||||||
version = "1.3.9";
|
version = "1.3.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/serf/${pname}-${version}.tar.bz2";
|
url = "mirror://apache/serf/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
|
hash = "sha256-voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config scons ];
|
nativeBuildInputs = [ pkg-config scons ];
|
||||||
|
@ -17,11 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./scons.patch
|
./scons.patch
|
||||||
# https://issues.apache.org/jira/projects/SERF/issues/SERF-198
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch";
|
|
||||||
hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch";
|
url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch";
|
||||||
hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4=";
|
hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4=";
|
||||||
|
@ -44,6 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "HTTP client library based on APR";
|
description = "HTTP client library based on APR";
|
||||||
|
homepage = "https://serf.apache.org/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ orivej raskin ];
|
maintainers = with maintainers; [ orivej raskin ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
|
|
@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct
|
||||||
index 4358a23..6ce7776 100644
|
index 4358a23..6ce7776 100644
|
||||||
--- a/SConstruct
|
--- a/SConstruct
|
||||||
+++ b/SConstruct
|
+++ b/SConstruct
|
||||||
@@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
|
|
||||||
# To be used to ensure a PREFIX directory is only created when installing.
|
|
||||||
def createPathIsDirCreateWithTarget(target):
|
|
||||||
def my_validator(key, val, env):
|
|
||||||
- build_targets = (map(str, BUILD_TARGETS))
|
|
||||||
+ build_targets = (list(map(str, BUILD_TARGETS)))
|
|
||||||
if target in build_targets:
|
|
||||||
return PathVariable.PathIsDirCreate(key, val, env)
|
|
||||||
else:
|
|
||||||
@@ -155,6 +155,8 @@ if sys.platform == 'win32':
|
@@ -155,6 +155,8 @@ if sys.platform == 'win32':
|
||||||
env = Environment(variables=opts,
|
env = Environment(variables=opts,
|
||||||
tools=('default', 'textfile',),
|
tools=('default', 'textfile',),
|
||||||
|
@ -20,25 +11,3 @@ index 4358a23..6ce7776 100644
|
||||||
)
|
)
|
||||||
|
|
||||||
env.Append(BUILDERS = {
|
env.Append(BUILDERS = {
|
||||||
@@ -163,9 +164,9 @@ env.Append(BUILDERS = {
|
|
||||||
suffix='.def', src_suffix='.h')
|
|
||||||
})
|
|
||||||
|
|
||||||
-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
|
|
||||||
- 'SERF_MINOR_VERSION ([0-9]+).*'
|
|
||||||
- 'SERF_PATCH_VERSION ([0-9]+)',
|
|
||||||
+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
|
|
||||||
+ b'SERF_MINOR_VERSION ([0-9]+).*'
|
|
||||||
+ b'SERF_PATCH_VERSION ([0-9]+)',
|
|
||||||
env.File('serf.h').get_contents(),
|
|
||||||
re.DOTALL)
|
|
||||||
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
|
|
||||||
@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
|
|
||||||
|
|
||||||
unknown = opts.UnknownVariables()
|
|
||||||
if unknown:
|
|
||||||
- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
|
|
||||||
+ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
|
|
||||||
|
|
||||||
apr = str(env['APR'])
|
|
||||||
apu = str(env['APU'])
|
|
||||||
|
|
Loading…
Reference in a new issue