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 <l...@nkvd.ignorelist.com> --- Index: packages/mail/xmail/Makefile =================================================================== --- packages/mail/xmail/Makefile (revision 39161) +++ packages/mail/xmail/Makefile (working copy) @@ -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 @@ 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 Index: packages/mail/xmail/patches/010-Makefile.common.patch =================================================================== --- packages/mail/xmail/patches/010-Makefile.common.patch (revision 39161) +++ packages/mail/xmail/patches/010-Makefile.common.patch (working copy) @@ -1,14 +1,15 @@ --- a/Makefile.common +++ b/Makefile.common -@@ -76,15 +76,15 @@ - SENDMAILOBJS = SendMail.o +@@ -77,7 +77,7 @@ - %.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} +@@ -84,8 +84,8 @@ ${OUTDIR}: @mkdir ${OUTDIR} Index: packages/mail/xmail/patches/020-Makefile.lnx.patch =================================================================== --- packages/mail/xmail/patches/020-Makefile.lnx.patch (revision 39161) +++ packages/mail/xmail/patches/020-Makefile.lnx.patch (working copy) @@ -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 Index: packages/mail/xmail/patches/030-sysmachine.patch =================================================================== --- packages/mail/xmail/patches/030-sysmachine.patch (revision 39161) +++ packages/mail/xmail/patches/030-sysmachine.patch (working copy) @@ -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 +--- a/SysMachine.h ++++ b/SysMachine.h @@ -0,0 +1,30 @@ +#ifndef _MACHDEFS_H +#define _MACHDEFS_H Index: packages/mail/xmail/patches/050-ctrlclnt_add_ipv6_support.patch =================================================================== --- packages/mail/xmail/patches/050-ctrlclnt_add_ipv6_support.patch (revision 0) +++ packages/mail/xmail/patches/050-ctrlclnt_add_ipv6_support.patch (working copy) @@ -0,0 +1,56 @@ +--- a/CTRLClient.cpp ++++ b/CTRLClient.cpp +@@ -53,7 +53,7 @@ + /* Needed by library functions ( START ) */ + bool bServerDebug = false; + int iLogRotateHours = 24; +-int iAddrFamily = AF_INET; ++int iAddrFamily = SYS_INET64; + static char const * const pszCClnErrors[] = { + "Wrong command line usage", + "Either none or both private key and certificate file must be supplied" +@@ -349,7 +349,7 @@ + void CClnShowUsage(char const *pszProgName) + { + fprintf(stderr, +- "use : %s [-snuptfSLcKCXHD] ...\n" ++ "use : %s [-snuptfSLcKCXHD4657] ...\n" + "options :\n" + " -s server = set server address\n" + " -n port = set server port [%d]\n" +@@ -364,7 +364,11 @@ + " -X filename = set the SSL certificate-list file\n" + " -H dir = set the SSL certificate-store directory\n" + " -c = disable MD5 authentication\n" +- " -D = enable debug\n", ++ " -D = enable debug\n" ++ " -4 = connect only to IPv4 addresses\n" ++ " -6 = connect only to IPv6 addresses\n" ++ " -5 = prefer IPv4 addresses over IPv6 addresses\n" ++ " -7 = prefer IPv6 addresses over IPv4 addresses\n", + pszProgName, STD_CTRL_PORT, STD_CTRL_TIMEOUT); + } + +@@ -467,6 +471,22 @@ + bServerDebug = true; + break; + ++ case '4': ++ iAddrFamily = AF_INET; ++ break; ++ ++ case '6': ++ iAddrFamily = AF_INET6; ++ break; ++ ++ case '5': ++ iAddrFamily = SYS_INET46; ++ break; ++ ++ case '7': ++ iAddrFamily = SYS_INET64; ++ break; ++ + default: + return CCLN_ERR_BAD_USAGE; + } _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
