[Buildroot] [PATCH 1/2] package/dovecot: New package

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in          |    1 +
 package/dovecot/Config.in  |   17 +++++++++++
 package/dovecot/dovecot.mk |   72 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 package/dovecot/Config.in
 create mode 100644 package/dovecot/dovecot.mk

diff --git a/package/Config.in b/package/Config.in
index 26dc69c..39084cc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -930,6 +930,7 @@ menu "Miscellaneous"
 endmenu
 
 menu "Mail"
+	source "package/dovecot/Config.in"
 	source "package/exim/Config.in"
 	source "package/fetchmail/Config.in"
 	source "package/heirloom-mailx/Config.in"
diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in
new file mode 100644
index 0000000..a529a54
--- /dev/null
+++ b/package/dovecot/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_DOVECOT
+	select BR2_PACKAGE_OPENSSL
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_MMU # fork()
+	bool "dovecot"
+	help
+	  Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-
+	  like systems, written with security primarily in mind. Dovecot is an
+	  excellent choice for both small and large installations. It's fast,
+	  simple to set up, requires no special administration and it uses very
+	  little memory.
+
+	  http://www.dovecot.org
+
+comment "dovecot needs a toolchain w/ ipv6"
+	depends on BR2_USE_MMU
+	depends on !BR2_INET_IPV6
diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk
new file mode 100644
index 0000000..91805a7
--- /dev/null
+++ b/package/dovecot/dovecot.mk
@@ -0,0 +1,72 @@
+################################################################################
+#
+# dovecot
+#
+################################################################################
+
+DOVECOT_VERSION_MAJOR = 2.2
+DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).13
+DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
+DOVECOT_INSTALL_STAGING = YES
+DOVECOT_LICENSE = LGPLv2.1; some exceptions are mentioned in COPYING
+DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
+DOVECOT_DEPENDENCIES = host-pkgconf openssl zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+DOVECOT_CONF_ENV= \
+	RPCGEN=__disable_RPCGEN_rquota \
+	i_cv_epoll_works=yes \
+	i_cv_inotify_works=yes \
+	i_cv_posix_fallocate_works=no \
+	i_cv_signed_size_t=no \
+	i_cv_gmtime_max_time_t=32 \
+	i_cv_signed_time_t=yes \
+	i_cv_mmap_plays_with_write=yes \
+	i_cv_fd_passing=yes \
+	i_cv_c99_vsnprintf=yes \
+	lib_cv_va_copy=yes \
+	lib_cv___va_copy=yes \
+	lib_cv_va_val_copy=yes
+
+DOVECOT_CONF_OPT = \
+	--with-dovecot=/usr/lib \
+	--without-dovecot-install-dirs \
+	--libexecdir=/usr/bin/dovecot \
+	--with-moduledir=/usr/lib \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--without-sql \
+	--with-zlib \
+	--with-ssl=openssl \
+	--without-docs
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+DOVECOT_CONF_OPT += --with-bzlib
+DOVECOT_DEPENDENCIES += bzip2
+else
+DOVECOT_CONF_OPT += --without-bzlib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+DOVECOT_CONF_OPT += --with-libcap
+DOVECOT_DEPENDENCIES += libcap
+else
+DOVECOT_CONF_OPT += --without-libcap
+endif
+
+define DOVECOT_POST_CONFIGURE
+	for i in $$(find $(@D) -name "Makefile"); do \
+		$(SED) 's%^pkglibdir =.*%pkglibdir = \$$(libdir)%' $$i; \
+		$(SED) 's%^pkglibexecdir =.*%pkglibexecdir = \$$(libexecdir)%' $$i; \
+	done
+endef
+
+DOVECOT_POST_CONFIGURE_HOOKS += DOVECOT_POST_CONFIGURE
+
+define DOVECOT_FIX_STAGING_DOVECOT_CONFIG
+	$(SED) 's,^LIBDOVECOT_INCLUDE=.*$$,LIBDOVECOT_INCLUDE=\"-I$(STAGING_DIR)/usr/include/dovecot\",' $(STAGING_DIR)/usr/lib/dovecot-config
+	$(SED) 's,^dovecot_pkglibexecdir=.*$$,dovecot_pkglibexecdir=/usr/bin,' $(STAGING_DIR)/usr/lib/dovecot-config
+endef
+
+DOVECOT_POST_INSTALL_STAGING_HOOKS += DOVECOT_FIX_STAGING_DOVECOT_CONFIG
+
+$(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] package/dovecot-pigeonhole: New package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in                                |    1 +
 package/dovecot-pigeonhole/Config.in             |    9 +++++++
 package/dovecot-pigeonhole/dovecot-pigeonhole.mk |   31 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/dovecot-pigeonhole/Config.in
 create mode 100644 package/dovecot-pigeonhole/dovecot-pigeonhole.mk

diff --git a/package/Config.in b/package/Config.in
index 39084cc..8eeead6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -931,6 +931,7 @@ endmenu
 
 menu "Mail"
 	source "package/dovecot/Config.in"
+	source "package/dovecot-pigeonhole/Config.in"
 	source "package/exim/Config.in"
 	source "package/fetchmail/Config.in"
 	source "package/heirloom-mailx/Config.in"
diff --git a/package/dovecot-pigeonhole/Config.in b/package/dovecot-pigeonhole/Config.in
new file mode 100644
index 0000000..44320dd
--- /dev/null
+++ b/package/dovecot-pigeonhole/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_DOVECOT_PIGEONHOLE
+	bool "dovecot-pigeonhole"
+	depends on BR2_PACKAGE_DOVECOT
+	help
+	  Pigeonhole is the name of the project that adds support for the Sieve
+	  language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the
+	  Dovecot Secure IMAP Server.
+
+	  http://pigeonhole.dovecot.org
diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
new file mode 100644
index 0000000..a55d2ec
--- /dev/null
+++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# dovecot-pigeonhole
+#
+################################################################################
+
+DOVECOT_PIGEONHOLE_VERSION = 0.4.3
+DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
+DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
+DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1
+DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
+DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
+
+DOVECOT_PIGEONHOLE_CONF_OPT = \
+	--with-dovecot=$(STAGING_DIR)/usr/lib \
+	--with-moduledir=/usr/lib \
+	--libexecdir=/usr/bin/dovecot \
+	--sysconfdir=/etc \
+	--localstatedir=/var
+
+define DOVECOT_PIGEONHOLE_POST_CONFIGURE
+	for i in $$(find $(@D) -name "Makefile"); do \
+		$(SED) 's%^pkglibdir =.*%pkglibdir = \$$(libdir)%' $$i; \
+		$(SED) 's%^pkglibexecdir =.*%pkglibexecdir = \$$(libexecdir)%' $$i; \
+		$(SED) 's%^sieve_plugindir =.*%sieve_plugindir = \$$(moduledir)%' $$i; \
+	done
+endef
+
+DOVECOT_PIGEONHOLE_POST_CONFIGURE_HOOKS += DOVECOT_PIGEONHOLE_POST_CONFIGURE
+
+$(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 28 Sep 2014 19:25:36 +0200, Bernd Kuhls wrote:
> +DOVECOT_VERSION_MAJOR = 2.2
> +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).13
> +DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
> +DOVECOT_INSTALL_STAGING = YES
> +DOVECOT_LICENSE = LGPLv2.1; some exceptions are mentioned in COPYING

I think we generally say only "<foo> with exceptions".

Did you check that it's LGPLv2.1 vs. LGPLv2.1+ ?

> +DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
> +DOVECOT_DEPENDENCIES = host-pkgconf openssl zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv)

If you do this with libiconv, then don't you need:

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

libiconv is a replacement for the missing iconv stuff in libc when
locale support is not enabled.

If zlib is really a mandatory dependency, then it should be selected
from the Config.in file.

> +DOVECOT_CONF_OPT = \
> +	--with-dovecot=/usr/lib \
> +	--without-dovecot-install-dirs \
> +	--libexecdir=/usr/bin/dovecot \

This looks weird. You really want /usr/bin/dovecot as a lib directory?
Shouldn't this be /usr/lib/dovecot instead?

> +	--with-moduledir=/usr/lib \
> +	--sysconfdir=/etc \
> +	--localstatedir=/var \
> +	--without-sql \
> +	--with-zlib \

Optional dependency?

> +	--with-ssl=openssl \

Ditto?

> +	--without-docs
> +
> +ifeq ($(BR2_PACKAGE_BZIP2),y)
> +DOVECOT_CONF_OPT += --with-bzlib
> +DOVECOT_DEPENDENCIES += bzip2
> +else
> +DOVECOT_CONF_OPT += --without-bzlib
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBCAP),y)
> +DOVECOT_CONF_OPT += --with-libcap
> +DOVECOT_DEPENDENCIES += libcap
> +else
> +DOVECOT_CONF_OPT += --without-libcap
> +endif
> +
> +define DOVECOT_POST_CONFIGURE
> +	for i in $$(find $(@D) -name "Makefile"); do \
> +		$(SED) 's%^pkglibdir =.*%pkglibdir = \$$(libdir)%' $$i; \
> +		$(SED) 's%^pkglibexecdir =.*%pkglibexecdir = \$$(libexecdir)%' $$i; \
> +	done
> +endef
> +
> +DOVECOT_POST_CONFIGURE_HOOKS += DOVECOT_POST_CONFIGURE
> +
> +define DOVECOT_FIX_STAGING_DOVECOT_CONFIG
> +	$(SED) 's,^LIBDOVECOT_INCLUDE=.*$$,LIBDOVECOT_INCLUDE=\"-I$(STAGING_DIR)/usr/include/dovecot\",' $(STAGING_DIR)/usr/lib/dovecot-config
> +	$(SED) 's,^dovecot_pkglibexecdir=.*$$,dovecot_pkglibexecdir=/usr/bin,' $(STAGING_DIR)/usr/lib/dovecot-config
> +endef

