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

Conflicts:
	NEWS
	VERSION
	doc/www/ReleaseNotes

diff --combined 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 --combined doc/www/ReleaseNotes
index 7ec41372a86c6ab024e9ea7258e465855f467da4,5ebaade881435df98734a992a3459897a260bb61..2d7d23a745d5ee64ee7bc552e5d3ce70c0550b3b
--- 1/doc/www/ReleaseNotes
--- 2/doc/www/ReleaseNotes
+++ b/doc/www/ReleaseNotes
@@@ -1,8 -1,9 +1,8 @@@
 -Netatalk 3.0.6
 -==============
 +Netatalk 3.1-beta2
 +===================
  
 -The Netatalk development team is proud to announce version 3.0.6 of
 -the Netatalk File Sharing suite. This is the latest update to the 3.0
 -release series. All users are encouraged to upgrade their systems to 3.0.6.
 +The Netatalk development team is proud to announce the second beta release
 +of the next Netatalk version 3.1. This release is intended for testing only.
  
  Netatalk is a freely-available Open Source AFP fileserver.
  A *NIX/*BSD system running Netatalk is capable of serving many Macintosh
@@@ -16,23 -17,22 +16,23 @@@ The suite contains
  * cnid_dbd   - the CNID database daemon serving CNIDs for AFP volumes
  * various supporting programs and utilities
  
 -Summary of major new features and enhancements in 3.0
 +Summary of major new features and enhancements in 3.1
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 -* New ini style configuration file afp.conf which replaces all previous
 -  configuration files
 -* New default AppleDouble backend using filesystem Extended Attributes,
 -  conversion from AppleDouble v2 is done automatically on access
 -* New service controller process "netatalk" responsible for starting and
 -  restarting afpd and cnid_metad as necessary
 -* AppleTalk support has been removed
 -* Coherent cross-platform locking with Solaris CIFS server
 +* AFP Spotlight Support with Gnome Tracker:
 +  https://projects.gnome.org/tracker/
 +
 +Please refer to the online manual for details about compiling Netatalk
 +with Spotlight support and how to configure:
 +
 +http://netatalk.sourceforge.net/3.1/htmldocs/installation.html#compiling-netatalk
 +
 +http://netatalk.sourceforge.net/3.1/htmldocs/configuration.html#id2615270
  
  Please make sure to read the upgrading section in the Netatalk online
 -manual before trying to upgrade your system to 3.0!
 +manual before trying to upgrade your system from version 2:
  
 -  http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html
 +http://netatalk.sourceforge.net/3.1/htmldocs/upgrade.html
  
  License
  ~~~~~~~
@@@ -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.
@@@ -364,4 -359,4 +387,4 @@@ We would like to thank all contributor
  their commitment.  Without the many suggestions, bug and problem reports,
  patches, and reviews this project wouldn't be where it is.
  
 - - The Netatalk Development Team, October 2013
 + - The Netatalk Development Team, September 2013

diff --combined libatalk/Makefile.am
index 3220b89aac042229fc0c22881ce62870faebac67,beafce4862e394a4b8d104a13576d6bbae50f582..84e67585e6bd95c1317380423cb6d21ae7fd313a
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -18,7 -18,7 +18,7 @@@
  #        current+1:0:0
  #
  
- VERSION_INFO = 6:0:0
+ VERSION_INFO = 7:0:0
  
  # History:          VERSION_INFO
  #
@@@ -33,8 -33,9 +33,9 @@@
  #   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
  
@@@ -44,7 -45,7 +45,7 @@@ libatalk_la_CFLAGS = 
        @PTHREAD_CFLAGS@
  
  libatalk_la_LIBADD  = \
 -      @WRAP_LIBS@ @ACL_LIBS@ @PTHREAD_LIBS@ \
 +      @WRAP_LIBS@ @ACL_LIBS@ @PTHREAD_LIBS@ @MYSQL_LIBS@ \
        acl/libacl.la \
        adouble/libadouble.la   \
        bstring/libbstring.la \
@@@ -52,7 -53,6 +53,7 @@@
        compat/libcompat.la     \
        dsi/libdsi.la           \
        iniparser/libiniparser.la \
 +      talloc/libtalloc.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
@@@ -64,7 -64,6 +65,7 @@@ libatalk_la_DEPENDENCIES = 
        cnid/libcnid.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
 +      talloc/libtalloc.la       \
        iniparser/libiniparser.la \
        unicode/libunicode.la \
        util/libutil.la         \
@@@ -105,4 -104,6 +106,6 @@@ EXTRA_DIST = 
        libatalk-3.0.1.abi \
        libatalk-3.0.2.abi \
        libatalk-3.0.3.abi \
-       libatalk-3.0.4.abi
+       libatalk-3.0.4.abi \
+       libatalk-3.0.5.abi \
+       libatalk-3.0.6.abi