diff --git a/baselibs.conf b/baselibs.conf index fe100ae..eb07b2b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,2 @@ libtalloc2 -python-talloc - obsoletes "pytalloc- < " python3-talloc diff --git a/talloc-2.1.14.tar.asc b/talloc-2.1.14.tar.asc deleted file mode 100644 index 3d0b655..0000000 --- a/talloc-2.1.14.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAltG7SoVHHNhbWJhLWJ1 -Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlWLkH/jyIMfV8uW200sip7WqrRrdaftnA -gMhkG4y304GjyAIkRG6a34y9U/UZR83p2+M2ftMHH8pyZVFW2EmHowNGXzs2fG0N -L2Lc3MvookV0XLbO0amwHbIKbFbZVtBUZm0do5yuM5DQsph3aQZ/loyXIkyoPeG2 -TOnu7+9/3C1EuEcC4SgnbQxA0Zlm0+ZuS8ukMeunXhe5XjqB/iNTC0q0pXG0a8lJ -tZdgF9isLs9tstYN6HsdbPR10vlKd30+8FXHOS+P/O1NnStXFI6s7rUNZfJ2Bs+r -5binXk2aWiM2/IvVRoEiwBftiTW6Dfyl7y3OhpqUEkzUWecr86zmyzO2V1k= -=wWgN ------END PGP SIGNATURE----- diff --git a/talloc-2.1.14.tar.gz b/talloc-2.1.14.tar.gz deleted file mode 100644 index b298764..0000000 --- a/talloc-2.1.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce -size 444589 diff --git a/talloc-2.1.16.tar.asc b/talloc-2.1.16.tar.asc new file mode 100644 index 0000000..97bd076 --- /dev/null +++ b/talloc-2.1.16.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlx1JvMVHHNhbWJhLWJ1 +Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAl1AYH/08X2y8LmqSv6xRrDU9JvhXoFFvI +82s0zgteRQjWJedRMgq9yhDbDl2fDeAdiQFqGG41kCqa5ZUsy8vOqlABGRH7RO2g +jgg1nkQFhy/yhnPxj8R29XB0XU3ZWOAl8nQnux6eFigCu5eFSNMkovBudmCJvEk8 +lEy10EUOwmE+Jzs4Et8bzBmJZTHuWxXVPil1IsFj1bGSXLnMMUs4qeEgK02qZkoT +6V9ZYMHUDvFXRbM/6YBHRdGe6/l217+Lkz0EvDLapWsTKm4wTcqnj37fsEgASLH8 +6QVx3xcNjw8Uj5QzpfyigMi4rAdsJYYVY63dnMW2mq4C2y1E7o8stExta2g= +=8KZO +-----END PGP SIGNATURE----- diff --git a/talloc-2.1.16.tar.gz b/talloc-2.1.16.tar.gz new file mode 100644 index 0000000..80833c1 --- /dev/null +++ b/talloc-2.1.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:195bf6830a070deb11c492b8cd575a59cd4d3b634164f3f693f6388f806a52a9 +size 634906 diff --git a/talloc-man.changes b/talloc-man.changes index 85c32f5..e15d2a1 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Mar 5 17:39:21 UTC 2019 - dmulder@suse.com + +- Update to version 2.1.16 + + Fix standalone build of talloc. + +------------------------------------------------------------------- +Wed Feb 6 17:47:12 UTC 2019 - dmulder@suse.com + +- Update to version 2.1.15 + + Deprecate talloc_set_memlimit() and talloc_autofree_context() + + Fix undefined behavior in talloc_memdup + + The build uses python3 by default: + + --extra-python would take python2 now + + To build with python2 only use: + PYTHON=python2 ./configure + PYTHON=python2 make + PYTHON=python2 make install + +------------------------------------------------------------------- +Wed Aug 8 16:08:31 UTC 2018 - dmulder@suse.com + +- Update to version 2.1.14 + + Fix some typos in the comments + + Remove extra 0x prefix for the "%p" format specifiers, + avoiding 0x0x0 strings in the output. + + make sure we link extra-python versions of libraries + ------------------------------------------------------------------- Thu Apr 5 23:23:22 UTC 2018 - jmcdonough@suse.com diff --git a/talloc-man.spec b/talloc-man.spec index 8773ff3..f0917b8 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?py3_soflags: %global py3_soflags cpython-%{python3_version_nodots}m} %{!?py3_soflags_dash: %global py3_soflags_dash %(echo %{py3_soflags} | sed "s/_/-/g")} %{!?py3_incdir: %global py3_incdir %(%{__python3} -c "import sysconfig as s; print(s.get_path('include'))")} -%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20 -%define with_python3 1 -%else -%define with_python3 0 -%endif %define build_man 1 %if %{build_man} @@ -36,18 +30,15 @@ BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: pkg-config -BuildRequires: python-devel -%if %{with_python3} BuildRequires: python3-base BuildRequires: python3-devel -%endif #!BuildIgnore: python %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.14 +Version: 2.1.16 Release: 0 Summary: Samba talloc Library -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc @@ -97,32 +88,11 @@ It is the core memory allocator used in Samba. 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: libtalloc2 = %{version} -Provides: pytalloc = %{version} -Obsoletes: pytalloc < %{version} - -%description -n python-talloc -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: pkg-config -Requires: python-talloc = %{version} -Provides: pytalloc-devel = %{version} -Obsoletes: pytalloc-devel < %{version} - -%description -n python-talloc-devel -Libraries and Header Files to Develop Programs with python-talloc Support - %package -n python3-talloc Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python Requires: libtalloc2 = %{version} +Obsoletes: python-talloc %description -n python3-talloc This package contains the Python3 bindings for the Talloc library. @@ -132,6 +102,7 @@ Summary: Developer tools for the Talloc library Group: Development/Libraries/Python Requires: pkg-config Requires: python3-talloc = %{version} +Obsoletes: python-talloc-devel %description -n python3-talloc-devel Libraries and Header Files to Develop Programs with python3-talloc Support @@ -141,6 +112,7 @@ Libraries and Header Files to Develop Programs with python3-talloc Support %prep %setup -n talloc-%{version} -q %patch0 -p1 +sed -i 's;../../buildtools/bin/waf;./buildtools/bin/waf;g' Makefile %build %if ! %{build_man} @@ -153,9 +125,6 @@ CONFIGURE_OPTIONS="\ --disable-silent-rules \ --bundled-libraries=NONE \ --builtin-libraries=replace \ -%if %{with_python3} - --extra-python=/usr/bin/python3 \ -%endif " ./configure ${CONFIGURE_OPTIONS} make %{?_smp_mflags} \ @@ -184,12 +153,10 @@ LD_LIBRARY_PATH=bin/shared make test %if ! %{build_man} %make_install rm -r "%{buildroot}/%{_mandir}" -%if %{with_python3} mkdir -p %{buildroot}/%{py3_incdir} -cp %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h +mv %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h sed -i 's;${prefix}/include;%{py3_incdir};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc sed -i 's;-lpytalloc-util.%{py3_soflags_dash};-lpytalloc-util.%{py3_soflags};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc -%endif %else # Install API documentation @@ -203,10 +170,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %postun -n libtalloc2 -p /sbin/ldconfig -%post -n python-talloc -p /sbin/ldconfig - -%postun -n python-talloc -p /sbin/ldconfig - %post -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig @@ -221,18 +184,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %{_libdir}/libtalloc.so %{_libdir}/pkgconfig/talloc.pc -%files -n python-talloc -%defattr(-,root,root) -%{_libdir}/libpytalloc-util.so.* -%{python_sitearch}/talloc.so - -%files -n python-talloc-devel -%defattr(-,root,root) -%{_includedir}/pytalloc.h -%{_libdir}/pkgconfig/pytalloc-util.pc -%{_libdir}/libpytalloc-util.so - -%if %{with_python3} %files -n python3-talloc %defattr(-,root,root) %{_libdir}/libpytalloc-util.%{py3_soflags}.so.* @@ -243,7 +194,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %{py3_incdir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so -%endif %else diff --git a/talloc.changes b/talloc.changes index 5217477..e15d2a1 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Mar 5 17:39:21 UTC 2019 - dmulder@suse.com + +- Update to version 2.1.16 + + Fix standalone build of talloc. + +------------------------------------------------------------------- +Wed Feb 6 17:47:12 UTC 2019 - dmulder@suse.com + +- Update to version 2.1.15 + + Deprecate talloc_set_memlimit() and talloc_autofree_context() + + Fix undefined behavior in talloc_memdup + + The build uses python3 by default: + + --extra-python would take python2 now + + To build with python2 only use: + PYTHON=python2 ./configure + PYTHON=python2 make + PYTHON=python2 make install + ------------------------------------------------------------------- Wed Aug 8 16:08:31 UTC 2018 - dmulder@suse.com diff --git a/talloc.spec b/talloc.spec index c88755e..e8ec731 100644 --- a/talloc.spec +++ b/talloc.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?py3_soflags: %global py3_soflags cpython-%{python3_version_nodots}m} %{!?py3_soflags_dash: %global py3_soflags_dash %(echo %{py3_soflags} | sed "s/_/-/g")} %{!?py3_incdir: %global py3_incdir %(%{__python3} -c "import sysconfig as s; print(s.get_path('include'))")} -%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20 -%define with_python3 1 -%else -%define with_python3 0 -%endif %define build_man 0 %if %{build_man} @@ -36,18 +30,15 @@ BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: pkg-config -BuildRequires: python-devel -%if %{with_python3} BuildRequires: python3-base BuildRequires: python3-devel -%endif #!BuildIgnore: python %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.14 +Version: 2.1.16 Release: 0 Summary: Samba talloc Library -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc @@ -97,32 +88,11 @@ It is the core memory allocator used in Samba. 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: libtalloc2 = %{version} -Provides: pytalloc = %{version} -Obsoletes: pytalloc < %{version} - -%description -n python-talloc -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: pkg-config -Requires: python-talloc = %{version} -Provides: pytalloc-devel = %{version} -Obsoletes: pytalloc-devel < %{version} - -%description -n python-talloc-devel -Libraries and Header Files to Develop Programs with python-talloc Support - %package -n python3-talloc Summary: Python3 bindings for the Talloc library Group: Development/Libraries/Python Requires: libtalloc2 = %{version} +Obsoletes: python-talloc %description -n python3-talloc This package contains the Python3 bindings for the Talloc library. @@ -132,6 +102,7 @@ Summary: Developer tools for the Talloc library Group: Development/Libraries/Python Requires: pkg-config Requires: python3-talloc = %{version} +Obsoletes: python-talloc-devel %description -n python3-talloc-devel Libraries and Header Files to Develop Programs with python3-talloc Support @@ -153,9 +124,6 @@ CONFIGURE_OPTIONS="\ --disable-silent-rules \ --bundled-libraries=NONE \ --builtin-libraries=replace \ -%if %{with_python3} - --extra-python=/usr/bin/python3 \ -%endif " ./configure ${CONFIGURE_OPTIONS} make %{?_smp_mflags} \ @@ -184,12 +152,10 @@ LD_LIBRARY_PATH=bin/shared make test %if ! %{build_man} %make_install rm -r "%{buildroot}/%{_mandir}" -%if %{with_python3} mkdir -p %{buildroot}/%{py3_incdir} -cp %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h +mv %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h sed -i 's;${prefix}/include;%{py3_incdir};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc sed -i 's;-lpytalloc-util.%{py3_soflags_dash};-lpytalloc-util.%{py3_soflags};g' %{buildroot}/%{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc -%endif %else # Install API documentation @@ -203,10 +169,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %postun -n libtalloc2 -p /sbin/ldconfig -%post -n python-talloc -p /sbin/ldconfig - -%postun -n python-talloc -p /sbin/ldconfig - %post -n python3-talloc -p /sbin/ldconfig %postun -n python3-talloc -p /sbin/ldconfig @@ -221,18 +183,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %{_libdir}/libtalloc.so %{_libdir}/pkgconfig/talloc.pc -%files -n python-talloc -%defattr(-,root,root) -%{_libdir}/libpytalloc-util.so.* -%{python_sitearch}/talloc.so - -%files -n python-talloc-devel -%defattr(-,root,root) -%{_includedir}/pytalloc.h -%{_libdir}/pkgconfig/pytalloc-util.pc -%{_libdir}/libpytalloc-util.so - -%if %{with_python3} %files -n python3-talloc %defattr(-,root,root) %{_libdir}/libpytalloc-util.%{py3_soflags}.so.* @@ -243,7 +193,6 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %{py3_incdir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so -%endif %else