Open Build Service

Changes of Revision 25

_service:tar_scm_kernel_repo:samba.spec Changed

@@ -49,7 +49,7 @@
 
 Name:           samba
 Version:        4.11.12
-Release:        20
+Release:        21
 
 Summary:        A suite for Linux to interoperate with Windows
 License:        GPLv3+ and LGPLv3+
@@ -294,6 +294,8 @@
 Patch6365:       backport-0002-CVE-2022-42898.patch
 Patch6366:       backport-0003-CVE-2022-42898.patch
 Patch6367:       backport-0004-CVE-2022-42898.patch
+Patch6368:       backport-s3waf-Fix-version-number-of-public-libsmbconf.patch
+Patch6369:       backport-waf-Fix-SO-version-number-of-libsamba-errors.patch
 
 
 BuildRequires: avahi-devel cups-devel dbus-devel docbook-style-xsl e2fsprogs-devel gawk gnupg2 gnutls-devel >= 3.4.7 gpgme-devel
@@ -3352,6 +3354,12 @@
 %{_mandir}/man*
 
 %changelog
+* Fri Dec 02 2022 xinghe <xinghe2@h-partners.com> - 4.11.12-21
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix so verion number of libsmbconf and libsamba-errors
+
 * Tue Nov 22 2022 zhouyihang <zhouyihang3@h-partners.com> - 4.11.12-20
 - Type:cves
 - CVE:CVE-2022-42898

_service:tar_scm_kernel_repo:backport-s3waf-Fix-version-number-of-public-libsmbconf.patch Added

@@ -0,0 +1,38 @@
+From bee89680ce671aaf03d6c8f8b3a5dceebfa9b963 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 24 Jun 2022 09:36:27 +0200
+Subject: [PATCH] s3:waf: Fix version number of public libsmbconf
+
+Error: ldconfig: /lib64/libsmbconf.so.0 is not a symbolic link
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15108
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+(cherry picked from commit 8458449ddf1a5c939784116aa3f9d21edaf93a05)
+
+Autobuild-User(v4-15-test): Jule Anger <janger@samba.org>
+Autobuild-Date(v4-15-test): Mon Jun 27 09:25:56 UTC 2022 on sn-devel-184
+
+Conflict: context adaptation
+Reference: https://github.com/samba-team/samba/commit/bee89680ce671aaf03d6c8f8b3a5dceebfa9b963
+---
+ source3/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript_build b/source3/wscript_build
+index aa3c717..d51dd60 100644
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -598,7 +598,7 @@ bld.SAMBA3_LIBRARY('smbconf',
+                         ''',
+                    public_headers='../lib/smbconf/smbconf.h',
+                    pc_files=[],
+-                   vnum='0')
++                   vnum='0.0.1')
+ 
+ bld.SAMBA3_LIBRARY('smbd_conn',
+                    source='smbd/conn.c',
+-- 
+2.27.0
+

_service:tar_scm_kernel_repo:backport-waf-Fix-SO-version-number-of-libsamba-errors.patch Added

@@ -0,0 +1,32 @@
+From 563a2c8d7296e77ae12de1c5a1a3797e72294068 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Wed, 10 Aug 2022 13:55:48 +0200
+Subject: [PATCH] waf: Fix SO version number of libsamba-errors
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15141
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Alexander Bokovoy <ab@samba.org>
+
+Conflict: NA
+Reference: https://github.com/samba-team/samba/commit/563a2c8d7296e77ae12de1c5a1a3797e72294068
+---
+ libcli/util/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
+index 9c8fddc..4267cfe 100644
+--- a/libcli/util/wscript_build
++++ b/libcli/util/wscript_build
+@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-errors',
+                   deps='gnutls',
+                   # private_library=True,
+                   pc_files=[],
+-                  vnum='1',
++                  vnum='1.0.0',
+                   )
+ 
+ bld.SAMBA_GENERATOR('ntstatus_generated',
+-- 
+2.33.0
+