Hello community, here is the log from the commit of package talloc for openSUSE:Factory checked in at 2017-10-25 17:46:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/talloc (Old) and /work/SRC/openSUSE:Factory/.talloc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "talloc" Wed Oct 25 17:46:16 2017 rev:29 rq:532690 version:2.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/talloc/talloc-man.changes 2017-04-17 10:22:06.413939604 +0200 +++ /work/SRC/openSUSE:Factory/.talloc.new/talloc-man.changes 2017-10-25 17:46:19.182798921 +0200 @@ -1,0 +2,21 @@ +Mon Oct 2 12:18:30 UTC 2017 - jeng...@inai.de + +- Remove %if guards for blocks that do not affect the build result. + Fix RPM groups and summaries. Drop very old SUSE support. + Replace old RPM macros by new constructs. + +------------------------------------------------------------------- +Wed Jul 26 08:58:20 UTC 2017 - scabr...@suse.com + +- Update to version 2.1.10 + + build, documentation and python3 improvements + + delete sle11-remove-unknown-compiler-options.patch, supported + options are checked for in upstream code + +------------------------------------------------------------------- +Thu Mar 23 20:45:20 UTC 2017 - jmcdono...@suse.com + +- sle11-remove-unknown-compiler-options.patch: build SLE11 and earlier + without -Wno-format-length. + +------------------------------------------------------------------- @@ -39,0 +61,5 @@ + +------------------------------------------------------------------- +Fri Feb 12 17:03:57 UTC 2016 - lmue...@suse.com + +- Provide python-talloc and python-talloc-devel; (bsc#966523). --- /work/SRC/openSUSE:Factory/talloc/talloc.changes 2017-04-17 10:22:06.473931107 +0200 +++ /work/SRC/openSUSE:Factory/.talloc.new/talloc.changes 2017-10-25 17:46:19.474785216 +0200 @@ -1,0 +2,21 @@ +Mon Oct 9 06:55:51 UTC 2017 - jmcdono...@suse.com + +- Reference library name directly instead of using variables to + pass obs source validator. + +------------------------------------------------------------------- +Mon Oct 2 12:18:30 UTC 2017 - jeng...@inai.de + +- Remove %if guards for blocks that do not affect the build result. + Fix RPM groups and summaries. Drop very old SUSE support. + Replace old RPM macros by new constructs. + +------------------------------------------------------------------- +Wed Jul 26 08:58:20 UTC 2017 - scabr...@suse.com + +- Update to version 2.1.10 + + build, documentation and python3 improvements + + delete sle11-remove-unknown-compiler-options.patch, supported + options are checked for in upstream code + +------------------------------------------------------------------- Old: ---- sle11-remove-unknown-compiler-options.patch talloc-2.1.9.tar.asc talloc-2.1.9.tar.gz New: ---- talloc-2.1.10.tar.asc talloc-2.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ talloc-man.spec ++++++ --- /var/tmp/diff_new_pack.bpkvJr/_old 2017-10-25 17:46:20.498737159 +0200 +++ /var/tmp/diff_new_pack.bpkvJr/_new 2017-10-25 17:46:20.498737159 +0200 @@ -30,36 +30,24 @@ BuildRequires: doxygen %else Name: talloc -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -%define build_make_smp_mflags %{?_smp_mflags} -%else -%define build_make_smp_mflags %{?jobs:-j%jobs} -%endif BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -%if 0%{?suse_version} > 1020 BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel %if %{with_python3} BuildRequires: python3-devel %endif -%if 0%{?suse_version} > 1100 #!BuildIgnore: python -%endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.9 +Version: 2.1.10 Release: 0 -PreReq: /sbin/ldconfig Summary: Samba talloc Library License: LGPL-3.0+ -Group: System/Libraries -Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz -Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc +Group: Development/Libraries/C and C++ +Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz +Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source4: baselibs.conf Patch0: talloc-python3.5-fix-soabi_name.patch Source50: talloc.keyring @@ -79,7 +67,7 @@ %define libtalloc_name libtalloc %endif %package -n %{libtalloc_name} -Summary: Libraries and Header Files to Develop Programs with talloc2 Support +Summary: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) @@ -94,17 +82,13 @@ %package -n libtalloc-devel Summary: Libraries and Header Files to Develop Programs with talloc2 Support -Group: Development/Libraries/C and C++ # Man pages are built in a 2nd spec file in order to break a build cycle with doxygen->cmake->krb5->libtalloc +Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif Requires: %{libtalloc_name} = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif %description -n libtalloc-devel Talloc is a hierarchical, reference counted memory pool system with @@ -112,30 +96,25 @@ It is the core memory allocator used in Samba. -Libraries and Header Files to Develop Programs with talloc2 Support +Libraries and Header Files to Develop Programs with talloc2 Support. %package -n python-talloc Summary: Python bindings for the Talloc library Group: Development/Libraries/Python Requires: %{libtalloc_name} = %{version} -PreReq: /sbin/ldconfig Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} %description -n python-talloc -This package contains the python bindings for the Talloc library. +This package contains the Python bindings for the Talloc library. %package -n python-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} Conflicts: python3-talloc-devel @@ -149,21 +128,16 @@ Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python Requires: %{libtalloc_name} = %{version} -PreReq: /sbin/ldconfig %description -n python3-talloc -This package contains the python3 bindings for the Talloc library. +This package contains the Python3 bindings for the Talloc library. %package -n python3-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python3-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python3-talloc = %{version} Conflicts: python-talloc-devel %description -n python3-talloc-devel @@ -178,13 +152,7 @@ %build %if ! %{build_man} -%if 0%{?suse_version} && 0%{?suse_version} < 911 - OPTIMIZATION="-O" -%else - # use the default optimization - unset OPTIMIZATION -%endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -198,7 +166,7 @@ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all %else @@ -210,22 +178,26 @@ %if ! %{build_man} %check %if 0%{?suse_version} != 1110 || "%{_build_arch}" == x86_64 +%if "%{qemu_user_space_build}" == "1" +echo "skipping test on qemu userspace build due to AT_RANDOM not changing" +%else # qemu_user_space_build == 1 mkdir lib/talloc ln test_magic_differs* lib/talloc/ -LD_LIBRARY_PATH=bin/shared %{__make} test +LD_LIBRARY_PATH=bin/shared make test +%endif # qemu_user_space_build == 1 %endif # suse_version != 1110; fails for i586 and ppc64 %endif # ! build_man %install %if ! %{build_man} -DESTDIR=${RPM_BUILD_ROOT} make install -rm -r ${RPM_BUILD_ROOT}/%{_mandir} +%make_install +rm -r "%{buildroot}/%{_mandir}" %else # Install API documentation -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} -cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} +mkdir -p "%{buildroot}/%{_mandir}" +cp -a doc/man/* "%{buildroot}/%{_mandir}/" %endif # ! build_man @@ -238,11 +210,9 @@ %postun -n python-talloc -p /sbin/ldconfig -%if %{with_python3} %post -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig -%endif %files -n %{libtalloc_name} %defattr(-,root,root) @@ -275,6 +245,7 @@ %defattr(-,root,root) %{_includedir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.pc +%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so %endif @@ -282,10 +253,8 @@ %files %defattr(-,root,root) -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100 %{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/talloc*.3.* -%endif %endif # ! build_man ++++++ talloc.spec ++++++ --- /var/tmp/diff_new_pack.bpkvJr/_old 2017-10-25 17:46:20.518736220 +0200 +++ /var/tmp/diff_new_pack.bpkvJr/_new 2017-10-25 17:46:20.522736033 +0200 @@ -30,39 +30,26 @@ BuildRequires: doxygen %else Name: talloc -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -%define build_make_smp_mflags %{?_smp_mflags} -%else -%define build_make_smp_mflags %{?jobs:-j%jobs} -%endif BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -%if 0%{?suse_version} > 1020 BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel %if %{with_python3} BuildRequires: python3-devel %endif -%if 0%{?suse_version} > 1100 #!BuildIgnore: python -%endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.9 +Version: 2.1.10 Release: 0 -PreReq: /sbin/ldconfig Summary: Samba talloc Library License: LGPL-3.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Source: http://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source1: http://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source4: baselibs.conf Patch0: talloc-python3.5-fix-soabi_name.patch -Patch1: sle11-remove-unknown-compiler-options.patch Source50: talloc.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,17 +61,12 @@ %if ! %{build_man} -%if 0%{?suse_version} > 0 -%define libtalloc_name libtalloc2 -%else -%define libtalloc_name libtalloc -%endif -%package -n %{libtalloc_name} -Summary: Libraries and Header Files to Develop Programs with talloc2 Support +%package -n libtalloc2 +Summary: Samba talloc library Group: System/Libraries Provides: bundled(libreplace) -%description -n %{libtalloc_name} +%description -n libtalloc2 Talloc is a hierarchical, reference counted memory pool system with destructors. @@ -95,17 +77,13 @@ %package -n libtalloc-devel Summary: Libraries and Header Files to Develop Programs with talloc2 Support -Group: Development/Libraries/C and C++ # Man pages are built in a 2nd spec file in order to break a build cycle with doxygen->cmake->krb5->libtalloc +Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: %{libtalloc_name} = %{version} -%if 0%{?suse_version} > 1020 +Requires: libtalloc2 = %{version} Requires: pkg-config -%else -Requires: pkgconfig -%endif %description -n libtalloc-devel Talloc is a hierarchical, reference counted memory pool system with @@ -113,30 +91,25 @@ It is the core memory allocator used in Samba. -Libraries and Header Files to Develop Programs with talloc2 Support +Libraries and Header Files to Develop Programs with talloc2 Support. %package -n python-talloc Summary: Python bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} -PreReq: /sbin/ldconfig +Requires: libtalloc2 = %{version} Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} %description -n python-talloc -This package contains the python bindings for the Talloc library. +This package contains the Python bindings for the Talloc library. %package -n python-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} Conflicts: python3-talloc-devel @@ -144,51 +117,33 @@ %description -n python-talloc-devel Libraries and Header Files to Develop Programs with python-talloc Support - -%if %{with_python3} %package -n python3-talloc Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python -Requires: %{libtalloc_name} = %{version} -PreReq: /sbin/ldconfig +Requires: libtalloc2 = %{version} %description -n python3-talloc -This package contains the python3 bindings for the Talloc library. - +This package contains the Python3 bindings for the Talloc library. %package -n python3-talloc-devel Summary: Developer tools for the Talloc library Group: Development/Libraries/Python -Requires: python3-talloc = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python3-talloc = %{version} Conflicts: python-talloc-devel %description -n python3-talloc-devel Libraries and Header Files to Develop Programs with python3-talloc Support -%endif %endif # ! build_man %prep %setup -n talloc-%{version} -q %patch0 -p1 -%if 0%{?suse_version} < 1200 -%patch1 -p1 -%endif %build %if ! %{build_man} -%if 0%{?suse_version} && 0%{?suse_version} < 911 - OPTIMIZATION="-O" -%else - # use the default optimization - unset OPTIMIZATION -%endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -202,7 +157,7 @@ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all %else @@ -219,40 +174,38 @@ %else # qemu_user_space_build == 1 mkdir lib/talloc ln test_magic_differs* lib/talloc/ -LD_LIBRARY_PATH=bin/shared %{__make} test +LD_LIBRARY_PATH=bin/shared make test %endif # qemu_user_space_build == 1 %endif # suse_version != 1110; fails for i586 and ppc64 %endif # ! build_man %install %if ! %{build_man} -DESTDIR=${RPM_BUILD_ROOT} make install -rm -r ${RPM_BUILD_ROOT}/%{_mandir} +%make_install +rm -r "%{buildroot}/%{_mandir}" %else # Install API documentation -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir} -cp -a doc/man/* ${RPM_BUILD_ROOT}/%{_mandir} +mkdir -p "%{buildroot}/%{_mandir}" +cp -a doc/man/* "%{buildroot}/%{_mandir}/" %endif # ! build_man %if ! %{build_man} -%post -n %{libtalloc_name} -p /sbin/ldconfig +%post -n libtalloc2 -p /sbin/ldconfig -%postun -n %{libtalloc_name} -p /sbin/ldconfig +%postun -n libtalloc2 -p /sbin/ldconfig %post -n python-talloc -p /sbin/ldconfig %postun -n python-talloc -p /sbin/ldconfig -%if %{with_python3} %post -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig -%endif -%files -n %{libtalloc_name} +%files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libtalloc.so.* @@ -283,6 +236,7 @@ %defattr(-,root,root) %{_includedir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.pc +%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so %endif @@ -290,10 +244,8 @@ %files %defattr(-,root,root) -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100 %{_mandir}/man3/libtalloc*.3.* %{_mandir}/man3/talloc*.3.* -%endif %endif # ! build_man ++++++ talloc-2.1.9.tar.gz -> talloc-2.1.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/ABI/pytalloc-util-2.1.10.sigs new/talloc-2.1.10/ABI/pytalloc-util-2.1.10.sigs --- old/talloc-2.1.9/ABI/pytalloc-util-2.1.10.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.10/ABI/pytalloc-util-2.1.10.sigs 2017-07-23 00:23:56.000000000 +0200 @@ -0,0 +1,16 @@ +_pytalloc_check_type: int (PyObject *, const char *) +_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *) +_pytalloc_get_ptr: void *(PyObject *) +_pytalloc_get_type: void *(PyObject *, const char *) +pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *) +pytalloc_BaseObject_check: int (PyObject *) +pytalloc_BaseObject_size: size_t (void) +pytalloc_CObject_FromTallocPtr: PyObject *(void *) +pytalloc_Check: int (PyObject *) +pytalloc_GenericObject_reference_ex: PyObject *(TALLOC_CTX *, void *) +pytalloc_GenericObject_steal_ex: PyObject *(TALLOC_CTX *, void *) +pytalloc_GetBaseObjectType: PyTypeObject *(void) +pytalloc_GetObjectType: PyTypeObject *(void) +pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) +pytalloc_steal: PyObject *(PyTypeObject *, void *) +pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/ABI/pytalloc-util.py3-2.1.10.sigs new/talloc-2.1.10/ABI/pytalloc-util.py3-2.1.10.sigs --- old/talloc-2.1.9/ABI/pytalloc-util.py3-2.1.10.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.10/ABI/pytalloc-util.py3-2.1.10.sigs 2017-07-23 00:23:56.000000000 +0200 @@ -0,0 +1,15 @@ +_pytalloc_check_type: int (PyObject *, const char *) +_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *) +_pytalloc_get_ptr: void *(PyObject *) +_pytalloc_get_type: void *(PyObject *, const char *) +pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *) +pytalloc_BaseObject_check: int (PyObject *) +pytalloc_BaseObject_size: size_t (void) +pytalloc_Check: int (PyObject *) +pytalloc_GenericObject_reference_ex: PyObject *(TALLOC_CTX *, void *) +pytalloc_GenericObject_steal_ex: PyObject *(TALLOC_CTX *, void *) +pytalloc_GetBaseObjectType: PyTypeObject *(void) +pytalloc_GetObjectType: PyTypeObject *(void) +pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) +pytalloc_steal: PyObject *(PyTypeObject *, void *) +pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/ABI/talloc-2.1.10.sigs new/talloc-2.1.10/ABI/talloc-2.1.10.sigs --- old/talloc-2.1.9/ABI/talloc-2.1.10.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.10/ABI/talloc-2.1.10.sigs 2017-07-23 00:23:56.000000000 +0200 @@ -0,0 +1,65 @@ +_talloc: void *(const void *, size_t) +_talloc_array: void *(const void *, size_t, unsigned int, const char *) +_talloc_free: int (void *, const char *) +_talloc_get_type_abort: void *(const void *, const char *, const char *) +_talloc_memdup: void *(const void *, const void *, size_t, const char *) +_talloc_move: void *(const void *, const void *) +_talloc_pooled_object: void *(const void *, size_t, const char *, unsigned int, size_t) +_talloc_realloc: void *(const void *, void *, size_t, const char *) +_talloc_realloc_array: void *(const void *, void *, size_t, unsigned int, const char *) +_talloc_reference_loc: void *(const void *, const void *, const char *) +_talloc_set_destructor: void (const void *, int (*)(void *)) +_talloc_steal_loc: void *(const void *, const void *, const char *) +_talloc_zero: void *(const void *, size_t, const char *) +_talloc_zero_array: void *(const void *, size_t, unsigned int, const char *) +talloc_asprintf: char *(const void *, const char *, ...) +talloc_asprintf_append: char *(char *, const char *, ...) +talloc_asprintf_append_buffer: char *(char *, const char *, ...) +talloc_autofree_context: void *(void) +talloc_check_name: void *(const void *, const char *) +talloc_disable_null_tracking: void (void) +talloc_enable_leak_report: void (void) +talloc_enable_leak_report_full: void (void) +talloc_enable_null_tracking: void (void) +talloc_enable_null_tracking_no_autofree: void (void) +talloc_find_parent_byname: void *(const void *, const char *) +talloc_free_children: void (void *) +talloc_get_name: const char *(const void *) +talloc_get_size: size_t (const void *) +talloc_increase_ref_count: int (const void *) +talloc_init: void *(const char *, ...) +talloc_is_parent: int (const void *, const void *) +talloc_named: void *(const void *, size_t, const char *, ...) +talloc_named_const: void *(const void *, size_t, const char *) +talloc_parent: void *(const void *) +talloc_parent_name: const char *(const void *) +talloc_pool: void *(const void *, size_t) +talloc_realloc_fn: void *(const void *, void *, size_t) +talloc_reference_count: size_t (const void *) +talloc_reparent: void *(const void *, const void *, const void *) +talloc_report: void (const void *, FILE *) +talloc_report_depth_cb: void (const void *, int, int, void (*)(const void *, int, int, int, void *), void *) +talloc_report_depth_file: void (const void *, int, int, FILE *) +talloc_report_full: void (const void *, FILE *) +talloc_set_abort_fn: void (void (*)(const char *)) +talloc_set_log_fn: void (void (*)(const char *)) +talloc_set_log_stderr: void (void) +talloc_set_memlimit: int (const void *, size_t) +talloc_set_name: const char *(const void *, const char *, ...) +talloc_set_name_const: void (const void *, const char *) +talloc_show_parents: void (const void *, FILE *) +talloc_strdup: char *(const void *, const char *) +talloc_strdup_append: char *(char *, const char *) +talloc_strdup_append_buffer: char *(char *, const char *) +talloc_strndup: char *(const void *, const char *, size_t) +talloc_strndup_append: char *(char *, const char *, size_t) +talloc_strndup_append_buffer: char *(char *, const char *, size_t) +talloc_test_get_magic: int (void) +talloc_total_blocks: size_t (const void *) +talloc_total_size: size_t (const void *) +talloc_unlink: int (const void *, void *) +talloc_vasprintf: char *(const void *, const char *, va_list) +talloc_vasprintf_append: char *(char *, const char *, va_list) +talloc_vasprintf_append_buffer: char *(char *, const char *, va_list) +talloc_version_major: int (void) +talloc_version_minor: int (void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/pkgconfig.py new/talloc-2.1.10/buildtools/wafsamba/pkgconfig.py --- old/talloc-2.1.9/buildtools/wafsamba/pkgconfig.py 2015-11-06 14:28:25.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/pkgconfig.py 2017-04-28 10:57:26.000000000 +0200 @@ -38,16 +38,20 @@ return 0 -def PKG_CONFIG_FILES(bld, pc_files, vnum=None): +def PKG_CONFIG_FILES(bld, pc_files, vnum=None, extra_name=None): '''install some pkg_config pc files''' dest = '${PKGCONFIGDIR}' dest = bld.EXPAND_VARIABLES(dest) for f in TO_LIST(pc_files): - base=os.path.basename(f) + if extra_name: + target = f.split('.pc')[0] + extra_name + ".pc" + else: + target = f + base=os.path.basename(target) t = bld.SAMBA_GENERATOR('PKGCONFIG_%s' % base, rule=subst_at_vars, source=f+'.in', - target=f) + target=target) bld.add_manual_dependency(bld.path.find_or_declare(f), bld.env['PREFIX']) t.vars = [] if t.env.RPATH_ON_INSTALL: @@ -58,7 +62,7 @@ t.env.PACKAGE_VERSION = vnum for v in [ 'PREFIX', 'EXEC_PREFIX', 'LIB_RPATH' ]: t.vars.append(t.env[v]) - bld.INSTALL_FILES(dest, f, flat=True, destname=base) + bld.INSTALL_FILES(dest, target, flat=True, destname=base) Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_bundled.py new/talloc-2.1.10/buildtools/wafsamba/samba_bundled.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_bundled.py 2015-12-10 12:01:40.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_bundled.py 2017-07-02 22:22:14.000000000 +0200 @@ -110,6 +110,7 @@ @conf def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', + maxversion=None, version_blacklist=[], onlyif=None, implied_deps=None, pkg=None): '''check if a library is available as a system library. @@ -117,12 +118,15 @@ ''' return conf.CHECK_BUNDLED_SYSTEM(libname, minversion=minversion, + maxversion=maxversion, + version_blacklist=version_blacklist, onlyif=onlyif, implied_deps=implied_deps, pkg=pkg) @conf def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', + maxversion=None, version_blacklist=[], checkfunctions=None, headers=None, checkcode=None, onlyif=None, implied_deps=None, require_headers=True, pkg=None, set_target=True): @@ -181,16 +185,29 @@ minversion = minimum_library_version(conf, libname, minversion) msg = 'Checking for system %s' % libname + msg_ver = [] if minversion != '0.0.0': - msg += ' >= %s' % minversion + msg_ver.append('>=%s' % minversion) + if maxversion is not None: + msg_ver.append('<=%s' % maxversion) + for v in version_blacklist: + msg_ver.append('!=%s' % v) + if msg_ver != []: + msg += " (%s)" % (" ".join(msg_ver)) uselib_store=libname.upper() if pkg is None: pkg = libname + version_checks = '%s >= %s' % (pkg, minversion) + if maxversion is not None: + version_checks += ' %s <= %s' % (pkg, maxversion) + for v in version_blacklist: + version_checks += ' %s != %s' % (pkg, v) + # try pkgconfig first if (conf.CHECK_CFG(package=pkg, - args='"%s >= %s" --cflags --libs' % (pkg, minversion), + args='"%s" --cflags --libs' % (version_checks), msg=msg, uselib_store=uselib_store) and check_functions_headers_code()): if set_target: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_conftests.py new/talloc-2.1.10/buildtools/wafsamba/samba_conftests.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_conftests.py 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_conftests.py 2017-04-28 10:57:26.000000000 +0200 @@ -24,7 +24,7 @@ if not 'env' in kw: kw['env'] = self.env.copy() - # match the configuration test with speficic options, for example: + # match the configuration test with specific options, for example: # --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv" additional_dirs = [] if 'msg' in kw: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_deps.py new/talloc-2.1.10/buildtools/wafsamba/samba_deps.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_deps.py 2015-12-10 12:01:40.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_deps.py 2017-04-28 10:57:26.000000000 +0200 @@ -229,6 +229,7 @@ if modules == []: sname = sname.replace('-','_') + sname = sname.replace('.','_') sname = sname.replace('/','_') cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinel)) if sentinel == 'NULL': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_patterns.py new/talloc-2.1.10/buildtools/wafsamba/samba_patterns.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_patterns.py 2015-12-10 12:01:40.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_patterns.py 2017-07-23 00:23:56.000000000 +0200 @@ -14,7 +14,7 @@ return 0 -def SAMBA_MKVERSION(bld, target): +def SAMBA_MKVERSION(bld, target, source='VERSION'): '''generate the version.h header for Samba''' # We only force waf to re-generate this file if we are installing, @@ -22,7 +22,7 @@ # git revision) included in the version. t = bld.SAMBA_GENERATOR('VERSION', rule=write_version_header, - source= 'VERSION', + source=source, target=target, always=bld.is_install) Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION @@ -51,7 +51,6 @@ fp.write("*/\n") fp.write("\n") fp.write("#include \"includes.h\"\n") - fp.write("#include \"build_env.h\"\n") fp.write("#include \"dynconfig/dynconfig.h\"\n") fp.write("#include \"lib/cluster_support.h\"\n") @@ -92,19 +91,6 @@ fp.write(" return;\n") fp.write(" }\n") fp.write("\n") - fp.write("#ifdef _BUILD_ENV_H\n") - fp.write(" /* Output information about the build environment */\n") - fp.write(" output(screen,\"Build environment:\\n\");\n") - fp.write(" output(screen,\" Built by: %s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);\n") - fp.write(" output(screen,\" Built on: %s\\n\",BUILD_ENV_DATE);\n") - fp.write("\n") - fp.write(" output(screen,\" Built using: %s\\n\",BUILD_ENV_COMPILER);\n") - fp.write(" output(screen,\" Build host: %s\\n\",BUILD_ENV_UNAME);\n") - fp.write(" output(screen,\" SRCDIR: %s\\n\",BUILD_ENV_SRCDIR);\n") - fp.write(" output(screen,\" BUILDDIR: %s\\n\",BUILD_ENV_BUILDDIR);\n") - fp.write("\n") - fp.write("\n") - fp.write("#endif\n") fp.write("\n") fp.write(" /* Output various paths to files and directories */\n") fp.write(" output(screen,\"\\nPaths:\\n\");\n") @@ -178,6 +164,9 @@ keys_header_other.append(key) else: keys_option_have.append(key) + elif key.startswith("static_init_"): + l = key.split("(") + keys_misc.append(l[0]) else: keys_misc.append(key) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_python.py new/talloc-2.1.10/buildtools/wafsamba/samba_python.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_python.py 2016-02-19 22:02:02.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_python.py 2017-04-28 10:57:26.000000000 +0200 @@ -40,6 +40,18 @@ @conf def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True): + if conf.env.disable_python: + if mandatory: + raise Utils.WafError("Cannot check for python headers when " + "--disable-python specified") + + conf.msg("python headers", "Check disabled due to --disable-python") + # we don't want PYTHONDIR in config.h, as otherwise changing + # --prefix causes a complete rebuild + del(conf.env.defines['PYTHONDIR']) + del(conf.env.defines['PYTHONARCHDIR']) + return + if conf.env["python_headers_checked"] == []: if conf.env['EXTRA_PYTHON']: conf.setenv('extrapython') @@ -75,6 +87,20 @@ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' else: conf.env['PYTHON_SO_ABI_FLAG'] = '' + conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( + conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) + + for lib in conf.env['LINKFLAGS_PYEMBED']: + if lib.startswith('-L'): + conf.env.append_unique('LIBPATH_PYEMBED', lib[2:]) # strip '-L' + conf.env['LINKFLAGS_PYEMBED'].remove(lib) + + return + +def PYTHON_BUILD_IS_ENABLED(self): + return self.CONFIG_SET('HAVE_PYTHON_H') + +Build.BuildContext.PYTHON_BUILD_IS_ENABLED = PYTHON_BUILD_IS_ENABLED def SAMBA_PYTHON(bld, name, @@ -91,6 +117,11 @@ enabled=True): '''build a python extension for Samba''' + # force-disable when we can't build python modules, so + # every single call doesn't need to pass this in. + if not bld.PYTHON_BUILD_IS_ENABLED(): + enabled = False + if bld.env['IS_EXTRA_PYTHON']: name = 'extra-' + name @@ -138,7 +169,10 @@ def pyembed_libname(bld, name, extrapython=False): - return name + bld.env['PYTHON_SO_ABI_FLAG'] + if bld.env['PYTHON_SO_ABI_FLAG']: + return name + bld.env['PYTHON_SO_ABI_FLAG'] + else: + return name Build.BuildContext.pyembed_libname = pyembed_libname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/samba_third_party.py new/talloc-2.1.10/buildtools/wafsamba/samba_third_party.py --- old/talloc-2.1.9/buildtools/wafsamba/samba_third_party.py 2015-11-06 14:28:25.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/samba_third_party.py 2017-04-28 10:57:26.000000000 +0200 @@ -33,3 +33,9 @@ return conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h') Build.BuildContext.CHECK_POPT = CHECK_POPT + +@conf +def CHECK_CMOCKA(conf): + return conf.CHECK_BUNDLED_SYSTEM_PKG('cmocka', minversion='1.1.1') + +Build.BuildContext.CHECK_CMOCKA = CHECK_CMOCKA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/wafsamba.py new/talloc-2.1.10/buildtools/wafsamba/wafsamba.py --- old/talloc-2.1.9/buildtools/wafsamba/wafsamba.py 2016-02-19 22:02:02.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/wafsamba.py 2017-06-15 23:19:32.000000000 +0200 @@ -144,7 +144,7 @@ '''define a Samba library''' if pyembed and bld.env['IS_EXTRA_PYTHON']: - public_headers = pc_files = None + public_headers = None if private_library and public_headers: raise Utils.WafError("private library '%s' must not have public header files" % @@ -225,7 +225,7 @@ if vnum is None and soname is None: raise Utils.WafError("public library '%s' must have a vnum" % libname) - if pc_files is None and not bld.env['IS_EXTRA_PYTHON']: + if pc_files is None: raise Utils.WafError("public library '%s' must have pkg-config file" % libname) if public_headers is None and not bld.env['IS_EXTRA_PYTHON']: @@ -328,7 +328,10 @@ t.link_name = link_name if pc_files is not None and not private_library: - bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) + if pyembed and bld.env['IS_EXTRA_PYTHON']: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG']) + else: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): @@ -462,7 +465,8 @@ pyembed=False, manpages=None, allow_undefined_symbols=False, - allow_warnings=False + allow_warnings=False, + install=True ): '''define a Samba module.''' @@ -532,7 +536,8 @@ pyembed=pyembed, manpages=manpages, allow_undefined_symbols=allow_undefined_symbols, - allow_warnings=allow_warnings + allow_warnings=allow_warnings, + install=install ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/buildtools/wafsamba/wscript new/talloc-2.1.10/buildtools/wafsamba/wscript --- old/talloc-2.1.9/buildtools/wafsamba/wscript 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/buildtools/wafsamba/wscript 2017-04-28 10:57:26.000000000 +0200 @@ -196,6 +196,10 @@ help='tag release in git at the same time', type='string', action='store', dest='TAG_RELEASE') + opt.add_option('--disable-python', + help='do not generate python modules', + action='store_true', dest='disable_python', default=False) + opt.add_option('--extra-python', type=str, help=("build selected libraries for the specified " "additional version of Python " @@ -208,6 +212,8 @@ conf.env.hlist = [] conf.env.srcdir = conf.srcdir + conf.define('SRCDIR', conf.env['srcdir']) + if Options.options.timestamp_dependencies: conf.ENABLE_TIMESTAMP_DEPENDENCIES() @@ -279,8 +285,14 @@ conf.env.AUTOCONF_HOST = Options.options.AUTOCONF_HOST conf.env.AUTOCONF_PROGRAM_PREFIX = Options.options.AUTOCONF_PROGRAM_PREFIX + conf.env.disable_python = Options.options.disable_python + conf.env.EXTRA_PYTHON = Options.options.EXTRA_PYTHON + if (conf.env.disable_python and conf.env.EXTRA_PYTHON): + Logs.error('ERROR: cannot specify both --disable-python and --extra-python.') + sys.exit(1) + if (conf.env.AUTOCONF_HOST and conf.env.AUTOCONF_BUILD and conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/lib/replace/replace.c new/talloc-2.1.10/lib/replace/replace.c --- old/talloc-2.1.9/lib/replace/replace.c 2015-11-06 14:28:25.000000000 +0100 +++ new/talloc-2.1.10/lib/replace/replace.c 2017-06-15 23:19:32.000000000 +0200 @@ -820,6 +820,24 @@ strncpy(buf, s, buflen); return 0; } +#elif (!defined(STRERROR_R_XSI_NOT_GNU)) +#undef strerror_r +int rep_strerror_r(int errnum, char *buf, size_t buflen) +{ + char *s = strerror_r(errnum, buf, buflen); + if (s == NULL) { + /* Shouldn't happen, should always get a string */ + return EINVAL; + } + if (s != buf) { + strlcpy(buf, s, buflen); + if (strlen(s) > buflen - 1) { + return ERANGE; + } + } + return 0; + +} #endif #ifndef HAVE_CLOCK_GETTIME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/lib/replace/replace.h new/talloc-2.1.10/lib/replace/replace.h --- old/talloc-2.1.9/lib/replace/replace.h 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/lib/replace/replace.h 2017-06-15 23:19:32.000000000 +0200 @@ -628,7 +628,7 @@ char *rep_get_current_dir_name(void); #endif -#ifndef HAVE_STRERROR_R +#if (!defined(HAVE_STRERROR_R) || !defined(STRERROR_R_XSI_NOT_GNU)) #define strerror_r rep_strerror_r int rep_strerror_r(int errnum, char *buf, size_t buflen); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/lib/replace/system/time.h new/talloc-2.1.10/lib/replace/system/time.h --- old/talloc-2.1.9/lib/replace/system/time.h 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.10/lib/replace/system/time.h 2017-06-15 23:19:32.000000000 +0200 @@ -79,13 +79,21 @@ typedef int clockid_t; int rep_clock_gettime(clockid_t clk_id, struct timespec *tp); #endif -/* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on */ +/* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on. + * + * on AIX the values of CLOCK_* are cast expressions, not integer constants, + * this prevents them from being compared against in a preprocessor directive. + * The following ...IS_* macros can be used to check which clock is in use. + */ #if defined(CLOCK_MONOTONIC) #define CUSTOM_CLOCK_MONOTONIC CLOCK_MONOTONIC +#define CUSTOM_CLOCK_MONOTONIC_IS_MONOTONIC #elif defined(CLOCK_HIGHRES) #define CUSTOM_CLOCK_MONOTONIC CLOCK_HIGHRES +#define CUSTOM_CLOCK_MONOTONIC_IS_HIGHRES #else #define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME +#define CUSTOM_CLOCK_MONOTONIC_IS_REALTIME #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/lib/replace/test/os2_delete.c new/talloc-2.1.10/lib/replace/test/os2_delete.c --- old/talloc-2.1.9/lib/replace/test/os2_delete.c 2015-04-29 11:20:16.000000000 +0200 +++ new/talloc-2.1.10/lib/replace/test/os2_delete.c 2017-06-15 23:19:32.000000000 +0200 @@ -63,7 +63,7 @@ off_t offsets[READDIR_SIZE]; int i, j; struct dirent *de; - char names[READDIR_SIZE][30]; + char names[READDIR_SIZE][256]; /* scan, remembering offsets */ for (i=0, de=readdir(d); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/lib/replace/wscript new/talloc-2.1.10/lib/replace/wscript --- old/talloc-2.1.9/lib/replace/wscript 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/lib/replace/wscript 2017-07-02 22:22:14.000000000 +0200 @@ -81,6 +81,9 @@ conf.CHECK_HEADERS('sys/atomic.h') conf.CHECK_HEADERS('libgen.h') + if conf.CHECK_CFLAGS('-Wno-format-truncation'): + conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1') + # Check for process set name support conf.CHECK_CODE(''' #include <sys/prctl.h> @@ -466,6 +469,7 @@ conf.DEFINE('HAVE_ROBUST_MUTEXES', 1) conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True) + conf.CHECK_FUNCS_IN('crypt_r', 'crypt', checklibc=True) conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True, headers='readline.h readline/readline.h readline/history.h') @@ -626,6 +630,13 @@ conf.RECURSE('system') conf.SAMBA_CONFIG_H() + if conf.CHECK_FUNCS('strerror_r'): + # Check if strerror_r is XSI-Compatable, the default GNU implementation + # is not + conf.CHECK_CODE('int strerror_r(int errnum, char *buf, size_t buflen);', + 'STRERROR_R_XSI_NOT_GNU', + headers='string.h', addmain=False, link=False, + msg="Checking for XSI (rather than GNU) prototype for strerror_r") REPLACEMENT_FUNCTIONS = { @@ -703,11 +714,14 @@ private_library=True, deps='crypt dl nsl socket rt attr' + extra_libs) + replace_test_cflags="-Wno-format-zero-length" + if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): + replace_test_cflags += " -Wno-format-truncation" bld.SAMBA_SUBSYSTEM('replace-test', source='''test/testsuite.c test/strptime.c test/os2_delete.c test/getifaddrs.c''', deps='replace', - cflags="-Wno-format-length") + cflags=replace_test_cflags) if bld.env.standalone_replace: bld.SAMBA_BINARY('replace_testsuite', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/pytalloc-util.pc.in new/talloc-2.1.10/pytalloc-util.pc.in --- old/talloc-2.1.9/pytalloc-util.pc.in 2015-06-13 03:00:10.000000000 +0200 +++ new/talloc-2.1.10/pytalloc-util.pc.in 2017-04-28 10:57:26.000000000 +0200 @@ -3,9 +3,9 @@ libdir=@libdir@ includedir=@includedir@ -Name: pytalloc-util +Name: pytalloc-util@PYTHON_SO_ABI_FLAG@ Description: Utility functions for using talloc objects with Python Version: @TALLOC_VERSION@ -Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_SO_ABI_FLAG@ +Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_LIBNAME_SO_ABI_FLAG@ Cflags: -I${includedir} URL: http://talloc.samba.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/talloc.h new/talloc-2.1.10/talloc.h --- old/talloc-2.1.9/talloc.h 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/talloc.h 2017-04-28 10:57:26.000000000 +0200 @@ -407,10 +407,11 @@ * * @param[in] new_ctx The new parent context. * - * @param[in] pptr Pointer to the talloc chunk to move. + * @param[in] pptr Pointer to a pointer to the talloc chunk to move. + * + * @return The pointer to the talloc chunk that moved. + * It does not have any failure modes. * - * @return The pointer of the talloc chunk it has been moved to, - * NULL on error. */ void *talloc_move(const void *new_ctx, void **pptr); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/third_party/waf/wafadmin/3rdparty/paranoid.py new/talloc-2.1.10/third_party/waf/wafadmin/3rdparty/paranoid.py --- old/talloc-2.1.9/third_party/waf/wafadmin/3rdparty/paranoid.py 2015-04-29 11:20:16.000000000 +0200 +++ new/talloc-2.1.10/third_party/waf/wafadmin/3rdparty/paranoid.py 2017-07-02 22:22:14.000000000 +0200 @@ -21,9 +21,9 @@ def check_task_classes(self): for x in Task.TaskBase.classes: if isinstance(x, Task.Task): - if not getattr(cls, 'ext_in', None) or getattr(cls, 'before', None): + if not getattr(x, 'ext_in', None) or getattr(x, 'before', None): say('class %s has no precedence constraints (ext_in/before)') - if not getattr(cls, 'ext_out', None) or getattr(cls, 'after', None): + if not getattr(x, 'ext_out', None) or getattr(x, 'after', None): say('class %s has no precedence constraints (ext_out/after)') comp = Build.BuildContext.compile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.9/wscript new/talloc-2.1.10/wscript --- old/talloc-2.1.9/wscript 2017-02-27 20:23:11.000000000 +0100 +++ new/talloc-2.1.10/wscript 2017-07-23 00:23:56.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python APPNAME = 'talloc' -VERSION = '2.1.9' +VERSION = '2.1.10' blddir = 'bin' @@ -32,9 +32,6 @@ 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): @@ -46,22 +43,24 @@ 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) - - 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)) @@ -70,20 +69,32 @@ Logs.warn('Disabling pytalloc-util as python devel libs not found') conf.env.disable_python = True - conf.CHECK_HEADERS('sys/auxv.h') - conf.CHECK_FUNCS('getauxval') + 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.SAMBA_CONFIG_H() + 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 + + # 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 - conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() + if using_system_pytalloc_util: + conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) 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? @@ -126,7 +137,7 @@ private_library=private_library, manpages='man/talloc.3') - if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python: + if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): for env in bld.gen_python_environments(['PKGCONFIGDIR']): name = bld.pyembed_libname('pytalloc-util') @@ -140,16 +151,19 @@ abi_match='pytalloc_* _pytalloc_*', private_library=private_library, public_headers=('' if private_library else 'pytalloc.h'), - pc_files='pytalloc-util.pc' + pc_files='pytalloc-util.pc', + enabled=bld.PYTHON_BUILD_IS_ENABLED() ) 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) @@ -157,12 +171,18 @@ def test(ctx): '''run talloc testsuite''' import Utils, samba_utils + + samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') + samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') + cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite') ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper') magic_cmd = os.path.join(srcdir, 'lib', 'talloc', 'test_magic_differs.sh') + if not os.path.exists(magic_cmd): + magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh') magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd) print("magic differs test returned %d" % magic_ret)