From 9d38c3cc4b099f540c60d55e6eda20a62c1d115cd4518af1dbd886e1a81a3d40 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 5 Dec 2018 17:34:52 +0000 Subject: [PATCH 1/3] Accepting request 654115 from home:dmulder:branches:network:samba:STABLE - Remove python2 build dependency from samba-libs; (bsc#1116900); - Update update-apparmor-samba-profile script to ignore the shares's paths containing substitution variables in any place, not only at the beginning of the path. OBS-URL: https://build.opensuse.org/request/show/654115 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=609 --- samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 | 3 - samba-4.9.3+git.117.de34b389efa.tar.bz2 | 3 + samba.changes | 12 +++ samba.spec | 99 ++++++++++++++++++++----- 4 files changed, 97 insertions(+), 20 deletions(-) delete mode 100644 samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 create mode 100644 samba-4.9.3+git.117.de34b389efa.tar.bz2 diff --git a/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 b/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 deleted file mode 100644 index f234a7d..0000000 --- a/samba-4.9.3+git.113.3f6a4cdc269.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a313fad76b8ecb98b5169427c920aa0f79033525327c837bc3b11c3ac5e1110f -size 24650354 diff --git a/samba-4.9.3+git.117.de34b389efa.tar.bz2 b/samba-4.9.3+git.117.de34b389efa.tar.bz2 new file mode 100644 index 0000000..65a220e --- /dev/null +++ b/samba-4.9.3+git.117.de34b389efa.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a26cb82a109c071aa161dedbd6cdf6a9994ac0e74b39e87b2b2a971970da25d +size 24646967 diff --git a/samba.changes b/samba.changes index c3fbc0d..67add92 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Nov 29 15:54:27 UTC 2018 - David Mulder + +- Remove python2 build dependency from samba-libs; (bsc#1116900); + +------------------------------------------------------------------- +Wed Nov 28 09:35:06 UTC 2018 - Samuel Cabrero + +- Update update-apparmor-samba-profile script to ignore the shares's + paths containing substitution variables in any place, not only at the + beginning of the path. + ------------------------------------------------------------------- Mon Nov 19 12:28:56 UTC 2018 - Samuel Cabrero diff --git a/samba.spec b/samba.spec index ff00b8c..d1108dc 100644 --- a/samba.spec +++ b/samba.spec @@ -168,7 +168,7 @@ BuildRequires: krb5-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.9.3+git.113.3f6a4cdc269 +Version: 4.9.3+git.117.de34b389efa Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -318,11 +318,31 @@ Requires: krb5 %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315 Requires: libfam0-gamin %endif +Requires: samba-libs-python %description libs The samba-libs package contains the libraries needed by programs that link against the SMB, RPC and other protocols provided by the Samba suite. +%package libs-python3 +Summary: Python3 dependencies of samba-libs +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: python3 +Provides: samba-libs-python + +%description libs-python3 +Dependencies of samba-libs that require python3. + +%package libs-python +Summary: Python2 dependencies of samba-libs +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: python + +%description libs-python +Dependencies of samba-libs that require python2. + %package pidl Summary: Perl IDL compiler License: GPL-3.0-or-later @@ -697,26 +717,54 @@ This subpackage contains libraries and header files for developing applications that want to make use of libsamba-passdb. -%package -n libsamba-policy0 +%package -n libsamba-policy0-python3 Summary: Active Directory Group Policy library License: GPL-3.0-or-later Group: System/Libraries +Provides: libsamba-policy0 -%description -n libsamba-policy0 -This subpackage contains the library for policy management. +%description -n libsamba-policy0-python3 +This subpackage contains the python3 library for policy management. +%package -n libsamba-policy0-python +Summary: Active Directory Group Policy library +License: GPL-3.0-or-later +Group: System/Libraries +Provides: libsamba-policy0 +%description -n libsamba-policy0-python +This subpackage contains the python2 library for policy management. %package -n libsamba-policy-devel Summary: Development files for the Samba AD Group Policy library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version} +Requires: libsamba-policy-python-devel = %{version} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing applications that want to make use of libsamba-policy. +%package -n libsamba-policy-python3-devel +Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libsamba-policy0-python3 = %{version} +Provides: libsamba-policy-python-devel + +%description -n libsamba-policy-python3-devel +This subpackage contains libraries and header files for developing +applications that want to make use of libsamba-policy. + +%package -n libsamba-policy-python-devel +Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libsamba-policy0-python = %{version} + +%description -n libsamba-policy-python-devel +This subpackage contains libraries and header files for developing +applications that want to make use of libsamba-policy. %package -n libsamba-util0 Summary: Samba utility function library @@ -1509,9 +1557,13 @@ fi %postun -n libsamba-hostconfig0 -p /sbin/ldconfig %post -n libsamba-passdb0 -p /sbin/ldconfig %postun -n libsamba-passdb0 -p /sbin/ldconfig +%if %{with_python3} +%post -n libsamba-policy0-python3 -p /sbin/ldconfig +%postun -n libsamba-policy0-python3 -p /sbin/ldconfig +%endif %if %{with_python} -%post -n libsamba-policy0 -p /sbin/ldconfig -%postun -n libsamba-policy0 -p /sbin/ldconfig +%post -n libsamba-policy0-python -p /sbin/ldconfig +%postun -n libsamba-policy0-python -p /sbin/ldconfig %endif %post -n libsamba-util0 -p /sbin/ldconfig %postun -n libsamba-util0 -p /sbin/ldconfig @@ -1950,14 +2002,6 @@ exit 0 %{_libdir}/samba/libsamba-security-samba4.so %{_libdir}/samba/libsamba-sockets-samba4.so %{_libdir}/samba/libsamba3-util-samba4.so -%if %{with_python} -%{_libdir}/samba/libsamba-python-samba4.so -%{_libdir}/samba/libsamba-net-samba4.so -%endif -%if %{with_python3} -%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so -%{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so -%endif %{_libdir}/samba/libsamdb-common-samba4.so %{_libdir}/samba/libsecrets3-samba4.so %{_libdir}/samba/libserver-id-db-samba4.so @@ -1993,6 +2037,18 @@ exit 0 %{_libdir}/samba/pdb/smbpasswd.so %{_libdir}/samba/pdb/tdbsam.so +%files libs-python3 +%if %{with_python3} +%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-samba4.so +%{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-samba4.so +%endif + +%files libs-python +%if %{with_python} +%{_libdir}/samba/libsamba-python-samba4.so +%{_libdir}/samba/libsamba-net-samba4.so +%endif + %if %{with_pidl} %files pidl %defattr(-,root,root) @@ -2376,23 +2432,32 @@ exit 0 %_includedir/samba-4.0/passdb.h %_libdir/libsamba-passdb.so -%files -n libsamba-policy0 +%files -n libsamba-policy0-python %defattr(-,root,root) %if %{with_python} %_libdir/libsamba-policy.so.0* %endif + +%files -n libsamba-policy0-python3 +%defattr(-,root,root) %if %{with_python3} %_libdir/libsamba-policy.%{py3_soflags_dash}.so.0* %endif %files -n libsamba-policy-devel %defattr(-,root,root) -%if %{with_python} %dir %_includedir/samba-4.0/ %_includedir/samba-4.0/policy.h + +%files -n libsamba-policy-python-devel +%defattr(-,root,root) +%if %{with_python} %_libdir/libsamba-policy.so %_libdir/pkgconfig/samba-policy.pc %endif + +%files -n libsamba-policy-python3-devel +%defattr(-,root,root) %if %{with_python3} %_libdir/libsamba-policy.%{py3_soflags_dash}.so %_libdir/pkgconfig/samba-policy.%{py3_soflags}.pc From 825807924f9561b7609ee466751013fe45e0d4abe2f0e9ab08ebaaafde188441 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Wed, 5 Dec 2018 19:02:35 +0000 Subject: [PATCH 2/3] Accepting request 655382 from home:dmulder:branches:network:samba:STABLE Fix package names in baselibs.conf OBS-URL: https://build.opensuse.org/request/show/655382 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=610 --- baselibs.conf | 5 ++++- samba-4.9.3+git.117.de34b389efa.tar.bz2 | 3 --- samba-4.9.3+git.119.fdb1964c208.tar.bz2 | 3 +++ samba.spec | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 samba-4.9.3+git.117.de34b389efa.tar.bz2 create mode 100644 samba-4.9.3+git.119.fdb1964c208.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 1e57fa4..c8f5ba4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -11,7 +11,8 @@ libsamba-errors0 libsamba-hostconfig0 libsamba-passdb0 obsoletes "libpdb0- < " -libsamba-policy0 +libsamba-policy0-python3 +libsamba-policy0-python libsamba-util0 libsamdb0 libsmbclient0 @@ -27,4 +28,6 @@ samba-client supplements "packageand(samba-client:glibc-)" -/usr/lib/samba samba-libs +samba-libs-python3 +samba-libs-python samba-ad-dc diff --git a/samba-4.9.3+git.117.de34b389efa.tar.bz2 b/samba-4.9.3+git.117.de34b389efa.tar.bz2 deleted file mode 100644 index 65a220e..0000000 --- a/samba-4.9.3+git.117.de34b389efa.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a26cb82a109c071aa161dedbd6cdf6a9994ac0e74b39e87b2b2a971970da25d -size 24646967 diff --git a/samba-4.9.3+git.119.fdb1964c208.tar.bz2 b/samba-4.9.3+git.119.fdb1964c208.tar.bz2 new file mode 100644 index 0000000..342d3c3 --- /dev/null +++ b/samba-4.9.3+git.119.fdb1964c208.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54f1ae4348f307645e962ab9b7944e35b907f1b7a02de2294c14701e21d951fb +size 24644920 diff --git a/samba.spec b/samba.spec index d1108dc..b86dfb9 100644 --- a/samba.spec +++ b/samba.spec @@ -168,7 +168,7 @@ BuildRequires: krb5-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.9.3+git.117.de34b389efa +Version: 4.9.3+git.119.fdb1964c208 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} From 9842f795c9c6fc0c23705b6a9afc790773194a766702621ae44c50517fcb2eb6 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Thu, 6 Dec 2018 17:56:35 +0000 Subject: [PATCH 3/3] Accepting request 655864 from home:dmulder:branches:network:samba:STABLE Fix package naming and dependencies OBS-URL: https://build.opensuse.org/request/show/655864 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=611 --- baselibs.conf | 2 +- samba-4.9.3+git.119.fdb1964c208.tar.bz2 | 3 --- samba-4.9.3+git.121.c328d5e9101.tar.bz2 | 3 +++ samba.spec | 32 ++++++++++++------------- 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 samba-4.9.3+git.119.fdb1964c208.tar.bz2 create mode 100644 samba-4.9.3+git.121.c328d5e9101.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index c8f5ba4..4914135 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -12,7 +12,7 @@ libsamba-hostconfig0 libsamba-passdb0 obsoletes "libpdb0- < " libsamba-policy0-python3 -libsamba-policy0-python +libsamba-policy0 libsamba-util0 libsamdb0 libsmbclient0 diff --git a/samba-4.9.3+git.119.fdb1964c208.tar.bz2 b/samba-4.9.3+git.119.fdb1964c208.tar.bz2 deleted file mode 100644 index 342d3c3..0000000 --- a/samba-4.9.3+git.119.fdb1964c208.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54f1ae4348f307645e962ab9b7944e35b907f1b7a02de2294c14701e21d951fb -size 24644920 diff --git a/samba-4.9.3+git.121.c328d5e9101.tar.bz2 b/samba-4.9.3+git.121.c328d5e9101.tar.bz2 new file mode 100644 index 0000000..ccd5f00 --- /dev/null +++ b/samba-4.9.3+git.121.c328d5e9101.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10cf75bb97fe733f72c52fe73ea23f7470e13a14b413cfc40c9e53110b302e8f +size 24645183 diff --git a/samba.spec b/samba.spec index b86dfb9..6a14f5d 100644 --- a/samba.spec +++ b/samba.spec @@ -168,7 +168,7 @@ BuildRequires: krb5-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.9.3+git.119.fdb1964c208 +Version: 4.9.3+git.121.c328d5e9101 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -318,7 +318,7 @@ Requires: krb5 %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315 Requires: libfam0-gamin %endif -Requires: samba-libs-python +Requires: samba-libs-python = %{version} %description libs The samba-libs package contains the libraries needed by programs that @@ -365,6 +365,7 @@ Requires: python-ldb Requires: python-talloc Requires: python-tdb Requires: python-tevent +Requires: libsamba-policy0 = %{version} %endif %description python @@ -380,6 +381,7 @@ Requires: python3-ldb Requires: python3-talloc Requires: python3-tdb Requires: python3-tevent +Requires: libsamba-policy0-python3 = %{version} %description python3 The samba-python3 package contains the Python libraries needed by programs @@ -717,24 +719,22 @@ This subpackage contains libraries and header files for developing applications that want to make use of libsamba-passdb. +%package -n libsamba-policy0 +Summary: Active Directory Group Policy library +License: GPL-3.0-or-later +Group: System/Libraries + +%description -n libsamba-policy0 +This subpackage contains the python2 library for policy management. + %package -n libsamba-policy0-python3 Summary: Active Directory Group Policy library License: GPL-3.0-or-later Group: System/Libraries -Provides: libsamba-policy0 %description -n libsamba-policy0-python3 This subpackage contains the python3 library for policy management. -%package -n libsamba-policy0-python -Summary: Active Directory Group Policy library -License: GPL-3.0-or-later -Group: System/Libraries -Provides: libsamba-policy0 - -%description -n libsamba-policy0-python -This subpackage contains the python2 library for policy management. - %package -n libsamba-policy-devel Summary: Development files for the Samba AD Group Policy library License: GPL-3.0-or-later @@ -760,7 +760,7 @@ applications that want to make use of libsamba-policy. Summary: Development files for the Samba AD Group Policy library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libsamba-policy0-python = %{version} +Requires: libsamba-policy0 = %{version} %description -n libsamba-policy-python-devel This subpackage contains libraries and header files for developing @@ -1562,8 +1562,8 @@ fi %postun -n libsamba-policy0-python3 -p /sbin/ldconfig %endif %if %{with_python} -%post -n libsamba-policy0-python -p /sbin/ldconfig -%postun -n libsamba-policy0-python -p /sbin/ldconfig +%post -n libsamba-policy0 -p /sbin/ldconfig +%postun -n libsamba-policy0 -p /sbin/ldconfig %endif %post -n libsamba-util0 -p /sbin/ldconfig %postun -n libsamba-util0 -p /sbin/ldconfig @@ -2432,7 +2432,7 @@ exit 0 %_includedir/samba-4.0/passdb.h %_libdir/libsamba-passdb.so -%files -n libsamba-policy0-python +%files -n libsamba-policy0 %defattr(-,root,root) %if %{with_python} %_libdir/libsamba-policy.so.0*