Merge tag 'branchpoint-5.1' into release

Branch point for 5.1 release.

Conflicts:
	configure.ac
	debian/changelog

diff --combined configure.ac
index 1e08101be9ae874ce8a72908e0807fb8f6e616bb,e47aca290efb7473bc1786087a980560ccd1b7c2..a07f74d5f21e9b92e089ffca542ada4cb419c936
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,11 -18,12 +18,12 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  
- AC_INIT([disorder], [5.0.3], [richard+disorder@sfere.greenend.org.uk])
 -AC_INIT([disorder], [5.0.DEV], [richard+disorder@sfere.greenend.org.uk])
++AC_INIT([disorder], [5.1], [richard+disorder@sfere.greenend.org.uk])
  AC_CONFIG_AUX_DIR([config.aux])
- AM_INIT_AUTOMAKE(disorder, [5.0.3])
 -AM_INIT_AUTOMAKE(disorder, [5.0.DEV])
++AM_INIT_AUTOMAKE(disorder, [5.1])
  AC_CONFIG_SRCDIR([server/disorderd.c])
  AM_CONFIG_HEADER([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
  
  # Find host type
  AC_CANONICAL_HOST
@@@ -107,6 -108,7 +108,7 @@@ case "$host" i
   ;;
  *linux* | *Linux* )
    AC_MSG_RESULT([Linux])
+   AC_DEFINE_UNQUOTED([PATH_PROC_MOUNTS],["/proc/mounts"],[path to kernel mount list])
    ;;
  *-apple-darwin* )
    AC_MSG_RESULT([Mac OS X])
@@@ -156,7 -158,7 +158,7 @@@
    # Look for a suitable version of libdb among the versions found in FreeBSD 7.0
    AC_CACHE_CHECK([looking for a libdb install],[rjk_cv_libdb],[
      rjk_cv_libdb="none"
-     for db in db43 db44 db45 db46; do
+     for db in db43 db44 db45 db47; do
        if test -e /usr/local/lib/$db; then
          rjk_cv_libdb=$db
          break
@@@ -522,7 -524,6 +524,6 @@@ if test $want_server = yes; the
    AC_CHECK_HEADERS([db.h],[:],[
      missing_headers="$missing_headers $ac_header"
    ])
-   AC_CHECK_HEADERS([FLAC/file_decoder.h])
  fi
  AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
                 getopt.h iconv.h langinfo.h \
@@@ -547,6 -548,18 +548,18 @@@ AC_C_BIGENDIA
  AC_CHECK_TYPES([struct sockaddr_in6],,,[AC_INCLUDES_DEFAULT
  #include <netinet/in.h>])
  
+ # Figure out how we'll check for devices being mounted and unmounted
+ AC_CACHE_CHECK([for list of mounted filesystems],[rjk_cv_mtab],[
+   if test -e /etc/mtab; then
+     rjk_cv_mtab=/etc/mtab
+   else
+     rjk_cv_mtab=none
+   fi
+ ])
+ if test $rjk_cv_mtab != none; then
+   AC_DEFINE_UNQUOTED([PATH_MTAB],["$rjk_cv_mtab"],[path to file containing mount list])
+ fi
+ 
  # enable -Werror when we check for certain characteristics:
  
  old_CFLAGS="${CFLAGS}"
@@@ -639,12 -652,12 +652,12 @@@ if test ! -z "$missing_functions"; the
  fi
  
  # Functions we can take or leave
- AC_CHECK_FUNCS([fls])
+ AC_CHECK_FUNCS([fls getfsstat])
  
  if test $want_server = yes; then
    # <db.h> had better be version 3 or later
    AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
-     AC_PREPROC_IFELSE([
+     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
                       #include <db.h>
                       #ifndef DB_VERSION_MAJOR
                       # error cannot determine db version
@@@ -655,16 -668,16 +668,16 @@@
                       #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
                       # error inadequate db version
                       #endif
-                     ],
+                     ],[])],
                      [rjk_cv_db_version=ok],
                      [rjk_cv_db_version=inadequate])
      if test $rjk_cv_db_version = ok; then
-       AC_PREPROC_IFELSE([
+       AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
                           #include <db.h>
                           #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6
                           # error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270
                           #endif
-                         ],
+                         ],[])],
                          [rjk_cv_db_version=ok],
                          [rjk_cv_db_version=toxic])
      fi
@@@ -716,13 -729,13 +729,13 @@@ if test "x$GCC" = xyes; the
      if test $GCC = yes; then
        CC="$CC -Wall -Werror"
      fi
-     AC_COMPILE_IFELSE([
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
        static int x(char *f) {
         return *f;
        }
        int z(const char *g) {
        return x((char *)g);
-       }],
+       }],[])],
        [rjk_cv_pr29478=no],
        [rjk_cv_pr29478=yes]
      )
@@@ -738,11 -751,11 +751,11 @@@
      if test $GCC = yes; then
        CC="$CC -Wreturn-type -Werror"
      fi
-     AC_COMPILE_IFELSE([
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
        static void *threadfn(void) {
          for(;;)
            ;
-       }],
+       }],[])],
        [rjk_cv_gcc44_stupidity=no],
        [rjk_cv_gcc44_stupidity=yes])
      CC="$old_CC"
@@@ -752,7 -765,7 +765,7 @@@
    fi
  
    # a reasonable default set of warnings
-   CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \
+   CC="${CC} -Wall -W -Wpointer-arith \
        -Wwrite-strings -Wmissing-prototypes \
        -Wmissing-declarations -Wnested-externs"
  

diff --combined debian/changelog
index 331ec122186306d84dd68c5b3eaae89e68a1a586,52be205907609ad4ec73cfe6038542012b5afd5c..793454279ec902192f9f89d0265a44030cbbba51
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,8 +1,28 @@@
 -disorder (5.0.DEV) unstable; urgency=low
++disorder (5.1) stable; urgency=low
+ 
 -  * Development version.
++  * DisOrder 5.1
+ 
 - -- Richard Kettlewell <rjk@greenend.org.uk>  Sat, 12 Feb 2011 15:44:33 +0000
++ -- Richard Kettlewell <rjk@terraraq.org.uk>  Sun, 17 Feb 2013 16:22:14 +0000
++
 +disorder (5.0.3) stable; urgency=emergency
 +
 +  * Security: Local connections can no longer create and delete users
 +    unless they are properly authorized.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Sun, 31 Jul 2011 17:07:59 +0100
 +
 +disorder (5.0.2) unstable; urgency=low
 +
 +  * Mention login cookie.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Sat, 28 May 2011 11:54:52 +0100
 +
 +disorder (5.0.1) unstable; urgency=low
 +
 +  * Disorder 5.0.1
 +  * The sense of the Control -> Playing menu item was fixed.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Thu, 10 Jun 2010 09:18:58 +0100
  
  disorder (5.0) unstable; urgency=low