From b764520cbe2fa1828f78494b77d85d3c355140b0fb34c8777993b3f74749c5cd Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Mon, 19 Mar 2018 10:55:13 +0000 Subject: [PATCH 1/3] Accepting request 588001 from home:jmcdough:4-8-factory Update talloc required for samba 4.8.0 OBS-URL: https://build.opensuse.org/request/show/588001 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=101 --- talloc-2.1.10.tar.asc | 11 ----------- talloc-2.1.10.tar.gz | 3 --- talloc-2.1.11.tar.asc | 11 +++++++++++ talloc-2.1.11.tar.gz | 3 +++ talloc-man.changes | 13 +++++++++++++ talloc-man.spec | 4 ++-- talloc.changes | 7 +++++++ talloc.spec | 4 ++-- 8 files changed, 38 insertions(+), 18 deletions(-) delete mode 100644 talloc-2.1.10.tar.asc delete mode 100644 talloc-2.1.10.tar.gz create mode 100644 talloc-2.1.11.tar.asc create mode 100644 talloc-2.1.11.tar.gz diff --git a/talloc-2.1.10.tar.asc b/talloc-2.1.10.tar.asc deleted file mode 100644 index 17a403a..0000000 --- a/talloc-2.1.10.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJZc9C2AAoJEEeTkWETCEAlH8YH/2/kD83vsMhKBg/s4WTgdRnM -CHEpxvo3O/3Qj2LxjZzSocfm2KtFraKCD7/fiPP3ZO7tSQwFS2P4HX44r+0ZWApy -+Vnah6rAf5wBlr+4oiPK6xTr4I6juPbSayEkTUMFVtVcF53/gsug7a72bmg0xDak -/gl6VHOptWpJu/VN4yPCd+Qx/7WyjvgRLXy9j5L9WLV12Fi++EGi8JzkK2aX+AMY -d1KXGExawm7Tgj4+Vw6b9XeW0H6g+x+a0WKWJC7hRUoaoVaq7b9UCNI3XXHDSBx7 -7mY0nb/XyHcA/m93k+qbpbOjbPaNnm6mvKqIJJWPjNd8gCK/DT7/DuFJi2FQrO8= -=oUDL ------END PGP SIGNATURE----- diff --git a/talloc-2.1.10.tar.gz b/talloc-2.1.10.tar.gz deleted file mode 100644 index 988cad1..0000000 --- a/talloc-2.1.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619 -size 441645 diff --git a/talloc-2.1.11.tar.asc b/talloc-2.1.11.tar.asc new file mode 100644 index 0000000..c546df0 --- /dev/null +++ b/talloc-2.1.11.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJaWbB/AAoJEEeTkWETCEAl9LgIAK9JaL8JwgY4zLj3PmhnZep2 +9yLM1CR/RwI6BKhqTvqIKF9eofeUdaHRaDKq93v0WxRyMsOlVfh7DAsrN5MBvdES +dl91zb1tpbInTnvqUE0JjgKVLQdQ/wvrC3xxliV//QJoQgNuUhhQfQFg2dOeV7YU +H6w6YddFWu+mmOBz3LrG1IS6kP9kK3ynbFRpkuEAjwXC4rMfkrXicY2LYcR79JC0 +0LT4QS7GJ9abC6ZTp02yo1DymETaHSGha9T84S5fcseIIpcW+5qbBu/AL3qo6kJO +hQnw83ALRmtXfM5Nen3PoKscrGp25vmCmro4GCsA2ee9asU0k39n9cywhiqJqIg= +=/dPS +-----END PGP SIGNATURE----- diff --git a/talloc-2.1.11.tar.gz b/talloc-2.1.11.tar.gz new file mode 100644 index 0000000..e9a98e5 --- /dev/null +++ b/talloc-2.1.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3 +size 443320 diff --git a/talloc-man.changes b/talloc-man.changes index 72eef19..c8711f8 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com + +- Update to version 2.1.11 + + disable-python - fix talloc wscript if bundling disabled + + Do not disclose the random talloc magic in free()'ed memory + +------------------------------------------------------------------- +Mon Oct 9 06:55:51 UTC 2017 - jmcdonough@suse.com + +- Reference library name directly instead of using variables to + pass obs source validator. + ------------------------------------------------------------------- Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de diff --git a/talloc-man.spec b/talloc-man.spec index b6071a4..6fb8e5d 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -41,7 +41,7 @@ BuildRequires: python3-devel #!BuildIgnore: python %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.10 +Version: 2.1.11 Release: 0 Summary: Samba talloc Library License: LGPL-3.0+ diff --git a/talloc.changes b/talloc.changes index 5710c26..c8711f8 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com + +- Update to version 2.1.11 + + disable-python - fix talloc wscript if bundling disabled + + Do not disclose the random talloc magic in free()'ed memory + ------------------------------------------------------------------- Mon Oct 9 06:55:51 UTC 2017 - jmcdonough@suse.com diff --git a/talloc.spec b/talloc.spec index e97d958..af8f03e 100644 --- a/talloc.spec +++ b/talloc.spec @@ -1,7 +1,7 @@ # # spec file for package talloc-man # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -41,7 +41,7 @@ BuildRequires: python3-devel #!BuildIgnore: python %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.10 +Version: 2.1.11 Release: 0 Summary: Samba talloc Library License: LGPL-3.0+ From e882c424e3f27782b9ab4cf166d648a201ee3a42c0a31d6351cdd5c561312a99 Mon Sep 17 00:00:00 2001 From: Aurelien Aptel Date: Mon, 19 Mar 2018 15:28:20 +0000 Subject: [PATCH 2/3] Accepting request 557473 from home:dmulder:branches:network:samba:STABLE Changes required for adding Python3 support to the samba package. OBS-URL: https://build.opensuse.org/request/show/557473 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=102 --- talloc.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/talloc.spec b/talloc.spec index af8f03e..600ceb4 100644 --- a/talloc.spec +++ b/talloc.spec @@ -18,6 +18,8 @@ %{!?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 @@ -36,6 +38,7 @@ BuildRequires: libxslt BuildRequires: pkg-config BuildRequires: python-devel %if %{with_python3} +BuildRequires: python3-base BuildRequires: python3-devel %endif #!BuildIgnore: python @@ -112,7 +115,6 @@ Requires: pkg-config Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} -Conflicts: python3-talloc-devel %description -n python-talloc-devel Libraries and Header Files to Develop Programs with python-talloc Support @@ -130,7 +132,6 @@ Summary: Developer tools for the Talloc library Group: Development/Libraries/Python Requires: pkg-config Requires: python3-talloc = %{version} -Conflicts: python-talloc-devel %description -n python3-talloc-devel Libraries and Header Files to Develop Programs with python3-talloc Support @@ -183,7 +184,12 @@ 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 +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 @@ -234,8 +240,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %files -n python3-talloc-devel %defattr(-,root,root) -%{_includedir}/pytalloc.h -%{_libdir}/pkgconfig/pytalloc-util.pc +%{py3_incdir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so %endif From 138b92c0d02189481d1c927f69cffe3eda9debe928b72aa660bea444e87b9db8 Mon Sep 17 00:00:00 2001 From: Aurelien Aptel Date: Tue, 3 Apr 2018 10:25:43 +0000 Subject: [PATCH 3/3] Accepting request 591706 from home:dimstar:Factory - Eliminate usage of %__cp and %__mkdir_p. ran pre_checkin.sh, to sync up things again, which is why talloc-man has sssuch a big diff. OBS-URL: https://build.opensuse.org/request/show/591706 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=103 --- talloc-man.changes | 5 +++++ talloc-man.spec | 40 ++++++++++++++++++---------------------- talloc.changes | 5 +++++ talloc.spec | 4 ++-- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/talloc-man.changes b/talloc-man.changes index c8711f8..3c4e687 100644 --- a/talloc-man.changes +++ b/talloc-man.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 16:24:11 UTC 2018 - dimstar@opensuse.org + +- Eliminate usage of %__cp and %__mkdir_p. + ------------------------------------------------------------------- Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com diff --git a/talloc-man.spec b/talloc-man.spec index 6fb8e5d..c10ffd1 100644 --- a/talloc-man.spec +++ b/talloc-man.spec @@ -18,6 +18,8 @@ %{!?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 @@ -36,6 +38,7 @@ BuildRequires: libxslt BuildRequires: pkg-config BuildRequires: python-devel %if %{with_python3} +BuildRequires: python3-base BuildRequires: python3-devel %endif #!BuildIgnore: python @@ -61,17 +64,12 @@ It is the core memory allocator used in Samba. %if ! %{build_man} -%if 0%{?suse_version} > 0 -%define libtalloc_name libtalloc2 -%else -%define libtalloc_name libtalloc -%endif -%package -n %{libtalloc_name} +%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. @@ -87,7 +85,7 @@ Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1030 Recommends: %{name}-man %endif -Requires: %{libtalloc_name} = %{version} +Requires: libtalloc2 = %{version} Requires: pkg-config %description -n libtalloc-devel @@ -102,7 +100,7 @@ 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} +Requires: libtalloc2 = %{version} Provides: pytalloc = %{version} Obsoletes: pytalloc < %{version} @@ -117,32 +115,26 @@ Requires: pkg-config Requires: python-talloc = %{version} Provides: pytalloc-devel = %{version} Obsoletes: pytalloc-devel < %{version} -Conflicts: python3-talloc-devel %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} +Requires: libtalloc2 = %{version} %description -n python3-talloc 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: pkg-config 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 @@ -192,7 +184,12 @@ 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 +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 @@ -202,9 +199,9 @@ 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 @@ -214,7 +211,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %postun -n python3-talloc -p /sbin/ldconfig -%files -n %{libtalloc_name} +%files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libtalloc.so.* @@ -243,8 +240,7 @@ cp -a doc/man/* "%{buildroot}/%{_mandir}/" %files -n python3-talloc-devel %defattr(-,root,root) -%{_includedir}/pytalloc.h -%{_libdir}/pkgconfig/pytalloc-util.pc +%{py3_incdir}/pytalloc.h %{_libdir}/pkgconfig/pytalloc-util.%{py3_soflags}.pc %{_libdir}/libpytalloc-util.%{py3_soflags}.so %endif diff --git a/talloc.changes b/talloc.changes index c8711f8..3c4e687 100644 --- a/talloc.changes +++ b/talloc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 16:24:11 UTC 2018 - dimstar@opensuse.org + +- Eliminate usage of %__cp and %__mkdir_p. + ------------------------------------------------------------------- Fri Mar 16 17:49:24 UTC 2018 - jmcdonough@suse.com diff --git a/talloc.spec b/talloc.spec index 600ceb4..48b5e48 100644 --- a/talloc.spec +++ b/talloc.spec @@ -185,8 +185,8 @@ LD_LIBRARY_PATH=bin/shared make test %make_install rm -r "%{buildroot}/%{_mandir}" %if %{with_python3} -%{__mkdir_p} %{buildroot}/%{py3_incdir} -%{__cp} %{buildroot}/%{_includedir}/pytalloc.h %{buildroot}/%{py3_incdir}/pytalloc.h +mkdir -p %{buildroot}/%{py3_incdir} +cp %{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