Update to 2.1.13 and add support for NetBSD 6.0 libquota

Changes since 2.1.12:
        - Some fixes to cache file changes in v2.1.11.
        - fts-solr: Overlong UTF8 sequences in mails were rejected by Solr and
          caused the mails to not be indexed.
        - virtual storage: Sorting mailbox by from/to/cc/bcc didn't work.


(manu)

$NetBSD: patch-config.h.in,v 1.1 2013/01/19 05:25:51 manu Exp $

Support NetBSD's libquota

--- config.h.in.orig	2013-01-18 18:24:40.000000000 +0100
+++ config.h.in	2013-01-18 18:27:26.000000000 +0100
@@ -283,8 +283,14 @@
 
 /* Define to 1 if you have the `quotactl' function. */
 #undef HAVE_QUOTACTL
 
+/* Define to 1 if you have the <quota.h> header file. */
+#undef HAVE_QUOTA_H
+
+/* Define if you have quota_open() */
+#undef HAVE_QUOTA_OPEN
+
 /* Define if Q_QUOTACTL exists */
 #undef HAVE_Q_QUOTACTL
 
 /* Define if you have RLIMIT_AS for setrlimit() */

--- configure.orig	2013-01-07 08:52:01.000000000 +0100
+++ configure	2013-01-19 02:57:06.000000000 +0100
@@ -631,8 +631,9 @@
 BUILD_SOLR_TRUE
 CURL_LIBS
 CURL_CFLAGS
 CURLCONFIG
+QUOTA_LIBS
 HAVE_RQUOTA_FALSE
 HAVE_RQUOTA_TRUE
 RPCGEN
 BUILD_ZLIB_PLUGIN_FALSE
@@ -18047,9 +18048,10 @@
 
 
 for ac_header in strings.h stdint.h unistd.h dirent.h malloc.h inttypes.h \
   sys/uio.h sys/sysmacros.h sys/resource.h sys/select.h libgen.h \
-  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h sys/fs/quota_common.h \
+  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h \
+  quota.h sys/fs/quota_common.h \
   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
   sys/utsname.h glob.h linux/falloc.h ucred.h
 do :
@@ -24214,8 +24216,72 @@
   HAVE_RQUOTA_FALSE=
 fi
 
 
+QUOTA_LIBS=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing quota_open" >&5
+$as_echo_n "checking for library containing quota_open... " >&6; }
+if ${ac_cv_search_quota_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char quota_open ();
+int
+main ()
+{
+return quota_open ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' quota; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_quota_open=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_quota_open+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_quota_open+:} false; then :
+
+else
+  ac_cv_search_quota_open=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_quota_open" >&5
+$as_echo "$ac_cv_search_quota_open" >&6; }
+ac_res=$ac_cv_search_quota_open
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+
+$as_echo "#define HAVE_QUOTA_OPEN /**/" >>confdefs.h
+
+  QUOTA_LIBS="-lquota"
+
+fi
+
+
+
 
 fts=" squat"
 not_fts=""
 

--- configure.in.orig	2013-01-07 08:51:52.000000000 +0100
+++ configure.in	2013-01-19 02:56:47.000000000 +0100
@@ -288,9 +288,10 @@
 AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", Dovecot version)
 
 AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h inttypes.h \
   sys/uio.h sys/sysmacros.h sys/resource.h sys/select.h libgen.h \
-  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h sys/fs/quota_common.h \
+  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h \
+  quota.h sys/fs/quota_common.h \
   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
   sys/utsname.h glob.h linux/falloc.h ucred.h)
 
@@ -2609,8 +2610,15 @@
   have_rquota=yes
 fi
 AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
 
+QUOTA_LIBS=""
+AC_SEARCH_LIBS(quota_open, quota, [
+  AC_DEFINE(HAVE_QUOTA_OPEN,, Define if you have quota_open())
+  QUOTA_LIBS="-lquota"
+])
+AC_SUBST(QUOTA_LIBS)
+
 dnl
 dnl ** Full text search
 dnl
 

--- src/plugins/quota/Makefile.am.orig	2013-01-19 02:59:14.000000000 +0100
+++ src/plugins/quota/Makefile.am	2013-01-19 03:05:16.000000000 +0100
@@ -26,8 +26,11 @@
 	quota-maildir.c \
         quota-plugin.c \
 	quota-storage.c
 
+lib10_quota_plugin_la_LIBADD = \
+	$(QUOTA_LIBS)
+
 lib10_quota_plugin_la_SOURCES = $(quota_dist_sources)
 nodist_lib10_quota_plugin_la_SOURCES = $(RQUOTA_XDR)
 
 doveadm_module_LTLIBRARIES = \

