New upstream release 0.9.32
This commit is contained in:
parent
ad74ae0ee7
commit
20f8727ecb
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,3 +19,4 @@ tevent-0.9.8.tar.gz
|
||||
/tevent-0.9.29.tar.gz
|
||||
/tevent-0.9.30.tar.gz
|
||||
/tevent-0.9.31.tar.gz
|
||||
/tevent-0.9.32.tar.gz
|
||||
|
||||
66
0001-Revert-waf-disable-python-align-talloc-s-wscript.patch
Normal file
66
0001-Revert-waf-disable-python-align-talloc-s-wscript.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From f9d6bc97b003249a9e0ebb222ba3ee6a7bea1caa Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Sat, 3 Jun 2017 11:50:26 +0200
|
||||
Subject: [PATCH 1/2] Revert "waf: disable-python - align talloc's wscript"
|
||||
|
||||
This reverts commit dcba0b19757b64164577722976b3da7622ff3955.
|
||||
---
|
||||
lib/talloc/wscript | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
|
||||
index df7e6be55939a1aa9004e2decb65768387fb4b60..af939104a173208a0e9206b721a514d5b752a655 100644
|
||||
--- a/lib/talloc/wscript
|
||||
+++ b/lib/talloc/wscript
|
||||
@@ -32,6 +32,9 @@ def set_options(opt):
|
||||
opt.add_option('--enable-talloc-compat1',
|
||||
help=("Build talloc 1.x.x compat library [False]"),
|
||||
action="store_true", dest='TALLOC_COMPAT1', default=False)
|
||||
+ opt.add_option('--disable-python',
|
||||
+ help=("disable the pytalloc module"),
|
||||
+ action="store_true", dest='disable_python', default=False)
|
||||
|
||||
|
||||
def configure(conf):
|
||||
@@ -43,6 +46,8 @@ def configure(conf):
|
||||
conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1]))
|
||||
conf.define('TALLOC_BUILD_VERSION_RELEASE', int(VERSION.split('.')[2]))
|
||||
|
||||
+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
|
||||
+
|
||||
conf.env.TALLOC_COMPAT1 = False
|
||||
if conf.env.standalone_talloc:
|
||||
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
|
||||
@@ -137,7 +142,7 @@ def build(bld):
|
||||
private_library=private_library,
|
||||
manpages='man/talloc.3')
|
||||
|
||||
- if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'):
|
||||
+ if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
|
||||
for env in bld.gen_python_environments(['PKGCONFIGDIR']):
|
||||
name = bld.pyembed_libname('pytalloc-util')
|
||||
|
||||
@@ -151,19 +156,16 @@ def build(bld):
|
||||
abi_match='pytalloc_* _pytalloc_*',
|
||||
private_library=private_library,
|
||||
public_headers=('' if private_library else 'pytalloc.h'),
|
||||
- pc_files='pytalloc-util.pc',
|
||||
- enabled=bld.PYTHON_BUILD_IS_ENABLED()
|
||||
+ pc_files='pytalloc-util.pc'
|
||||
)
|
||||
bld.SAMBA_PYTHON('pytalloc',
|
||||
'pytalloc.c',
|
||||
deps='talloc ' + name,
|
||||
- enabled=bld.PYTHON_BUILD_IS_ENABLED(),
|
||||
realname='talloc.so')
|
||||
|
||||
bld.SAMBA_PYTHON('test_pytalloc',
|
||||
'test_pytalloc.c',
|
||||
deps='pytalloc',
|
||||
- enabled=bld.PYTHON_BUILD_IS_ENABLED(),
|
||||
realname='_test_pytalloc.so',
|
||||
install=False)
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 701c6ad53c6dbe08efd515fdacc72a906293453a Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Mon, 5 Dec 2016 14:23:40 +0100
|
||||
Subject: [PATCH] tevent: remove shebang from tevent.py
|
||||
|
||||
The tevent.py is not a executable python script.
|
||||
And rpmlint consider it as an error if module file
|
||||
contians shebang
|
||||
|
||||
python2-tevent.x86_64: E: non-executable-script
|
||||
/usr/lib64/python2.7/site-packages/tevent.py 644 /usr/bin/python
|
||||
python3-tevent.x86_64: E: non-executable-script
|
||||
/usr/lib64/python3.5/site-packages/tevent.py 644 /usr/bin/python
|
||||
|
||||
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
||||
Reviewed-by: Michael Adam <obnox@samba.org>
|
||||
---
|
||||
lib/tevent/tevent.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/lib/tevent/tevent.py b/lib/tevent/tevent.py
|
||||
index c296544eb413bc7e0029cb2b91fd667f8863a3c6..70455046a9fcf9935e7d8244e0c6d694bd82c9ac 100644
|
||||
--- a/lib/tevent/tevent.py
|
||||
+++ b/lib/tevent/tevent.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/python
|
||||
#
|
||||
# Python integration for tevent
|
||||
#
|
||||
--
|
||||
2.12.0
|
||||
|
||||
107
0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch
Normal file
107
0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch
Normal file
@ -0,0 +1,107 @@
|
||||
From c8f013a451cb3ed1917dc9183833978a39f25c05 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Sat, 3 Jun 2017 11:50:48 +0200
|
||||
Subject: [PATCH 2/2] Revert "talloc: use the system pytalloc-util for python3
|
||||
as well"
|
||||
|
||||
This reverts commit f5cafee0c7a96396798d2b229ff3f9dced1d74f3.
|
||||
---
|
||||
lib/talloc/pytalloc-util.pc.in | 4 ++--
|
||||
lib/talloc/wscript | 44 ++++++++++++++----------------------------
|
||||
2 files changed, 16 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
|
||||
index 06f83e26aa43b3eafd0364c1603673742c2de63b..b87c94edf20c5325d3cde598bfa914bd478ed815 100644
|
||||
--- a/lib/talloc/pytalloc-util.pc.in
|
||||
+++ b/lib/talloc/pytalloc-util.pc.in
|
||||
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
-Name: pytalloc-util@PYTHON_SO_ABI_FLAG@
|
||||
+Name: pytalloc-util
|
||||
Description: Utility functions for using talloc objects with Python
|
||||
Version: @TALLOC_VERSION@
|
||||
-Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_LIBNAME_SO_ABI_FLAG@
|
||||
+Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_SO_ABI_FLAG@
|
||||
Cflags: -I${includedir}
|
||||
URL: http://talloc.samba.org/
|
||||
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
|
||||
index af939104a173208a0e9206b721a514d5b752a655..7f9bad743555b442be30a91bf50cb361bfa0de18 100644
|
||||
--- a/lib/talloc/wscript
|
||||
+++ b/lib/talloc/wscript
|
||||
@@ -48,24 +48,20 @@ def configure(conf):
|
||||
|
||||
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
|
||||
|
||||
+ if not conf.env.standalone_talloc:
|
||||
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
|
||||
+ implied_deps='replace'):
|
||||
+ conf.define('USING_SYSTEM_TALLOC', 1)
|
||||
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
||||
+ implied_deps='talloc replace'):
|
||||
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
|
||||
+
|
||||
conf.env.TALLOC_COMPAT1 = False
|
||||
if conf.env.standalone_talloc:
|
||||
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
|
||||
- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
||||
- conf.env.TALLOC_VERSION = VERSION
|
||||
|
||||
conf.CHECK_XSLTPROC_MANPAGES()
|
||||
|
||||
- conf.CHECK_HEADERS('sys/auxv.h')
|
||||
- conf.CHECK_FUNCS('getauxval')
|
||||
-
|
||||
- conf.SAMBA_CONFIG_H()
|
||||
-
|
||||
- conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
|
||||
-
|
||||
- # We need to set everything non-python up before here, because
|
||||
- # SAMBA_CHECK_PYTHON makes a copy of conf and we need it set up correctly
|
||||
-
|
||||
if not conf.env.disable_python:
|
||||
# also disable if we don't have the python libs installed
|
||||
conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
|
||||
@@ -74,32 +70,20 @@ def configure(conf):
|
||||
Logs.warn('Disabling pytalloc-util as python devel libs not found')
|
||||
conf.env.disable_python = True
|
||||
|
||||
- if not conf.env.standalone_talloc:
|
||||
- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
|
||||
- implied_deps='replace'):
|
||||
- conf.define('USING_SYSTEM_TALLOC', 1)
|
||||
+ conf.CHECK_HEADERS('sys/auxv.h')
|
||||
+ conf.CHECK_FUNCS('getauxval')
|
||||
|
||||
- using_system_pytalloc_util = True
|
||||
- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
||||
- implied_deps='talloc replace'):
|
||||
- using_system_pytalloc_util = False
|
||||
+ conf.SAMBA_CONFIG_H()
|
||||
|
||||
- # We need to get a pytalloc-util for all the python versions
|
||||
- # we are building for
|
||||
- if conf.env['EXTRA_PYTHON']:
|
||||
- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
|
||||
- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
|
||||
- implied_deps='talloc replace'):
|
||||
- using_system_pytalloc_util = False
|
||||
-
|
||||
- if using_system_pytalloc_util:
|
||||
- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
|
||||
+ conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
|
||||
|
||||
|
||||
def build(bld):
|
||||
bld.RECURSE('lib/replace')
|
||||
|
||||
if bld.env.standalone_talloc:
|
||||
+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
||||
+ bld.env.TALLOC_VERSION = VERSION
|
||||
private_library = False
|
||||
|
||||
# should we also install the symlink to libtalloc1.so here?
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
From b7ae41e6ca133e08f1dc62bd49436f51f490f46b Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Tue, 6 Dec 2016 18:07:18 +0100
|
||||
Subject: [PATCH 2/5] lib replace: Fix detection of features
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If configure script is executed with stricter cflags
|
||||
"-Werrorr=implicit-function-declaration -Werror=implicit-int"
|
||||
then detection of few features will fail.
|
||||
|
||||
Checking for C99 vsnprintf : not found
|
||||
Checking for HAVE_SHARED_MMAP : not found
|
||||
Checking for HAVE_MREMAP : not found
|
||||
|
||||
lib/replace/test/shared_mmap.c:18:1:
|
||||
error: return type defaults to ‘int’ [-Werror=implicit-int]
|
||||
main()
|
||||
^~~~
|
||||
lib/replace/test/shared_mmap.c: In function ‘main’:
|
||||
lib/replace/test/shared_mmap.c:25:16:
|
||||
error: implicit declaration of function ‘exit’
|
||||
[-Werror=implicit-function-declaration]
|
||||
if (fd == -1) exit(1);
|
||||
^~~~
|
||||
lib/replace/test/shared_mmap.c:25:16:
|
||||
warning: incompatible implicit declaration of built-in function ‘exit’
|
||||
lib/replace/test/shared_mmap.c:25:16:
|
||||
note: include ‘<stdlib.h>’ or provide a declaration of ‘exit’
|
||||
|
||||
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@samba.org>
|
||||
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||||
---
|
||||
lib/replace/test/shared_mmap.c | 5 ++++-
|
||||
lib/replace/test/shared_mremap.c | 5 ++++-
|
||||
lib/replace/test/snprintf.c | 2 +-
|
||||
3 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/replace/test/shared_mmap.c b/lib/replace/test/shared_mmap.c
|
||||
index 50dad8d69648a6993e64d3d0433576319e1ad462..9d6e3fc95aa5d0981df1530582236ba826d1a432 100644
|
||||
--- a/lib/replace/test/shared_mmap.c
|
||||
+++ b/lib/replace/test/shared_mmap.c
|
||||
@@ -4,6 +4,9 @@
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#ifdef HAVE_STDLIB_H
|
||||
+#include <stdlib.h>
|
||||
+#endif
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -15,7 +18,7 @@
|
||||
#define MAP_FILE 0
|
||||
#endif
|
||||
|
||||
-main()
|
||||
+int main(void)
|
||||
{
|
||||
int *buf;
|
||||
int i;
|
||||
diff --git a/lib/replace/test/shared_mremap.c b/lib/replace/test/shared_mremap.c
|
||||
index 05032ad12e3aa0feb755207ea032216e0665fe0a..08040e2e595f356155f4fb5977b3637b1e76aefb 100644
|
||||
--- a/lib/replace/test/shared_mremap.c
|
||||
+++ b/lib/replace/test/shared_mremap.c
|
||||
@@ -3,6 +3,9 @@
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#ifdef HAVE_STDLIB_H
|
||||
+#include <stdlib.h>
|
||||
+#endif
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -18,7 +21,7 @@
|
||||
#define MAP_FAILED (int *)-1
|
||||
#endif
|
||||
|
||||
-main()
|
||||
+int main(void)
|
||||
{
|
||||
int *buf;
|
||||
int fd;
|
||||
diff --git a/lib/replace/test/snprintf.c b/lib/replace/test/snprintf.c
|
||||
index d06630bcc98d54033fdb5c7e62ecb91eae13e01b..77473f067b26589330d8d1a602d3334332795837 100644
|
||||
--- a/lib/replace/test/snprintf.c
|
||||
+++ b/lib/replace/test/snprintf.c
|
||||
@@ -26,4 +26,4 @@ void foo(const char *format, ...)
|
||||
printf("1");
|
||||
exit(0);
|
||||
}
|
||||
-main() { foo("hello"); }
|
||||
+int main(void) { foo("hello"); }
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From f4c0a750d4adebcf2342a44e85f04526c34268c8 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Tue, 6 Dec 2016 18:07:36 +0100
|
||||
Subject: [PATCH 3/5] WAF: Fix detection of linker features
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Following check of linker feature failed with strict CFLAGS
|
||||
"-Werrorr=implicit-function-declaration -Werror=implicit-int"
|
||||
|
||||
Checking for rpath library support : not found
|
||||
Checking for -Wl,--version-script support : not found
|
||||
|
||||
../main.c: In function ‘main’:
|
||||
../main.c:1:26: error: implicit declaration of function ‘lib_func’
|
||||
[-Werror=implicit-function-declaration]
|
||||
int main(void) {return !(lib_func() == 42);}
|
||||
^~~~~~~~
|
||||
|
||||
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@samba.org>
|
||||
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||||
---
|
||||
buildtools/wafsamba/samba_conftests.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
|
||||
index 045f858e9cdaae7ee5754a2c7fbef6642a7fee59..c9f8fdc0131838b44dc92196fa95c6b2f7aea506 100644
|
||||
--- a/buildtools/wafsamba/samba_conftests.py
|
||||
+++ b/buildtools/wafsamba/samba_conftests.py
|
||||
@@ -286,7 +286,9 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
|
||||
os.makedirs(subdir)
|
||||
|
||||
Utils.writef(os.path.join(subdir, 'lib1.c'), 'int lib_func(void) { return 42; }\n')
|
||||
- Utils.writef(os.path.join(dir, 'main.c'), 'int main(void) {return !(lib_func() == 42);}\n')
|
||||
+ Utils.writef(os.path.join(dir, 'main.c'),
|
||||
+ 'int lib_func(void);\n'
|
||||
+ 'int main(void) {return !(lib_func() == 42);}\n')
|
||||
|
||||
bld = Build.BuildContext()
|
||||
bld.log = conf.log
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From be12f82cf1ca652b06995e84971c878621315d24 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Tue, 6 Dec 2016 18:07:43 +0100
|
||||
Subject: [PATCH 4/5] WAF: Fix detection os sysname ...
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Detection of sysname failed with stricter CFLAGS
|
||||
"-Werrorr=implicit-function-declaration -Werror=implicit-int"
|
||||
|
||||
Checking uname sysname type : not found
|
||||
Checking uname machine type : not found
|
||||
Checking uname release type : not found
|
||||
Checking uname version type : not found
|
||||
|
||||
../test.c: In function ‘main’:
|
||||
../test.c:8:32: error: implicit declaration of function ‘printf’
|
||||
[-Werror=implicit-function-declaration]
|
||||
printf("%s", n.sysname);
|
||||
^~~~~~
|
||||
../test.c:8:32: warning: incompatible implicit declaration
|
||||
of built-in function ‘printf’
|
||||
../test.c:8:32: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’
|
||||
|
||||
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@samba.org>
|
||||
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||||
---
|
||||
buildtools/wafsamba/samba_conftests.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
|
||||
index c9f8fdc0131838b44dc92196fa95c6b2f7aea506..72e432164984c7faa9bc93745d401b5c38849d37 100644
|
||||
--- a/buildtools/wafsamba/samba_conftests.py
|
||||
+++ b/buildtools/wafsamba/samba_conftests.py
|
||||
@@ -438,6 +438,7 @@ def CHECK_UNAME(conf):
|
||||
ret = True
|
||||
for v in "sysname machine release version".split():
|
||||
if not conf.CHECK_CODE('''
|
||||
+ int printf(const char *format, ...);
|
||||
struct utsname n;
|
||||
if (uname(&n) == -1) return -1;
|
||||
printf("%%s", n.%s);
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 59abfcb7945103cd4031abac86d51cd51ce052ca Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Date: Tue, 6 Dec 2016 18:07:50 +0100
|
||||
Subject: [PATCH 5/5] WAF: Fix detection of IPv6
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Detection of IPv6 failed with strict CFLAGS due to missing
|
||||
header file.
|
||||
|
||||
Checking for HAVE_IPV6 : not found
|
||||
|
||||
../test.c: In function ‘main’:
|
||||
../test.c:226:34: error: implicit declaration of function
|
||||
‘if_nametoindex’ [-Werror=implicit-function-declaration]
|
||||
int idx = if_nametoindex("iface1");
|
||||
^~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
|
||||
Reviewed-by: Andreas Schneider <asn@samba.org>
|
||||
Reviewed-by: Ralph Boehme <slow@samba.org>
|
||||
|
||||
Autobuild-User(master): Ralph Böhme <slow@samba.org>
|
||||
Autobuild-Date(master): Mon Jan 2 18:03:20 CET 2017 on sn-devel-144
|
||||
---
|
||||
lib/replace/wscript | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 1dfd90293ea6835a22510242e063bf3d2a20d263..ea0d5d09b895a7a119eb783f803ff5b9019e37df 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -189,7 +189,7 @@ def configure(conf):
|
||||
''',
|
||||
define='HAVE_IPV6',
|
||||
lib='nsl socket',
|
||||
- headers='sys/socket.h netdb.h netinet/in.h')
|
||||
+ headers='sys/socket.h netdb.h netinet/in.h net/if.h')
|
||||
|
||||
if conf.CONFIG_SET('HAVE_SYS_UCONTEXT_H') and conf.CONFIG_SET('HAVE_SIGNAL_H'):
|
||||
conf.CHECK_CODE('''
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -7,19 +7,15 @@
|
||||
%endif
|
||||
|
||||
Name: libtevent
|
||||
Version: 0.9.31
|
||||
Release: 4%{?dist}
|
||||
Group: System Environment/Daemons
|
||||
Version: 0.9.32
|
||||
Release: 1%{?dist}
|
||||
Summary: The tevent library
|
||||
License: LGPLv3+
|
||||
URL: http://tevent.samba.org/
|
||||
Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
|
||||
|
||||
Patch0001: 0001-tevent-remove-shebang-from-tevent.py.patch
|
||||
Patch0002: 0002-lib-replace-Fix-detection-of-features.patch
|
||||
Patch0003: 0003-WAF-Fix-detection-of-linker-features.patch
|
||||
Patch0004: 0004-WAF-Fix-detection-os-sysname.patch
|
||||
Patch0005: 0005-WAF-Fix-detection-of-IPv6.patch
|
||||
Patch0001: 0001-Revert-waf-disable-python-align-talloc-s-wscript.patch
|
||||
Patch0002: 0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch
|
||||
|
||||
BuildRequires: libtalloc-devel >= 2.1.0
|
||||
BuildRequires: python-devel
|
||||
@ -43,7 +39,6 @@ Tevent also provide helpers to deal with asynchronous code providing the
|
||||
tevent_req (Tevent Request) functions.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Developer tools for the Tevent library
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
Requires: libtalloc-devel%{?_isa} >= 2.0.7
|
||||
@ -54,7 +49,6 @@ Header files needed to develop programs that link against the Tevent library.
|
||||
|
||||
|
||||
%package -n python2-tevent
|
||||
Group: Development/Libraries
|
||||
Summary: Python bindings for the Tevent library
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -67,7 +61,6 @@ Python bindings for libtevent
|
||||
%if 0%{?fedora}
|
||||
|
||||
%package -n python3-tevent
|
||||
Group: Development/Libraries
|
||||
Summary: Python 3 bindings for the Tevent library
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -95,12 +88,8 @@ UpdateTimestamps() {
|
||||
}
|
||||
|
||||
%setup -q -n tevent-%{version}
|
||||
|
||||
%patch0001 -p3
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
%patch0004 -p1
|
||||
%patch0005 -p1
|
||||
|
||||
%build
|
||||
|
||||
@ -135,18 +124,15 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}
|
||||
cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libtevent.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/tevent.h
|
||||
%{_libdir}/libtevent.so
|
||||
%{_libdir}/pkgconfig/tevent.pc
|
||||
%{_mandir}/man3/tevent*.gz
|
||||
|
||||
%files -n python2-tevent
|
||||
%defattr(-,root,root,-)
|
||||
%{python2_sitearch}/tevent.py*
|
||||
%{python2_sitearch}/_tevent.so
|
||||
|
||||
@ -157,7 +143,6 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
%if 0%{?with_python3}
|
||||
|
||||
%files -n python3-tevent
|
||||
%defattr(-,root,root,-)
|
||||
%{python3_sitearch}/tevent.py
|
||||
%{python3_sitearch}/__pycache__/tevent.*
|
||||
%{python3_sitearch}/_tevent.cpython*.so
|
||||
@ -165,6 +150,9 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 23 2017 Lukas Slebodnik <lslebodn@redhat.com> - 0.9.32-1
|
||||
- New upstream release 0.9.32
|
||||
|
||||
* Fri Mar 10 2017 Lukas Slebodnik <lslebodn@redhat.org> - 0.9.31-4
|
||||
- Fix configure detection with strict CFLAGS - rhbz#1401231
|
||||
- Fix few fedora packaging violations - rhbz#1401226
|
||||
|
||||
Loading…
Reference in New Issue
Block a user