diff options
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch | 108 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.6.5.bb (renamed from meta-networking/recipes-connectivity/samba/samba_4.6.2.bb) | 5 |
2 files changed, 2 insertions, 111 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch b/meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch deleted file mode 100644 index c94bc3185..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1573638212a9733a44939a4d38a226f38dca36f1 Mon Sep 17 00:00:00 2001 -From: Michele Baldessari <michele@acksyn.org> -Date: Tue, 9 Jul 2013 23:23:33 +0200 -Subject: [PATCH] Fix typos in man-pages - -Fix some typos in the man-pages. - -Signed-off-by: Michele Baldessari <michele@acksyn.org> -Reviewed-by: Simo Sorce <idra@samba.org> - -Autobuild-User(master): Simo Sorce <idra@samba.org> -Autobuild-Date(master): Wed Jul 10 16:45:07 CEST 2013 on sn-devel-104 ---- - docs-xml/manpages/dbwrap_tool.1.xml | 2 +- - docs-xml/manpages/idmap_autorid.8.xml | 2 +- - docs-xml/manpages/net.8.xml | 2 +- - docs-xml/manpages/pdbedit.8.xml | 2 +- - docs-xml/manpages/samba.7.xml | 2 +- - docs-xml/manpages/smbclient.1.xml | 2 +- - docs-xml/manpages/smbpasswd.5.xml | 2 +- - docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -Index: samba-4.1.11/docs-xml/manpages/smbstatus.1.xml -=================================================================== ---- samba-4.1.11.orig/docs-xml/manpages/smbstatus.1.xml -+++ samba-4.1.11/docs-xml/manpages/smbstatus.1.xml -@@ -137,6 +137,13 @@ - </listitem> - </varlistentry> - -+ <varlistentry> -+ <term>-n|--numeric</term> -+ <listitem><para>causes smbstatus to display numeric UIDs and GIDs instead of -+ resolving them to names.</para> -+ </listitem> -+ </varlistentry> -+ - </variablelist> - </refsect1> - -Index: samba-4.1.11/docs-xml/manpages/sharesec.1.xml -=================================================================== ---- samba-4.1.11.orig/docs-xml/manpages/sharesec.1.xml -+++ samba-4.1.11/docs-xml/manpages/sharesec.1.xml -@@ -129,6 +129,13 @@ - </para></listitem> - </varlistentry> - -+ <varlistentry> -+ <term>-S|--setsddl=STRING</term> -+ <listitem><para> -+ Set security descriptor by providing ACL in SDDL format. -+ </para></listitem> -+ </varlistentry> -+ - &stdarg.help; - &stdarg.server.debug; - &popt.common.samba; -Index: samba-4.1.11/docs-xml/build/DTD/samba.entities -=================================================================== ---- samba-4.1.11.orig/docs-xml/build/DTD/samba.entities -+++ samba-4.1.11/docs-xml/build/DTD/samba.entities -@@ -270,6 +270,44 @@ file. - &popt.common.samba; - '> - -+<!ENTITY stdarg.signing ' -+<varlistentry> -+<term>-S|--signing on|off|required</term> -+<listitem><para>Set the client signing state. -+</para></listitem> -+</varlistentry> -+'> -+ -+<!ENTITY stdarg.machinepass ' -+<varlistentry> -+<term>-P|--machine-pass</term> -+<listitem><para>Use stored machine account password. -+</para></listitem> -+</varlistentry> -+'> -+ -+<!ENTITY stdarg.encrypt ' -+<varlistentry> -+<term>-e|--encrypt</term> -+<listitem><para> -+This command line parameter requires the remote -+server support the UNIX extensions or that the SMB3 protocol has been selected. -+Requests that the connection be encrypted. Negotiates SMB encryption using either -+SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for -+the encryption negotiation (either kerberos or NTLMv1/v2 if given -+domain/username/password triple. Fails the connection if encryption -+cannot be negotiated. -+</para></listitem> -+</varlistentry> -+'> -+ -+<!ENTITY stdarg.pwnthash ' -+<varlistentry> -+<term>--pw-nt-hash</term> -+<listitem><para>The supplied password is the NT hash. -+</para></listitem> -+</varlistentry> -+'> - - <!ENTITY stdarg.resolve.order ' - <varlistentry> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.5.bb index 7574aefb4..389a2743e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.5.bb @@ -12,7 +12,6 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ " SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://00-fix-typos-in-man-pages.patch \ file://16-do-not-check-xsltproc-manpages.patch \ file://20-do-not-import-target-module-while-cross-compile.patch \ file://21-add-config-option-without-valgrind.patch \ @@ -26,8 +25,8 @@ SRC_URI_append_libc-musl = " \ file://samba-4.2.7-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[md5sum] = "461def8190ffc651fd8458b24ca2a622" -SRC_URI[sha256sum] = "927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35" +SRC_URI[md5sum] = "2ae8ce2862d8bfa95e4681371ebb1623" +SRC_URI[sha256sum] = "c06901e1d318b425b8c3ecea3ef23a91e7371312a9ea7adbf34fb8eb42ca3b84" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl |