While working on updating the FreeBSD port, I noticed a few patches that
may be appropriate for merging.
First, the test for -lcourier-unicode seems to be slightly deficient.
All of the AC_CHECK_LIB checks successfully locate libs in
/usr/local/lib, but AC_LINK_IFELSE doesn't seem to. I think that's
because that part of configure.ac stashes $LIBS where -L/usr/local/lib
will be? Regardless, maybe this section can be refactored to use
AC_CHECK_LIB...
Second, courier/perms.sh.in sets a number of executables to 555, and
others to 755. The FreeBSD maintainer makes those consistent, removing
write access.
The last patch appears to clarify an error message when messages exceed
the administrative limit.
Could you check these over, Sam?
--- configure.orig 2017-01-25 20:41:21.217193416 -0800
+++ configure 2017-01-25 20:41:52.000581482 -0800
@@ -16418,7 +16418,7 @@
save_LIBS="$LIBS"
-LIBS="-lcourier-unicode"
+LIBS="-lcourier-unicode -L/usr/local/lib"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--- courier/perms.sh.in.orig 2007-07-01 11:36:31.000000000 -0400
+++ courier/perms.sh.in 2007-07-01 11:36:31.000000000 -0400
@@ -11,9 +11,6 @@
datarootdir="@datarootdir@"
PERMS="
-. 755
-
-@localstatedir@ 755 x bin bin
@localstatedir@/tmp 770
@localstatedir@/msgs 750
@localstatedir@/msgq 750
@@ -47,7 +44,6 @@
@sysconfdir@/rfcerr2046.txt 444 config
@sysconfdir@/rfcerr2047.txt 444 config
-@libexecdir@ 755 x bin bin
@libexecdir@/courier 755 x bin bin
@libexecdir@/courier/modules 755 x bin bin
@libexecdir@/courier/submitmkdir 4550
@@ -61,14 +57,13 @@
@libexecdir@/courier/makedatprog 555
@libexecdir@/courier/imaplogin 555 x bin bin
@libexecdir@/courier/pcpd 555 x bin bin
-@libexecdir@/courier/webmail 700 x root bin
+@libexecdir@/courier/webmail 500 x root bin
@libexecdir@/courier/webmail/webmail 555 x root bin
@libexecdir@/courier/webmail/webmlm 555 x root bin
@libexecdir@/courier/sqwebmaild 555
-@libexecdir@/courier/sqwebpasswd 2755
-@libexecdir@/courier/webmail/webadmin 4555 x root bin
+@libexecdir@/courier/sqwebpasswd 2555
+@libexecdir@/courier/webmail/webadmin 4511 x root bin
-@sbindir@ 755 x bin bin
@sbindir@/courier 555
@sbindir@/showconfig 555
@sbindir@/showmodules 550
@@ -82,7 +77,6 @@
@datadir@/imapd 555 x bin bin
@datadir@/imapd-ssl 555 x bin bin
-@bindir@ 755 x bin bin
@bindir@/cancelmsg 6555
@bindir@/courier-config 555
@bindir@/mailq 2555
@@ -109,10 +109,10 @@
@sbindir@/makehosteddomains 555
@datadir@/makeimapaccess 555
@sbindir@/makeimapaccess 555
-@datadir@/pop3d 755
-@sbindir@/pop3d 755
-@datadir@/pop3d-ssl 755
-@sbindir@/pop3d-ssl 755
+@datadir@/pop3d 555
+@sbindir@/pop3d 555
+@datadir@/pop3d-ssl 555
+@sbindir@/pop3d-ssl 555
@sbindir@/webgpg 555
@datadir@ 755 x bin bin
@@ -226,7 +220,7 @@
if test "@HAVE_LDAP@" != 0
then
echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
- echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
+ echo @sbindir@/courierldapaliasd 500 @mailuser@ @mailgroup@
fi
echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
--- courier/submit2.C.orig 2008-01-29 13:06:47.000000000 +0100
+++ courier/submit2.C 2009-10-03 22:34:47.000000000 +0200
@@ -860,7 +860,7 @@
if (sizelimit && bytecount > sizelimit)
{
std::cout << "523 Message length (" <<
- sizelimit << " bytes) exceeds administrative limit."
+ bytecount << " bytes) exceeds administrative limit(" <<
sizelimit << ")."
<< std::endl << std::flush;
return (1);
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
courier-users mailing list
courier-users@lists.sourceforge.net
Unsubscribe: https://lists.sourceforge.net/lists/listinfo/courier-users
