Browse Source

updated 13 packages

bindfs-1.17.7-1

git-2.45.2-1

krb5-1.21.2-1

libtdb-1.4.10-1

libxml2-2.13.1-1

libxslt-1.1.41-1

openldap-2.6.8-1

popt-1.19-1

rsync-3.3.0-1

samba-4.20.2-1

shadow-utils-4.15.2-1

sudo-1.9.15p5-1

valgrind-3.23.0-1
Tomohiro "Tomo-p" KATO 8 months ago
parent
commit
e214cc9ed0

+ 10 - 1
b/bindfs/bindfs-vl.spec

@@ -1,5 +1,7 @@
+%bcond_with test
+
 Name:           bindfs
-Version:        1.17.4
+Version:        1.17.7
 Release:        1%{?_dist_release}
 Summary:        Fuse filesystem to mirror a directory
 Group:          system,admin-tools
@@ -12,10 +14,12 @@ Source0:        https://bindfs.org/downloads/bindfs-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  fuse3-devel
+%if %{with test}
 # for test suite
 #BuildRequires:  glibc-debuginfo
 BuildRequires:  ruby
 BuildRequires:  valgrind
+%endif
 Requires:       fuse3
 
 %description
@@ -39,6 +43,7 @@ the mirror directory.
 %make_install
 
 
+%if %{with test}
 %check
 # Fedora's koji does not provide /dev/fuse, therefore skip the tests there
 # Always cat log files on failure to be able to debug issues
@@ -51,6 +56,7 @@ else
     make -C tests/internals/ check || (cat tests/internals/test-suite.log; false)
 fi
 %endif
+%endif
 
 
 %files
@@ -61,6 +67,9 @@ fi
 
 
 %changelog
+* Fri Jun 21 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.27.7-1
+- new upstream release.
+
 * Mon Oct 30 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.17.4-1
 - new upstream release.
 

+ 15 - 13
g/git/git-vl.spec

@@ -5,7 +5,7 @@
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        2.40.1
+Version:        2.45.2
 Release:        1%{?_dist_release}
 Summary:        Core git tools
 Summary(ja):    Core git ツール
@@ -30,13 +30,13 @@ Patch0:         git-1.5-gitweb-home-link.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel
+BuildRequires:	pkgconfig(zlib), openssl-devel, curl-devel
 BuildRequires:  expat-devel, gettext, asciidoc
 BuildRequires:  pcre2-devel
 BuildRequires:  xmlto
 
-# git-credential-gnome-keyring
-BuildRequires:  glib2-devel libgnome-keyring-devel
+# git-credential-libsecret
+BuildRequires:  libsecret-devel
 
 Requires:	perl-Git = %{version}-%{release}
 Requires:	zlib
@@ -237,9 +237,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
      gitwebdir=/var/www/git \
      INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
 
-pushd contrib/credential/gnome-keyring
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
-popd
+%make_build -C contrib/credential/libsecret/
 
 # arch
 %if %{without arch}
@@ -310,10 +308,9 @@ install -m0755 -d $RPM_BUILD_ROOT%{_libdir}
 install libgit.a $RPM_BUILD_ROOT%{_libdir}/
 install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
 
-# git-credential-gnome-keyring
-pushd contrib/credential/gnome-keyring
-%__install -m0755 git-credential-gnome-keyring $RPM_BUILD_ROOT%{_libexecdir}/git-core
-popd
+# git-credential-libsecret
+install -pm 755 contrib/credential/libsecret/git-credential-libsecret \
+	%{buildroot}%{_libexecdir}/git-core/
 
 %find_lang %{name}
 
@@ -347,7 +344,7 @@ fi
 %{_bindir}/git-shell
 %{_bindir}/scalar
 %{_datadir}/git-core/
-%exclude %{_libexecdir}/git-core/git-credential-gnome-keyring
+%exclude %{_libexecdir}/git-core/git-credential-libsecret
 %license COPYING
 %doc README.md Documentation/*.txt contrib/hooks
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
@@ -374,7 +371,7 @@ fi
 %defattr(-,root,root)
 %doc contrib/diff-highlight/README.diff-highlight
 %{_bindir}/diff-highlight
-%{_libexecdir}/git-core/git-credential-gnome-keyring
+%{_libexecdir}/git-core/git-credential-libsecret
 
 %if %{with arch}
 %files arch
@@ -446,6 +443,11 @@ fi
 
 
 %changelog
+* Wed Jun 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.45.2-1
+- new upstream release.
+- dropped git-credential-gnome-keyring.
+- added git-credential-libsecret.
+
 * Fri May 05 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-1
 - new upstream release.
 

+ 27 - 40
k/krb5/krb5-vl.spec

@@ -28,8 +28,8 @@ BuildRequires: socket_wrapper
 Summary: The Kerberos network authentication system
 Summary(ja): Kerberos ネットワーク認証システム
 Name: krb5
-Version: 1.19.2
-Release: 4%{_dist_release}%{?with_systemd:.systemd}
+Version: 1.21.2
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -67,44 +67,22 @@ Source201: kadmin.service
 Source202: krb5kdc.service
 Source203: krb5-krb5kdc.conf
 
-Patch0: downstream-ksu-pam-integration.patch
-Patch1: downstream-SELinux-integration.patch
-Patch3: downstream-netlib-and-dns.patch
-Patch4: downstream-fix-debuginfo-with-y.tab.c.patch
-Patch5: downstream-Remove-3des-support.patch
-Patch7: downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
-Patch8: Add-APIs-for-marshalling-credentials.patch
-Patch9: Add-hostname-canonicalization-helper-to-k5test.py.patch
-Patch10: Support-host-based-GSS-initiator-names.patch
-Patch11: Add-KCM_OP_GET_CRED_LIST-for-faster-iteration.patch
-Patch12: Fix-KCM-flag-transmission-for-remove_cred.patch
-Patch13: Make-KCM-iteration-fallback-work-with-sssd-kcm.patch
-Patch14: Use-KCM_OP_RETRIEVE-in-KCM-client.patch
-Patch15: Fix-KCM-retrieval-support-for-sssd.patch
-Patch17: Move-some-dejagnu-kadmin-tests-to-Python-tests.patch
-Patch18: Fix-some-principal-realm-canonicalization-cases.patch
-Patch19: Allow-kinit-with-keytab-to-defer-canonicalization.patch
-Patch20: Fix-kadmin-k-with-fallback-or-referral-realm.patch
-Patch21: Fix-softpkcs11-build-issues-with-openssl-3.0.patch
-Patch22: Remove-deprecated-OpenSSL-calls-from-softpkcs11.patch
-Patch23: Fix-k5tls-module-for-OpenSSL-3.patch
-Patch24: Fix-leaks-on-error-in-kadm5-init-functions.patch
-Patch25: Clean-up-context-after-failed-open-in-libkdb5.patch
-Patch26: Use-asan-in-one-of-the-CI-builds.patch
-Patch29: Clean-up-gssapi_krb5-ccache-name-functions.patch
-Patch30: Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch
-Patch32: Add-buildsystem-detection-of-the-OpenSSL-3-KDF-inter.patch
-Patch33: Use-OpenSSL-s-SSKDF-in-PKINIT-when-available.patch
-Patch34: Use-OpenSSL-s-KBKDF-and-KRB5KDF-for-deriving-long-te.patch
-Patch35: Handle-OpenSSL-3-s-providers.patch
-Patch36: Remove-TCL-based-libkadm5-API-tests.patch
-Patch37: Use-SHA256-instead-of-SHA1-for-PKINIT-CMS-digest.patch
-Patch38: krb5-krad-remote.patch
-Patch39: krb5-krad-larger-attrs.patch
-Patch40: Try-harder-to-avoid-password-change-replay-errors.patch
-Patch41: Add-configure-variable-for-default-PKCS-11-module.patch
-Patch42: downstream-Allow-krad-UDP-TCP-localhost-connection-with-FIPS.patch
-Patch43: Read-GSS-configuration-files-with-mtime-0.patch
+Patch0001: 0001-Revert-Don-t-issue-session-keys-with-deprecated-enct.patch
+Patch0002: 0002-downstream-ksu-pam-integration.patch
+Patch0003: 0003-downstream-SELinux-integration.patch
+Patch0004: 0004-downstream-fix-debuginfo-with-y.tab.c.patch
+Patch0005: 0005-downstream-Remove-3des-support.patch
+Patch0006: 0006-downstream-FIPS-with-PRNG-and-RADIUS-and-MD4.patch
+Patch0007: 0007-downstream-Allow-krad-UDP-TCP-localhost-connection-w.patch
+Patch0008: 0008-downstream-Make-tests-compatible-with-sssd_krb5_loca.patch
+Patch0009: 0009-downstream-Include-missing-OpenSSL-FIPS-header.patch
+Patch0010: 0010-downstream-Do-not-set-root-as-ksu-file-owner.patch
+Patch0011: 0011-downstream-Allow-KRB5KDF-MD5-and-MD4-in-FIPS-mode.patch
+Patch0012: 0012-downstream-Allow-to-set-PAC-ticket-signature-as-opti.patch
+Patch0013: 0013-downstream-Make-PKINIT-CMS-SHA-1-signature-verificat.patch
+Patch0014: 0014-Enable-PKINIT-if-at-least-one-group-is-available.patch
+Patch0015: 0015-Replace-ssl.wrap_socket-for-tests.patch
+Patch0016: 0016-Fix-unimportant-memory-leaks.patch
 
 # Vine patch(es)
 
@@ -334,6 +312,12 @@ PORT=`expr 7777 + $LONG_BIT - 48`
 sed -i -e s,7777,`expr "$PORT" + 0`,g $cfg
 sed -i -e s,7778,`expr "$PORT" + 1`,g $cfg
 
+# Fix kadmind port hard-coded in tests
+PORT=`expr 61000 + $LONG_BIT - 48`
+sed -i -e \
+    "s,params.kadmind_port = 61001;,params.kadmind_port = $((PORT + 1));," \
+    src/lib/kadm5/t_kadm5.c
+
 
 %build
 source %{_libdir}/tclConfig.sh
@@ -925,6 +909,9 @@ exit 0
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.21.2-1
+- new upstream release.
+
 * Mon Nov 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19.2-4
 - new upstream release.
 - re-imported all patches from rawhide.

+ 5 - 2
lib/libt/libtdb/libtdb-vl.spec

@@ -5,7 +5,7 @@
 Summary: The tdb library
 Summary(ja): TDB ライブラリ
 Name: libtdb
-Version: 1.4.9
+Version: 1.4.10
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -78,7 +78,7 @@ Python3 bindings for libtdb
 %package -n compat32-libtdb
 Summary: The TDB library
 Summary(ja): TDB ライブラリ
-Group: system
+Group: system,legacy
 Requires: libtdb = %{version}-%{release}
 
 %description -n compat32-libtdb
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.10-1
+- new upstream release.
+
 * Wed Oct 11 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.9-1
 - new upstream release.
 

+ 8 - 2
lib/libx/libxml2/libxml2-vl.spec

@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Name: libxml2
-Version: 2.11.5
+Version: 2.13.1
 Release: 1%{_dist_release}
 Group: system
 Vendor: Project Vine
@@ -22,7 +22,7 @@ BuildRequires: python-rpm-macros
 BuildRequires: python python-devel python2-rpm-macros
 BuildRequires: python3 python3-devel python3-rpm-macros
 BuildRequires: libxcrypt-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 BuildRequires: pkgconfig
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
@@ -323,6 +323,12 @@ chmod -x doc/*.py
 
 
 %changelog
+* Wed Jun 26 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.13.1-1
+- updated to 2.13.1.
+
+* Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.13.0-1
+- updated to 2.13.0.
+
 * Fri Sep 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.11.5-1
 - updated to 2.11.5.
 - updated Patch1.

+ 15 - 9
lib/libx/libxslt/libxslt-vl.spec

@@ -6,7 +6,7 @@
 Summary: Library providing the Gnome XSLT engine
 Summary(ja): XSLT エンジンライブラリ
 Name: libxslt
-Version: 1.1.38
+Version: 1.1.41
 Release: 1%{_dist_release}
 Group: system
 Vendor: Project Vine
@@ -19,14 +19,14 @@ Source: https://gitlab.gnome.org/GNOME/%{name}/-/archive/v%{version}/%{name}-v%{
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtirpc-devel
 BuildRequires: libxcrypt-devel
-BuildRequires: libxml2-devel >= 2.9.9
-BuildRequires: zlib-devel >= 1.1.4
+BuildRequires: libxml2-devel >= 2.13.1
+BuildRequires: pkgconfig(zlib)
 BuildRequires: perl
 BuildRequires: python python-devel python-rpm-macros libxml2-python
 %if %{with python3}
 BuildRequires: python3 python3-devel python3-rpm-macros python3-libxml2
 %endif
-Requires: libxml2 >= 2.9.9
+Requires: libxml2 >= 2.13.1
 
 %description
 This C library allows to transform XML files into other XML files
@@ -192,7 +192,7 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 %files
 %defattr(-, root, root)
 %license Copyright
-%doc AUTHORS NEWS README TODO FEATURES
+%doc AUTHORS NEWS README.md TODO FEATURES
 %doc doc/*.html doc/tutorial doc/EXSLT
 %{_bindir}/xsltproc
 %{_libdir}/lib*.so.*
@@ -201,7 +201,7 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 %files devel
 %defattr(-, root, root)
 %license Copyright
-%doc AUTHORS NEWS README TODO FEATURES
+%doc AUTHORS NEWS README.md TODO FEATURES
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/*.sh
@@ -210,7 +210,7 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 %dir %{_libdir}/cmake
 %{_libdir}/cmake/libxslt
 %{_bindir}/xslt-config
-%{_datadir}/aclocal/*.m4
+#{_datadir}/aclocal/*.m4
 %{_mandir}/man3/*
 %exclude %{_datadir}/gtk-doc
 
@@ -221,7 +221,7 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 %files python
 %defattr(-, root, root)
 %license Copyright
-%doc AUTHORS NEWS README FEATURES
+%doc AUTHORS NEWS README.md FEATURES
 %doc python/tests/*.py
 %doc python/tests/*.xml
 %doc python/tests/*.xsl
@@ -232,7 +232,7 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 %files -n python3-%{name}
 %defattr(-, root, root)
 %license Copyright
-%doc AUTHORS NEWS README FEATURES
+%doc AUTHORS NEWS README.md FEATURES
 %doc python/TODO
 %doc python/tests/*.py
 %doc python/tests/*.xml
@@ -257,6 +257,12 @@ rm -f %{buildroot}%{python_sitelib}/libxslt.py{c,o}
 
 
 %changelog
+* Wed Jun 26 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.41-1
+- updated to 1.1.41.
+
+* Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.40-1
+- updated to 1.1.40.
+
 * Fri Sep 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.38-1
 - updated to 1.1.38.
 

+ 12 - 6
o/openldap/openldap-vl.spec

@@ -8,7 +8,7 @@
 Summary: The configuration files, libraries and documentation for OpenLDAP.
 Summary(ja): OpenLDAP の設定ファイル,ライブラリ,ドキュメント.
 Name: openldap
-Version: 2.6.4
+Version: 2.6.8
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -173,7 +173,7 @@ OpenLDAPはオープンソースなLDAP (Lightweight Directory Access Protocol)
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: libraries for OpenLDAP.
-Group: system
+Group: system,legacy
 
 %description -n compat32-%{name}
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -199,7 +199,7 @@ libraries and documentation for OpenLDAP.
 
 %package -n compat32-%{name}-devel
 Summary: OpenLDAP development libraries and header files.
-Group: programming
+Group: programming,legacy
 
 %description -n compat32-%{name}-devel
 The openldap-devel package includes the development libraries and
@@ -253,10 +253,12 @@ pushd openldap-ppolicy-check-password-%{check_password_version}
 popd
 
 
+%global optflags %(echo %{optflags} | sed -e 's/-Werror=format-security/-Wformat -Wformat-security -Werror=format-security/')
+
 %build
 # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
-export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
-export LDFLAGS="-fPIE"
+export CFLAGS="%{optflags} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
+export LDFLAGS="%{__global_ldflags} -fPIE"
 
 pushd openldap-%{version}
 %configure \
@@ -302,7 +304,7 @@ pushd openldap-%{version}
 	\
 	--libexecdir=%{_libdir}
 
-make %{_smp_mflags}
+%make_build
 popd
 
 pushd openldap-ppolicy-check-password-%{check_password_version}
@@ -537,6 +539,7 @@ fi
 %{_libdir}/openldap/home*
 %{_libdir}/openldap/lloadd*
 %{_libdir}/openldap/memberof*
+%{_libdir}/openldap/nestgroup*
 %{_libdir}/openldap/otp*
 %{_libdir}/openldap/pcache*
 %{_libdir}/openldap/ppolicy*
@@ -604,6 +607,9 @@ fi
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.8-1
+- new upstream release.
+
 * Wed Jun 07 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.4-1
 - new upstream release.
 

+ 7 - 11
p/popt/popt-vl.spec

@@ -3,9 +3,9 @@
 Summary:	C library for parsing command line parameters
 Summary(ja):    コマンドラインパラメータを文法解析するためのCライブラリ
 Name:		popt
-Version:	1.18
+Version:	1.19
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -62,7 +62,7 @@ The %{name}-static package contains the static library for %{name}.
 %package -n compat32-%{name}
 Summary: A C library for parsing command line parameters.
 Summary(ja): コマンドラインパラメータを文法解析するためのCライブラリ
-Group: system
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -89,7 +89,7 @@ Poptは、コマンドライン引数を設定ファイルによってエイリ
 %package -n compat32-%{name}-devel
 Summary:	Development files for the popt library
 Summary(ja):	popt ライブラリの開発ファイル
-Group:		programming
+Group:		programming,legacy
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -144,13 +144,6 @@ make check
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %license COPYING
@@ -182,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19-1
+- new upstream release.
+
 * Fri Feb 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18-1
 - new upstream release.
 - dropped all patches.

+ 16 - 4
r/rsync/rsync-vl.spec

@@ -5,7 +5,7 @@
 Summary:     A program for synchronizing files over a network.
 Summary(ja): ネットワーク越しにファイルを同期させるプログラム
 Name: rsync
-Version: 3.2.7%{?prerelease:~%{prerelease}}
+Version: 3.3.0%{?prerelease:~%{prerelease}}
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: network
 Vendor: Project Vine
@@ -30,7 +30,7 @@ Patch1: rsync-3.2.2-runtests.patch
 # none
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libacl-devel libattr-devel popt-devel
+BuildRequires: libacl-devel libattr-devel popt-devel xxhash-devel
 BuildRequires: lz4-devel openssl-devel libzstd-devel
 BuildRequires: acl attr
 
@@ -78,6 +78,9 @@ package provides the anonymous rsync service.
 %setup -q -n rsync-%{version}%{?prerelease:%{prerelease}}
 %setup -q -b 1 -n rsync-%{version}%{?prerelease:%{prerelease}}
 
+patch -p1 -i patches/detect-renamed.diff
+patch -p1 -i patches/detect-renamed-lax.diff
+
 %patch1 -p1 -b .runtests
 
 # security fixes
@@ -85,8 +88,14 @@ package provides the anonymous rsync service.
 
 
 %build
-%configure --disable-xxhash
-make %{?_smp_mflags}
+%configure \
+  --enable-openssl \
+  --enable-xxhash \
+  --enable-zstd \
+  --enable-lz4 \
+  --enable-ipv6
+
+%make_build
 
 
 %install
@@ -150,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.0-1
+- updated to 3.3.0.
+
 * Sun Oct 08 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.7-1
 - updated to 3.2.7.
 

+ 383 - 385
s/samba/samba-vl.spec

@@ -3,14 +3,14 @@
 %bcond_with tracker
 %bcond_without pidl
 
-%define samba_version 4.19.2
+%define samba_version 4.20.2
 #define rc_number rc4
 %define samba_release 1
 
 %define doc_version 4.18.0
 %define api_version 4.0
 %define libwbc_soname 0
-%define libwbc_sover 0.15
+%define libwbc_sover 0.16
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_libsmbclient 1
@@ -58,13 +58,13 @@ Source2: https://ja.osdn.net/dl/samba-jp/samba-ja-docs-%{doc_version}.tar.gz
 Source5: pam_winbind.conf
 Source6: samba.pamd
 
-Source100:     nmb.init
-Source101:     smb.init
-Source102:     winbind.init
-Source103:     smb.conf
-Source104:     samba.sysconfig
-Source200:     samba4.init
-Source201:     named.conf.dlz
+Source100: nmb.init
+Source101: smb.init
+Source102: winbind.init
+Source103: smb.conf
+Source104: samba.sysconfig
+Source200: samba4.init
+Source201: named.conf.dlz
 
 Source999: perl-requires.sh
 
@@ -125,6 +125,7 @@ BuildRequires: libcap-devel
 BuildRequires: libicu-devel
 #BuildRequires: libldb-devel >= 1.1.25
 BuildRequires: libpcap-devel
+BuildRequires: libtasn1-devel
 BuildRequires: libtdb-devel
 #BuildRequires: libtevent-devel
 BuildRequires: libtirpc-devel
@@ -156,7 +157,8 @@ BuildRequires: sqlite-devel
 %if %{with tracker}
 BuildRequires: tracker-devel
 %endif
-BuildRequires: zlib-devel
+BuildRequires: xz
+BuildRequires: pkgconfig(zlib)
 
 #BuildRequires: libuuid-devel
 
@@ -174,6 +176,24 @@ for Linux and Unix.
 %description -l ja
 SambaはLinux・UNIX用の、Windowsとの標準的な相互運用性ソフトウェア群です。
 
+## --------------------------------------------------------------------
+%package client-libs
+Summary: Samba client libraries
+Summary(ja): Samba クライアントライブラリ
+Group: system
+Requires: samba-common = %{samba_version}-%{release}
+Requires: samba-common-libs = %{samba_version}-%{release}
+Requires: libwbclient = %{samba_version}-%{release}
+Requires: krb5-libs
+
+%description client-libs
+The samba-client-libs package contains internal libraries needed by the
+SMB/CIFS clients.
+
+%description client-libs -l ja
+samba-client-libs パッケージは SMB/CIFS クライアントに必要とされる内部ライブラリを
+含有しています。
+
 ## --------------------------------------------------------------------
 %package client
 Summary: Samba client programs
@@ -199,6 +219,7 @@ samba-client は Linux カーネルがサポートしている SMB ファイル
 Summary: Samba libraries
 Summary(ja): Samba ライブラリ
 Group: system
+Requires: samba-common-libs = %{samba_version}-%{release}
 %if %with_libwbclient
 Requires: libwbclient
 %endif
@@ -271,6 +292,17 @@ packages of Samba.
 samba-common は Samba のサーバーとクライアントの両方のパッケージで
 使用される共通のファイルを提供します。
 
+## --------------------------------------------------------------------
+%package common-libs
+Summary: Libraries used by both Samba servers and clients
+Group: system
+Requires(pre): samba-common = %{samba_version}-%{release}
+Requires: samba-common = %{samba_version}-%{release}
+
+%description common-libs
+The samba-common-libs package contains internal libraries needed by the
+SMB/CIFS servers and clients.
+
 ## --------------------------------------------------------------------
 %package test
 Summary: Testing tools for Samba servers and clients
@@ -411,7 +443,8 @@ The %{name}-dc package provides AD Domain Controller functionality
 Summary: Samba AD Domain Controller Libraries 
 Summary(ja): Samba AD ドメインコントローラ ライブラリ
 Group: system
-Requires: %{name}-libs = %{samba_version}
+Requires: %{name}-libs = %{samba_version}-%{release}
+Requires: samba-common-libs = %{samba_version}-%{release}
 
 %description dc-libs
 The samba-dc-libs package contains the libraries needed by the DC to
@@ -523,6 +556,8 @@ export PYTHON=%{__python3}
   --with-shared-modules=%{_samba4_modules} \
   --with-pam \
   --without-fam \
+  --with-pie \
+  --with-relro \
   --disable-rpath-install \
   --with-cachedir=/var/lib/samba \
   --with-configdir=%{_sysconfdir}/samba \
@@ -609,6 +644,10 @@ install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig
 install -d -m 0755 %{buildroot}%{_tmpfilesdir}
 # Create /run/samba.
 echo "d /run/samba  755 root root" > %{buildroot}%{_tmpfilesdir}/samba.conf
+# NetworkManager online/offline script
+install -d -m 0755 %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/
+install -m 0755 packaging/NetworkManager/30-winbind-systemd \
+            %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/30-winbind
 %else
 # initscripts
 install -m755 %{SOURCE100} %{buildroot}%{_initrddir}/nmb
@@ -679,10 +718,6 @@ rm -f %{buildroot}%{_mandir}/ja/man1/winexe.1*
 %endif
 
 
-## ====================================================================
-%clean
-rm -rf %{buildroot}
-
 ## ====================================================================
 %pre
 if [ "$1" -eq "2" ]; then
@@ -709,6 +744,7 @@ fi
 %if %{with systemd}
 %systemd_post smb.service
 %systemd_post nmb.service
+%systemd_post samba-bgqd.service
 %else
 if [ $1 -eq 1 ]; then   # Install
   # chkconfig
@@ -723,6 +759,7 @@ exit 0
 %if %{with systemd}
 %systemd_preun smb.service
 %systemd_preun nmb.service
+%systemd_preun samba-bgqd.service
 %else
 if [ $1 = 0 -o -x /bin/systemctl ] ; then
   /sbin/service smb stop >/dev/null 2>&1 || :
@@ -741,6 +778,7 @@ exit 0
 %if %{with systemd}
 %systemd_postun_with_restart smb.service
 %systemd_postun_with_restart nmb.service
+%systemd_postun_with_restart samba-bgqd.service
 %else
 if [ $1 -ge 0 ]; then   # Upgrade
   /sbin/service smb condrestart >/dev/null 2>&1 || :
@@ -931,51 +969,39 @@ fi
 %if %{with ja_docs}
 %doc docs-ja/docs-xml/output/htmldocs
 %endif
-%{_bindir}/dumpmscat
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbrename
-%{_bindir}/ldbsearch
-%{_bindir}/mvxattr
+
 %{_bindir}/smbstatus
 %{_sbindir}/eventlogadm
 %{_sbindir}/nmbd
 %{_sbindir}/smbd
-%{_libdir}/samba/auth
-%{_libdir}/samba/rpcd_*
+%dir %{_libdir}/samba/auth
+%{_libdir}/samba/auth/unix.so
+%dir %{_libdir}/samba/vfs
+%{_libdir}/samba/vfs/*
 %{_libdir}/samba/samba-bgqd
 %{_libdir}/samba/samba-dcerpcd
-%{_libdir}/samba/vfs
+%{_libdir}/samba/rpcd_*
+%exclude %{_libdir}/samba/vfs/posix_eadb.so
 %config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %config(noreplace) %{_sysconfdir}/pam.d/samba
-%{_sysconfdir}/openldap/schema/samba.schema
+%dir %{_sysconfdir}/openldap/schema
+%config %{_sysconfdir}/openldap/schema/samba.schema
 %attr(0700,root,root) %dir /var/log/samba
 %attr(0700,root,root) %dir /var/log/samba/old
 %attr(1777,root,root) %dir /var/spool/samba
 %if %{with systemd}
 %{_unitdir}/smb.service
 %{_unitdir}/nmb.service
+%{_unitdir}/samba-bgqd.service
 %else
 %{_initrddir}/nmb
 %{_initrddir}/smb
 %endif
 %if %{with tracker}
-%{_datadir}/samba/mdssvc
+%dir %{_datadir}/samba/mdssvc
+%{_datadir}/samba/mdssvc/*
 %endif
 
-%{_mandir}/man1/ldbadd.1*
-%{_mandir}/man1/ldbdel.1*
-%{_mandir}/man1/ldbedit.1*
-%{_mandir}/man1/ldbmodify.1*
-%{_mandir}/man1/ldbrename.1*
-%{_mandir}/man1/ldbsearch.1*
-%{_mandir}/man3/ldb.3*
-
-%{_mandir}/man3/talloc.3.gz
-
-%{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man7/samba.7*
 %{_mandir}/man8/eventlogadm.8*
@@ -989,10 +1015,8 @@ fi
 %{_mandir}/man8/vfs_aio_pthread.8*
 %{_mandir}/man8/vfs_audit.8*
 %{_mandir}/man8/vfs_btrfs.8*
-#%{_mandir}/man8/vfs_cacheprime.8*
 %{_mandir}/man8/vfs_cap.8*
 %{_mandir}/man8/vfs_catia.8*
-#%{_mandir}/man8/vfs_ceph.8*
 %{_mandir}/man8/vfs_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_default_quota.8*
@@ -1007,9 +1031,7 @@ fi
 %{_mandir}/man8/vfs_gpfs.8*
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
-#%{_mandir}/man8/vfs_nfs4acl_xattr.8*
 %{_mandir}/man8/vfs_offline.8*
-#%{_mandir}/man8/vfs_prealloc.8*
 %{_mandir}/man8/vfs_preopen.8*
 %{_mandir}/man8/vfs_readahead.8*
 %{_mandir}/man8/vfs_readonly.8*
@@ -1022,7 +1044,6 @@ fi
 %{_mandir}/man8/vfs_streams_xattr.8*
 %{_mandir}/man8/vfs_syncops.8*
 %{_mandir}/man8/vfs_time_audit.8*
-#%{_mandir}/man8/vfs_tsmsm.8*
 %{_mandir}/man8/vfs_unityed_media.8*
 %{_mandir}/man8/vfs_virusfilter.8*
 %{_mandir}/man8/vfs_worm.8*
@@ -1091,163 +1112,24 @@ fi
 ## --------------------------------------------------------------------
 %files libs
 %defattr(-,root,root)
-%{_libdir}/libdcerpc-binding.so.*
+%{_libdir}/libdcerpc-samr.so.*
 %{_libdir}/libdcerpc-server-core.so.*
-%{_libdir}/libdcerpc.so.*
-%{_libdir}/libndr-krb5pac.so.*
-%{_libdir}/libndr-nbt.so.*
-%{_libdir}/libndr-standard.so.*
-%{_libdir}/libndr.so.*
 %{_libdir}/libnetapi.so.*
-%{_libdir}/libsamba-credentials.so.*
-%{_libdir}/libsamba-errors.so*
-%{_libdir}/libsamba-hostconfig.so.*
-%{_libdir}/libsamba-passdb.so.*
-%{_libdir}/libsamba-util.so.*
-%{_libdir}/libsamdb.so.*
-%{_libdir}/libsmbconf.so.*
 %{_libdir}/libsmbldap.so.*
 
-# talloc
-#%{_libdir}/samba/libtalloc.so*
-%{_libdir}/samba/libpytalloc-util.*.so
-%{_libdir}/samba/libtalloc-samba4.so
-
-# tevent
-#%{_libdir}/samba/libtevent.so*
-%{_libdir}/libtevent-util.so.*
-%{_libdir}/samba/libtevent-samba4.so
-
-# ldb
-#%{_libdir}/samba/libldb.so*
-%{_libdir}/samba/libldb-*.so*
-%{_libdir}/samba/libpyldb-util.*.so
-
-# libraries needed by the public libraries
 %dir %{_libdir}/samba
-%{_libdir}/samba/libCHARSET3-samba4.so
-%{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
-%{_libdir}/samba/libMESSAGING-samba4.so
-%{_libdir}/samba/libMESSAGING-SEND-samba4.so
-%{_libdir}/samba/libREG-FULL-samba4.so
-%{_libdir}/samba/libRPC-SERVER-LOOP-samba4.so
-%{_libdir}/samba/libRPC-WORKER-samba4.so
-%{_libdir}/samba/libaddns-samba4.so
-%{_libdir}/samba/libads-samba4.so
-%{_libdir}/samba/libasn1-samba4.so
-%{_libdir}/samba/libasn1util-samba4.so
-%{_libdir}/samba/libauth-samba4.so
-%{_libdir}/samba/libauth-unix-token-samba4.so
-%{_libdir}/samba/libauth4-samba4.so
-%{_libdir}/samba/libauthkrb5-samba4.so
-%{_libdir}/samba/libcli-cldap-samba4.so
-%{_libdir}/samba/libcli-ldap-common-samba4.so
-%{_libdir}/samba/libcli-ldap-samba4.so
-%{_libdir}/samba/libcli-nbt-samba4.so
-%{_libdir}/samba/libcli-smb-common-samba4.so
-%{_libdir}/samba/libcli-spoolss-samba4.so
-%{_libdir}/samba/libcliauth-samba4.so
-%{_libdir}/samba/libclidns-samba4.so
-%{_libdir}/samba/libcluster-samba4.so
-%{_libdir}/samba/libcmdline-contexts-samba4.so
-%{_libdir}/samba/libcmdline-samba4.so
-%{_libdir}/samba/libcmocka-samba4.so
-%{_libdir}/samba/libcom-err-samba4.so*
-%{_libdir}/samba/libcommon-auth-samba4.so
-%{_libdir}/samba/libdb-glue-samba4.so
-%{_libdir}/samba/libdbwrap-samba4.so
-%{_libdir}/samba/libdcerpc-pkt-auth-samba4.so
-%{_libdir}/samba/libdcerpc-samba-samba4.so
-%{_libdir}/samba/libdcerpc-samba4.so
-%{_libdir}/samba/libdfs-server-ad-samba4.so
-%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
-%{_libdir}/samba/libdsdb-module-samba4.so
-%{_libdir}/samba/libevents-samba4.so
-%{_libdir}/samba/libflag-mapping-samba4.so
-%{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpext-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
-%{_libdir}/samba/libgse-samba4.so
-%{_libdir}/samba/libgss-preauth-samba4.so
-%{_libdir}/samba/libgssapi-samba4.so
-%{_libdir}/samba/libhcrypto-samba4.so
-%{_libdir}/samba/libhdb-samba4.so
-%{_libdir}/samba/libheimbase-samba4.so
-%{_libdir}/samba/libhttp-samba4.so
-%{_libdir}/samba/libhx509-samba4.so
-%{_libdir}/samba/libinterfaces-samba4.so
-%{_libdir}/samba/libiov-buf-samba4.so
-%{_libdir}/samba/libkrb5-samba4.so
-%{_libdir}/samba/libkrb5samba-samba4.so
-%{_libdir}/samba/libldbsamba-samba4.so
-%{_libdir}/samba/liblibcli-lsa3-samba4.so
-%{_libdir}/samba/liblibcli-netlogon3-samba4.so
-%{_libdir}/samba/liblibsmb-samba4.so
-%{_libdir}/samba/libmessages-dgm-samba4.so
-%{_libdir}/samba/libmessages-util-samba4.so
-%{_libdir}/samba/libmscat-samba4.so
-%{_libdir}/samba/libmsghdr-samba4.so
-%{_libdir}/samba/libmsrpc3-samba4.so
-%{_libdir}/samba/libndr-samba-samba4.so
-%{_libdir}/samba/libndr-samba4.so
-%{_libdir}/samba/libnet-keytab-samba4.so
-%{_libdir}/samba/libnetif-samba4.so
-%{_libdir}/samba/libnpa-tstream-samba4.so
-%{_libdir}/samba/libnss-info-samba4.so
-%{_libdir}/samba/libpac-samba4.so
-%{_libdir}/samba/libposix-eadb-samba4.so
-%{_libdir}/samba/libprinter-driver-samba4.so
-%{_libdir}/samba/libprinting-migrate-samba4.so
-%{_libdir}/samba/libprocess-model-samba4.so
-%{_libdir}/samba/libregistry-samba4.so
-%{_libdir}/samba/libreplace-samba4.so
-%{_libdir}/samba/libroken-samba4.so
-%{_libdir}/samba/libsamba-cluster-support-samba4.so
-%{_libdir}/samba/libsamba-debug-samba4.so
-%{_libdir}/samba/libsamba-modules-samba4.so
-%{_libdir}/samba/libsamba-security-samba4.so
-%{_libdir}/samba/libsamba-sockets-samba4.so
-%{_libdir}/samba/libsamba3-util-samba4.so
-%{_libdir}/samba/libsamdb-common-samba4.so
-%{_libdir}/samba/libsecrets3-samba4.so
-%{_libdir}/samba/libserver-role-samba4.so
-%{_libdir}/samba/libservice-samba4.so
-%{_libdir}/samba/libshares-samba4.so
-%{_libdir}/samba/libsmb-transport-samba4.so
-%{_libdir}/samba/libsmbclient-raw-samba4.so
-%{_libdir}/samba/libsmbd-base-samba4.so
-#{_libdir}/samba/libsmbd-conn-samba4.so
-%{_libdir}/samba/libsmbd-shim-samba4.so
-%{_libdir}/samba/libsmbldaphelper-samba4.so
-%{_libdir}/samba/libsmbpasswdparser-samba4.so
-%{_libdir}/samba/libsocket-blocking-samba4.so
-%{_libdir}/samba/libstable-sort-samba4.so
-%{_libdir}/samba/libsys-rw-samba4.so
-%{_libdir}/samba/libtalloc-report-printf-samba4.so
-%{_libdir}/samba/libtalloc-report-samba4.so
-%{_libdir}/samba/libtdb-wrap-samba4.so
-%{_libdir}/samba/libtrusts-util-samba4.so
-#{_libdir}/samba/libutil-cmdline-samba4.so
-%{_libdir}/samba/libutil-reg-samba4.so
-%{_libdir}/samba/libutil-setid-samba4.so
-%{_libdir}/samba/libutil-tdb-samba4.so
-%{_libdir}/samba/libwind-samba4.so
-%{_libdir}/samba/libxattr-tdb-samba4.so
-
-%if ! %with_libsmbclient
-%{_libdir}/libsmbclient.so.*
-%{_libdir}/libsmbsharemodes.so.*
-%{_mandir}/man7/libsmbclient.7.gz
-%if %{with ja_docs}
-# ja manual
-%{_mandir}/ja/man7/libsmbclient.7.gz
-%endif
-%endif # ! with_libsmbclient
-
-%if ! %with_libwbclient
-%{_libdir}/libwbclient.so.*
-%{_libdir}/samba/libwinbind-client.so
-%endif # ! with_libwbclient
+%{_libdir}/samba/libMESSAGING-private-samba.so
+%{_libdir}/samba/libREG-FULL-private-samba.so
+%{_libdir}/samba/libRPC-SERVER-LOOP-private-samba.so
+%{_libdir}/samba/libRPC-WORKER-private-samba.so
+%{_libdir}/samba/libads-private-samba.so
+%{_libdir}/samba/libauth-private-samba.so
+%{_libdir}/samba/libdfs-server-ad-private-samba.so
+%{_libdir}/samba/libprinting-migrate-private-samba.so
+%{_libdir}/samba/libshares-private-samba.so
+%{_libdir}/samba/libsmbd-base-private-samba.so
+%{_libdir}/samba/libsmbpasswdparser-private-samba.so
+%{_libdir}/samba/libxattr-tdb-private-samba.so
 
 ## --------------------------------------------------------------------
 %files common
@@ -1260,6 +1142,7 @@ fi
 %{_bindir}/profiles
 %{_bindir}/samba-log-parser
 %{_bindir}/smbcontrol
+%{_bindir}/smbpasswd
 %{_bindir}/testparm
 #%{_datadir}/samba/codepages
 %dir %{_datadir}/samba
@@ -1283,6 +1166,7 @@ fi
 %{_mandir}/man5/smb.conf.5.gz
 %{_mandir}/man8/net.8.gz
 %{_mandir}/man8/pdbedit.8.gz
+%{_mandir}/man8/smbpasswd.8.gz
 %if %{with ja_docs}
 # ja manuals
 %{_mandir}/ja/man1/profiles.1.gz
@@ -1294,48 +1178,174 @@ fi
 %{_mandir}/ja/man8/pdbedit.8.gz
 %endif
 
-# common libraries
-%{_libdir}/samba/libgenrand-samba4.so
-#{_libdir}/samba/libpopt-samba3-cmdline-samba4.so
-#{_libdir}/samba/libpopt-samba3-samba4.so
-%{_libdir}/samba/libserver-id-db-samba4.so
-%{_libdir}/samba/libtime-basic-samba4.so
-%{_libdir}/samba/pdb
+
+## --------------------------------------------------------------------
+%files common-libs
+%{_libdir}/libdcerpc-binding.so.*
+%{_libdir}/libndr-krb5pac.so.*
+%{_libdir}/libndr-nbt.so.*
+%{_libdir}/libndr-standard.so.*
+%{_libdir}/libndr.so.*
+%{_libdir}/libnetapi.so.*
+%{_libdir}/libsamba-credentials.so.*
+%{_libdir}/libsamba-errors.so.*
+%{_libdir}/libsamba-hostconfig.so.*
+%{_libdir}/libsamba-passdb.so.*
+%{_libdir}/libsamba-util.so.*
+%{_libdir}/libsamdb.so.*
+%{_libdir}/libsmbconf.so.*
+%{_libdir}/libtevent-util.so.*
+
+%{_libdir}/samba/libCHARSET3-private-samba.so
+%{_libdir}/samba/libMESSAGING-SEND-private-samba.so
+%{_libdir}/samba/libaddns-private-samba.so
+%{_libdir}/samba/libasn1-private-samba.so
+%{_libdir}/samba/libasn1util-private-samba.so
+%{_libdir}/samba/libauthkrb5-private-samba.so
+%{_libdir}/samba/libcli-cldap-private-samba.so
+%{_libdir}/samba/libcli-ldap-common-private-samba.so
+%{_libdir}/samba/libcli-ldap-private-samba.so
+%{_libdir}/samba/libcli-nbt-private-samba.so
+%{_libdir}/samba/libcli-smb-common-private-samba.so
+%{_libdir}/samba/libcli-spoolss-private-samba.so
+%{_libdir}/samba/libcliauth-private-samba.so
+%{_libdir}/samba/libclidns-private-samba.so
+%{_libdir}/samba/libcluster-private-samba.so
+%{_libdir}/samba/libcmdline-contexts-private-samba.so
+%{_libdir}/samba/libcmdline-private-samba.so
+%{_libdir}/samba/libcom-err-private-samba.so
+%{_libdir}/samba/libcommon-auth-private-samba.so
+%{_libdir}/samba/libdbwrap-private-samba.so
+%{_libdir}/samba/libdcerpc-pkt-auth-private-samba.so
+%{_libdir}/samba/libdcerpc-samba-private-samba.so
+%{_libdir}/samba/libevents-private-samba.so
+%{_libdir}/samba/libflag-mapping-private-samba.so
+%{_libdir}/samba/libgenrand-private-samba.so
+%{_libdir}/samba/libgensec-private-samba.so
+%{_libdir}/samba/libgse-private-samba.so
+%{_libdir}/samba/libgssapi-private-samba.so
+%{_libdir}/samba/libhcrypto-private-samba.so
+%{_libdir}/samba/libheimbase-private-samba.so
+%{_libdir}/samba/libhx509-private-samba.so
+%{_libdir}/samba/libinterfaces-private-samba.so
+%{_libdir}/samba/libiov-buf-private-samba.so
+%{_libdir}/samba/libkrb5-private-samba.so
+%{_libdir}/samba/libkrb5samba-private-samba.so
+#{_libdir}/samba/libldb-private-samba.so
+%{_libdir}/samba/libldbsamba-private-samba.so
+%{_libdir}/samba/liblibcli-lsa3-private-samba.so
+%{_libdir}/samba/liblibcli-netlogon3-private-samba.so
+%{_libdir}/samba/liblibsmb-private-samba.so
+%{_libdir}/samba/libmessages-dgm-private-samba.so
+%{_libdir}/samba/libmessages-util-private-samba.so
+%{_libdir}/samba/libmsghdr-private-samba.so
+%{_libdir}/samba/libmsrpc3-private-samba.so
+%{_libdir}/samba/libndr-samba-private-samba.so
+%{_libdir}/samba/libndr-samba4-private-samba.so
+%{_libdir}/samba/libnetif-private-samba.so
+%{_libdir}/samba/libnpa-tstream-private-samba.so
+%{_libdir}/samba/libreplace-private-samba.so
+%{_libdir}/samba/libroken-private-samba.so
+%{_libdir}/samba/libsamba-cluster-support-private-samba.so
+%{_libdir}/samba/libsamba-debug-private-samba.so
+%{_libdir}/samba/libsamba-modules-private-samba.so
+%{_libdir}/samba/libsamba-security-private-samba.so
+%{_libdir}/samba/libsamba-sockets-private-samba.so
+%{_libdir}/samba/libsamba3-util-private-samba.so
+%{_libdir}/samba/libsamdb-common-private-samba.so
+%{_libdir}/samba/libsecrets3-private-samba.so
+%{_libdir}/samba/libserver-id-db-private-samba.so
+%{_libdir}/samba/libserver-role-private-samba.so
+%{_libdir}/samba/libsmb-transport-private-samba.so
+%{_libdir}/samba/libsmbd-shim-private-samba.so
+%{_libdir}/samba/libsocket-blocking-private-samba.so
+%{_libdir}/samba/libstable-sort-private-samba.so
+%{_libdir}/samba/libsys-rw-private-samba.so
+%{_libdir}/samba/libtalloc-private-samba.so
+%{_libdir}/samba/libtalloc-report-printf-private-samba.so
+%{_libdir}/samba/libtalloc-report-private-samba.so
+%{_libdir}/samba/libtdb-wrap-private-samba.so
+%{_libdir}/samba/libtevent-private-samba.so
+%{_libdir}/samba/libtime-basic-private-samba.so
+%{_libdir}/samba/libtrusts-util-private-samba.so
+%{_libdir}/samba/libutil-reg-private-samba.so
+%{_libdir}/samba/libutil-setid-private-samba.so
+%{_libdir}/samba/libutil-tdb-private-samba.so
+%{_libdir}/samba/libwind-private-samba.so
+
+%{_libdir}/samba/libldb-*.so
+%dir %{_libdir}/samba/ldb
+%{_libdir}/samba/ldb/asq.so
+%{_libdir}/samba/ldb/ldb.so
+%{_libdir}/samba/ldb/paged_searches.so
+%{_libdir}/samba/ldb/rdn_name.so
+%{_libdir}/samba/ldb/sample.so
+%{_libdir}/samba/ldb/server_sort.so
+%{_libdir}/samba/ldb/skel.so
+%{_libdir}/samba/ldb/tdb.so
+
+%dir %{_libdir}/samba/pdb
+%{_libdir}/samba/pdb/*
 
 ## --------------------------------------------------------------------
 %files dc-libs
-%defattr(-,root,root)
-# dc
-%{_libdir}/libdcerpc-samr.so.*
 %{_libdir}/libdcerpc-server.so.*
-%{_libdir}/libsamba-policy.*.so.*
-%{_libdir}/samba/libad-claims-samba4.so
-%{_libdir}/samba/libauthn-policy-util-samba4.so
-%{_libdir}/samba/libHDB-SAMBA4-samba4.so
-%{_libdir}/samba/libdnsserver-common-samba4.so
-%{_libdir}/samba/libscavenge-dns-records-samba4.so
+%dir %{_libdir}/samba
+%{_libdir}/samba/libHDB-SAMBA4-private-samba.so
+%{_libdir}/samba/libLIBWBCLIENT-OLD-private-samba.so
+%{_libdir}/samba/libad-claims-private-samba.so
+%{_libdir}/samba/libauth-unix-token-private-samba.so
+%{_libdir}/samba/libauth4-private-samba.so
+%{_libdir}/samba/libauthn-policy-util-private-samba.so
+%{_libdir}/samba/libdb-glue-private-samba.so
+%{_libdir}/samba/libdcerpc-samba4-private-samba.so
+%{_libdir}/samba/libdnsserver-common-private-samba.so
+%{_libdir}/samba/libdsdb-module-private-samba.so
+%{_libdir}/samba/libdsdb-garbage-collect-tombstones-private-samba.so
+%{_libdir}/samba/libgss-preauth-private-samba.so
+%{_libdir}/samba/libhdb-private-samba.so
+%{_libdir}/samba/libheimntlm-private-samba.so
+%{_libdir}/samba/libkdc-private-samba.so
+%{_libdir}/samba/libnet-keytab-private-samba.so
+%{_libdir}/samba/libpac-private-samba.so
+%{_libdir}/samba/libprocess-model-private-samba.so
+%{_libdir}/samba/libscavenge-dns-records-private-samba.so
+%{_libdir}/samba/libservice-private-samba.so
+
+%dir %{_libdir}/samba/process_model
+%{_libdir}/samba/process_model/*
+%dir %{_libdir}/samba/service
+%{_libdir}/samba/service/*
 
 ## --------------------------------------------------------------------
 %files dc
-%defattr(-,root,root)
 %{_bindir}/samba-tool
 %{_sbindir}/samba
-%{_sbindir}/samba_kcc
 %{_sbindir}/samba_dnsupdate
 %{_sbindir}/samba_downgrade_db
 %{_sbindir}/samba-gpupdate
+%{_sbindir}/samba_kcc
 %{_sbindir}/samba_spnupdate
 %{_sbindir}/samba_upgradedns
+
+%dir %{_libdir}/samba
+%{_libdir}/samba/libposix-eadb-private-samba.so
 %{_libdir}/samba/auth/samba4.so
+%{_libdir}/samba/vfs/posix_eadb.so
 %{_libdir}/samba/bind9
-%{_libdir}/samba/gensec
-%{_libdir}/samba/libheimntlm-samba4.so
-%{_libdir}/samba/libkdc-samba4.so
-%{_libdir}/samba/libpac-samba4.so
+%dir %{_libdir}/samba/gensec/
+%{_libdir}/samba/gensec/*
 %dir %{_libdir}/samba/ldb
 %{_libdir}/samba/ldb/*
-%{_libdir}/samba/process_model
-%{_libdir}/samba/service
+%exclude %{_libdir}/samba/ldb/asq.so
+%exclude %{_libdir}/samba/ldb/ldb.so
+%exclude %{_libdir}/samba/ldb/paged_searches.so
+%exclude %{_libdir}/samba/ldb/rdn_name.so
+%exclude %{_libdir}/samba/ldb/sample.so
+%exclude %{_libdir}/samba/ldb/server_sort.so
+%exclude %{_libdir}/samba/ldb/skel.so
+%exclude %{_libdir}/samba/ldb/tdb.so
+
 %dir /var/lib/samba/sysvol
 %{_datadir}/samba/admx
 %{_datadir}/samba/setup
@@ -1358,19 +1368,20 @@ fi
 ## --------------------------------------------------------------------
 %files winbind
 %defattr(-,root,root)
-#%{_bindir}/wbinfo3
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-%{_libdir}/samba/libnss-info-samba4.so
-%{_libdir}/samba/libidmap-samba4.so
+%{_libdir}/samba/libnss-info-private-samba.so
+%{_libdir}/samba/libidmap-private-samba.so
 %{_sbindir}/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
 %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
 %{_mandir}/man5/pam_winbind.conf.5*
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/idmap_*.8*
-#%{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 %if %{with systemd}
+%dir %{_prefix}/lib/NetworkManager
+%dir %{_prefix}/lib/NetworkManager/dispatcher.d
+%{_prefix}/lib/NetworkManager/dispatcher.d/*
 %{_unitdir}/winbind.service
 %else
 %{_initrddir}/winbind
@@ -1386,8 +1397,9 @@ fi
 %files winbind-krb5-locator
 %defattr(-,root,root)
 %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
-%{_libdir}/samba/krb5/winbind_krb5_locator.so
+%dir %{_libdir}/samba/krb5
 %{_libdir}/samba/krb5/async_dns_krb5_locator.so
+%{_libdir}/samba/krb5/winbind_krb5_locator.so
 %{_mandir}/man8/winbind_krb5_locator.8*
 %if %{with ja_docs}
 # ja manual
@@ -1398,12 +1410,10 @@ fi
 %files winbind-clients
 %defattr(-,root,root)
 %{_bindir}/ntlm_auth
-#%{_bindir}/ntlm_auth3
 %{_bindir}/wbinfo
+#{_libdir}/samba/krb5/winbind_krb5_localauth.so
 %{_libdir}/libnss_winbind.so*
 %{_libdir}/libnss_wins.so*
-#/%{smb_lib}/libnss_winbind.so.2
-#/%{smb_lib}/libnss_wins.so.2
 /%{_lib}/security/pam_winbind.so
 %{_mandir}/man1/ntlm_auth.1.gz
 %{_mandir}/man1/wbinfo.1.gz
@@ -1415,13 +1425,29 @@ fi
 %{_mandir}/ja/man8/pam_winbind.8.gz
 %endif
 
+## --------------------------------------------------------------------
+%files client-libs
+%{_libdir}/libdcerpc.so.*
+%dir %{_libdir}/samba
+%{_libdir}/samba/libgpext-private-samba.so
+%{_libdir}/samba/libgpo-private-samba.so
+%{_libdir}/samba/libhttp-private-samba.so
+%{_libdir}/samba/libldb-cmdline-private-samba.so
+%{_libdir}/samba/libmscat-private-samba.so
+%{_libdir}/samba/libprinter-driver-private-samba.so
+%{_libdir}/samba/libregistry-private-samba.so
+%{_libdir}/samba/libsmbclient-raw-private-samba.so
+%{_libdir}/samba/libsmbldaphelper-private-samba.so
+%{_libdir}/samba/libtorture-private-samba.so
+
 ## --------------------------------------------------------------------
 %files client
 %defattr(-,root,root)
 %{_bindir}/cifsdd
 %{_bindir}/dbwrap_tool
-#{_bindir}/findsmb
+%{_bindir}/dumpmscat
 %{_bindir}/mdsearch
+%{_bindir}/mvxattr
 %{_bindir}/nmblookup
 %{_bindir}/oLschema2ldif
 %{_bindir}/regdiff
@@ -1434,24 +1460,18 @@ fi
 %{_bindir}/smbcacls
 %{_bindir}/smbclient
 %{_bindir}/smbcquotas
-#%{_bindir}/smbfilter
 %{_bindir}/smbget
-#%{_bindir}/findsmg
-#%{_bindir}/smbtar
-#%{_bindir}/smbiconv
-%{_bindir}/smbpasswd
 %{_bindir}/smbprint
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/smbtree
-#%{_bindir}/split_tokens
-#%exclude %{_libdir}/samba/libldb-cmdline.so
+%{_bindir}/wspsearch
 %{_libexecdir}/samba/smbspool_krb5_wrapper
 %{_mandir}/man1/dbwrap_tool.1.gz
-#{_mandir}/man1/findsmb.1.gz
+%{_mandir}/man1/nmblookup.1.gz
 %{_mandir}/man1/log2pcap.1.gz
 %{_mandir}/man1/mdsearch.1.gz
-%{_mandir}/man1/nmblookup.1.gz
+%{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/oLschema2ldif.1.gz
 %{_mandir}/man1/regdiff.1.gz
 %{_mandir}/man1/regpatch.1.gz
@@ -1465,18 +1485,17 @@ fi
 %{_mandir}/man1/smbget.1.gz
 %{_mandir}/man1/smbtar.1.gz
 %{_mandir}/man1/smbtree.1.gz
+%{_mandir}/man1/wspsearch.1*
 %{_mandir}/man5/smbpasswd.5.gz
 %{_mandir}/man7/traffic_learner.7.gz
 %{_mandir}/man7/traffic_replay.7.gz
 %{_mandir}/man8/cifsdd.8.gz
 %{_mandir}/man8/samba-regedit.8.gz
-%{_mandir}/man8/smbpasswd.8.gz
 %{_mandir}/man8/smbspool.8.gz
 %{_mandir}/man8/smbspool_krb5_wrapper.8.gz
 %if %{with ja_docs}
 #ja manuals
 %{_mandir}/ja/man1/dbwrap_tool.1.gz
-#{_mandir}/ja/man1/findsmb.1.gz
 %{_mandir}/ja/man1/log2pcap.1.gz
 %{_mandir}/ja/man1/mdsearch.1.gz
 %{_mandir}/ja/man1/nmblookup.1.gz
@@ -1498,24 +1517,37 @@ fi
 %{_mandir}/ja/man8/smbspool_krb5_wrapper.8.gz
 %endif
 
+%{_bindir}/ldbadd
+%{_bindir}/ldbdel
+%{_bindir}/ldbedit
+%{_bindir}/ldbmodify
+%{_bindir}/ldbrename
+%{_bindir}/ldbsearch
+
+%{_mandir}/man1/ldbadd.1*
+%{_mandir}/man1/ldbdel.1*
+%{_mandir}/man1/ldbedit.1*
+%{_mandir}/man1/ldbmodify.1*
+%{_mandir}/man1/ldbrename.1*
+%{_mandir}/man1/ldbsearch.1*
+
 ## --------------------------------------------------------------------
 %files test
-%defattr(-,root,root)
 %{_bindir}/gentest
 %{_bindir}/locktest
 %{_bindir}/masktest
 %{_bindir}/ndrdump
 %{_bindir}/smbtorture
+
+%dir %{_libdir}/samba
+%{_libdir}/samba/libcmocka-private-samba.so
+%{_libdir}/samba/libdlz-bind9-for-torture-private-samba.so
+
 %{_mandir}/man1/gentest.1*
 %{_mandir}/man1/locktest.1*
 %{_mandir}/man1/masktest.1*
 %{_mandir}/man1/ndrdump.1*
 %{_mandir}/man1/smbtorture.1*
-#%{_mandir}/man1/vfstest.1*
-
-%{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
-%{_libdir}/samba/libtorture-samba4.so
-
 %if %{with ja_docs}
 # ja manual
 %{_mandir}/ja/man1/vfstest.1*
@@ -1523,7 +1555,6 @@ fi
 
 ## --------------------------------------------------------------------
 %files devel
-%defattr(-,root,root)
 %{samba_includedir}/charset.h
 %{samba_includedir}/core/doserr.h
 %{samba_includedir}/core/error.h
@@ -1583,6 +1614,7 @@ fi
 %{samba_includedir}/samba/version.h
 %{samba_includedir}/share.h
 %{samba_includedir}/smb2_lease_struct.h
+%{samba_includedir}/smb3posix.h
 %{samba_includedir}/smbconf.h
 %{samba_includedir}/smb_ldap.h
 %{samba_includedir}/smbldap.h
@@ -1620,6 +1652,7 @@ fi
 %{_libdir}/libndr.so
 %{_libdir}/libnetapi.so
 %{_libdir}/libsamba-credentials.so
+%{_libdir}/libsamba-errors.so
 %{_libdir}/libsamba-hostconfig.so
 %{_libdir}/libsamba-passdb.so
 %{_libdir}/libsamba-policy.*.so
@@ -1645,20 +1678,23 @@ fi
 %{_libdir}/libdcerpc-server-core.so
 %{_libdir}/pkgconfig/dcerpc_server.pc
 
+%{_mandir}/man3/ldb.3*
+%{_mandir}/man3/talloc.3.gz
+
 ## --------------------------------------------------------------------
 %files python
-%defattr(-,root,root,-)
+%{python3_sitearch}/*
 %{_libdir}/libsamba-policy.cpython*.so*
+%dir %{_libdir}/samba
+%{_libdir}/samba/libpyldb-util.*.so
+%{_libdir}/samba/libpytalloc-util.*.so
 %{_libdir}/samba/libsamba-net.cpython*.so
 %{_libdir}/samba/libsamba-python.cpython*.so
-%{python3_sitearch}/*
-%{_libdir}/samba/libpyldb-util.cpython*.so*
-%{_libdir}/samba/libpytalloc-util.cpython*.so*
 
 ## --------------------------------------------------------------------
 %if %{with pidl}
 %files pidl
-%defattr(-,root,root,-)
+%dir %{perl_vendorlib}/Parse
 %{perl_vendorlib}/Parse/*
 %{_mandir}/man1/pidl.1.gz
 %{_mandir}/man3/Parse::Pidl::Wireshark::NDR.3pm.gz
@@ -1672,189 +1708,151 @@ fi
 ## --------------------------------------------------------------------
 %if %with_libsmbclient
 %files -n libsmbclient
-%defattr(-,root,root)
 %{_libdir}/libsmbclient.so.*
-%{_mandir}/man7/libsmbclient.7*
-%if %{with ja_docs}
-# ja manual
-%{_mandir}/ja/man7/libsmbclient.7*
-%endif
 
 ## --------------------------------------------------------------------
 %files -n libsmbclient-devel
-%defattr(-,root,root)
 %{samba_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.so
 %{_libdir}/pkgconfig/smbclient.pc
-#%{_mandir}/man7/libsmbclient.7*
+%{_mandir}/man7/libsmbclient.7*
+%if %{with ja_docs}
+# ja manual
+%{_mandir}/ja/man7/libsmbclient.7*
+%endif
 %endif # with_libsmbclient
 
 ## --------------------------------------------------------------------
 %if %with_libwbclient
 %files -n libwbclient
-%defattr(-,root,root)
-#%{_libdir}/samba/libwinbind-client-samba4.so
+%dir %{_libdir}/samba
+%dir %{_libdir}/samba/wbclient
 %{_libdir}/samba/wbclient/libwbclient.so.*
 
 ## --------------------------------------------------------------------
 %files -n libwbclient-devel
-%defattr(-,root,root)
 %{samba_includedir}/wbclient.h
 %{_libdir}/samba/wbclient/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 %endif # with_libwbclient
 
 %if %build_compat32
-
 ## --------------------------------------------------------------------
 %files -n compat32-samba-libs
-%defattr(-,root,root)
 %{_libdir}/libdcerpc-binding.so.*
-%{_libdir}/libdcerpc.so.*
-%{_libdir}/libdcerpc-server-core.so.*
-%{_libdir}/libsamba-errors.so*
 %{_libdir}/libndr-krb5pac.so.*
 %{_libdir}/libndr-nbt.so.*
 %{_libdir}/libndr-standard.so.*
 %{_libdir}/libndr.so.*
-%{_libdir}/libnetapi.so.*
 %{_libdir}/libsamba-credentials.so.*
+%{_libdir}/libsamba-errors.so.*
 %{_libdir}/libsamba-hostconfig.so.*
-%{_libdir}/libsamba-passdb.so.*
 %{_libdir}/libsamba-util.so.*
 %{_libdir}/libsamdb.so.*
 %{_libdir}/libsmbconf.so.*
-%{_libdir}/libsmbldap.so.*
 %{_libdir}/libtevent-util.so.*
 
-# libraries needed by the public libraries
 %dir %{_libdir}/samba
-%{_libdir}/samba/libCHARSET3-samba4.so
-%{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
-%{_libdir}/samba/libMESSAGING-samba4.so
-%{_libdir}/samba/libMESSAGING-SEND-samba4.so
-%{_libdir}/samba/libaddns-samba4.so
-%{_libdir}/samba/libads-samba4.so
-%{_libdir}/samba/libasn1-samba4.so
-%{_libdir}/samba/libasn1util-samba4.so
-%{_libdir}/samba/libauth-samba4.so
-%{_libdir}/samba/libauth-unix-token-samba4.so
-%{_libdir}/samba/libauth4-samba4.so
-%{_libdir}/samba/libauthkrb5-samba4.so
-%{_libdir}/samba/libcli-cldap-samba4.so
-%{_libdir}/samba/libcli-ldap-common-samba4.so
-%{_libdir}/samba/libcli-ldap-samba4.so
-%{_libdir}/samba/libcli-nbt-samba4.so
-%{_libdir}/samba/libcli-smb-common-samba4.so
-%{_libdir}/samba/libcli-spoolss-samba4.so
-%{_libdir}/samba/libcliauth-samba4.so
-%{_libdir}/samba/libclidns-samba4.so
-%{_libdir}/samba/libcluster-samba4.so
-%{_libdir}/samba/libcmdline-contexts-samba4.so
-%{_libdir}/samba/libcmdline-samba4.so
-%{_libdir}/samba/libcmocka-samba4.so
-%{_libdir}/samba/libcom-err-samba4.so
-%{_libdir}/samba/libcommon-auth-samba4.so
-%{_libdir}/samba/libdb-glue-samba4.so
-%{_libdir}/samba/libdbwrap-samba4.so
-%{_libdir}/samba/libdcerpc-pkt-auth-samba4.so
-%{_libdir}/samba/libdcerpc-samba-samba4.so
-%{_libdir}/samba/libdcerpc-samba4.so
-%{_libdir}/samba/libdfs-server-ad-samba4.so
-%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
-%{_libdir}/samba/libdsdb-module-samba4.so
-%{_libdir}/samba/libevents-samba4.so
-%{_libdir}/samba/libflag-mapping-samba4.so
-%{_libdir}/samba/libgenrand-samba4.so
-%{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpext-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
-%{_libdir}/samba/libgse-samba4.so
-%{_libdir}/samba/libgssapi-samba4.so
-%{_libdir}/samba/libgss-preauth-samba4.so
-%{_libdir}/samba/libhcrypto-samba4.so
-%{_libdir}/samba/libhdb-samba4.so
-%{_libdir}/samba/libheimbase-samba4.so
-%{_libdir}/samba/libheimntlm-samba4.so
-%{_libdir}/samba/libhttp-samba4.so
-%{_libdir}/samba/libhx509-samba4.so
-%{_libdir}/samba/libinterfaces-samba4.so
-%{_libdir}/samba/libiov-buf-samba4.so
-%{_libdir}/samba/libkrb5-samba4.so
-%{_libdir}/samba/libkrb5samba-samba4.so
-#%{_libdir}/samba/libldb.so*
-%{_libdir}/samba/libldbsamba-samba4.so
-%{_libdir}/samba/liblibcli-lsa3-samba4.so
-%{_libdir}/samba/liblibcli-netlogon3-samba4.so
-%{_libdir}/samba/liblibsmb-samba4.so
-%{_libdir}/samba/libmessages-dgm-samba4.so
-%{_libdir}/samba/libmessages-util-samba4.so
-%{_libdir}/samba/libmsghdr-samba4.so
-%{_libdir}/samba/libmsrpc3-samba4.so
-%{_libdir}/samba/libndr-samba-samba4.so
-%{_libdir}/samba/libndr-samba4.so
-%{_libdir}/samba/libnet-keytab-samba4.so
-%{_libdir}/samba/libnetif-samba4.so
-%{_libdir}/samba/libnpa-tstream-samba4.so
-%{_libdir}/samba/libnss-info-samba4.so
-#{_libdir}/samba/libpopt-samba3-cmdline-samba4.so
-#{_libdir}/samba/libpopt-samba3-samba4.so
-%{_libdir}/samba/libposix-eadb-samba4.so
-%{_libdir}/samba/libprinting-migrate-samba4.so
-%{_libdir}/samba/libprocess-model-samba4.so
-%{_libdir}/samba/libregistry-samba4.so
-%{_libdir}/samba/libreplace-samba4.so
-%{_libdir}/samba/libroken-samba4.so
-%{_libdir}/samba/libsamba-cluster-support-samba4.so
-%{_libdir}/samba/libsamba-debug-samba4.so
-%{_libdir}/samba/libsamba-modules-samba4.so
-%{_libdir}/samba/libsamba-security-samba4.so
-%{_libdir}/samba/libsamba-sockets-samba4.so
-%{_libdir}/samba/libsamba3-util-samba4.so
-%{_libdir}/samba/libsamdb-common-samba4.so
-%{_libdir}/samba/libsecrets3-samba4.so
-%{_libdir}/samba/libserver-role-samba4.so
-%{_libdir}/samba/libserver-id-db-samba4.so
-%{_libdir}/samba/libservice-samba4.so
-%{_libdir}/samba/libshares-samba4.so
-%{_libdir}/samba/libsmb-transport-samba4.so
-%{_libdir}/samba/libsmbclient-raw-samba4.so
-%{_libdir}/samba/libsmbd-base-samba4.so
-#{_libdir}/samba/libsmbd-conn-samba4.so
-%{_libdir}/samba/libsmbd-shim-samba4.so
-%{_libdir}/samba/libsmbldaphelper-samba4.so
-%{_libdir}/samba/libsmbpasswdparser-samba4.so
-%{_libdir}/samba/libsocket-blocking-samba4.so
-%{_libdir}/samba/libsys-rw-samba4.so
-%{_libdir}/samba/libtalloc-report-printf-samba4.so
-%{_libdir}/samba/libtalloc-report-samba4.so
-%{_libdir}/samba/libtalloc-samba4.so
-%{_libdir}/samba/libtdb-wrap-samba4.so
-%{_libdir}/samba/libtevent-samba4.so
-%{_libdir}/samba/libtime-basic-samba4.so
-%{_libdir}/samba/libtrusts-util-samba4.so
-#{_libdir}/samba/libutil-cmdline-samba4.so
-%{_libdir}/samba/libutil-reg-samba4.so
-%{_libdir}/samba/libutil-setid-samba4.so
-%{_libdir}/samba/libutil-tdb-samba4.so
-%{_libdir}/samba/libwind-samba4.so
-%{_libdir}/samba/libxattr-tdb-samba4.so
+%{_libdir}/samba/libCHARSET3-private-samba.so
+%{_libdir}/samba/libMESSAGING-SEND-private-samba.so
+%{_libdir}/samba/libaddns-private-samba.so
+%{_libdir}/samba/libasn1-private-samba.so
+%{_libdir}/samba/libasn1util-private-samba.so
+%{_libdir}/samba/libauthkrb5-private-samba.so
+%{_libdir}/samba/libcli-cldap-private-samba.so
+%{_libdir}/samba/libcli-ldap-common-private-samba.so
+%{_libdir}/samba/libcli-nbt-private-samba.so
+%{_libdir}/samba/libcli-smb-common-private-samba.so
+%{_libdir}/samba/libcliauth-private-samba.so
+%{_libdir}/samba/libclidns-private-samba.so
+%{_libdir}/samba/libcluster-private-samba.so
+%{_libdir}/samba/libcom-err-private-samba.so
+%{_libdir}/samba/libcommon-auth-private-samba.so
+%{_libdir}/samba/libdbwrap-private-samba.so
+%{_libdir}/samba/libdcerpc-samba-private-samba.so
+%{_libdir}/samba/libflag-mapping-private-samba.so
+%{_libdir}/samba/libgenrand-private-samba.so
+%{_libdir}/samba/libgensec-private-samba.so
+%{_libdir}/samba/libgse-private-samba.so
+%{_libdir}/samba/libgssapi-private-samba.so
+%{_libdir}/samba/libhcrypto-private-samba.so
+%{_libdir}/samba/libheimbase-private-samba.so
+%{_libdir}/samba/libhx509-private-samba.so
+%{_libdir}/samba/libinterfaces-private-samba.so
+%{_libdir}/samba/libiov-buf-private-samba.so
+%{_libdir}/samba/libkrb5-private-samba.so
+%{_libdir}/samba/libkrb5samba-private-samba.so
+%{_libdir}/samba/libldb-private-samba.so
+%{_libdir}/samba/libldbsamba-private-samba.so
+%{_libdir}/samba/liblibcli-lsa3-private-samba.so
+%{_libdir}/samba/liblibsmb-private-samba.so
+%{_libdir}/samba/libmessages-dgm-private-samba.so
+%{_libdir}/samba/libmessages-util-private-samba.so
+%{_libdir}/samba/libmsghdr-private-samba.so
+%{_libdir}/samba/libmsrpc3-private-samba.so
+%{_libdir}/samba/libndr-samba-private-samba.so
+%{_libdir}/samba/libndr-samba4-private-samba.so
+%{_libdir}/samba/libnpa-tstream-private-samba.so
+%{_libdir}/samba/libreplace-private-samba.so
+%{_libdir}/samba/libroken-private-samba.so
+%{_libdir}/samba/libsamba-cluster-support-private-samba.so
+%{_libdir}/samba/libsamba-debug-private-samba.so
+%{_libdir}/samba/libsamba-modules-private-samba.so
+%{_libdir}/samba/libsamba-security-private-samba.so
+%{_libdir}/samba/libsamba-sockets-private-samba.so
+%{_libdir}/samba/libsamba3-util-private-samba.so
+%{_libdir}/samba/libsamdb-common-private-samba.so
+%{_libdir}/samba/libsecrets3-private-samba.so
+%{_libdir}/samba/libserver-id-db-private-samba.so
+%{_libdir}/samba/libserver-role-private-samba.so
+%{_libdir}/samba/libsmb-transport-private-samba.so
+%{_libdir}/samba/libsmbd-shim-private-samba.so
+%{_libdir}/samba/libsocket-blocking-private-samba.so
+%{_libdir}/samba/libstable-sort-private-samba.so
+%{_libdir}/samba/libsys-rw-private-samba.so
+%{_libdir}/samba/libtalloc-private-samba.so
+%{_libdir}/samba/libtalloc-report-printf-private-samba.so
+%{_libdir}/samba/libtalloc-report-private-samba.so
+%{_libdir}/samba/libtdb-wrap-private-samba.so
+%{_libdir}/samba/libtevent-private-samba.so
+%{_libdir}/samba/libtime-basic-private-samba.so
+%{_libdir}/samba/libutil-reg-private-samba.so
+%{_libdir}/samba/libutil-setid-private-samba.so
+%{_libdir}/samba/libutil-tdb-private-samba.so
+%{_libdir}/samba/libwind-private-samba.so
+
+%dir %{_libdir}/samba/ldb
+%{_libdir}/samba/ldb/*
 
 ## --------------------------------------------------------------------
 %files -n compat32-libwbclient
-%defattr(755,root,root)
-#%{_libdir}/samba/libwinbind-client-samba4.so
+%dir %{_libdir}/samba
+%dir %{_libdir}/samba/wbclient
 %{_libdir}/samba/wbclient/libwbclient.so.*
 
 ## --------------------------------------------------------------------
 %files -n compat32-libsmbclient
-%defattr(755,root,root)
 %{_libdir}/libsmbclient.so.*
 
 %endif
 
 
 %changelog
+* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.20.2-1
+- new upstream release.
+
+* Tue Jun 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.7-1
+- new upstream release.
+
+* Mon Feb 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.5-1
+- new upstream release.
+
+* Tue Jan 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.4-1
+- new upstream release.
+
+* Tue Nov 28 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.3-1
+- new upstream release.
+
 * Tue Oct 17 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.2-1
 - new upstream release.
 

+ 47 - 24
s/shadow-utils/shadow-utils-vl.spec

@@ -4,7 +4,7 @@ Summary: Utilities for managing accounts and shadow password files.
 Summary(ja): シャドウパスワードファイルとアカウントを管理するユーティリティ
 Name: shadow-utils
 Epoch: 2
-Version: 4.14.2
+Version: 4.15.2
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -19,24 +19,31 @@ Source2: shadow-utils.useradd
 Source3: shadow-bsd.txt
 Source4: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 Source6: shadow-utils.HOME_MODE.xml
+Source7: passwd.pamd
 
 ### Patches ###
 # Misc manual page changes - non-upstreamable
-Patch0: shadow-4.14.0-manfix.patch
+Patch0: shadow-4.15.0-manfix.patch
 # Date parsing improvement - could be upstreamed
-Patch1: shadow-4.2.1-date-parsing.patch
+Patch1: shadow-4.15.0-date-parsing.patch
 # Audit message changes - partially upstreamed
-Patch2: shadow-4.14.0-audit-update.patch
+Patch3: shadow-4.15.0-audit-update.patch
+# Probably non-upstreamable
+Patch4: shadow-4.15.0-account-tools-setuid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc
 BuildRequires: audit-libs-devel >= 1.6.5
+BuildRequires: pam-devel
 BuildRequires: libacl-devel, libattr-devel
 BuildRequires: bison, flex, docbook-style-xsl, docbook-dtds
 BuildRequires: autoconf, automake, libtool, gettext-devel
 BuildRequires: /usr/bin/xsltproc, /usr/bin/itstool
 Obsoletes: adduser
 
+Provides: passwd = 0.80-2
+Obsoletes: passwd < 0.80-2
+
 ### Globals ###
 %global includesubiddir %{_includedir}/shadow
 
@@ -88,8 +95,7 @@ Development files for shadow-utils-subid.
 
 
 %prep
-%setup -q -n shadow-%{version}
-%autopatch -p1 -M 99
+%autosetup -p1 -n shadow-%{version}
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -110,6 +116,7 @@ autoreconf -ivf
 	--enable-shadowgrp \
 	--enable-man \
 	--with-audit \
+	--with-libpam \
 	--with-sha-crypt \
 	--with-bcrypt \
 	--with-yescrypt \
@@ -120,7 +127,6 @@ autoreconf -ivf
 %endif
 	--without-libbsd \
 	--without-libcrack \
-	--without-libpam \
 	--enable-shared \
 	--with-group-name-max-length=32 \
 	--enable-lastlog \
@@ -134,6 +140,8 @@ make install DESTDIR=%{buildroot} gnulocaledir=%{buildroot}/%{_datadir}/locale M
 install -d -m 755 %{buildroot}/etc/default
 install -c -m 0644 %{SOURCE1} %{buildroot}/etc/login.defs
 install -c -m 0600 %{SOURCE2} %{buildroot}/etc/default/useradd
+install -d -m 755 $RPM_BUILD_ROOT%{_pam_confdir}
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pam_confdir}/passwd
 
 ln -s useradd %{buildroot}%{_sbindir}/adduser
 ln -s useradd.8 %{buildroot}/%{_mandir}/man8/adduser.8
@@ -147,11 +155,8 @@ rm %{buildroot}%{_bindir}/chsh
 rm %{buildroot}%{_bindir}/expiry
 rm %{buildroot}%{_bindir}/groups
 rm %{buildroot}%{_bindir}/login
-rm %{buildroot}%{_bindir}/passwd
 rm %{buildroot}%{_bindir}/su
 rm %{buildroot}%{_bindir}/faillog
-rm %{buildroot}%{_sysconfdir}/login.access
-rm %{buildroot}%{_sysconfdir}/limits
 rm %{buildroot}%{_sbindir}/logoutd
 rm %{buildroot}%{_sbindir}/nologin
 rm %{buildroot}%{_mandir}/man1/chfn.*
@@ -164,18 +169,10 @@ rm %{buildroot}%{_mandir}/man1/groups.*
 rm %{buildroot}%{_mandir}/*/man1/groups.*
 rm %{buildroot}%{_mandir}/man1/login.*
 rm %{buildroot}%{_mandir}/*/man1/login.*
-rm %{buildroot}%{_mandir}/man1/passwd.*
-rm %{buildroot}%{_mandir}/*/man1/passwd.*
 rm %{buildroot}%{_mandir}/man1/su.*
 rm %{buildroot}%{_mandir}/*/man1/su.*
-rm %{buildroot}%{_mandir}/man5/limits.*
-rm %{buildroot}%{_mandir}/*/man5/limits.*
-rm %{buildroot}%{_mandir}/man5/login.access.*
-rm %{buildroot}%{_mandir}/*/man5/login.access.*
 rm %{buildroot}%{_mandir}/man5/passwd.*
 rm %{buildroot}%{_mandir}/*/man5/passwd.*
