From nobody Sun May 07 16:13:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QDqG8743lz498k7; Sun, 7 May 2023 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QDqG86B5Yz3m4d; Sun, 7 May 2023 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683475984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHsBZXDStC9KshO8Oeh+QGmEJ8bf5nVZj+dLko+Cz0A=; b=qFUGxTy++P7toyRfSrEAql9NrW6Hgf/LcUALbAJU9JMUUYim+2LU8YHvrv2DkG4siHFY9Q W4Bj8Q2WCyAbplK+HSAFHQbNS7YcXGzapMxrImERtyNqyiKHByWWrqAUOBciMYWjkTXQIc uXIcLLZyOU/88ma41pBXiK1ECF2XePQqTtBxWMs95A5OieBwQgAiSM0kiP6ELhj/2P2LEQ KeJ14oX/fLw6savRt8NGW909xO+vlo2U33IlLPmyMXWNfSfR6zWinIzLAJmg3rVVbvOSJX Y15pDkDL8d8gWkvlxzYRhvPcEkNSBo7s0BjkbZX2T/WvXOIPHu1vMUIRDIXKzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683475984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHsBZXDStC9KshO8Oeh+QGmEJ8bf5nVZj+dLko+Cz0A=; b=H/zOVO3qfPNMRjFZY6mh3EnIrWXigTqMgyzNjwCViyh95HdOwean4ixrtVNyLkmqwRSbQ2 qefrBNlXk1LMbnASjp6vKFOt4jnnZf9RnZIfdW071iQWJ948tpPIR8Hr05iH1tQGtfPU2K dio1D487gIZg66Q6venUXmly8wnJjOQwAHJ88nRTnneEbb32nvNwsgJpOzjXu4ENQ5uD8c tMHVaRhEhVaB3nGixN4rB+6UqU5eut2iQARxybOPupM23+CfsGuzVv4p6Ij2AW/7yvbjEq dtaUzB8R+2AoFKTSeuLwjCtSOhDybSMysAKY2gVTehBfWniu9BJ+C9Exe6Ob9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683475984; a=rsa-sha256; cv=none; b=DIVOZjOcUyJcSM3O1cPgDkv+tm/dLnnsZ/1B1gz52oUqPHB3YuSdoWJxtKghqt+YKIiDJs rwwHmq66TI6eDDjfEKF8f9TkfUgmjeXJ1zvLb7yXvG4ygI9yhXbOP83zS6hh17wGXDB4o9 6TwnI45FcqLWVrcU1uTmiy5wN+IJfQIaY6LrfcTPioRcunpmQ35FJn7bs6cOjqQbhXMLXw ER5j05Rno0Z2meqPuh0W2mvYKAMP+JgnkZzx1TJtnqiEd+aCML9YL+KAr+fBHPJ17AUJcm GkgH6pk+92IcW1Qa0k9hRJdjKtX7s5uyaQ01aE3iR8TsJe4HMTORkSR/W0zaoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDqG85Gk9zQ5Y; Sun, 7 May 2023 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 347GD41q039958; Sun, 7 May 2023 16:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347GD47f039957; Sun, 7 May 2023 16:13:04 GMT (envelope-from git) Date: Sun, 7 May 2023 16:13:04 GMT Message-Id: <202305071613.347GD47f039957@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b63c215e5780 - main - mail/libesmtp: Update to 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b63c215e57802cb23ea8b5f3a691946dd83bc1a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b63c215e57802cb23ea8b5f3a691946dd83bc1a2 commit b63c215e57802cb23ea8b5f3a691946dd83bc1a2 Author: Po-Chuan Hsieh AuthorDate: 2023-05-07 16:03:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-05-07 16:03:14 +0000 mail/libesmtp: Update to 1.1.0 - Update pkg-descr - Take maintainership Changes: https://github.com/libesmtp/libESMTP/releases https://libesmtp.github.io/reference/changes-since-v1.0.6.html --- mail/libesmtp/Makefile | 44 ++++++++------------------------ mail/libesmtp/distinfo | 8 +++--- mail/libesmtp/files/patch-meson.build | 18 +++++++++++++ mail/libesmtp/files/patch-ntlm_ntlmdes.c | 34 ------------------------ mail/libesmtp/pkg-descr | 18 ++++--------- mail/libesmtp/pkg-plist | 27 +++++--------------- 6 files changed, 43 insertions(+), 106 deletions(-) diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index 6672ee640ca5..73293d117ba1 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -1,47 +1,25 @@ PORTNAME= libesmtp -PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTVERSION= 1.1.0 +DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= mail -MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \ - http://ftp.osuosl.org/pub/blfs/svn/l/ \ - GENTOO -PATCH_SITES= https://gitweb.gentoo.org/repo/gentoo.git/plain/net-libs/libesmtp/files/ \ - https://raw.githubusercontent.com/gentoo/gentoo/master/net-libs/libesmtp/files/ -PATCHFILES= libesmtp-1.0.6-openssl-1.1-api-compatibility.patch:-p1 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for posting electronic mail WWW= http://www.stafford.uklinux.net/libesmtp/ LICENSE= LGPL21+ -LICENSE_FILE= ${WRKSRC}/COPYING.LIB - -USES= autoreconf cpe gmake libtool tar:bzip2 -GNU_CONFIGURE= yes -# require-all-recipients (implied by enable-all) is required for Balsa -CONFIGURE_ARGS= --enable-all --disable-isoc -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -CPE_VENDOR= libesmtp_project +LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS_DEFINE= OPENSSL DEBUG DOCS EXAMPLES -OPTIONS_DEFAULT=OPENSSL -OPTIONS_SUB= yes +USES= cpe meson pkgconfig ssl -DEBUG_CONFIGURE_ENABLE= debug -OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} -OPENSSL_USES= ssl +CFLAGS+= -D__BSD_VISIBLE +MESON_ARGS= --default-library=both -Dbdat=true -Detrn=true -Dlwres=disabled -Dpthreads=enabled -Dtls=enabled -Dxdg=true -Dxusr=true +USE_LDCONFIG= yes -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in AUTHORS ChangeLog NEWS Notes README TODO - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -.endfor +CPE_VENDOR= libesmtp_project -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} +USE_GITHUB= yes +GH_PROJECT= libESMTP .include diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo index 84b139364e8e..3d8d53658700 100644 --- a/mail/libesmtp/distinfo +++ b/mail/libesmtp/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1281387021 -SHA256 (libesmtp-1.0.6.tar.bz2) = d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b -SIZE (libesmtp-1.0.6.tar.bz2) = 365506 -SHA256 (libesmtp-1.0.6-openssl-1.1-api-compatibility.patch) = d10161f8b01c7865dcb948f8e65e61b8596752856953a605632d2c09dd41494c -SIZE (libesmtp-1.0.6-openssl-1.1-api-compatibility.patch) = 2243 +TIMESTAMP = 1683227585 +SHA256 (libesmtp-libESMTP-v1.1.0_GH0.tar.gz) = 32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 +SIZE (libesmtp-libESMTP-v1.1.0_GH0.tar.gz) = 169134 diff --git a/mail/libesmtp/files/patch-meson.build b/mail/libesmtp/files/patch-meson.build new file mode 100644 index 000000000000..1b9692e5271f --- /dev/null +++ b/mail/libesmtp/files/patch-meson.build @@ -0,0 +1,18 @@ +--- meson.build.orig 2021-06-04 16:18:50 UTC ++++ meson.build +@@ -61,7 +61,6 @@ add_project_arguments(cc.get_supported_arguments(cflag + ################################################################################ + # dependencies + ################################################################################ +-dldep = cc.find_library('dl') + ssldep = dependency('openssl', version : '>=1.1.0', required : get_option('tls')) + threaddep = dependency('threads', required : get_option('pthreads')) + +@@ -69,7 +68,6 @@ threaddep = dependency('threads', required : get_optio + lwresdep = cc.find_library('lwres', required : get_option('lwres')) + + deps = [ +- dldep, + ssldep, + threaddep, + lwresdep, diff --git a/mail/libesmtp/files/patch-ntlm_ntlmdes.c b/mail/libesmtp/files/patch-ntlm_ntlmdes.c deleted file mode 100644 index 064ce30dff04..000000000000 --- a/mail/libesmtp/files/patch-ntlm_ntlmdes.c +++ /dev/null @@ -1,34 +0,0 @@ ---- ntlm/ntlmdes.c.orig 2010-08-08 15:45:56 UTC -+++ ntlm/ntlmdes.c -@@ -30,10 +30,10 @@ - #include "ntlm.h" - - static void --lm_deshash (void *result, const_des_cblock *iv, const void *secret) -+lm_deshash (void *result, const_DES_cblock *iv, const void *secret) - { -- des_cblock key; -- des_key_schedule ks; -+ DES_cblock key; -+ DES_key_schedule ks; - unsigned char key_56[8]; - size_t len; - -@@ -85,7 +85,7 @@ lm_uccpy (char *dst, size_t dstlen, cons - void - lm_hash_password (unsigned char *hash, const char *pass) - { -- static const_des_cblock iv = { 0x4B, 0x47, 0x53, 0x21, -+ static const_DES_cblock iv = { 0x4B, 0x47, 0x53, 0x21, - 0x40, 0x23, 0x24, 0x25 }; - char lmpass[14]; - -@@ -137,7 +137,7 @@ ntlm_responses (unsigned char *lm_resp, - const unsigned char *challenge, const char *secret) - { - unsigned char hash[21]; -- des_cblock nonce; -+ DES_cblock nonce; - - memcpy (&nonce, challenge, sizeof nonce); - diff --git a/mail/libesmtp/pkg-descr b/mail/libesmtp/pkg-descr index 1d1305058fc0..8bf8b77261eb 100644 --- a/mail/libesmtp/pkg-descr +++ b/mail/libesmtp/pkg-descr @@ -1,14 +1,6 @@ -libESMTP is a library to manage posting (or submission of) electronic -mail using SMTP to a preconfigured Mail Transport Agent (MTA) such as -Exim. It may be used as part of a Mail User Agent (MUA) or another -program that must be able to post electronic mail but where mail -functionality is not the program's primary purpose. libESMTP is not -intended to be used as part of a program that implements a Mail -Transport Agent. +libESMTP is an SMTP client which manages submission of electronic mail via a +preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. -libESMTP is an attempt to provide a robust implementation of the SMTP -protocol for use with mail clients. It is being developed as a reaction -to the experience of incomplete or buggy implementations of SMTP and -also to help remove the need for the installation of MTAs on -workstations which only need them to provide a sendmail command for a -mail client to post its mail. +libESMTP relieves the developer of the need to handle the complexity of +negotiating the SMTP protocol by providing a simple API. Additionally libESMTP +transparently handles many SMTP extensions including authentication. diff --git a/mail/libesmtp/pkg-plist b/mail/libesmtp/pkg-plist index b8530a7e0563..1bb284196aff 100644 --- a/mail/libesmtp/pkg-plist +++ b/mail/libesmtp/pkg-plist @@ -1,25 +1,10 @@ -bin/libesmtp-config include/auth-client.h -include/auth-plugin.h include/libesmtp.h -lib/esmtp-plugins/sasl-cram-md5.a -lib/esmtp-plugins/sasl-cram-md5.so -lib/esmtp-plugins/sasl-login.a -lib/esmtp-plugins/sasl-login.so -%%OPENSSL%%lib/esmtp-plugins/sasl-ntlm.a -%%OPENSSL%%lib/esmtp-plugins/sasl-ntlm.so -lib/esmtp-plugins/sasl-plain.a -lib/esmtp-plugins/sasl-plain.so +lib/esmtp-plugins-6.2.0/sasl-crammd5.so +lib/esmtp-plugins-6.2.0/sasl-login.so +lib/esmtp-plugins-6.2.0/sasl-ntlm.so +lib/esmtp-plugins-6.2.0/sasl-plain.so lib/libesmtp.a lib/libesmtp.so -lib/libesmtp.so.6 -lib/libesmtp.so.6.1.6 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/Notes -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mail-file.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-mail +lib/libesmtp.so.6.2.0 +libdata/pkgconfig/libesmtp-1.0.pc