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.

6 files changed, 16 insertions, 15 deletions

diff --git a/lang/python26/ALTERNATIVES b/lang/python26/ALTERNATIVES
index 0ff8f52530b..fdf681be668 100644
--- a/lang/python26/ALTERNATIVES
+++ b/lang/python26/ALTERNATIVES
@@ -1,3 +1,4 @@
 bin/2to3 @PREFIX@/bin/2to3-2.6
 bin/pydoc @PREFIX@/bin/pydoc2.6
 bin/python @PREFIX@/bin/python2.6
+bin/smtpd.py @PREFIX@/bin/smtpd2.6.py
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 38fbb664755..e6975a6641e 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2014/02/12 23:28:16 tron Exp $
+# $NetBSD: Makefile,v 1.60 2014/03/12 12:57:06 obache Exp $
 
 .include "dist.mk"
 
-PKGREVISION=	2
+PKGREVISION=	3
 
 PKGNAME=	python26-${PY_DISTVERSION}
 CATEGORIES=	lang python
@@ -156,7 +156,7 @@ SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 
 post-extract:
-	${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
+	${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
 
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index ebf2b7ecb76..4e0ffe9f7be 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.16 2014/02/12 23:28:16 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.17 2014/03/12 12:57:06 obache Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -2277,9 +2277,9 @@ lib/python${PY_VER_SUFFIX}/site-packages/README
 lib/python${PY_VER_SUFFIX}/site.py
 lib/python${PY_VER_SUFFIX}/site.pyc
 lib/python${PY_VER_SUFFIX}/site.pyo
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.py
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.pyc
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.pyo
+lib/python${PY_VER_SUFFIX}/smtpd.py
+lib/python${PY_VER_SUFFIX}/smtpd.pyc
+lib/python${PY_VER_SUFFIX}/smtpd.pyo
 lib/python${PY_VER_SUFFIX}/smtplib.py
 lib/python${PY_VER_SUFFIX}/smtplib.pyc
 lib/python${PY_VER_SUFFIX}/smtplib.pyo
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index bfe9f837e93..32ce84f1832 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2014/02/09 13:47:10 drochner Exp $
+$NetBSD: distinfo,v 1.54 2014/03/12 12:57:06 obache Exp $
 
 SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8
 RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3
@@ -16,7 +16,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
 SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019
-SHA1 (patch-am) = 380dfaa8ca90532a52dcca972e34965f6e64fce1
+SHA1 (patch-am) = 4064aa3cbe34389ce344d7372eb71c7305f38e07
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2
@@ -25,6 +25,6 @@ SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
 SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
 SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
 SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
-SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858
+SHA1 (patch-bc) = 2a57949e0085ac3e8fe8ecd64ffb2b205f3862ac
 SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
 SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 8489a42e848..bdbe118e4d2 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.19 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: patch-am,v 1.20 2014/03/12 12:57:06 obache Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -378,7 +378,7 @@ support building the "nis" and "crypt" modules.
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.6',
 +                     'Tools/scripts/2to3-2.6',
-+                     'Lib/smtpd2.6.py']
++                     'Tools/scripts/smtpd2.6.py']
          )
  
  # --install-platlib
diff --git a/lang/python26/patches/patch-bc b/lang/python26/patches/patch-bc
index 346ea056b15..d4654dd15fb 100644
--- a/lang/python26/patches/patch-bc
+++ b/lang/python26/patches/patch-bc
@@ -1,11 +1,11 @@
-$NetBSD: patch-bc,v 1.1 2010/11/23 08:24:04 tron Exp $
+$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/smtpd2.6.py.orig	2010-11-22 18:18:59.000000000 +0000
-+++ Lib/smtpd2.6.py	2010-11-22 18:19:03.000000000 +0000
+--- 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.
  """