-rm %{buildroot}%{_mandir}/man5/porttime.*
-rm %{buildroot}%{_mandir}/*/man5/porttime.*
 rm %{buildroot}%{_mandir}/man5/suauth.*
 rm %{buildroot}%{_mandir}/*/man5/suauth.*
 rm %{buildroot}%{_mandir}/man8/logoutd.*
@@ -189,10 +186,19 @@ rm %{buildroot}%{_mandir}/*/man5/faillog.*
 rm %{buildroot}%{_mandir}/man8/faillog.*
 rm %{buildroot}%{_mandir}/*/man8/faillog.*
 
-find $RPM_BUILD_ROOT%{_mandir} -depth -type d -empty -delete
+# Remove PAM service files we don't use.
+rm %{buildroot}%{_pam_confdir}/chfn
+rm %{buildroot}%{_pam_confdir}/chpasswd
+rm %{buildroot}%{_pam_confdir}/chsh
+rm %{buildroot}%{_pam_confdir}/groupmems
+rm %{buildroot}%{_pam_confdir}/login
+rm %{buildroot}%{_pam_confdir}/newusers
+rm %{buildroot}%{_pam_confdir}/su
+
+find %{buildroot}%{_mandir} -depth -type d -empty -delete
 %find_lang shadow
-for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
-    dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||")
+for dir in $(ls -1d %{buildroot}%{_mandir}/{??,??_??}) ; do
+    dir=$(echo $dir | sed -e "s|^%{buildroot}||")
     lang=$(basename $dir)
 #   echo "%%lang($lang) $dir" >> shadow.lang
 #   echo "%%lang($lang) $dir/man*" >> shadow.lang
@@ -201,17 +207,25 @@ done
 
 # Move header files to its own folder
 echo $(ls)
-mkdir -p $RPM_BUILD_ROOT/%{includesubiddir}
-install -m 644 libsubid/subid.h $RPM_BUILD_ROOT/%{includesubiddir}/
+mkdir -p %{buildroot}/%{includesubiddir}
+install -m 644 libsubid/subid.h %{buildroot}/%{includesubiddir}/
 
 # Remove .a and .la files created by libsubid
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{a,la}
+rm -f %{buildroot}/%{_libdir}/libsubid.{a,la}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%posttrans
+if [ -e /etc/apt/rpmpriorities ]; then
+  if grep -q -e passwd /etc/apt/rpmpriorities 2>/dev/null; then
+    sed -i -e 's/^  passwd$/  shadow-utils/' /etc/apt/rpmpriorities
+  fi
+fi
+
+
 %files -f shadow.lang
 %defattr(-,root,root)
 %license gpl-2.0.txt shadow-bsd.txt
@@ -219,6 +233,7 @@ rm -rf %{buildroot}
 %dir /etc/default
 %attr(0644,root,root)	%config /etc/login.defs
 %attr(0600,root,root)	%config /etc/default/useradd
+%config(noreplace) %{_pam_confdir}/passwd
 %{_bindir}/sg
 %attr(4755,root,root) %{_bindir}/chage
 %attr(4755,root,root) %{_bindir}/gpasswd
@@ -226,6 +241,7 @@ rm -rf %{buildroot}
 %attr(4755,root,root) %{_bindir}/newgrp
 %attr(0755,root,root) %caps(cap_setgid=ep) %{_bindir}/newgidmap
 %attr(0755,root,root) %caps(cap_setuid=ep) %{_bindir}/newuidmap
+%attr(4755,root,root) %{_bindir}/passwd
 %{_sbindir}/adduser
 %attr(0755,root,root) %{_sbindir}/user*
 %attr(0755,root,root) %{_sbindir}/group*
@@ -243,6 +259,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/newgrp.1*
 %{_mandir}/man1/newgidmap.1*
 %{_mandir}/man1/newuidmap.1*
+%{_mandir}/man1/passwd.*
 %{_mandir}/man3/shadow.3*
 %{_mandir}/man5/shadow.5*
 %{_mandir}/man5/login.defs.5*
@@ -273,6 +290,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jun 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.15.2-1
+- updated to 4.15.2.
+
+* Thu Apr 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.15.1-1
+- updated to 4.15.1.
+
 * Mon Oct 30 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.14.2-1
 - updated to 4.14.2.
 

+ 5 - 2
s/sudo/sudo-vl.spec

@@ -1,7 +1,7 @@
 Summary: Allows command execution as root for specified users
 Summary(ja): スーパーユーザ権限でのコマンドの実行
 Name: sudo