dovecot-config is in $(STAGING_DIR)/usr/lib ? This looks weird.

> +
> +DOVECOT_POST_INSTALL_STAGING_HOOKS += DOVECOT_FIX_STAGING_DOVECOT_CONFIG
> +
> +$(eval $(autotools-package))

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] package/dovecot-pigeonhole: New package

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 28 Sep 2014 19:25:37 +0200, Bernd Kuhls wrote:

> diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
> new file mode 100644
> index 0000000..a55d2ec
> --- /dev/null
> +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
> @@ -0,0 +1,31 @@
> +################################################################################
> +#
> +# dovecot-pigeonhole
> +#
> +################################################################################
> +
> +DOVECOT_PIGEONHOLE_VERSION = 0.4.3
> +DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
> +DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
> +DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1

LGPLv2.1 or LGPLv2.1+ ?

> +DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
> +DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
> +
> +DOVECOT_PIGEONHOLE_CONF_OPT = \
> +	--with-dovecot=$(STAGING_DIR)/usr/lib \
> +	--with-moduledir=/usr/lib \
> +	--libexecdir=/usr/bin/dovecot \

Same question as dovecot: really /usr/bin/dovecot ?

> +	--sysconfdir=/etc \
> +	--localstatedir=/var
> +
> +define DOVECOT_PIGEONHOLE_POST_CONFIGURE
> +	for i in $$(find $(@D) -name "Makefile"); do \
> +		$(SED) 's%^pkglibdir =.*%pkglibdir = \$$(libdir)%' $$i; \
> +		$(SED) 's%^pkglibexecdir =.*%pkglibexecdir = \$$(libexecdir)%' $$i; \
> +		$(SED) 's%^sieve_plugindir =.*%sieve_plugindir = \$$(moduledir)%' $$i; \
> +	done
> +endef
> +
> +DOVECOT_PIGEONHOLE_POST_CONFIGURE_HOOKS += DOVECOT_PIGEONHOLE_POST_CONFIGURE

Like for dovecot.mk, it might be good to have a short comment above
explaining what's going on here.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Bernd Kuhls]

Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20140929191314.36b87a70 at free-electrons.com:

> Did you check that it's LGPLv2.1 vs. LGPLv2.1+ ?

Hi,

how to do that?
Are the websites where I can upload license files for checking?

I compared http://www.gnu.org/licenses/lgpl-2.1.txt and 
http://www.dovecot.org/doc/COPYING.LGPL, they are 100% identical.

http://www.dovecot.org/doc/COPYING says:
"Everything else is LGPLv2.1 (see COPYING.LGPL) unless otherwise mentioned
at the beginning of the file."

Regards, Bernd

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Fri, 03 Oct 2014 11:33:15 +0200, Bernd Kuhls wrote:

> how to do that?
> Are the websites where I can upload license files for checking?
> 
> I compared http://www.gnu.org/licenses/lgpl-2.1.txt and 
> http://www.dovecot.org/doc/COPYING.LGPL, they are 100% identical.
> 
> http://www.dovecot.org/doc/COPYING says:
> "Everything else is LGPLv2.1 (see COPYING.LGPL) unless otherwise mentioned
> at the beginning of the file."

Regarding LGPLv2.1 vs. LGPLv2.1+ it's not written in the license text
(the license text is just one particular version), but in the header of
each source file, where you have a "(or later)" specification if it's
with "+", or no such specification when it's just one particular
version that applies.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Bernd Kuhls]

Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20141003134024.4de4020b at free-electrons.com:

> Regarding LGPLv2.1 vs. LGPLv2.1+ it's not written in the license text
> (the license text is just one particular version), but in the header of
> each source file, where you have a "(or later)" specification if it's
> with "+", or no such specification when it's just one particular
> version that applies.

Hi,

http://hg.dovecot.org/dovecot-2.2/file/tip/src/master/main.c, among many 
others, contains

/* Copyright (c) 2005-2014 Dovecot authors, see the included COPYING file */

Imho it is therefore save to assume that Dovecot is licensed by LGPLv2.1: 

http://hg.dovecot.org/dovecot-2.2/file/tip/COPYING

