head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.48
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.46
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.44
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.42
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.40
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.38
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.36
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.34
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.32
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.30
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.28
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.26
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.24
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.22
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.20
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.18
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.16
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.14
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.12
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.10
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.8
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.6
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.4
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.2
	pkgsrc-2020Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2020.04.17.11.28.02;	author tm;	state Exp;
branches;
next	;
commitid	vXNgffYDDvhsmJ4C;


desc
@@


1.1
log
@up-imapproxy: re-add version 1.2.8 with OpenSSL 1.1 patches

Include patchset from the community and Debian package maintainers to
support OpenSSL version 1.1. This is the more feature rich version of
imapproxy.

Last official changelog entries:

2016-09-12  Paul Lesniewski <paul@@squirrelmail.org>
	* Added support for systemd startup
	* Added support for accepting pre-auth ID commands (RFC 2971)
	* Added support for DNS RR to cycle through multiple IMAP
	  server backends (thanks to Wolfgang Breyha)
	* Added ability to restrict DNS lookups to IPv4 or IPv6
	  only (thanks to Wolfgang Breyha)
	* Make EGD support conditional, provide compatibility with
	  LibreSSL, other small fixes provided by the BSD team
	* Fixed anomalous crashes recycling used connections (thanks
	  to Emmanuel Dreyfus)
	* Retain compatibility with older OpenSSL versions (thanks to
	  Wolfgang Breyha)
	* Make use of the no_new_privs flag (Linux only) when becoming
	  non-root (thanks to Shawn Landden)

2014-01-20  Paul Lesniewski <paul@@squirrelmail.org>
	* Added support for up to TLS v1.2 (thanks to Emmanuel Dreyfus)
	* Added support for ECDHE ciphers (thanks to Emmanuel Dreyfus)
	* Added ability to manually specify TLS ciphers (thanks to Emmanuel Dreyfus)
	* Added server certificate validation (thanks to Emmanuel Dreyfus)

2012-01-01  Paul Lesniewski <paul@@squirrelmail.org>
	* Fixed problem where default TLS CA data would never
	  be loaded (thanks to Orion Poplawski)
	* Fixed bug in SSL context initialization
@
text
@$NetBSD$

Fix config and pid file path. And add missing definitions.

--- include/imapproxy.h.orig	Fri Jan 27 20:53:57 2017
+++ include/imapproxy.h	Thu Apr 16 21:25:31 2020
@@@@ -179,10 +179,10 @@@@
 #define SELECT_STATUS_BUF_SIZE  256               /* size of select status   */
 
 #ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE     "/etc/imapproxy.conf"
+#define DEFAULT_CONFIG_FILE     "@@PKG_SYSCONFDIR@@/etc/imapproxy.conf"
 #endif
 #ifndef DEFAULT_PID_FILE
-#define DEFAULT_PID_FILE       "/var/run/imapproxy.pid"
+#define DEFAULT_PID_FILE       "@@VARBASE@@/run/imapproxy.pid"
 #endif
 
 #define LITERAL_PASSWORD        1
@@@@ -373,8 +373,12 @@@@
 extern void ICC_Logout( ICC_Struct * );
 extern void ICC_Recycle( unsigned int );
 extern void ICC_Recycle_Loop( void );
+extern void ICC_Invalidate( ICC_Struct * );
 extern void LockMutex( pthread_mutex_t * );
 extern void UnLockMutex( pthread_mutex_t * );
+#ifdef HAVE_LIBSSL
+extern int Attempt_STARTTLS( ITD_Struct * );
+#endif
 extern void SetDefaultConfigValues(ProxyConfig_Struct *);
 extern void SetConfigOptions( char * );
 extern void SetLogOptions( void );
@