-Version: 1.9.14p3
+Version: 1.9.15p5
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -23,7 +23,7 @@ BuildRequires: bison
 BuildRequires: openldap-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: libcap-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 
 %description
 Sudo (superuser do) allows a system administrator to give certain users 
@@ -208,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jun 22 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.15p5-1
+- updated to 1.9.15p5.
+
 * Thu Sep 28 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.14p3-1
 - updated to 1.9.14p3.
 

+ 18 - 39
v/valgrind/valgrind-vl.spec

@@ -29,7 +29,7 @@
 Summary:        Tool for finding memory management bugs in programs
 Summary(ja):    プログラムのメモリ管理バグを発見するためのツール
 Name:           valgrind
-Version:        3.21.0
+Version:        3.23.0
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -51,44 +51,18 @@ Patch3: valgrind-3.16.0-some-stack-protector.patch
 # Add some -Wl,z,now.
 Patch4: valgrind-3.16.0-some-Wl-z-now.patch
 
-# Workaround https://bugs.kde.org/show_bug.cgi?id=402833
-# by disabling overlap checking for memcpy
-Patch5: valgrind-3.21.0-no-memcpy-replace-check.patch
-
-# Add --with-gdbscripts-dir=PATH configure option
-# https://bugs.kde.org/show_bug.cgi?id=469768
-Patch6: valgrind-3.21.0-Add-with-gdbscripts-dir.patch
-
-# Add epoll_pwait2
-# https://bugs.kde.org/show_bug.cgi?id=460192
-Patch7: valgrind-3.21.0-epoll_pwait2.patch
-
-# Can't run callgrind_control with valgrind 3.21.0 because of perl errors
-# https://bugs.kde.org/show_bug.cgi?id=470121
-Patch8: valgrind-3.21.0-callgrind_control-no-strict.patch
-
-# Multiple realloc zero errors crash in MC_(eq_Error)
-# https://bugs.kde.org/show_bug.cgi?id=470520
-Patch9: valgrind-3.21.0-realloc-again.patch
-
-# s390x: Assertion failure on VGM instruction
-# https://bugs.kde.org/show_bug.cgi?id=470132
-Patch10: valgrind-3.21.0-vgm.patch
-Patch11: valgrind-3.21.0-vgm-tests.patch
-
-# s390x: Valgrind cannot start qemu-kvm when "sysctl vm.allocate_pgste=0"
-# https://bugs.kde.org/show_bug.cgi?id=470978
-Patch12: valgrind-3.21.0-pgste.patch
-
-# gdb --multi mode stdout redirecting to stderr
-# https://bugs.kde.org/show_bug.cgi?id=471311
-Patch13: valgrind-3.21.0-gdb-multi-mode-stdout-redirecting-to-stderr.patch
-
-# Add support for lazy reading and downloading of DWARF debuginfo
-# https://bugs.kde.org/show_bug.cgi?id=471807
-# Plus fixup commit a0d555a0dfe078ef04ea49d991a8090ab14bd4a5
-Patch14: valgrind-3.21.0-lazy-debuginfo.patch
-Patch15: valgrind-3.21.0-cleanup-read_elf_object.patch
+# Patches from upstream VALGRIND_3_23_BRANCH
+Patch5: 0001-Prepare-NEWS-for-branch-3.23-fixes.patch
+Patch6: 0002-486180-MIPS-VexGuestArchState-has-no-member-named-gu.patch
+Patch7: 0003-Bug-486293-memccpy-false-positives.patch
+Patch8: 0004-Bug-486569-linux-inotify_init-syscall-wrapper-missin.patch
+Patch9: 0005-aarch64-frinta-and-frinta-vector-instructions.patch
+Patch10: 0006-mips-skip-using-shared-syscall-numbers-for-mips32.patch
+Patch11: 0007-Fix-uninitialized-err-in-handle_extension.patch
+Patch12: 0008-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch
+Patch13: 0009-s390x-Minor-fixes-in-extension-s390x.c.patch
+Patch14: 0010-Bug-453044-gbserver_tests-failures-in-aarch64.patch
+Patch15: 0011-Linux-regtest-reallocarray-needs-malloc.h.patch
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 %if %{build_multilib}
@@ -374,6 +348,7 @@ echo ===============END TESTING===============
 %defattr(-,root,root)
 %dir %{_includedir}/valgrind
 %{_includedir}/valgrind/valgrind.h
+%{_includedir}/valgrind/cachegrind.h
 %{_includedir}/valgrind/callgrind.h
 %{_includedir}/valgrind/drd.h
 %{_includedir}/valgrind/helgrind.h
@@ -401,6 +376,10 @@ echo ===============END TESTING===============
 
 
 %changelog
+* Fri Jun 21 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.23.0-1
+- new upstream release.
+- re-imported all patches from rawhide.
+
 * Sat Sep 23 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.21.0-1
 - new upstream release.
 - re-imported all patches from rawhide.