sendmail: update to 8.18.2

Remove two patches no longer needed due to changes upstream.

Signed-off-by: W. Michael Petullo <mike@flyn.org>

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index d124420c01c4d5edf0661035b0a127ce1b83caa0..34c9e22028cd034d8fba958ae69cbf0cbb612d8e 100644 (file)
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sendmail
-PKG_VERSION:=8.18.1
-PKG_RELEASE:=2
+PKG_VERSION:=8.18.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.sendmail.org
-PKG_HASH:=cbf1f309c38e4806f7cf3ead24260f17d1fe8fb63256d13edb3cdd1a098f0770
+PKG_HASH:=1a085faa8ace52cffde2f5e9bc611bdb5f81481caaabf46f0437b719ca089d2f
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 
 PKG_LICENSE:=Sendmail

diff --git a/mail/sendmail/patches/010-enable-nonroot-install.patch b/mail/sendmail/patches/010-enable-nonroot-install.patch
index f7c4135dbb4b0995e7f8a2cf8e9b14ec540ba7d7..1e3a52efcd344f14ed927f18338e3ec9f614b5ed 100644 (file)
--- a/mail/sendmail/patches/010-enable-nonroot-install.patch
+++ b/mail/sendmail/patches/010-enable-nonroot-install.patch
@@ -87,7 +87,7 @@
  bldFINISH
 --- a/sendmail/Makefile.m4
 +++ b/sendmail/Makefile.m4
-@@ -55,8 +55,6 @@ ${DESTDIR}${MSPQ}:
+@@ -60,8 +60,6 @@ ${DESTDIR}${MSPQ}:
        @echo "You must have set up a new user ${MSPQOWN} and a new group ${GBINGRP}"
        @echo "as explained in sendmail/SECURITY."
        mkdir -p ${DESTDIR}${MSPQ}
@@ -96,7 +96,7 @@
        chmod 0770 ${DESTDIR}${MSPQ}
  
  divert(0)
-@@ -68,7 +66,7 @@ ifdef(`confNO_STATISTICS_INSTALL',, `bld
+@@ -73,7 +71,7 @@ ifdef(`confNO_STATISTICS_INSTALL',, `bld
  divert(bldTARGETS_SECTION)
  
  install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
@@ -105,7 +105,7 @@
        for i in ${sendmailTARGET_LINKS}; do \
                rm -f $$i; \
                ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
-@@ -76,7 +74,7 @@ install-set-user-id: bldCURRENT_PRODUCT
+@@ -81,7 +79,7 @@ install-set-user-id: bldCURRENT_PRODUCT
  
  define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
  install-sm-mta: bldCURRENT_PRODUCT
@@ -114,7 +114,7 @@
        for i in confMTA_LINKS; do \
                rm -f $$i; \
                ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
-@@ -84,14 +82,14 @@ install-sm-mta: bldCURRENT_PRODUCT
+@@ -89,14 +87,14 @@ install-sm-mta: bldCURRENT_PRODUCT
  
  install-hf:
        if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi

diff --git a/mail/sendmail/patches/103-create-install-dirs.patch b/mail/sendmail/patches/103-create-install-dirs.patch
index 8e4d3d3d92714f0397150f248a55aa9e23f56772..a0beff5ffe5b4b7fc8d85a47c308f0e9ac0bc38a 100644 (file)
--- a/mail/sendmail/patches/103-create-install-dirs.patch
+++ b/mail/sendmail/patches/103-create-install-dirs.patch
@@ -1,6 +1,6 @@
 --- a/sendmail/Makefile.m4
 +++ b/sendmail/Makefile.m4
-@@ -69,6 +69,7 @@ install-set-user-id: bldCURRENT_PRODUCT
+@@ -74,6 +74,7 @@ install-set-user-id: bldCURRENT_PRODUCT
        ${INSTALL} -c -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
        for i in ${sendmailTARGET_LINKS}; do \
                rm -f $$i; \
@@ -8,7 +8,7 @@
                ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
        done
  
-@@ -77,6 +78,7 @@ install-sm-mta: bldCURRENT_PRODUCT
+@@ -82,6 +83,7 @@ install-sm-mta: bldCURRENT_PRODUCT
        ${INSTALL} -c -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
        for i in confMTA_LINKS; do \
                rm -f $$i; \

diff --git a/mail/sendmail/patches/220-sm_strtoll.patch b/mail/sendmail/patches/220-sm_strtoll.patch
deleted file mode 100644 (file)
index af3c41a..0000000
--- a/mail/sendmail/patches/220-sm_strtoll.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Bug: https://bugs.gentoo.org/944460
-
---- a/libsm/vfscanf.c
-+++ b/libsm/vfscanf.c
-@@ -240,13 +240,13 @@ literal:
-                       /* FALLTHROUGH */
-                 case 'd':
-                       c = CT_INT;
--                      ccfn = (ULONGLONG_T (*)())sm_strtoll;
-+                      ccfn = (ULONGLONG_T (*)(const char *, char **, int))sm_strtoll;
-                       base = 10;
-                       break;
- 
-                 case 'i':
-                       c = CT_INT;
--                      ccfn = (ULONGLONG_T (*)())sm_strtoll;
-+                      ccfn = (ULONGLONG_T (*)(const char *, char **, int))sm_strtoll;
-                       base = 0;
-                       break;
- 
-@@ -324,7 +324,7 @@ literal:
-                       if (isupper(c))
-                               flags |= LONG;
-                       c = CT_INT;
--                      ccfn = (ULONGLONG_T (*)()) sm_strtoll;
-+                      ccfn = (ULONGLONG_T (*)(const char *, char **, int)) sm_strtoll;
-                       base = 10;
-                       break;
-               }

diff --git a/mail/sendmail/patches/230-ctime.patch b/mail/sendmail/patches/230-ctime.patch
deleted file mode 100644 (file)
index 5901af6..0000000
--- a/mail/sendmail/patches/230-ctime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/945726
-
---- a/mailstats/mailstats.c
-+++ b/mailstats/mailstats.c
-@@ -65,7 +65,7 @@ main(argc, argv)
-       char sfilebuf[MAXPATHLEN];
-       char buf[MAXLINE];
-       struct statistics stats;
--      extern char *ctime();
-+      extern char *ctime(const time_t *);
-       extern char *optarg;
-       extern int optind;
- # define MSOPTS "cC:f:opP"