"Everything else is LGPLv2.1 (see COPYING.LGPL) unless otherwise mentioned at 
the beginning of the file."

Regards, Bernd

[Buildroot] [PATCH 1/2] package/dovecot: New package

[Bernd Kuhls]

Hi,

Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20140929191314.36b87a70 at free-
electrons.com:

>> +DOVECOT_CONF_OPT = \
>> +     --with-dovecot=/usr/lib \
>> +     --without-dovecot-install-dirs \
>> +     --libexecdir=/usr/bin/dovecot \
> 
> This looks weird. You really want /usr/bin/dovecot as a lib directory?
> Shouldn't this be /usr/lib/dovecot instead?

$libexecdir contains binary files, not libs

$ ls -la usr/libexec/
insgesamt 5384
drwxrwxr-x 2 fli4l fli4l    4096 Okt  3 15:07 .
drwxrwxr-x 8 fli4l fli4l    4096 Okt  3 15:07 ..
-rwxr-xr-x 1 fli4l fli4l   45472 Okt  3 15:07 aggregator
-rwxr-xr-x 1 fli4l fli4l   46046 Okt  3 15:07 anvil
-rwxr-xr-x 1 fli4l fli4l 1073617 Okt  3 15:07 auth
-rwxr-xr-x 1 fli4l fli4l   13026 Okt  3 15:07 checkpassword-reply
-rwxr-xr-x 1 fli4l fli4l  216800 Okt  3 15:07 config
-rwxr-xr-x 1 fli4l fli4l    2839 Okt  3 15:07 decode2text.sh
lrwxrwxrwx 1 fli4l fli4l      11 Okt  3 15:07 deliver -> dovecot-lda
-rwxr-xr-x 1 fli4l fli4l  167149 Okt  3 15:07 dict
-rwxr-xr-x 1 fli4l fli4l  213021 Okt  3 15:07 director
-rwxr-xr-x 1 fli4l fli4l   20330 Okt  3 15:07 dns-client
-rwxr-xr-x 1 fli4l fli4l 1016161 Okt  3 15:07 doveadm-server
-rwxr-xr-x 1 fli4l fli4l   71817 Okt  3 15:07 dovecot-lda
-rwxr-xr-x 1 fli4l fli4l   11762 Okt  3 15:07 gdbhelper
-rwxr-xr-x 1 fli4l fli4l  931236 Okt  3 15:07 imap
-rwxr-xr-x 1 fli4l fli4l   73946 Okt  3 15:07 imap-login
-rwxr-xr-x 1 fli4l fli4l   46435 Okt  3 15:07 imap-urlauth
-rwxr-xr-x 1 fli4l fli4l   26963 Okt  3 15:07 imap-urlauth-login
-rwxr-xr-x 1 fli4l fli4l  129652 Okt  3 15:07 imap-urlauth-worker
-rwxr-xr-x 1 fli4l fli4l   65959 Okt  3 15:07 indexer
-rwxr-xr-x 1 fli4l fli4l   69629 Okt  3 15:07 indexer-worker
-rwxr-xr-x 1 fli4l fli4l   46971 Okt  3 15:07 ipc
-rwxr-xr-x 1 fli4l fli4l  158678 Okt  3 15:07 lmtp
-rwxr-xr-x 1 fli4l fli4l   47096 Okt  3 15:07 log
-rwxr-xr-x 1 fli4l fli4l   16133 Okt  3 15:07 maildirlock
-rwxr-xr-x 1 fli4l fli4l  122073 Okt  3 15:07 pop3
-rwxr-xr-x 1 fli4l fli4l   56652 Okt  3 15:07 pop3-login
-rwxr-xr-x 1 fli4l fli4l  384370 Okt  3 15:07 quota-status
-rwxr-xr-x 1 fli4l fli4l   28107 Okt  3 15:07 rawlog
-rwxr-xr-x 1 fli4l fli4l   94576 Okt  3 15:07 replicator
-rwxr-xr-x 1 fli4l fli4l   22063 Okt  3 15:07 script
-rwxr-xr-x 1 fli4l fli4l   22352 Okt  3 15:07 script-login
-rwxr-xr-x 1 fli4l fli4l   43799 Okt  3 15:07 ssl-params
-rwxr-xr-x 1 fli4l fli4l  130070 Okt  3 15:07 stats
-rwxr-xr-x 1 fli4l fli4l   27626 Okt  3 15:07 xml2text

Nonetheless I removed that and similar options from the package so it 
installs all files to their default paths. Locally I need other paths, 
their options are part of v1 of this patch and will be removed in v2, I 
will keep my adjustments in a private patch.

> dovecot-config is in $(STAGING_DIR)/usr/lib ? This looks weird.

Correct, thats the default path for this file.

Regards, Bernd