pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/imap-uw
Module Name: pkgsrc
Committed By: vins
Date: Tue Nov 11 20:40:56 UTC 2025
Modified Files:
pkgsrc/mail/imap-uw: Makefile buildlink3.mk distinfo hacks.mk
options.mk
pkgsrc/mail/imap-uw/patches: patch-src_osdep_unix_ssl__unix.c
Log Message:
mail/imap-uw: fix build with gcc14 on NetBSD
Since we're here, apply some lint fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/mail/imap-uw/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/imap-uw/buildlink3.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/imap-uw/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/imap-uw/hacks.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/imap-uw/options.mk
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/imap-uw/Makefile
diff -u pkgsrc/mail/imap-uw/Makefile:1.156 pkgsrc/mail/imap-uw/Makefile:1.157
--- pkgsrc/mail/imap-uw/Makefile:1.156 Sun Oct 26 17:28:47 2025
+++ pkgsrc/mail/imap-uw/Makefile Tue Nov 11 20:40:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2025/10/26 17:28:47 vins Exp $
+# $NetBSD: Makefile,v 1.157 2025/11/11 20:40:56 vins Exp $
#
# ATTENTION:
# The Kerberos support in this software is known to be problematic. If you
@@ -11,7 +11,7 @@
DISTNAME= imap-2007f
PKGNAME= ${DISTNAME:S/-/-uw-/}
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= mail
#MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
EXTRACT_SUFX= .tar.Z
@@ -35,11 +35,11 @@ MAKE_JOBS_SAFE= no
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
-. if empty(CC_VERSION:Mgcc-)
+.if ${CC_VERSION} != gcc-
BUILD_TARGET.SunOS= soc
-. else
+.else
BUILD_TARGET.SunOS= gso
-. endif
+.endif
.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
BUILD_TARGET.Linux= lnp
.else
@@ -47,11 +47,11 @@ BUILD_TARGET.Linux= slx
.endif
.if ${OPSYS} == Darwin
LDFLAGS+= -flat_namespace
-. if exists(/usr/include/pam/pam_appl.h)
+. if exists(/usr/include/pam/pam_appl.h)
BUILD_TARGET.Darwin= oxp
-. else
+. else
BUILD_TARGET.Darwin= osx
-. endif
+. endif
.endif
.if ${OPSYS} == "IRIX"
. if ${OPSYS_VERSION} >= 060500
@@ -113,13 +113,14 @@ SUBST_SED.man+= -e "s|/etc/rimapd|${PRE
SUBST_SED.man+= -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g"
SUBST_SED.man+= -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
-INSTALLATION_DIRS+= bin lib libexec sbin \
- ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+= bin lib libexec sbin \
+ ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
+ include/c-client
# Generate _pic.a library from shared objects.
post-build:
cd ${WRKSRC}/c-client; \
- ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo
+ ${LIBTOOL} --tag=CC --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo
do-install: install-headers install-lib install-doc
${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${DESTDIR}${PREFIX}/libexec
@@ -141,7 +142,6 @@ do-install: install-headers install-lib
.PHONY: install-headers install-lib install-doc
install-headers:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/c-client
${CAT} ${PKGDIR}/PLIST | \
while read entry; do \
case "$$entry" in \
@@ -157,7 +157,7 @@ install-lib:
${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${DESTDIR}${PREFIX}/lib
${RANLIB} ${DESTDIR}${PREFIX}/lib/${CCLIENT_PICLIB}
-DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
install-doc:
${INSTALL_DATA_DIR} ${DOCDIR}
${CP} -R ${WRKSRC}/docs/* ${DOCDIR}
Index: pkgsrc/mail/imap-uw/buildlink3.mk
diff -u pkgsrc/mail/imap-uw/buildlink3.mk:1.25 pkgsrc/mail/imap-uw/buildlink3.mk:1.26
--- pkgsrc/mail/imap-uw/buildlink3.mk:1.25 Tue Oct 24 22:09:43 2023
+++ pkgsrc/mail/imap-uw/buildlink3.mk Tue Nov 11 20:40:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2023/10/24 22:09:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2025/11/11 20:40:56 vins Exp $
BUILDLINK_TREE+= imap-uw
@@ -8,13 +8,19 @@ IMAP_UW_BUILDLINK3_MK:=
.include "../../mk/bsd.fast.prefs.mk"
BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2007dnb1
-BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2007fnb12
+BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2007fnb15
BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw
.if ${OPSYS} == "Darwin"
BUILDLINK_LDFLAGS.imap-uw+= -flat_namespace
.endif
-.include "../../security/openssl/buildlink3.mk"
+pkgbase := imap-uw
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.imap-uw:Mssl}
+
+. include "../../security/openssl/buildlink3.mk"
+.endif # PKG_BUILD_OPTIONS
.endif # IMAP_UW_BUILDLINK3_MK
BUILDLINK_TREE+= -imap-uw
Index: pkgsrc/mail/imap-uw/distinfo
diff -u pkgsrc/mail/imap-uw/distinfo:1.54 pkgsrc/mail/imap-uw/distinfo:1.55
--- pkgsrc/mail/imap-uw/distinfo:1.54 Mon Nov 10 20:49:43 2025
+++ pkgsrc/mail/imap-uw/distinfo Tue Nov 11 20:40:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2025/11/10 20:49:43 vins Exp $
+$NetBSD: distinfo,v 1.55 2025/11/11 20:40:56 vins Exp $
BLAKE2s (imap-2007f.tar.Z) = 6e67d03b84ec0fed4db99c81aea92160304c1f0c7c9ece7d5e9c4375f1490621
SHA512 (imap-2007f.tar.Z) = 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
@@ -42,4 +42,4 @@ SHA1 (patch-src_c-client_misc.h) = 5cf51
SHA1 (patch-src_c-client_nntp.c) = 0cca24036e699a4cd8c349056c9e0cfbd4910a9d
SHA1 (patch-src_mlock_Makefile) = 6bf652f597ad21dffa44e01d6cb89525eeaf7fc9
SHA1 (patch-src_mlock_mlock.c) = 5cdc25f4295479fb772959cb84e51c0a9fa97c01
-SHA1 (patch-src_osdep_unix_ssl__unix.c) = cdb4ce9420f649d7cbd6d1e433336c6be94b10f9
+SHA1 (patch-src_osdep_unix_ssl__unix.c) = e4fadc1212d06a04824e7f9b2c70592254a3329e
Index: pkgsrc/mail/imap-uw/hacks.mk
diff -u pkgsrc/mail/imap-uw/hacks.mk:1.3 pkgsrc/mail/imap-uw/hacks.mk:1.4
--- pkgsrc/mail/imap-uw/hacks.mk:1.3 Sun Oct 26 17:28:47 2025
+++ pkgsrc/mail/imap-uw/hacks.mk Tue Nov 11 20:40:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2025/10/26 17:28:47 vins Exp $
+# $NetBSD: hacks.mk,v 1.4 2025/11/11 20:40:56 vins Exp $
.if !defined(IMAP_UW_HACKS_MK)
IMAP_UW_HACKS_MK= defined
@@ -10,7 +10,7 @@ IMAP_UW_HACKS_MK= defined
### to free unreference scalar". Remove optimisation flags as a
### workaround until GCC is fixed.
###
-.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
+.if ${CC_VERSION:Mgcc*} && ${MACHINE_PLATFORM:MNetBSD-*-alpha}
PKG_HACKS+= alpha-codegen
BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-O
.endif
@@ -38,5 +38,21 @@ SUBST_SED.hacks+= -e "s:void \*d2:const
SUBST_SED.hacks+= -e "s:const struct direct \**d1:const void \*d1:g"
SUBST_SED.hacks+= -e "s:const struct direct \**d2:const void \*d2:g"
-.endif
+.elif ${OPSYS:M*BSD}
+
+PKG_HACKS+= incompatible-pointer-types
+
+SUBST_CLASSES+= hacks
+SUBST_STAGE.hacks= pre-configure
+SUBST_MESSAGE.hacks= Applying fixes for OS-dependent routines on *BSD.
+SUBST_FILES.hacks+= src/osdep/unix/news.c src/osdep/unix/mh.c \
+ src/osdep/unix/mix.c src/osdep/unix/mx.c
+SUBST_SED.hacks+= -e "s:char \*s = name:const char \*s = name:g"
+SUBST_SED.hacks+= -e "s:char c,\*s;:char c; const char \*s;:g"
+SUBST_SED.hacks+= -e "s:mix_dirfmttest (char \*name):mix_dirfmttest (const char \*name):g"
+SUBST_SED.hacks+= -e "s:struct direct \*name:const struct direct \*name:g"
+SUBST_SED.hacks+= -e "s:const void \*d1:const struct direct \**d1:g"
+SUBST_SED.hacks+= -e "s:const void \*d2:const struct direct \**d2:g"
+
+.endif # incompatible-pointer-types
.endif # IMAP_UW_HACKS_MK
Index: pkgsrc/mail/imap-uw/options.mk
diff -u pkgsrc/mail/imap-uw/options.mk:1.9 pkgsrc/mail/imap-uw/options.mk:1.10
--- pkgsrc/mail/imap-uw/options.mk:1.9 Sun Sep 2 00:52:50 2018
+++ pkgsrc/mail/imap-uw/options.mk Tue Nov 11 20:40:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/09/02 00:52:50 maya Exp $
+# $NetBSD: options.mk,v 1.10 2025/11/11 20:40:56 vins Exp $
.include "../../mk/bsd.prefs.mk"
@@ -23,11 +23,11 @@ MAKE_FLAGS+= IP=4
###
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE}
-MAKE_ENV+= EXTRAAUTHENTICATORS=gss
-EXTRASPECIALS+= GSSDIR=${KRB5BASE}
-CFLAGS.heimdal= -DHEIMDAL_KRB5
-CFLAGS+= ${CFLAGS.${KRB5_TYPE}}
+MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE}
+MAKE_ENV+= EXTRAAUTHENTICATORS=gss
+EXTRASPECIALS+= GSSDIR=${KRB5BASE}
+CFLAGS.heimdal+= -DHEIMDAL_KRB5
+CFLAGS+= ${CFLAGS.${KRB5_TYPE}}
.endif
###
Index: pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c
diff -u pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c:1.2 pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c:1.3
--- pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c:1.2 Mon Apr 16 21:27:57 2018
+++ pkgsrc/mail/imap-uw/patches/patch-src_osdep_unix_ssl__unix.c Tue Nov 11 20:40:56 2025
@@ -1,14 +1,32 @@
-$NetBSD: patch-src_osdep_unix_ssl__unix.c,v 1.2 2018/04/16 21:27:57 christos Exp $
+$NetBSD: patch-src_osdep_unix_ssl__unix.c,v 1.3 2025/11/11 20:40:56 vins Exp $
-Description: Support OpenSSL 1.1
- When building with OpenSSL 1.1 and newer, use the new built-in
- hostname verification instead of code that doesn't compile due to
- structs having been made opaque.
-Bug-Debian: https://bugs.debian.org/828589
+* Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+ Bug-Debian: https://bugs.debian.org/828589
+
+* Enable OpenSSL 1.0 compatibility to build with OpenSSL 3.x.
--- src/osdep/unix/ssl_unix.c.orig 2011-07-23 00:20:10.000000000 +0000
-+++ src/osdep/unix/ssl_unix.c 2018-04-16 17:20:28.991950059 -0400
-@@ -219,16 +219,28 @@
++++ src/osdep/unix/ssl_unix.c
+@@ -26,6 +26,7 @@
+ * Last Edited: 13 January 2007
+ */
+
++#define OPENSSL_API_COMPAT 0x10100000
+ #define crypt ssl_private_crypt
+ #include <x509v3.h>
+ #include <ssl.h>
+@@ -40,7 +41,6 @@
+ #define SSLBUFLEN 8192
+ #define SSLCIPHERLIST "ALL:!LOW"
+
+-
+ /* SSL I/O stream */
+
+ typedef struct ssl_stream {
+@@ -219,16 +219,28 @@ static char *ssl_start_work (SSLSTREAM *
(sslclientkey_t) mail_parameters (NIL,GET_SSLCLIENTKEY,NIL);
if (ssl_last_error) fs_give ((void **) &ssl_last_error);
ssl_last_host = host;
@@ -41,7 +59,7 @@ Bug-Debian: https://bugs.debian.org/8285
SSL_CTX_set_default_verify_paths (stream->context);
/* ...unless a non-standard path desired */
if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
-@@ -266,6 +278,7 @@
+@@ -266,6 +278,7 @@ static char *ssl_start_work (SSLSTREAM *
if (SSL_write (stream->con,"",0) < 0)
return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
/* need to validate host names? */
@@ -49,7 +67,7 @@ Bug-Debian: https://bugs.debian.org/8285
if (!(flags & NET_NOVALIDATECERT) &&
(err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
host))) {
-@@ -275,6 +288,7 @@
+@@ -275,6 +288,7 @@ static char *ssl_start_work (SSLSTREAM *
sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
return ssl_last_error = cpystr (tmp);
}
@@ -57,7 +75,7 @@ Bug-Debian: https://bugs.debian.org/8285
return NIL;
}
-@@ -313,6 +327,7 @@
+@@ -313,6 +327,7 @@ static int ssl_open_verify (int ok,X509_
* Returns: NIL if validated, else string of error message
*/
@@ -65,7 +83,7 @@ Bug-Debian: https://bugs.debian.org/8285
static char *ssl_validate_cert (X509 *cert,char *host)
{
int i,n;
-@@ -342,6 +357,7 @@
+@@ -342,6 +357,7 @@ static char *ssl_validate_cert (X509 *ce
else ret = "Unable to locate common name in certificate";
return ret;
}
@@ -73,7 +91,7 @@ Bug-Debian: https://bugs.debian.org/8285
/* Case-independent wildcard pattern match
* Accepts: base string
-@@ -702,9 +718,13 @@
+@@ -702,9 +718,13 @@ void ssl_server_init (char *server)
if (stat (key,&sbuf)) strcpy (key,cert);
}
/* create context */
@@ -90,7 +108,7 @@ Bug-Debian: https://bugs.debian.org/8285
syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s",
tcp_clienthost ());
else { /* set context options */
-@@ -772,17 +792,35 @@
+@@ -772,17 +792,35 @@ static RSA *ssl_genkey (SSL *con,int exp
{
unsigned long i;
static RSA *key = NIL;
Home |
Main Index |
Thread Index |
Old Index