Status of new courier-* debs?
Hi. I'm really interested in seeing the new
courier-imap in Debian as soon as possible;
what's your status on it?
Do you need a sponsor?
Here's a patch to clean up lots of ugly places
in the packaging (please use lintian), and a
quick check to make sure the static input buffer
isn't overflowed (which can lead to severe mail loss)
[Cc'd to d-d, as I'm not sure who all are interested
in this. Stefan's packages are at
deb http://ftp.linuxia.de/ftp/debian courier main
deb-src http://ftp.linuxia.de/ftp/debian courier main
]
diff -Naur courier-0.31.0.start/debian/changelog courier-0.31.0/debian/changelog
--- courier-0.31.0.start/debian/changelog Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/changelog Mon Feb 19 14:43:46 2001
@@ -1,3 +1,21 @@
+courier (1:0.31.0-1.1) unstable; urgency=low
+
+ * Check static buffer overrun in command input, and die if that
+ happens.
+ * Remove empty lines from debian/*.conffiles
+ * Add /usr/bin/couriertls to debian/courier-base.files,
+ the man page was already there.
+ * Removed /etc/courier/filters/active from debian/courier-mta.conffiles
+ * Added more cleanup to debian/rules, also preserve files
+ make distclean removes.
+ * Make debian/fixlinks executable before running it.
+ * Stop using dh_suidregister.
+ * Depend on exim or mail-transport-agent, not just m-t-a,
+ and apache or httpd, not just httpd.
+ * Use build-depends instead of dh_testversion.
+
+ -- Tommi Virtanen <tv@debian.org> Mon, 19 Feb 2001 14:43:10 +0200
+
courier (1:0.31.0-1) unstable; urgency=low
* upstream release (includes esmtpd-msa)
diff -Naur courier-0.31.0.start/debian/control courier-0.31.0/debian/control
--- courier-0.31.0.start/debian/control Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/control Mon Feb 19 01:08:17 2001
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Stefan Hornburg <racke@linuxia.de>
Standards-Version: 3.2.1.0
-Build-Depends: libmysqlclient6-dev, libopenldap1-dev, libpam0g-dev
+Build-Depends: libmysqlclient6-dev, libopenldap1-dev, libpam0g-dev, debhelper (>= 1.1.17)
Package: courier-base
Architecture: any
@@ -38,7 +38,7 @@
Package: courier-maildrop
Architecture: any
-Depends: ${shlibs:Depends}, mail-transport-agent, courier-base
+Depends: ${shlibs:Depends}, exim | mail-transport-agent, courier-base
Description: Maildrop delivery agent/mail filter.
This mail filter module is included in the Courier mail
server, which uses it to filter incoming mail. Maildrop
@@ -47,7 +47,7 @@
Package: sqwebmail
Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, mail-transport-agent, courier-base, ispell, httpd
+Depends: ${shlibs:Depends}, ${perl:Depends}, exim | mail-transport-agent, courier-base, ispell, apache | httpd
Description: Webmail Server
This package contains the SqWebMail webmail server.
This CGI is used by the Courier mail server to provide
@@ -57,7 +57,7 @@
Package: courier-pop
Architecture: any
-Depends: ${shlibs:Depends}, mail-transport-agent, courier-base
+Depends: ${shlibs:Depends}, exim | mail-transport-agent, courier-base
Provides: pop3-server
Conflicts: pop3-server
Replaces: pop3-server
@@ -71,13 +71,13 @@
Package: courier-pop-ssl
Architecture: any
-Depends: mail-transport-agent, courier-base
+Depends: exim | mail-transport-agent, courier-base
Description: POP3 daemon with SSL, PAM and Maildir support
This package contains the Courier POP-3 over SSL daemon.
Package: courier-imap
Architecture: any
-Depends: ${shlibs:Depends}, mail-transport-agent, courier-base
+Depends: ${shlibs:Depends}, exim | mail-transport-agent, courier-base
Suggests: imap-client
Provides: imap-server
Conflicts: imap-server
@@ -91,7 +91,7 @@
Package: courier-imap-ssl
Architecture: any
-Depends: mail-transport-agent, courier-base
+Depends: exim | mail-transport-agent, courier-base
Suggests: imap-client
Description: IMAP daemon with SSL, PAM and Maildir support
This package allows users to read mailboxes stored on the server
diff -Naur courier-0.31.0.start/debian/courier-authmysql.conffiles courier-0.31.0/debian/courier-authmysql.conffiles
--- courier-0.31.0.start/debian/courier-authmysql.conffiles Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/courier-authmysql.conffiles Sun Feb 18 22:53:12 2001
@@ -1,2 +1 @@
/etc/courier/authmysqlrc
-
diff -Naur courier-0.31.0.start/debian/courier-base.files courier-0.31.0/debian/courier-base.files
--- courier-0.31.0.start/debian/courier-base.files Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/courier-base.files Sun Feb 18 22:54:13 2001
@@ -20,6 +20,7 @@
/usr/bin/reformail
/usr/bin/reformime
/usr/bin/testmxlookup
+/usr/bin/couriertls
/usr/lib/courier/authlib/authcustom
/usr/lib/courier/authlib/authpam
/usr/lib/courier/authlib/authuserdb
diff -Naur courier-0.31.0.start/debian/courier-mta.conffiles courier-0.31.0/debian/courier-mta.conffiles
--- courier-0.31.0.start/debian/courier-mta.conffiles Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/courier-mta.conffiles Mon Feb 19 00:12:24 2001
@@ -4,7 +4,6 @@
/etc/courier/esmtpd
/etc/courier/esmtpd-msa
/etc/courier/esmtpauthclient
-/etc/courier/filters/active
/etc/courier/module.esmtp
/etc/courier/module.local
/etc/courier/module.uucp
diff -Naur courier-0.31.0.start/debian/courier-pop-ssl.conffiles courier-0.31.0/debian/courier-pop-ssl.conffiles
--- courier-0.31.0.start/debian/courier-pop-ssl.conffiles Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/courier-pop-ssl.conffiles Sun Feb 18 22:55:50 2001
@@ -1,4 +1,3 @@
/etc/courier/pop3d-ssl
/etc/courier/pop3d.cnf
/etc/init.d/courier-pop-ssl
-
diff -Naur courier-0.31.0.start/debian/rules courier-0.31.0/debian/rules
--- courier-0.31.0.start/debian/rules Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/rules Mon Feb 19 14:19:50 2001
@@ -17,9 +17,25 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+SAVEFILES:= \
+ courier/module.esmtp/esmtpd-msa.dist \
+ courier/module.esmtp/esmtpd.dist \
+ courier/module.esmtp/staticlist.c \
+ courier/module.uucp/staticlist.c \
+ courier.spec \
+ http11/http11.h \
+ maildrop/html2man.pl \
+ userdb/html2man.pl \
+
build: build-stamp
build-stamp:
dh_testdir
+
+ set -e; for a in $(SAVEFILES); do \
+ [ -e debian/save-files/$$a ] \
+ || install -D $$a debian/save-files/$$a ;\
+ done
+
# fcgi: fastcgi support for SqWebMail
LIBS=-lmysqlclient ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
--with-piddir=/var/run/courier \
@@ -55,6 +71,144 @@
# Add here commands to clean up after the build process.
-$(MAKE) distclean
+ -$(MAKE) distclean -C courier/doc
+ -$(MAKE) distclean -C bdbobj
+ rm -rf authlib/libauth-modules.dir
+ rm -f \
+ version \
+ permissions.dat */permissions.dat */*/permissions.dat */*/*/permissions.dat \
+ webmail/html/en \
+ courier/doc/*.[0-9] imap/*.[0-9] \
+ courier/doc/authlib.html \
+ courier/doc/couriertcpd.html \
+ courier/doc/couriertls.html \
+ courier/doc/deliverquota.html \
+ courier/doc/dotlock.html \
+ courier/doc/imapd.html \
+ courier/doc/maildirmake.html \
+ courier/doc/maildirquota.html \
+ courier/doc/maildrop.README.html \
+ courier/doc/maildrop.html \
+ courier/doc/maildropex.html \
+ courier/doc/maildropfilter.html \
+ courier/doc/maildropgdbm.html \
+ courier/doc/maildroptips.html \
+ courier/doc/makedat.html \
+ courier/doc/makemime.html \
+ courier/doc/makeuserdb.html \
+ courier/doc/mkimapdcert.html \
+ courier/doc/reformail.html \
+ courier/doc/reformime.html \
+ courier/doc/testmxlookup.html \
+ courier/doc/userdb.html \
+ courier/doc/userdbpw.html \
+ authlib/authconfiglist \
+ authlib/authdaemon.msg \
+ authlib/authdaemond.versions.final \
+ authlib/authdaemondstaticlist.c \
+ authlib/authdaemonrc.h \
+ authlib/authinfodaemondlist.c \
+ authlib/authldaprc.h \
+ authlib/authlib.8 \
+ authlib/authmysqlrc.h \
+ authlib/authstaticlist.c \
+ authlib/libauth-modules \
+ authlib/vpopmail_config.h \
+ courier/bindir.h \
+ courier/cflags \
+ courier/courier.libdep \
+ courier/cxxflags \
+ courier/datadir.h \
+ courier/filters/courierfilter.8 \
+ courier/filters/courierperlfilter.8 \
+ courier/filters/dupfilter.8 \
+ courier/filters/filteractivedir.h \
+ courier/filters/filtersocketdir.h \
+ courier/filters/libfilter/permissions.dat \
+ courier/filters/perlfilter/filtersocketdir.h \
+ courier/filters/perlfilter/permissions.dat \
+ courier/filters/perlfilter/wrapperpl.h \
+ courier/filters/perlfilter/xsinit.c \
+ courier/filters/pidfile.h \
+ courier/filtersocketdir.h \
+ courier/imapd-ssl.dist \
+ courier/imapd.authpam \
+ courier/imapd.cnf \
+ courier/imapd.dist \
+ courier/libexecdir.h \
+ courier/libs/cflags \
+ courier/libs/cxxflags \
+ courier/libs/lcrwstatic.h \
+ courier/libs/libexecdir.h \
+ courier/libs/localstatedir.h \
+ courier/libs/sbindir.h \
+ courier/libs/sysconfdir.h \
+ courier/localstatedir.h \
+ courier/makedat \
+ courier/makeuserdb \
+ courier/mkimapdcert \
+ courier/mkpop3dcert \
+ courier/module.dsn/config \
+ courier/module.dsn/module.dsn \
+ courier/module.dsn/sysconfdir.h \
+ courier/module.esmtp/config \
+ courier/module.esmtp/libexecdir.h \
+ courier/module.esmtp/localstatedir.h \
+ courier/module.local/authmodulelist \
+ courier/module.local/cflags \
+ courier/module.local/config \
+ courier/module.local/libexecdir.h \
+ courier/module.local/module.local \
+ courier/module.local/modulelist.h \
+ courier/module.local/sysconfdir.h \
+ courier/module.uucp/config \
+ courier/module.uucp/courieruucp.8 \
+ courier/module.uucp/module.uucp \
+ courier/module.uucp/sysconfdir.h \
+ courier/modules.ctl \
+ courier/modules.lst \
+ courier/modules.lst.la \
+ courier/pop3d-ssl.dist \
+ courier/pop3d.authpam \
+ courier/pop3d.cnf \
+ courier/pop3d.dist \
+ courier/pw2userdb \
+ courier/quotawarnmsg.example \
+ courier/sbindir.h \
+ courier/sysconfdir.h \
+ courier/uidgid \
+ courier/userdb \
+ courier/vchkpw2userdb \
+ courier/webmail.authpam \
+ maildir/deliverquota.8 \
+ maildir/maildirfilterconfig.h \
+ maildir/maildirmake.1 \
+ maildir/maildirquota.7 \
+ maildir/maildirsharedrc.h \
+ maildir/quotawarnmsg.h \
+ maildrop/uidgid \
+ soxwrap/libsock5confdir.h \
+ soxwrap/soxlibs.dep \
+ tcpd/couriertls.config \
+ threadlib/libthread.dep \
+ unicode/charsetlist.c \
+ userdb/dummy \
+ userdb/makeuserdb.8 \
+ userdb/userdb.8 \
+ userdb/userdbpw.8 \
+ webmail/cron.cmd \
+ webmail/html/en-us/permissions.dat \
+ webmail/htmllibdir.h \
+ webmail/images/filelist \
+ webmail/ldapaddressbook.dist \
+ webmail/ldapsearch \
+ webmail/sqwebmail.msg
+
+ set -e; for a in $(SAVEFILES); do \
+ [ ! -d debian/save-files ] \
+ || mv debian/save-files/$$a $$a ;\
+ done
+ rm -rf debian/save-files
dh_clean
@@ -70,6 +224,7 @@
perl -i -pe 's%^/etc%$(BUILD)/etc%' permissions.dat
/usr/bin/perl sysconftool `awk ' $$5 == "config" && $$1 ~ /\.dist$$/ { print $$1 }' <permissions.dat`
# Change absolute link made by make install to a relative one
+ chmod a+x debian/fixlinks
debian/fixlinks $(BUILD)/usr/sbin
(cd debian/tmp/usr/bin/; ln -fs ../lib/courier/courier/modules/esmtp/addcr ./addcr)
@@ -121,8 +276,6 @@
# Build architecture-dependent files here.
binary-arch: build install
-# Need this version of debhelper for DH_OPTIONS to work.
- dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_installdebconf
@@ -143,7 +296,6 @@
dh_compress
dh_fixperms
# You may want to make some executables suid here.
- dh_suidregister
dh_installdeb
# dh_makeshlibs
dh_perl
diff -Naur courier-0.31.0.start/debian/sqwebmail.conffiles courier-0.31.0/debian/sqwebmail.conffiles
--- courier-0.31.0.start/debian/sqwebmail.conffiles Mon Feb 19 12:19:09 2001
+++ courier-0.31.0/debian/sqwebmail.conffiles Sun Feb 18 22:56:53 2001
@@ -1,2 +1 @@
/etc/pam.d/webmail
-
diff -Naur courier-0.31.0.start/imap/imaptoken.c courier-0.31.0/imap/imaptoken.c
--- courier-0.31.0.start/imap/imaptoken.c Tue Mar 14 03:39:05 2000
+++ courier-0.31.0/imap/imaptoken.c Sun Feb 18 22:51:10 2001
@@ -257,6 +257,10 @@
c=toupper(c);
appendch(c);
}
+ else
+ {
+ write_error_exit("max atom size too small");
+ }
c=READ();
}
if (l == 0)
diff -Naur courier-0.31.0.start/imap/mainloop.c courier-0.31.0/imap/mainloop.c
--- courier-0.31.0.start/imap/mainloop.c Mon Feb 28 07:16:52 2000
+++ courier-0.31.0/imap/mainloop.c Sun Feb 18 22:49:57 2001
@@ -51,6 +51,9 @@
{
int rc;
+ if (strlen(tag)+strlen(curtoken->tokenbuf) > IT_MAX_ATOM_SIZE)
+ write_error_exit("max atom size too small");
+
strncat(tag, curtoken->tokenbuf, IT_MAX_ATOM_SIZE);
rc=do_imap_command(tag);
--
tv@{{hq.yok.utu,havoc,gaeshido}.fi,{debian,wanderer}.org,stonesoft.com}
unix, linux, debian, networks, security, | Windows NT crashed.
kernel, TCP/IP, C, perl, free software, | I am the Blue Screen of Death.
mail, www, sw devel, unix admin, hacks. | No one hears your screams.
Reply to: