pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qsmtp Update to 0.38. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/a5edad5e998f
branches: trunk
changeset: 440514:a5edad5e998f
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat Oct 10 10:01:38 2020 +0000
description:
Update to 0.38. From the changelog:
- many portability fixes for BSD like systems
- Qremote: allow the SSL key to be stored independent of the certificate
diffstat:
mail/qsmtp/Makefile | 7 +-
mail/qsmtp/PLIST | 10 +-
mail/qsmtp/distinfo | 17 +----
mail/qsmtp/patches/patch-CMakeLists.txt | 74 ---------------------------
mail/qsmtp/patches/patch-include_qdns.h | 14 -----
mail/qsmtp/patches/patch-qsmtpd_antispam.c | 14 -----
mail/qsmtp/patches/patch-qsmtpd_auth.c | 17 ------
mail/qsmtp/patches/patch-qsmtpd_data.c | 14 -----
mail/qsmtp/patches/patch-tests_mmap__test.c | 11 ----
mail/qsmtp/patches/patch-tests_qsdata__test.c | 16 -----
10 files changed, 12 insertions(+), 182 deletions(-)
diffs (253 lines):
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/Makefile
--- a/mail/qsmtp/Makefile Sat Oct 10 09:31:50 2020 +0000
+++ b/mail/qsmtp/Makefile Sat Oct 10 10:01:38 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/07/04 14:11:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2020/10/10 10:01:38 schmonz Exp $
-DISTNAME= Qsmtp-0.37
-PKGREVISION= 2
+DISTNAME= Qsmtp-0.38
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.xz
@@ -13,8 +12,6 @@
USE_CMAKE= yes
CMAKE_ARGS+= -DAUTOQMAIL=${QMAILDIR}
-CMAKE_ARGS+= -DDOC_DESTINATION_DIRECTORY="share/doc/qsmtp/"
-CMAKE_ARGS.Darwin+= -DALLOW_INSECURE_BZERO=ON
BUILD_DEFS+= QMAILDIR
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/PLIST
--- a/mail/qsmtp/PLIST Sat Oct 10 09:31:50 2020 +0000
+++ b/mail/qsmtp/PLIST Sat Oct 10 10:01:38 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/07/04 14:11:40 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/10/10 10:01:38 schmonz Exp $
bin/Qremote
bin/Qsmtpd
bin/Qsurvey
@@ -10,7 +10,7 @@
man/man5/filterconf.5
man/man8/Qremote.8
man/man8/Qsmtpd.8
-share/doc/qsmtp/CREDITS
-share/doc/qsmtp/INSTALL
-share/doc/qsmtp/THOUGHTS
-share/doc/qsmtp/faq.html
+share/doc/Qsmtp/CREDITS
+share/doc/Qsmtp/INSTALL
+share/doc/Qsmtp/THOUGHTS
+share/doc/Qsmtp/faq.html
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/distinfo
--- a/mail/qsmtp/distinfo Sat Oct 10 09:31:50 2020 +0000
+++ b/mail/qsmtp/distinfo Sat Oct 10 10:01:38 2020 +0000
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/07/04 14:11:40 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2020/10/10 10:01:38 schmonz Exp $
-SHA1 (Qsmtp-0.37.tar.xz) = 768567e10adf47d651735bd8e7289a6b8a18d24a
-RMD160 (Qsmtp-0.37.tar.xz) = abf841db63e94142f309fcac93c29a29c1a4d692
-SHA512 (Qsmtp-0.37.tar.xz) = 911d9d956ef7d0c6ad150745db489dd96eca0b665d99c0db648b4382c0d21fc759ad4a138e7adf69c6749574ad619114e7f06f62c131d0ae103e9b0493d39ef3
-Size (Qsmtp-0.37.tar.xz) = 250100 bytes
-SHA1 (patch-CMakeLists.txt) = a764e2e2dd79043e9dd45fd213e95ab776a81299
-SHA1 (patch-include_qdns.h) = de5f47f62cb7482d1ed96814123f6f1abad4506b
-SHA1 (patch-qsmtpd_antispam.c) = 8df576496c31712e49f4679be172074d7712c089
-SHA1 (patch-qsmtpd_auth.c) = 48958cc70850e2016c755eb53c777998d1477018
-SHA1 (patch-qsmtpd_data.c) = 94a8c51a63c1d6db2433c932388bbac260f462c2
-SHA1 (patch-tests_mmap__test.c) = a39835b6fba0a183e8ff47bdeb7f26889cbb4b53
-SHA1 (patch-tests_qsdata__test.c) = 8b07628c00c05edee79fd6918ce6bc1a24747ebb
+SHA1 (Qsmtp-0.38.tar.xz) = 1e3e3fd605a8f691726b7967a78b1f2e94b2f9e4
+RMD160 (Qsmtp-0.38.tar.xz) = 8f9283b2f728782ace5586430b7982c305d8211d
+SHA512 (Qsmtp-0.38.tar.xz) = b1e5d3806eeb47488d91fff3dc60c88420bfa9edf77d2d68f51cdfea913c5c0298d13b9dd66a69100c9a9d1d4b7b1abadac11b253192b029329a13e77f895296
+Size (Qsmtp-0.38.tar.xz) = 252632 bytes
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-CMakeLists.txt
--- a/mail/qsmtp/patches/patch-CMakeLists.txt Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2020/07/04 14:11:41 schmonz Exp $
-
-Support PKGMANDIR.
-Support explicit_memset on NetBSD.
-Skip building API docs with Doxygen.
-
---- CMakeLists.txt.orig 2020-01-06 19:19:59.000000000 +0000
-+++ CMakeLists.txt
-@@ -7,7 +7,7 @@ project(Qsmtp
-
- option(CHECK_MEMORY "Add memory access checks" OFF)
-
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
-+set (CMAKE_MODULE_PATH "/data/scratch/mail/qsmtp/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
-
- set(CMAKE_C_STANDARD 99)
- set(CMAKE_C_STANDARD_REQUIRED On)
-@@ -95,7 +95,8 @@ endif ()
-
- set(CMAKE_REQUIRED_INCLUDES string.h)
- CHECK_FUNCTION_EXISTS(explicit_bzero HAS_EXP_BZERO)
--if (NOT HAS_EXP_BZERO)
-+CHECK_FUNCTION_EXISTS(explicit_memset HAS_EXP_MEMSET)
-+if (NOT HAS_EXP_BZERO AND NOT HAS_EXP_MEMSET)
- set(CMAKE_REQUIRED_INCLUDES bsd/string.h)
- find_library(LIBBSD NAMES bsd)
- if (LIBBSD)
-@@ -111,6 +112,9 @@ if (NOT HAS_EXP_BZERO)
- add_definitions(-DINSECURE_BZERO)
- endif ()
- endif ()
-+if (HAS_EXP_MEMSET)
-+ add_definitions(-DHAS_EXP_MEMSET)
-+endif ()
- set(CMAKE_REQUIRED_INCLUDES fcntl.h)
- CHECK_FUNCTION_EXISTS(openat HAS_OPENAT)
- unset(CMAKE_REQUIRED_INCLUDES)
-@@ -190,19 +194,19 @@ endif ()
- option(BUILD_DOC "Build documentation" ON)
- if (BUILD_DOC)
- # API documentation
-- find_package(Doxygen REQUIRED)
-+ # find_package(Doxygen REQUIRED)
-
-- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-+ # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-
-- add_custom_target(docu ALL
-- COMMAND ${DOXYGEN_EXECUTABLE}
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+ # add_custom_target(docu ALL
-+ # COMMAND ${DOXYGEN_EXECUTABLE}
-+ # WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-
- if (NOT DOC_DESTINATION_DIRECTORY)
- set(DOC_DESTINATION_DIRECTORY "doc/")
- endif ()
-
-- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
-+ # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
-
- # general documentation
- install(FILES
-@@ -220,8 +224,8 @@ if (BUILD_DOC)
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/Qremote.8
- ${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd.8
-- DESTINATION man/man8)
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/filterconf.5
-- DESTINATION man/man5)
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
- endif ()
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-include_qdns.h
--- a/mail/qsmtp/patches/patch-include_qdns.h Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-include_qdns.h,v 1.1 2020/03/06 20:50:24 schmonz Exp $
-
-Avoid conflicting implicit definition of htonl() on NetBSD.
-
---- include/qdns.h.orig 2020-01-06 19:19:59.000000000 +0000
-+++ include/qdns.h
-@@ -4,6 +4,7 @@
- #ifndef QSMTP_DNS_H
- #define QSMTP_DNS_H
-
-+#include <arpa/inet.h>
- #include <netinet/in.h>
-
- /** @enum mx_special_priorities
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-qsmtpd_antispam.c
--- a/mail/qsmtp/patches/patch-qsmtpd_antispam.c Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-qsmtpd_antispam.c,v 1.1 2020/01/12 23:03:28 joerg Exp $
-
-Find LOCK_* on NetBSD.
-
---- qsmtpd/antispam.c.orig 2020-01-11 21:21:57.002915885 +0000
-+++ qsmtpd/antispam.c
-@@ -1,6 +1,7 @@
- /** \file antispam.c
- \brief several helper functions for spam filters
- */
-+#define _NETBSD_SOURCE
-
- #include <qsmtpd/antispam.h>
-
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-qsmtpd_auth.c
--- a/mail/qsmtp/patches/patch-qsmtpd_auth.c Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-qsmtpd_auth.c,v 1.1 2020/01/12 23:03:28 joerg Exp $
-
-Use explicit_memset as explicit_bzero implementation on NetBSD.
-
---- qsmtpd/auth.c.orig 2020-01-11 21:10:23.629847795 +0000
-+++ qsmtpd/auth.c
-@@ -26,7 +26,9 @@
- #include <syslog.h>
- #include <time.h>
- #include <unistd.h>
--#ifdef NEED_BSD_STRING_H
-+#ifdef HAS_EXP_MEMSET
-+#define explicit_bzero(a, b) explicit_memset((a), 0, (b))
-+#elif defined(NEED_BSD_STRING_H)
- #include <bsd/string.h>
- #elif defined(INSECURE_BZERO)
- // insecure fallback, could be optimized out by the compiler so memory is not overwritten
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-qsmtpd_data.c
--- a/mail/qsmtp/patches/patch-qsmtpd_data.c Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-qsmtpd_data.c,v 1.1 2020/01/12 23:03:28 joerg Exp $
-
-Find LOCK_* on NetBSD.
-
---- qsmtpd/data.c.orig 2020-01-11 21:11:14.750764277 +0000
-+++ qsmtpd/data.c
-@@ -4,6 +4,7 @@
-
- #define _STD_SOURCE
- #define _GNU_SOURCE
-+#define _NETBSD_SOURCE
- #include <qsmtpd/qsdata.h>
-
- #include <fmt.h>
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-tests_mmap__test.c
--- a/mail/qsmtp/patches/patch-tests_mmap__test.c Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-tests_mmap__test.c,v 1.1 2020/01/12 23:03:28 joerg Exp $
-
-Find LOCK_* on NetBSD.
-
---- tests/mmap_test.c.orig 2020-01-11 21:22:55.244319133 +0000
-+++ tests/mmap_test.c
-@@ -1,3 +1,4 @@
-+#define _NETBSD_SOURCE
- #include <mmap.h>
- #include "test_io/testcase_io.h"
-
diff -r 2780369c6cfd -r a5edad5e998f mail/qsmtp/patches/patch-tests_qsdata__test.c
--- a/mail/qsmtp/patches/patch-tests_qsdata__test.c Sat Oct 10 09:31:50 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-tests_qsdata__test.c,v 1.1 2020/01/12 23:03:28 joerg Exp $
-
-Patch the right function on NetBSD, symbol renaming doesn't agree with
-the manual definition.
-
---- tests/qsdata_test.c.orig 2020-01-11 21:16:44.405991522 +0000
-+++ tests/qsdata_test.c
-@@ -53,6 +53,8 @@ time(time_t *t __attribute__ ((unused)))
- int
- #ifdef __DARWIN_ONLY_UNIX_CONFORMANCE
- gettimeofday(struct timeval *tv, void *tz)
-+#elif defined(__NetBSD__)
-+__gettimeofday50(struct timeval * __restrict tv, struct timezone * __restrict tz)
- #else
- gettimeofday(struct timeval *tv, struct timezone *tz)
- #endif
Home |
Main Index |
Thread Index |
Old Index