--- src/plugins/quota/Makefile.in.orig	2013-01-19 03:09:26.000000000 +0100
+++ src/plugins/quota/Makefile.in	2013-01-19 03:07:06.000000000 +0100
@@ -84,9 +84,10 @@
 lib10_doveadm_quota_plugin_la_LINK = $(LIBTOOL) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(lib10_doveadm_quota_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
-lib10_quota_plugin_la_LIBADD =
+am__DEPENDENCIES_1 =
+lib10_quota_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 = quota.lo quota-count.lo quota-fs.lo quota-dict.lo \
 	quota-dirsize.lo quota-maildir.lo quota-plugin.lo \
 	quota-storage.lo
 am_lib10_quota_plugin_la_OBJECTS = $(am__objects_1)
@@ -215,8 +216,9 @@
 PG_CONFIG = @PG_CONFIG@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+QUOTA_LIBS = @QUOTA_LIBS@
 RANLIB = @RANLIB@
 RPCGEN = @RPCGEN@
 RUN_TEST = @RUN_TEST@
 SED = @SED@
@@ -319,8 +321,11 @@
 	quota-maildir.c \
         quota-plugin.c \
 	quota-storage.c
 
+lib10_quota_plugin_la_LIBADD = \
+	$(QUOTA_LIBS)
+
 lib10_quota_plugin_la_SOURCES = $(quota_dist_sources)
 nodist_lib10_quota_plugin_la_SOURCES = $(RQUOTA_XDR)
 doveadm_module_LTLIBRARIES = \
 	lib10_doveadm_quota_plugin.la

$NetBSD: patch-src_plugins_quota_quota-fs.c,v 1.1 2013/01/19 05:25:51 manu Exp $

Support NetBSD's libquota

--- src/plugins/quota/quota-fs.c.orig	2013-01-18 18:05:57.000000000 +0100
+++ src/plugins/quota/quota-fs.c	2013-01-18 18:41:46.000000000 +0100
@@ -76,8 +76,11 @@
 
 	unsigned int inode_per_mail:1;
 	unsigned int user_disabled:1;
 	unsigned int group_disabled:1;
+#ifdef FS_QUOTA_NETBSD
+	struct quotahandle *qh;
+#endif
 };
 
 extern struct quota_backend quota_backend_fs;
 
@@ -525,9 +528,10 @@
 #endif
 }
 #endif
 
-#if defined(FS_QUOTA_LINUX) || defined(FS_QUOTA_BSDAIX)
+#if defined(FS_QUOTA_LINUX) || defined(FS_QUOTA_BSDAIX) || \
+    defined(FS_QUOTA_NETBSD)
 static void fs_quota_root_disable(struct fs_quota_root *root, bool group)
 {
 	if (group)
 		root->group_disabled = TRUE;
@@ -641,8 +645,46 @@
 	return 1;
 }
 #endif
 
+#ifdef FS_QUOTA_NETBSD
+static int
+fs_quota_get_netbsd(struct fs_quota_root *root, bool group, bool bytes,
+		    uint64_t *value_r, uint64_t *limit_r)
+{
+	struct quotakey qk;
+	struct quotaval qv;
+
+	if (root->qh == NULL) {
+		if ((root->qh = quota_open(root->mount->mount_path)) == NULL) {
+			i_error("cannot open quota for %s: %m",
+				root->mount->mount_path);
+			fs_quota_root_disable(root, group);
+			return 0;
+		}
+	} 
+
+	qk.qk_idtype = group ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
+	qk.qk_id = group ? root->gid : root->uid;
+	qk.qk_objtype = bytes ? QUOTA_OBJTYPE_BLOCKS : QUOTA_OBJTYPE_FILES;
+
+	if (quota_get(root->qh, &qk, &qv) != 0) {
+		if (errno == ESRCH) {
+			fs_quota_root_disable(root, group);
+			return 0;
+		}
+		i_error("quotactl(Q_GETQUOTA, %s) failed: %m",
+			root->mount->mount_path);
+		return -1;
+	}
+
+	*value_r = qv.qv_usage * DEV_BSIZE;
+	*limit_r = qv.qv_softlimit * DEV_BSIZE;
+
+	return 1;
+}
+#endif
+
 #ifdef FS_QUOTA_HPUX
 static int
 fs_quota_get_hpux(struct fs_quota_root *root, bool bytes,
 		  uint64_t *value_r, uint64_t *limit_r)
@@ -714,8 +756,10 @@
 			return 0;
 	}
 #ifdef FS_QUOTA_LINUX
 	return fs_quota_get_linux(root, group, bytes, value_r, limit_r);
+#elif defined (FS_QUOTA_NETBSD)
+	return fs_quota_get_netbsd(root, group, bytes, value_r, limit_r);
 #elif defined (FS_QUOTA_BSDAIX)
 	return fs_quota_get_bsdaix(root, group, bytes, value_r, limit_r);
 #else
 	if (group) {

$NetBSD: patch-src_plugins_quota_quota-fs.h,v 1.1 2013/01/19 05:25:51 manu Exp $

Support NetBSD's libquota

--- src/plugins/quota/quota-fs.h.orig	2011-12-13 12:35:29.000000000 +0100
+++ src/plugins/quota/quota-fs.h	2013-01-18 20:10:34.000000000 +0100
@@ -5,8 +5,12 @@
 	defined (HAVE_STRUCT_DQBLK_CURSPACE)
 #  define HAVE_FS_QUOTA
 #endif
 
+#ifdef HAVE_QUOTA_OPEN
+#  include <quota.h> /* NetBSD with libquota */
+#endif
+
 #ifdef HAVE_SYS_QUOTA_H
 #  include <sys/quota.h> /* Linux, HP-UX */
 #elif defined(HAVE_SYS_FS_UFS_QUOTA_H)
 #  include <sys/fs/ufs_quota.h> /* Solaris */
@@ -36,5 +40,11 @@
 #else
 #  undef HAVE_FS_QUOTA
 #endif
 
+#ifdef HAVE_QUOTA_OPEN /* NetBSD with libquota */
+#  define FS_QUOTA_NETBSD
+#  define HAVE_FS_QUOTA
+#  undef FS_QUOTA_LINUX /* obtained because we also have <sys/quota.h> */
+#endif
+
 #endif