From: "Robin H. Johnson (robbat2)" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in mail-mta/netqmail/files: conf-smtpd conf-common servercert.cnf genqmail-20080406-ldflags.patch conf-qmtpd conf-qmqpd
Date: Mon, 27 May 2013 00:45:52 +0000 (UTC) [thread overview]
Message-ID: <20130527004552.9E1BE2171D@flycatcher.gentoo.org> (raw)
robbat2 13/05/27 00:45:52
Modified: conf-smtpd conf-common servercert.cnf conf-qmtpd
conf-qmqpd
Added: genqmail-20080406-ldflags.patch
Log:
Fix security bug #372967. Also fixes bugs #335077, #331901, #370611, #403893, #404225.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 mail-mta/netqmail/files/conf-smtpd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-smtpd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-smtpd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-smtpd?r1=1.1&r2=1.2
Index: conf-smtpd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-smtpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- conf-smtpd 12 Feb 2006 18:42:33 -0000 1.1
+++ conf-smtpd 27 May 2013 00:45:52 -0000 1.2
@@ -1,5 +1,5 @@
# Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-smtpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-smtpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
# Stuff to run before tcpserver
#QMAIL_TCPSERVER_PRE=""
@@ -8,9 +8,6 @@
# Stuff to after qmail-smtpd
#QMAIL_SMTP_POST=""
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
# fixcrio inserts missing CRs at the ends of lines. See:
# http://cr.yp.to/ucspi-tcp/fixcrio.html
# http://cr.yp.to/docs/smtplf.html
1.2 mail-mta/netqmail/files/conf-common
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-common?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-common?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-common?r1=1.1&r2=1.2
Index: conf-common
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-common,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- conf-common 12 Feb 2006 18:42:33 -0000 1.1
+++ conf-common 27 May 2013 00:45:52 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/bash
# Common Configuration file for all qmail daemons
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-common,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-common,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
# Qmail User IDS to run daemons as
QMAILDUID=$(id -u qmaild)
@@ -17,7 +17,7 @@ TCPSERVER_PORT=${SERVICE}
# you do not need to specify -x, -c, -u or -g in this variable as those are
# added later
-TCPSERVER_OPTS="-p -v"
+TCPSERVER_OPTS="-p -v -R"
# This tells tcpserver where to file the rules cdb file
[[ -d /etc/tcprules.d/ ]] && \
@@ -25,9 +25,10 @@ TCPSERVER_OPTS="-p -v"
[[ ! -f "${TCPSERVER_RULESCDB}" ]] && \
TCPSERVER_RULESCDB=/etc/tcp.${SERVICE}.cdb
-# we limit data and stack segments to 8mbytes, you may need to raise this if
-# you are using a filter in QMAILQUEUE
-SOFTLIMIT_OPTS="-m 16000000"
+# we limit data and stack segments to 32mbytes, you may need to raise this if
+# you are using a filter in QMAILQUEUE.
+# Per bug #403893 amd64 needs a higher limit.
+SOFTLIMIT_OPTS="-m 32000000"
# We don't have anything to set QMAILQUEUE to at the moment, so we leave it
# alone. Generally it is best to add this in your appropriate (usually SMTP)
1.2 mail-mta/netqmail/files/servercert.cnf
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/servercert.cnf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/servercert.cnf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/servercert.cnf?r1=1.1&r2=1.2
Index: servercert.cnf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/servercert.cnf,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- servercert.cnf 12 Feb 2006 18:42:33 -0000 1.1
+++ servercert.cnf 27 May 2013 00:45:52 -0000 1.2
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/servercert.cnf,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/servercert.cnf,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
# This is the openssl config file to generate keys for qmail
[ req ]
@@ -6,7 +6,7 @@
# this should be a power of 2!
default_bits = 1024
# leave the rest of these alone!
-encrypt_key = yes
+encrypt_key = no
distinguished_name = req_dn
x509_extensions = cert_type
prompt = no
1.2 mail-mta/netqmail/files/conf-qmtpd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd?r1=1.1&r2=1.2
Index: conf-qmtpd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- conf-qmtpd 12 Feb 2006 18:42:33 -0000 1.1
+++ conf-qmtpd 27 May 2013 00:45:52 -0000 1.2
@@ -1,5 +1,5 @@
# Configuration file for qmail-qmtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmtpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
# For more information on making your servers talk QMTP
# see http://cr.yp.to/im/mxps.html
@@ -11,8 +11,5 @@
# Stuff to after qmail-qmtpd
#QMAIL_QMTP_POST=""
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
# I don't trust /etc/services to have obscure ports
TCPSERVER_PORT=209
1.2 mail-mta/netqmail/files/conf-qmqpd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd?r1=1.1&r2=1.2
Index: conf-qmqpd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- conf-qmqpd 12 Feb 2006 18:42:33 -0000 1.1
+++ conf-qmqpd 27 May 2013 00:45:52 -0000 1.2
@@ -1,5 +1,5 @@
# Configuration file for qmail-qmqpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd,v 1.1 2006/02/12 18:42:33 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/files/conf-qmqpd,v 1.2 2013/05/27 00:45:52 robbat2 Exp $
# Stuff to run before tcpserver
#QMAIL_TCPSERVER_PRE=""
@@ -8,8 +8,5 @@
# Stuff to after qmail-qmqpd
#QMAIL_QMQP_POST=""
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
# I don't trust /etc/services to have obscure ports
TCPSERVER_PORT=628
1.1 mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch?rev=1.1&content-type=text/plain
Index: genqmail-20080406-ldflags.patch
===================================================================
diff -Nuar genqmail-20080406.orig/spp/Makefile genqmail-20080406/spp/Makefile
--- genqmail-20080406.orig/spp/Makefile 2008-04-06 15:44:14.000000000 +0000
+++ genqmail-20080406/spp/Makefile 2013-05-27 00:37:58.687763457 +0000
@@ -14,7 +14,7 @@
rm -f $(TARGETS)
$(RESOLV_OBJS):
- $(CC) $(CFLAGS) -o $@ $@.c -lresolv
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c -lresolv
$(SIMPLE_OBJS):
- $(CC) $(CFLAGS) -o $@ $@.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
reply other threads:[~2013-05-27 0:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130527004552.9E1BE2171D@flycatcher.gentoo.org \
--to=robbat2@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox