pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/sqwebmail
Module Name: pkgsrc
Committed By: hans
Date: Mon Feb 12 21:47:02 UTC 2024
Modified Files:
pkgsrc/mail/sqwebmail: Makefile distinfo
pkgsrc/mail/sqwebmail/patches: patch-aa patch-ad patch-ah patch-aj
patch-am
Log Message:
Update SqWebmail to 6.2.5
Changes since 5.5.3: Too many to list here (5.5.3 was released in 2011).
The full changelog can be found here:
https://sourceforge.net/p/courier/courier-libs.git/ci/b7f06ca767a6f7c03a9d24e49f659c3a23238c7a/tree/sqwebmail/ChangeLog
Note that the Maildir unicode format has changed in the 6.0 release. See
mail/courier-maildir/MESSAGE.UTF8 for details.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/mail/sqwebmail/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/sqwebmail/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/sqwebmail/patches/patch-aa
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/sqwebmail/patches/patch-ad
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/sqwebmail/patches/patch-ah \
pkgsrc/mail/sqwebmail/patches/patch-aj
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/sqwebmail/patches/patch-am
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/sqwebmail/Makefile
diff -u pkgsrc/mail/sqwebmail/Makefile:1.88 pkgsrc/mail/sqwebmail/Makefile:1.89
--- pkgsrc/mail/sqwebmail/Makefile:1.88 Tue Jun 28 11:34:35 2022
+++ pkgsrc/mail/sqwebmail/Makefile Mon Feb 12 21:47:02 2024
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.88 2022/06/28 11:34:35 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2024/02/12 21:47:02 hans Exp $
-DISTNAME= sqwebmail-5.5.3
-PKGREVISION= 13
+DISTNAME= sqwebmail-6.2.5
+PKGREVISION=
CATEGORIES= mail www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Webmail CGI for access to maildir-style mailboxes
HOMEPAGE= https://www.courier-mta.org/sqwebmail/
DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
+DEPENDS+= gnupg2>=2.0.0:../../security/gnupg2
DEPENDS+= maildrop>=2.5.0:../../mail/maildrop
DEPENDS+= mime-types-[0-9]*:../../misc/mime-types
@@ -71,9 +70,9 @@ CONFIGURE_ARGS+= --with-mailer="${SENDMA
CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP}
CONFIGURE_ARGS+= --with-piddir=${COURIER_STATEDIR}/tmp
CONFIGURE_ARGS+= --without-ldapaddressbook --without-ldapaliasd
+CONFIGURE_ARGS+= --with-gpg2
CONFIGURE_ENV+= GZIP=${TOOLS_PATH.gzip}
-CONFIGURE_ENV+= GPG=${PREFIX}/bin/gpg
REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
REQD_DIRS_PERMS+= ${LIBEXECDIR}/webmail \
@@ -124,30 +123,30 @@ fix-perms:
post-install: fix-perms
${LN} -fs ${PREFIX}/share/courier/sqwebmail/webgpg \
${DESTDIR}${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/gpglib/mimegpg \
+ ${INSTALL_PROGRAM} ${WRKSRC}/libs/gpglib/mimegpg \
${DESTDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 \
+ ${INSTALL_MAN} ${WRKSRC}/libs/gpglib/mimegpg.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/gpglib/mimegpg.html \
+ ${INSTALL_DATA} ${WRKSRC}/libs/gpglib/mimegpg.html \
${DESTDIR}${DOCDIR}
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKDIR}/calendarmode \
${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/sqwebmail.pamconf \
+ ${INSTALL_DATA} ${WRKSRC}/libs/sqwebmail/sqwebmail.pamconf \
${DESTDIR}${EGDIR}/webmail.authpam
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/README.logindomainlist.html \
${DESTDIR}${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/INSTALL.html \
${DESTDIR}${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
+ ${INSTALL_DATA} ${WRKSRC}/libs/gpglib/README.html \
${DESTDIR}${DOCDIR}/sqwebmail/README.gpg.html
- ${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
+ ${INSTALL_DATA} ${WRKSRC}/libs/pcp/README.html \
${DESTDIR}${DOCDIR}/pcp_README.html
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html \
+ ${INSTALL_DATA} ${WRKSRC}/libs/sqwebmail/BUGS.html \
${DESTDIR}${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html \
+ ${INSTALL_DATA} ${WRKSRC}/libs/sqwebmail/SECURITY.html \
${DESTDIR}${DOCDIR}/sqwebmail
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/sqwebmail/distinfo
diff -u pkgsrc/mail/sqwebmail/distinfo:1.27 pkgsrc/mail/sqwebmail/distinfo:1.28
--- pkgsrc/mail/sqwebmail/distinfo:1.27 Tue Oct 26 10:54:31 2021
+++ pkgsrc/mail/sqwebmail/distinfo Mon Feb 12 21:47:02 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 10:54:31 nia Exp $
+$NetBSD: distinfo,v 1.28 2024/02/12 21:47:02 hans Exp $
-BLAKE2s (sqwebmail-5.5.3.tar.bz2) = 25088f289a4aecf5adfaf07bac73e9c4f333af6afb2e4dfb7b37748ba3281a88
-SHA512 (sqwebmail-5.5.3.tar.bz2) = 392c0a442b0813543cb349886df4656c7933d790941e212dd0ee3709059ade990d25765b6fe24ca4fb65efe6b992b193a3806362d0a83156c6b49936155d71a2
-Size (sqwebmail-5.5.3.tar.bz2) = 3725216 bytes
-SHA1 (patch-aa) = 2e2320737a693843a94d5da89273e67823152093
-SHA1 (patch-ad) = 30dfbc3e0e05748ad60a75bf2c46a0fa658781e9
-SHA1 (patch-ah) = 7dc2fcb609fcfe2b69c79c8a34413022571ef5e2
+BLAKE2s (sqwebmail-6.2.5.tar.bz2) = 9bd3f7b13d7ab2f33c0beae1ba895adccdc7066192464647a42de9f433b6768a
+SHA512 (sqwebmail-6.2.5.tar.bz2) = 9722dc4a572530ed83534cb504a219cd0de33442f6c1798a909de6bf1fbe078dbf88f86ab68b6f5f836f0a48740f87b94de4ab22e023dfeaf80b0902c5cc522f
+Size (sqwebmail-6.2.5.tar.bz2) = 3745295 bytes
+SHA1 (patch-aa) = ed1c1444001ce32368e0c6167d12f79a8c3a5156
+SHA1 (patch-ad) = 920eb52387a7dc854fcc6024ac156b435b3ef81d
+SHA1 (patch-ah) = 30c223c00740aaef6906d4aa5ff164370eb7d605
SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 195ff33119c1991bac32282f2d9a5d15dc00b0d8
-SHA1 (patch-am) = 84fc1f8c3ca047a6f4795cb9d88544cb31a49ea2
+SHA1 (patch-aj) = 75123859dd44a9c069635ed4901976d05b919625
+SHA1 (patch-am) = 9c84927ada7bf53e2c3c63eeb175979da7341d71
Index: pkgsrc/mail/sqwebmail/patches/patch-aa
diff -u pkgsrc/mail/sqwebmail/patches/patch-aa:1.11 pkgsrc/mail/sqwebmail/patches/patch-aa:1.12
--- pkgsrc/mail/sqwebmail/patches/patch-aa:1.11 Wed Nov 10 10:52:47 2010
+++ pkgsrc/mail/sqwebmail/patches/patch-aa Mon Feb 12 21:47:02 2024
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.11 2010/11/10 10:52:47 adam Exp $
+$NetBSD: patch-aa,v 1.12 2024/02/12 21:47:02 hans Exp $
---- Makefile.in.orig 2010-11-07 18:41:57.000000000 +0000
+--- Makefile.in.orig 2023-08-28 12:32:30.000000000 +0000
+++ Makefile.in
-@@ -283,18 +283,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
-
+@@ -242,7 +242,7 @@ distuninstallcheck_listfiles = find . -t
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+-pkglibexecdir = $(libexecdir)/sqwebmail
++pkglibexecdir = $(libexecdir)/courier
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+@@ -404,11 +404,11 @@ EXTRA_DIST = INSTALL.html README NEWS RE
+ packaging/debian/sqwebmail-apache2.lintian-overrides
scriptbindir = $(sbindir)
scriptbin_SCRIPTS = \
- sharedindexinstall sharedindexsplit
@@ -11,38 +20,28 @@ $NetBSD: patch-aa,v 1.11 2010/11/10 10:5
-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
+pkglibPROGRAMS = pcpd
-+pkglibexecdir = $(libexecdir)/courier
pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
-libexec_SCRIPTS = sqwebmaild.rc
+libexec_SCRIPTS =
CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \
sharedindexinstall sharedindexsplit
- pkgman8dir = @mandir@/man8
--pkgman8_DATA = deliverquota.8
-+pkgman8_DATA =
- pkgman1dir = @mandir@/man1
--pkgman1_DATA = maildirmake.1
-+pkgman1_DATA =
- @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index2.html
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -976,6 +977,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
- sqwebmaild.dist: sqwebmail/sqwebmaild.dist
- cp sqwebmail/sqwebmaild.dist .
+@@ -1053,6 +1053,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
+ sqwebmaild.dist: libs/sqwebmail/sqwebmaild.dist
+ cp libs/sqwebmail/sqwebmaild.dist .
+webmaild.rc: sqwebmaild.rc
+ cp sqwebmaild.rc webmaild.rc
+
- pcpd: pcp/pcpd
- cp pcp/pcpd .
+ pcpd: libs/pcp/pcpd
+ cp libs/pcp/pcpd .
-@@ -1011,7 +1015,7 @@ install-exec-local:
+@@ -1082,7 +1085,7 @@ install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(cgibindir)
test -w $(DESTDIR)$(cgibindir) || exit 0; \
- $(INSTALL_PROGRAM) sqwebmail/sqwebmail \
+ $(INSTALL_PROGRAM) libs/sqwebmail/sqwebmail \
- $(DESTDIR)$(cgibindir)/sqwebmail
+ $(DESTDIR)$(cgibindir)/webmail
$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
- $(INSTALL_PROGRAM) sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild
+ $(INSTALL_PROGRAM) libs/sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild
Index: pkgsrc/mail/sqwebmail/patches/patch-ad
diff -u pkgsrc/mail/sqwebmail/patches/patch-ad:1.12 pkgsrc/mail/sqwebmail/patches/patch-ad:1.13
--- pkgsrc/mail/sqwebmail/patches/patch-ad:1.12 Wed Nov 10 10:52:47 2010
+++ pkgsrc/mail/sqwebmail/patches/patch-ad Mon Feb 12 21:47:02 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2010/11/10 10:52:47 adam Exp $
+$NetBSD: patch-ad,v 1.13 2024/02/12 21:47:02 hans Exp $
---- sqwebmail/Makefile.in.orig 2010-11-07 18:42:06.000000000 +0000
-+++ sqwebmail/Makefile.in
-@@ -1144,7 +1144,7 @@ install-perms-local: install-perms-cache
+--- libs/sqwebmail/Makefile.in.orig 2023-08-28 12:32:45.000000000 +0000
++++ libs/sqwebmail/Makefile.in
+@@ -1420,7 +1420,7 @@ install-perms-local: install-perms-cache
htmllibdir.h: config.status
echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.12 2010/11/10 10:5
echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1152,7 +1152,7 @@ htmllibdir.h: config.status
+@@ -1428,7 +1428,7 @@ htmllibdir.h: config.status
echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
-- if test -d $(srcdir)/../courier \
-+ if true || test -d $(srcdir)/../courier \
+- if test -d $(srcdir)/../../courier \
++ if true || test -d $(srcdir)/../../courier \
; then \
echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1189,9 +1189,6 @@ install-perms-cache:
+@@ -1469,9 +1469,6 @@ install-perms-cache:
@echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
cache-reminder:
Index: pkgsrc/mail/sqwebmail/patches/patch-ah
diff -u pkgsrc/mail/sqwebmail/patches/patch-ah:1.8 pkgsrc/mail/sqwebmail/patches/patch-ah:1.9
--- pkgsrc/mail/sqwebmail/patches/patch-ah:1.8 Wed Nov 10 10:52:47 2010
+++ pkgsrc/mail/sqwebmail/patches/patch-ah Mon Feb 12 21:47:02 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.8 2010/11/10 10:52:47 adam Exp $
+$NetBSD: patch-ah,v 1.9 2024/02/12 21:47:02 hans Exp $
---- sqwebmail/configure.orig 2010-11-07 18:42:06.000000000 +0000
-+++ sqwebmail/configure
-@@ -11712,7 +11712,7 @@ fi
+--- libs/sqwebmail/configure.orig 2023-08-28 12:32:45.000000000 +0000
++++ libs/sqwebmail/configure
+@@ -14175,7 +14175,7 @@ fi
--if test -d ${srcdir}/../courier
-+if true || test -d ${srcdir}/../courier
+-if test -d ${srcdir}/../../courier
++if true || test -d ${srcdir}/../../courier
then
pkglibexecdir='$(libexecdir)/courier'
else
Index: pkgsrc/mail/sqwebmail/patches/patch-aj
diff -u pkgsrc/mail/sqwebmail/patches/patch-aj:1.8 pkgsrc/mail/sqwebmail/patches/patch-aj:1.9
--- pkgsrc/mail/sqwebmail/patches/patch-aj:1.8 Tue Jun 15 23:18:13 2010
+++ pkgsrc/mail/sqwebmail/patches/patch-aj Mon Feb 12 21:47:02 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.8 2010/06/15 23:18:13 pettai Exp $
+$NetBSD: patch-aj,v 1.9 2024/02/12 21:47:02 hans Exp $
---- INSTALL.html.orig Mon Sep 3 16:05:20 2007
+--- INSTALL.html.orig 2023-08-16 12:28:42.000000000 +0000
+++ INSTALL.html
-@@ -820,7 +820,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
- configuration files are installed in
- <code>/usr/lib/sqwebmail</code> (the default).</p>
-
-- <p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail
-+ <p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail
- is installed with a basic configuration for a single domain,
- SqWebMail sets the domain in the return address for outgoing
- messages to the defined system hostname. If this file exists it
+@@ -738,7 +738,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
+ <p>In addition, there's some global configuration that can be done after
+ installation. The following presumes that SqWebMail's configuration files are
+ installed in <code>/usr/lib/sqwebmail</code> (the default).</p>
+- <p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail is installed
++ <p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail is installed
+ with a basic configuration for a single domain, SqWebMail sets the domain in
+ the return address for outgoing messages to the defined system hostname. If
+ this file exists it will be used instead of the defined system hostname.</p>
Index: pkgsrc/mail/sqwebmail/patches/patch-am
diff -u pkgsrc/mail/sqwebmail/patches/patch-am:1.4 pkgsrc/mail/sqwebmail/patches/patch-am:1.5
--- pkgsrc/mail/sqwebmail/patches/patch-am:1.4 Wed Nov 10 10:52:47 2010
+++ pkgsrc/mail/sqwebmail/patches/patch-am Mon Feb 12 21:47:02 2024
@@ -1,22 +1,16 @@
-$NetBSD: patch-am,v 1.4 2010/11/10 10:52:47 adam Exp $
+$NetBSD: patch-am,v 1.5 2024/02/12 21:47:02 hans Exp $
---- pcp/configure.orig 2010-11-07 14:50:39.000000000 +0000
-+++ pcp/configure
-@@ -17258,14 +17258,15 @@ LIBS="$saveLIBS"
+--- libs/pcp/configure.orig 2023-04-24 15:19:05.000000000 +0000
++++ libs/pcp/configure
+@@ -16978,8 +16978,9 @@ LIBS="$saveLIBS"
echo $NETLIBS >pcp.libs
--if test -d ${srcdir}/../courier
-+if true || test -d ${srcdir}/../courier
- then
- scriptdir="$datadir/sqwebmail"
- else
- scriptdir="$prefix"
- fi
-
+-scriptdir="$datadir/sqwebmail"
-SENDIT="$scriptdir/sendit.sh"
++scriptdir="$prefix"
+# sendit.sh can be customized, so we call it from $(sysconfdir).
+SENDIT="$sysconfdir/sendit.sh"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+
Home |
Main Index |
Thread Index |
Old Index