Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
	NEWS
	VERSION
	doc/www/ReleaseNotes

diff --cc NEWS
index 0a4b5d9c46b39d421f13d8033ef450e236bc3944,8a8fb7792ad6bef211504140afd76d59399b1d57..cd9e90d35782ded405677a522257269bddde3db3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,17 -1,7 +1,21 @@@
 +Changes in 3.1.0
 +================
 +* NEW: AFP Spotlight support with Gnome Tracker
 +* NEW: New option "spotlight" (G/V)
 +* NEW: Configure option --with-tracker-pkgconfig-version
 +* NEW: Configure option --with-tracker-prefix
 +* NEW: If Spotlight is enabled, launch our own dbus instance
 +* NEW: New option "dbus daemon" (G)
 +* UPD: Add configure option --with-afpstats for overriding the
 +       result of autodetecting dbus-glib presence
 +* NEW: Add recvfile support with splice() on Linux. New global options
 +       "recvfile" (default: no) and "splice size" (default 64k).
 +* NEW: CNID backend "mysql" for use with a MySQL server
 +
+ Changes in 3.0.7
+ ================
+ * FIX: Build fixes for the Kerberos UAM
+ 
  Changes in 3.0.6
  ================
  * FIX: charset conversion failed when copying from Mac OS 9. Bug #523.

diff --cc doc/www/ReleaseNotes
index 7ec41372a86c6ab024e9ea7258e465855f467da4,5ebaade881435df98734a992a3459897a260bb61..2d7d23a745d5ee64ee7bc552e5d3ce70c0550b3b
--- 1/doc/www/ReleaseNotes
--- 2/doc/www/ReleaseNotes
+++ b/doc/www/ReleaseNotes
@@@ -41,36 -41,31 +41,59 @@@ Netatalk is a Free/Open Source Softwar
  the GNU General Public License (GPLv2).  The full license text is available
  at:
  
 -  http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 +http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 +
 +Changes in 3.1-beta2
 +~~~~~~~~~~~~~~~~~~~~
 +* FIX: Fix special Spotlight RPC function
 +
 +Changes in 3.1-beta1
 +~~~~~~~~~~~~~~~~~~~~
 +* REM: Remove support for Tracker versions < 0.7
 +* UPD: Add support for additional Spotlight RPC calls
 +
 +Changes in 3.1-alpha1
 +~~~~~~~~~~~~~~~~~~~~~
 +* NEW: AFP Spotlight support with Gnome Tracker
 +* NEW: New option "spotlight" (G/V)
 +* NEW: Configure option --with-tracker-pkgconfig-version
 +* NEW: Configure option --with-tracker-prefix
 +* NEW: If Spotlight is enabled, launch our own dbus instance
 +* NEW: New option "dbus daemon" (G)
 +* UPD: Add configure option --with-afpstats for overriding the
 +       result of autodetecting dbus-glib presence
 +
 +Changes in 3.0.6
 +~~~~~~~~~~~~~~~~
 +* FIX: charset conversion failed when copying from Mac OS 9. Bug #523.
 +* UPD: Don't force S_ISGID for directories on FreeBSD. Bug #525.
 +* NEW: Add support for ZFS ACLs on FreeBSD with libsunacl. From FR#83.
 +* FIX: Active Directory LDAP queries for ACL support with new options
 +       "ldap user filter" and "ldap group filter". Bug #526.
  
+ Changes in 3.0.6
+ ~~~~~~~~~~~~~~~~
+ * FIX: charset conversion failed when copying from Mac OS 9. Bug #523.
+ * UPD: Don't force S_ISGID for directories on FreeBSD. Bug #525.
+ * NEW: Add support for ZFS ACLs on FreeBSD with libsunacl. From FR#83.
+ * FIX: Active Directory LDAP queries for ACL support with new options
+        "ldap user filter" and "ldap group filter". Bug #526.
+ * NEW: Option "vol dbnest", when set to true, the CNID database for
+        a volume is stored in the volume root of a share in a directory
+        .AppleDB like in Netatalk 2. Defaults to false. From FR#84.
+ * FIX: Small fix in the DSI tickle handling. Bug #528.
+ * UPD: Enhance handling of connection attempts when hitting the
+        connection limit. Bug #529.
+ * FIX: Saving from Word to a folder that is a symlink to a folder on
+        another filesystem results in a crash of the afpd process and
+        the save to fail. This happens only if the option
+        "follow symlinks" is enabled. Bug #532.
+ * FIX: Disable Kerberos UAM if AFP service principal name can't be
+        evaluated. Fixes bug #531.
+ * FIX: Fix handling of large number of volumes. Bug #527.
+ * NEW: Configure option --with-tbd which can be used to disable the
+        use of the bundled tdb and use a system installed version.
+ 
  Changes in 3.0.5
  ~~~~~~~~~~~~~~~~
  * FIX: Fix a crash when using pam_winbind. Fixes bug #516.

diff --cc libatalk/Makefile.am
index 3220b89aac042229fc0c22881ce62870faebac67,beafce4862e394a4b8d104a13576d6bbae50f582..84e67585e6bd95c1317380423cb6d21ae7fd313a
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -33,8 -33,9 +33,9 @@@ VERSION_INFO = 7:0:
  #   3.0.3           4:0:0
  #   3.0.4           5:0:0
  #   3.0.5           6:0:0
+ #   3.0.6           7:0:0
  
 -SUBDIRS = acl adouble bstring compat cnid dsi iniparser util unicode vfs
 +SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc util unicode vfs
  
  lib_LTLIBRARIES = libatalk.la