samba: add license info and smbta-util option

Add license info and the smbta-util config knob.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/samba/Config.in b/package/samba/Config.in
index e88b3609f9c776a67253ea7effebfd88083f8785..928b40bd39095baef2a6ee14d64c1f3c7a20f92e 100644 (file)
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -168,6 +168,13 @@ config BR2_PACKAGE_SAMBA_SWAT
        help
          Samba Web Administration Tool
 
+config BR2_PACKAGE_SAMBA_SMBTA_UTIL
+       bool "smbta-util"
+       default y
+       help
+         Tool to ease the configuration of the vfs_smb_traffic_analyzer
+         module regarding data encryption.
+
 config BR2_PACKAGE_SAMBA_SMBTAR
        bool "smbtar"
        default y

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 301a39fc0c2825c819996ebda076bb743e3c157e..75e31735bc607f001c43dd24d8e4fabf7fea085f 100644 (file)
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -8,6 +8,8 @@ SAMBA_VERSION = 3.6.7
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES
+SAMBA_LICENSE = GPLv3+
+SAMBA_LICENSE_FILES = COPYING
 
 SAMBA_DEPENDENCIES = popt \
        $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \
@@ -104,6 +106,7 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSHARESEC) += usr/bin/sharesec
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus
+SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBTA_UTIL) += usr/bin/smbta-util
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat
 SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup