head 1.3; access; symbols pkgsrc-2015Q1:1.2.0.10 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.8 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.6 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.4 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.2 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.1.0.28 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.26 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.24 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.22 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.20 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.18 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.16 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.14 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.12 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.10 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.8 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.6 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.4 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.2; locks; strict; comment @# @; 1.3 date 2015.04.13.23.12.44; author rodent; state dead; branches; next 1.2; commitid NgZhNHAKgraV6uhy; 1.2 date 2014.03.12.12.57.06; author obache; state Exp; branches; next 1.1; commitid ihjUgSjUuNrnspsx; 1.1 date 2010.11.23.08.24.04; author tron; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2010.11.23.08.24.04; author spz; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2010.11.23.21.50.06; author spz; state Exp; branches; next ; desc @@ 1.3 log @Removing python26. EOL'd quite some ago and discussed a couple times on tech-pkg@@ and pkgsrc-users@@. @ text @$NetBSD: patch-bc,v 1.2 2014/03/12 12:57:06 obache Exp $ Fix for CVE-2010-3492 and CVE-2010-3493, taken from the Python SVN repository: http://svn.python.org/view?view=rev&revision=86084 --- Lib/smtpd.py.orig 2010-11-22 18:18:59.000000000 +0000 +++ Lib/smtpd.py 2010-11-22 18:19:03.000000000 +0000 @@@@ -35,7 +35,6 @@@@ and if remoteport is not given, then 25 is used. """ - # Overview: # # This file implements the minimal SMTP protocol as defined in RFC 821. It @@@@ -96,7 +95,6 @@@@ COMMASPACE = ', ' - def usage(code, msg=''): print >> sys.stderr, __doc__ % globals() if msg: @@@@ -104,7 +102,6 @@@@ sys.exit(code) - class SMTPChannel(asynchat.async_chat): COMMAND = 0 DATA = 1 @@@@ -276,7 +273,6 @@@@ self.push('354 End data with .') - class SMTPServer(asyncore.dispatcher): def __init__(self, localaddr, remoteaddr): self._localaddr = localaddr @@@@ -331,7 +327,6 @@@@ raise NotImplementedError - class DebuggingServer(SMTPServer): # Do something with the gathered message def process_message(self, peer, mailfrom, rcpttos, data): @@@@ -347,7 +342,6 @@@@ print '------------ END MESSAGE ------------' - class PureProxy(SMTPServer): def process_message(self, peer, mailfrom, rcpttos, data): lines = data.split('\n') @@@@ -388,7 +382,6 @@@@ return refused - class MailmanProxy(PureProxy): def process_message(self, peer, mailfrom, rcpttos, data): from cStringIO import StringIO @@@@ -467,13 +460,11 @@@@ msg.Enqueue(mlist, torequest=1) - class Options: setuid = 1 classname = 'PureProxy' - def parseargs(): global DEBUGSTREAM try: @@@@ -530,7 +521,6 @@@@ return options - if __name__ == '__main__': options = parseargs() # Become nobody @ 1.2 log @For smtpd.py, only rename with ${PY_VER_SUFFIX} to be installed as a tool, or rename of module name affect to other parts using this module. Noticed by Benjamin Lorenz in tech-pkg@@. Additionally, set ALTERNATIVE for bin/smtpd.py. @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.1 2010/11/23 08:24:04 tron Exp $ @ 1.1 log @Add fix for CVE-2010-3492 and update the fix for CVE-2010-3493. Both fixes taken from the Python 2.7 branch in the Python SVN repository. @ text @d1 1 a1 1 $NetBSD$ d7 2 a8 2 --- Lib/smtpd2.6.py.orig 2010-11-22 18:18:59.000000000 +0000 +++ Lib/smtpd2.6.py 2010-11-22 18:19:03.000000000 +0000 @ 1.1.2.1 log @file patch-bc was added on branch pkgsrc-2010Q3 on 2010-11-23 21:50:06 +0000 @ text @d1 86 @ 1.1.2.2 log @Pullup ticket 3279 - requested by tron security fixes Revisions pulled up: - pkgsrc/lang/python26/Makefile 1.31 - pkgsrc/lang/python26/distinfo 1.29 Files added: pkgsrc/lang/python26/patches/patch-ba pkgsrc/lang/python26/patches/patch-bb pkgsrc/lang/python26/patches/patch-bc ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tez Date: Wed Nov 17 18:44:07 UTC 2010 Modified Files: pkgsrc/lang/python26: Makefile distinfo Log Message: Add fix for SA41968 (CVE-2010-3493) from the 2.7 branch repo http://svn.python.org/view/python/branches/release27-maint/Lib/smtpd.py?r1=86084&r2=82503&view=patch To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/python26/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/python26/distinfo ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Tue Nov 23 08:24:05 UTC 2010 Modified Files: pkgsrc/lang/python26: Makefile distinfo Added Files: pkgsrc/lang/python26/patches: patch-ba patch-bb patch-bc Log Message: Add fix for CVE-2010-3492 and update the fix for CVE-2010-3493. Both fixes taken from the Python 2.7 branch in the Python SVN repository. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python26/Makefile cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/python26/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/python26/patches/patch-ba \ pkgsrc/lang/python26/patches/patch-bb \ pkgsrc/lang/python26/patches/patch-bc @ text @a0 86 $NetBSD: patch-bc,v 1.1 2010/11/23 08:24:04 tron Exp $ Fix for CVE-2010-3492 and CVE-2010-3493, taken from the Python SVN repository: http://svn.python.org/view?view=rev&revision=86084 --- Lib/smtpd2.6.py.orig 2010-11-22 18:18:59.000000000 +0000 +++ Lib/smtpd2.6.py 2010-11-22 18:19:03.000000000 +0000 @@@@ -35,7 +35,6 @@@@ and if remoteport is not given, then 25 is used. """ - # Overview: # # This file implements the minimal SMTP protocol as defined in RFC 821. It @@@@ -96,7 +95,6 @@@@ COMMASPACE = ', ' - def usage(code, msg=''): print >> sys.stderr, __doc__ % globals() if msg: @@@@ -104,7 +102,6 @@@@ sys.exit(code) - class SMTPChannel(asynchat.async_chat): COMMAND = 0 DATA = 1 @@@@ -276,7 +273,6 @@@@ self.push('354 End data with .') - class SMTPServer(asyncore.dispatcher): def __init__(self, localaddr, remoteaddr): self._localaddr = localaddr @@@@ -331,7 +327,6 @@@@ raise NotImplementedError - class DebuggingServer(SMTPServer): # Do something with the gathered message def process_message(self, peer, mailfrom, rcpttos, data): @@@@ -347,7 +342,6 @@@@ print '------------ END MESSAGE ------------' - class PureProxy(SMTPServer): def process_message(self, peer, mailfrom, rcpttos, data): lines = data.split('\n') @@@@ -388,7 +382,6 @@@@ return refused - class MailmanProxy(PureProxy): def process_message(self, peer, mailfrom, rcpttos, data): from cStringIO import StringIO @@@@ -467,13 +460,11 @@@@ msg.Enqueue(mlist, torequest=1) - class Options: setuid = 1 classname = 'PureProxy' - def parseargs(): global DEBUGSTREAM try: @@@@ -530,7 +521,6 @@@@ return options - if __name__ == '__main__': options = parseargs() # Become nobody @