From 323e2cbce21694a449e5d785b4bc5b553e0f37cf Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 5 Feb 2014 23:00:23 +0000
Subject: [PATCH] xmail: Update to version 1.27

This patch updates xmail to the latest version available, and
includes a quick fix for IPv6 support in CtrlClnt (XMail's
control client) commandline utility.

Signed-off-by: Luis Dallos <ld@nkvd.ignorelist.com>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@39497 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 mail/xmail/Makefile                           |  8 ++++----
 mail/xmail/patches/010-Makefile.common.patch  | 10 +++++-----
 mail/xmail/patches/020-Makefile.lnx.patch     |  4 ++--
 mail/xmail/patches/030-sysmachine.patch       |  5 ++---
 mail/xmail/patches/040-honour_opt_flags.patch |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 2e3cc2628..62969a115 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmail
-PKG_VERSION:=1.26
-PKG_RELEASE:=4
+PKG_VERSION:=1.27
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xmailserver.org/
-PKG_MD5SUM:=26d35c2fc104d79ebb6397c7dece5b15
+PKG_MD5SUM:=73c9d95012709d7b11511dfb6dd6ab3d
 
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
@@ -43,7 +43,7 @@ endef
 
 define Package/xmail/install
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/{CtrlClnt,MkUsers,XMCrypt,XMail,sendmail} $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/MailRoot.tar.bz2 $(1)/etc/
 	$(INSTALL_DIR) $(1)/etc/config
diff --git a/mail/xmail/patches/010-Makefile.common.patch b/mail/xmail/patches/010-Makefile.common.patch
index af6aa709f..0417268e8 100644
--- a/mail/xmail/patches/010-Makefile.common.patch
+++ b/mail/xmail/patches/010-Makefile.common.patch
@@ -1,11 +1,11 @@
 --- a/Makefile.common
 +++ b/Makefile.common
-@@ -76,15 +76,15 @@
- SENDMAILOBJS = SendMail.o
+@@ -77,15 +77,15 @@ SENDMAILOBJS = $(addprefix $(OUTDIR)/, $
  
- %.o : %.cpp
--	${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp
-+	${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp
+ 
+ $(OUTDIR)/%.o: %.cpp
+-	${CC} ${CPPFLAGS} ${CFLAGS} -o $(OUTDIR)/$*.o -c $*.cpp
++	${CXX} ${CPPFLAGS} ${CFLAGS} -o $(OUTDIR)/$*.o -c $*.cpp
  
  all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL}
  
diff --git a/mail/xmail/patches/020-Makefile.lnx.patch b/mail/xmail/patches/020-Makefile.lnx.patch
index 3f8866b07..bdc52234a 100644
--- a/mail/xmail/patches/020-Makefile.lnx.patch
+++ b/mail/xmail/patches/020-Makefile.lnx.patch
@@ -11,5 +11,5 @@
 +LD = $(CXX)
 +#STRIP = strip
  
- ifneq ("$(WITH_SSL_INCLUDE)", "")
-     CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE)
+ ifeq ("$(XMAIL_FILE_OFF_BITS)", "")
+     CFLAGS := $(CFLAGS) -D_FILE_OFFSET_BITS=64
diff --git a/mail/xmail/patches/030-sysmachine.patch b/mail/xmail/patches/030-sysmachine.patch
index c181e1276..716c46beb 100644
--- a/mail/xmail/patches/030-sysmachine.patch
+++ b/mail/xmail/patches/030-sysmachine.patch
@@ -1,6 +1,5 @@
-diff -urN xmail-1.25.orig/SysMachine.h xmail-1.25/SysMachine.h
---- xmail-1.25.orig/SysMachine.h	1970-01-01 01:00:00.000000000 +0100
-+++ xmail-1.25/SysMachine.h	2008-07-28 10:16:47.000000000 +0200
+--- /dev/null
++++ b/SysMachine.h
 @@ -0,0 +1,30 @@
 +#ifndef _MACHDEFS_H
 +#define _MACHDEFS_H
diff --git a/mail/xmail/patches/040-honour_opt_flags.patch b/mail/xmail/patches/040-honour_opt_flags.patch
index 51704322c..99cc46fbf 100644
--- a/mail/xmail/patches/040-honour_opt_flags.patch
+++ b/mail/xmail/patches/040-honour_opt_flags.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.common
 +++ b/Makefile.common
-@@ -24,10 +24,10 @@
+@@ -24,10 +24,10 @@ ifeq ($(DEBUG_OSSL), 1)
  endif
  
  ifeq ($(XMAIL_DEBUG), 1)
-- 
2.11.0