Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Re-add imapproxy, with updated patches to build with O...
details: https://anonhg.NetBSD.org/pkgsrc/rev/38102714e797
branches: trunk
changeset: 429124:38102714e797
user: manu <manu%pkgsrc.org@localhost>
date: Thu Apr 16 14:03:28 2020 +0000
description:
Re-add imapproxy, with updated patches to build with OpenSSL 1.1.1
diffstat:
doc/CHANGES-2020 | 3 +-
mail/imapproxy/DESCR | 6 +
mail/imapproxy/MESSAGE | 7 +
mail/imapproxy/Makefile | 51 ++++++++
mail/imapproxy/PLIST | 9 +
mail/imapproxy/distinfo | 14 ++
mail/imapproxy/files/imapproxy.sh | 18 +++
mail/imapproxy/patches/patch-aa | 26 ++++
mail/imapproxy/patches/patch-ba | 14 ++
mail/imapproxy/patches/patch-bb | 14 ++
mail/imapproxy/patches/patch-bc | 20 +++
mail/imapproxy/patches/patch-include_imapproxy.h | 17 ++
mail/imapproxy/patches/patch-src_config.c | 19 +++
mail/imapproxy/patches/patch-src_imapcommon.c | 131 +++++++++++++++++++++++
mail/imapproxy/patches/patch-src_main.c | 66 +++++++++++
15 files changed, 414 insertions(+), 1 deletions(-)
diffs (truncated from 482 to 300 lines):
diff -r c4cac9fb32b6 -r 38102714e797 doc/CHANGES-2020
--- a/doc/CHANGES-2020 Thu Apr 16 13:54:09 2020 +0000
+++ b/doc/CHANGES-2020 Thu Apr 16 14:03:28 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2318 2020/04/16 13:54:09 mef Exp $
+$NetBSD: CHANGES-2020,v 1.2319 2020/04/16 14:03:28 manu Exp $
Changes to the packages collection and infrastructure in 2020:
@@ -3189,3 +3189,4 @@
Updated devel/p5-PPIx-Regexp to 0.071 [mef 2020-04-16]
Updated devel/p5-Perl-Critic to 1.138 [mef 2020-04-16]
Updated devel/p5-Alien-Build to 2.21 [mef 2020-04-16]
+ Re-added mail/imapproxy [manu 2020-04-16]
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/DESCR Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,6 @@
+ImapProxy is a caching IMAP proxy daemon designed to be used with
+Horde/IMP. The program forwards all traffic between the client and the
+server, but keeps the connection to the server alive after the client logs
+out. When the same user attempts to log in again, the proxy will use the
+cached username/password pair to authenticate the client, and tie the new
+client to the old server connection (which was kept alive).
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/MESSAGE Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2020/04/16 14:03:29 manu Exp $
+
+imapproxy configuration file must be located at ${PREFIX}/etc/imapproxy.conf
+A sample file is provided in ${PREFIX}/share/examples/imapproxy
+
+===========================================================================
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/Makefile Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile,v 1.25 2020/04/16 14:03:29 manu Exp $
+#
+
+DISTNAME= squirrelmail-imap_proxy-1.2.7
+PKGNAME= imapproxy-1.2.7
+PKGREVISION= 6
+CATEGORIES= mail
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.imapproxy.org/
+COMMENT= Simple connection caching IMAP proxy daemon
+
+GNU_CONFIGURE= YES
+
+CONFIGURE_ARGS+= --exec_prefix=${DESTDIR}${PREFIX}
+BUILD_DEFS+= VARBASE
+CFLAGS+= -DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\"
+CFLAGS+= -DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\"
+RCD_SCRIPTS= imapproxy
+
+IMAPPROXY_USER?= imapproxy
+IMAPPROXY_GROUP?= imapproxy
+IMAPPROXY_CHROOT?= ${VARBASE}/chroot/imapproxy
+IMAPPROXY_DOC?= share/doc/imapproxy
+IMAPPROXY_EXAMPLES?= share/examples/imapproxy
+
+PKG_GROUPS_VARS+= IMAPPROXY_GROUP
+PKG_USERS_VARS+= IMAPPROXY_USER
+PKG_GROUPS= ${IMAPPROXY_GROUP}
+PKG_USERS= ${IMAPPROXY_USER}:${IMAPPROXY_GROUP}
+PKG_GECOS.${IMAPPROXY_USER}= IMAP Proxy pseudo-user
+PKG_HOME.${IMAPPROXY_USER}= ${IMAPPROXY_CHROOT}
+
+INSTALLATION_DIRS+= sbin
+INSTALLATION_DIRS+= ${IMAPPROXY_DOC}
+INSTALLATION_DIRS+= ${IMAPPROXY_EXAMPLES}
+
+MAKE_DIRS= ${VARBASE}/chroot
+OWN_DIRS= ${VARBASE}/chroot/imapproxy
+
+post-install:
+.for doc in COPYING ChangeLog README README.known_issues README.ssl
+ ${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/${IMAPPROXY_DOC}
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf \
+ ${DESTDIR}${PREFIX}/${IMAPPROXY_EXAMPLES}
+
+.include "../../mk/curses.buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/PLIST Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.6 2020/04/16 14:03:29 manu Exp $
+sbin/in.imapproxyd
+sbin/pimpstat
+share/doc/imapproxy/COPYING
+share/doc/imapproxy/ChangeLog
+share/doc/imapproxy/README
+share/doc/imapproxy/README.known_issues
+share/doc/imapproxy/README.ssl
+share/examples/imapproxy/imapproxy.conf
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/distinfo Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.13 2020/04/16 14:03:29 manu Exp $
+
+SHA1 (squirrelmail-imap_proxy-1.2.7.tar.gz) = b2e324383ae8a2cdb3b5bd0340a2e2174941bd65
+RMD160 (squirrelmail-imap_proxy-1.2.7.tar.gz) = 87f3b9ab367e9da2a3f532e6de867004abbe75cf
+SHA512 (squirrelmail-imap_proxy-1.2.7.tar.gz) = 355816e26eb9fa273b2b4e6cf0c2f55b85d0568291095913a4b05dd73a428a173c2a5b327c4ef296ca74ca500250b22fa2ae44d7d44613624641954fc9603507
+Size (squirrelmail-imap_proxy-1.2.7.tar.gz) = 136209 bytes
+SHA1 (patch-aa) = ee753ff90c68549067ef28d9ed8c10ffeb1982e4
+SHA1 (patch-ba) = 8f3d8adbac5a147cc143d7737d56a83401736a9d
+SHA1 (patch-bb) = 348768062f5f9e314223fb7d385f749646ed04be
+SHA1 (patch-bc) = c3daf40715af721a0c4ff1b1071a892c94b59ce5
+SHA1 (patch-include_imapproxy.h) = 9e2326ece220e48c3baa2949b13d21448405e741
+SHA1 (patch-src_config.c) = 84ac9bde7cf64add665adb0f4d658ef856a91ae0
+SHA1 (patch-src_imapcommon.c) = a8d95e87cd6f3857e69abe17dc71a683f196d98d
+SHA1 (patch-src_main.c) = e0795df7e7312cfb285cc65bbabdecd3553c7e65
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/files/imapproxy.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/files/imapproxy.sh Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: imapproxy.sh,v 1.4 2020/04/16 14:03:29 manu Exp $
+#
+
+# PROVIDE: imapproxy
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="imapproxy"
+rcvar=$name
+command="@PREFIX@/sbin/in.imapproxyd"
+required_files="@PKG_SYSCONFDIR@/imapproxy.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-aa Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.6 2020/04/16 14:03:29 manu Exp $
+
+--- Makefile.in.orig 2010-07-25 09:11:36.000000000 +0000
++++ Makefile.in
+@@ -70,7 +70,7 @@ $(XYD_BIN): $(XYD_OBJ)
+ $(CC) -o $@ $(XYD_OBJ) $(LDFLAGS) $(XYD_LIB)
+
+ $(TAT_BIN): $(TAT_OBJ)
+- $(CC) -o $@ $(TAT_OBJ) $(TAT_LIB)
++ $(CC) -o $@ $(TAT_OBJ) $(LDFLAGS) $(TAT_LIB)
+
+ clean:
+ rm -f ./src/core $(XYD_OBJ) $(TAT_OBJ) $(XYD_BIN) $(TAT_BIN)
+@@ -79,9 +79,9 @@ distclean: clean
+ rm -f config.cache config.log config.h Makefile
+
+ install: $(XYD_BIN) $(TAT_BIN)
+- mkdir -p $(EBIN)
+- $(INSTALL) -o bin -g bin -m 0755 $(XYD_BIN) $(EBIN)
+- $(INSTALL) -o bin -g bin -m 0755 $(TAT_BIN) $(EBIN)
++ ${BSD_INSTALL_PROGRAM_DIR} $(EBIN)
++ ${BSD_INSTALL_PROGRAM} $(XYD_BIN) $(EBIN)
++ ${BSD_INSTALL_PROGRAM} $(TAT_BIN) $(EBIN)
+
+ install-init:
+ $(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.init $(ETC)/init.d/imapproxy
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-ba Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.3 2020/04/16 14:03:29 manu Exp $
+--- configure.in.orig 2010-03-21 22:20:57.000000000 +0100
++++ configure.in 2010-03-21 22:21:05.000000000 +0100
+@@ -120,9 +120,9 @@
+ dnl Check for curses
+ save_LIBS="$LIBS"
+ LIB_CURSES=""
+ AC_CHECK_LIB(curses, initscr, LIB_CURSES="-lcurses", [ curses_found=no ])
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+ AC_CHECK_LIB(ncurses, initscr, LIB_CURSES="-lncurses",
+ AC_ERROR([Can't compile without curses!!!]))
+ fi
+
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-bb Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.3 2020/04/16 14:03:29 manu Exp $
+--- configure.orig 2010-03-21 22:20:49.000000000 +0100
++++ configure 2010-03-21 22:21:13.000000000 +0100
+@@ -3418,9 +3418,9 @@
+ else
+ curses_found=no
+ fi
+
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+ echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
+ echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-bc Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-bc,v 1.3 2020/04/16 14:03:29 manu Exp $
+--- include/imapproxy.h.orig 2010-03-22 07:40:36.000000000 +0100
++++ include/imapproxy.h 2010-03-22 08:46:47.000000000 +0100
+@@ -171,14 +171,14 @@
+ */
+ #define PGM "in.imapproxyd"
+ #define IMAP_UNTAGGED_OK "* OK " /* untagged OK response */
+ #define IMAP_TAGGED_OK "1 OK " /* tagged OK response */
+-#define BUFSIZE 4096 /* default buffer size */
++#define BUFSIZE 8192 /* default buffer size */
+ #define MAX_CONN_BACKLOG 5 /* tcp connection backlog */
+ #define MAXTAGLEN 256 /* max IMAP tag length */
+ #define MAXMAILBOXNAME 512 /* max mailbox name length */
+ #define MAXUSERNAMELEN 64 /* max username length */
+-#define MAXPASSWDLEN 64 /* max passwd length */
++#define MAXPASSWDLEN 8192 /* max passwd length */
+ #define POLL_TIMEOUT_MINUTES 30 /* Poll timeout in minutes */
+ #define POLL_TIMEOUT (POLL_TIMEOUT_MINUTES * 60000)
+ #define SELECT_BUF_SIZE BUFSIZE /* max length of a SELECT */
+ /* string we can cache */
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-include_imapproxy.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-include_imapproxy.h Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_imapproxy.h,v 1.3 2020/04/16 14:03:29 manu Exp $
+
+SASL PLAIN Support. Patch submitted upstream
+http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311
+
+--- include/imapproxy.h.orig 2013-04-15 11:57:37.000000000 +0200
++++ include/imapproxy.h 2013-04-15 11:58:33.000000000 +0200
+@@ -311,8 +311,9 @@
+ unsigned char support_unselect; /* unselect support flag */
+ unsigned char support_starttls; /* starttls support flag */
+ unsigned char login_disabled; /* login disabled flag */
+ char *chroot_directory; /* chroot(2) into this dir */
++ char *auth_sasl_mech; /* SASL mechanism */
+ };
+
+
+ /*
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-src_config.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-src_config.c Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_config.c,v 1.3 2020/04/16 14:03:29 manu Exp $
+
+SASL PLAIN Support. Patch submitted upstream
+http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311
+
+--- src/config.c.orig 2010-02-20 18:16:58.000000000 +0100
++++ src/config.c 2013-04-15 12:00:50.000000000 +0200
+@@ -452,8 +452,11 @@
+ &PC_Struct.force_tls, index );
+
+ ADD_TO_TABLE( "enable_admin_commands", SetBooleanValue,
+ &PC_Struct.enable_admin_commands, index );
++
++ ADD_TO_TABLE( "auth_sasl_mech", SetStringValue,
++ &PC_Struct.auth_sasl_mech, index );
+
+ ConfigTable[index].Keyword[0] = '\0';
+
+ FP = fopen( ConfigFile, "r" );
diff -r c4cac9fb32b6 -r 38102714e797 mail/imapproxy/patches/patch-src_imapcommon.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/imapproxy/patches/patch-src_imapcommon.c Thu Apr 16 14:03:28 2020 +0000
@@ -0,0 +1,131 @@
+$NetBSD: patch-src_imapcommon.c,v 1.3 2020/04/16 14:03:29 manu Exp $
+
+Build fixes for OpenSSL 1.1.1
+
+SASL PLAIN Support. Patch submitted upstream
+http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311
+
+--- src/imapcommon.c.orig 2010-07-26 09:08:47.000000000 +0200
++++ src/imapcommon.c 2020-04-16 15:49:08.132245848 +0200
+@@ -397,18 +397,19 @@
+ ITD_Struct Server;
+ int rc;
+ unsigned int Expiration;
+
+- EVP_MD_CTX mdctx;
++ EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
+ int md_len;
+
+ Expiration = PC_Struct.cache_expiration_time;
Home |
Main Index |
Thread Index |
Old Index