From e584683c247f2e49ebc3af1d72fad1b27da7df46 Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Tue, 4 Jul 2017 21:17:04 -0400
Subject: [PATCH 1/2] dovecot: install libraries to allow building plugins

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
 mail/dovecot/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index bf7a16b2b..4a8e99deb 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dovecot
 PKG_VERSION:=2.2.31
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dovecot.org/releases/2.2
@@ -78,6 +78,14 @@ CONFIGURE_VARS += \
 	lib_cv___va_copy=yes \
 	lib_cv_va_val_copy=yes
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/dovecot $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot $(1)/usr/lib/
+	rm -f $(1)/usr/lib/dovecot/*.la
+endef
+
+
 define Package/dovecot/install
 	$(INSTALL_DIR)  $(1)/etc/init.d \
 			$(1)/etc/dovecot \

From cf1e6c9ba985b0fdda910a8b7d55fcb8640d5ae7 Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Tue, 4 Jul 2017 21:18:45 -0400
Subject: [PATCH 2/2] pigeonhole: new package

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
 mail/pigeonhole/Makefile | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 mail/pigeonhole/Makefile

diff --git a/mail/pigeonhole/Makefile b/mail/pigeonhole/Makefile
new file mode 100644
index 000000000..51fb0a4a3
--- /dev/null
+++ b/mail/pigeonhole/Makefile
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2006-2017 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pigeonhole
+PKG_VERSION:=0.4.16
+PKG_RELEASE:=1
+
+DOVECOT_VERSION:=2.2
+
+PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION)
+PKG_HASH:=8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=COPYING COPYING.LGPL
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/dovecot-$(DOVECOT_VERSION)-$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/pigeonhole
+  SECTION:=mail
+  CATEGORY:=Mail
+  DEPENDS:=+dovecot
+  TITLE:=Mail filtering facilities for Dovecot
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  URL:=https://wiki2.dovecot.org/Pigeonhole
+endef
+
+define Package/pigeonhole/description
+  Pigeonhole provides mail filtering facilities for Dovecot using the Sieve
+  (RFC 5228) language.
+endef
+
+CONFIGURE_ARGS += \
+  --with-dovecot=$(STAGING_DIR)/usr/lib/dovecot/ \
+  --without-managesieve
+
+CONFIGURE_VARS += \
+  LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/dovecot/" \
+  CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/dovecot/"
+
+define Package/pigeonhole/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/dovecot/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/
+	find $(1)/usr/lib/dovecot/ -name "*.a" -o -name "*.la" | xargs rm
+endef
+
+$(eval $(call BuildPackage,pigeonhole))