Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lang/python26/ALTERNATIVES
View File

@@ -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

20
lang/python26/Makefile
View File

@@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.52 2013/02/06 23:22:38 jperkin Exp $
# $NetBSD: Makefile,v 1.62 2014/03/27 05:36:10 obache Exp $
.include "dist.mk"
PKGNAME= python26-${PY_DISTVERSION}
PKGREVISION= 3
PKGNAME= python26-${PY_DISTVERSION}
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -58,7 +59,7 @@ USE_TOOLS+= gmake
PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
.elif ${OPSYS} == "SunOS"
PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
CONFIGURE_ENV+= ac_cv_header_netpacket_packet_h=no
CONFIGURE_ENV+= ac_cv_header_netpacket_packet_h=no
.elif ${OPSYS} == "HPUX"
PY_PLATNAME= hp-ux11
.else
@@ -93,16 +94,6 @@ PLIST_VARS+= dl
PLIST.dl= yes
.endif
# builds additional modules if OpenSSL < 0.9.8
PLIST_VARS+= openssl097
CHECK_BUILTIN.openssl:= yes
.include "../../security/openssl/builtin.mk"
CHECK_BUILTIN.openssl:= no
.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \
!empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*)
PLIST.openssl097= yes
.endif
# setup.py causes some modules to be built if the platform is *not* 64bit.
PLIST_VARS+= extra-so
.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
@@ -165,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}
@@ -175,7 +166,6 @@ post-install:
${DESTDIR}${PREFIX}/lib/libpython2.6.sl.1.0
.endif
USE_GNU_READLINE= yes
BUILDLINK_DEPMETHOD.readline= build
.include "../../archivers/bzip2/buildlink3.mk"

14
lang/python26/PLIST.common
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.13 2010/09/16 11:09:50 obache 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}
@@ -1709,8 +1709,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_lsprof.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_multibytecodec.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_multiprocessing.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_random.so
${PLIST.openssl097}lib/python${PY_VER_SUFFIX}/lib-dynload/_sha256.so
${PLIST.openssl097}lib/python${PY_VER_SUFFIX}/lib-dynload/_sha512.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_socket.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
@@ -2279,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
@@ -2601,6 +2599,7 @@ lib/python${PY_VER_SUFFIX}/test/lock_tests.pyo
lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
lib/python${PY_VER_SUFFIX}/test/nullbytecert.pem
lib/python${PY_VER_SUFFIX}/test/nullcert.pem
lib/python${PY_VER_SUFFIX}/test/outstanding_bugs.py
lib/python${PY_VER_SUFFIX}/test/outstanding_bugs.pyc
@@ -3307,6 +3306,9 @@ lib/python${PY_VER_SUFFIX}/test/test_new.pyo
lib/python${PY_VER_SUFFIX}/test/test_nis.py
lib/python${PY_VER_SUFFIX}/test/test_nis.pyc
lib/python${PY_VER_SUFFIX}/test/test_nis.pyo
lib/python${PY_VER_SUFFIX}/test/test_nntplib.py
lib/python${PY_VER_SUFFIX}/test/test_nntplib.pyc
lib/python${PY_VER_SUFFIX}/test/test_nntplib.pyo
lib/python${PY_VER_SUFFIX}/test/test_normalization.py
lib/python${PY_VER_SUFFIX}/test/test_normalization.pyc
lib/python${PY_VER_SUFFIX}/test/test_normalization.pyo

6
lang/python26/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.5 2012/05/07 01:53:42 dholland Exp $
# $NetBSD: buildlink3.mk,v 1.6 2013/11/06 07:25:49 adam Exp $
BUILDLINK_TREE+= python26
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.python26+= python26>=2.6
BUILDLINK_ABI_DEPENDS.python26+= python26>=2.6.6nb8
BUILDLINK_PKGSRCDIR.python26?= ../../lang/python26
. if defined(BUILDLINK_DEPMETHOD.python)
.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python26?= ${BUILDLINK_DEPMETHOD.python}
. endif
.endif
#BUILDLINK_INCDIRS.python26+= include/python2.6
#BUILDLINK_LIBDIRS.python26+= lib/python2.6/config

6
lang/python26/dist.mk
View File

@@ -1,8 +1,8 @@
# $NetBSD: dist.mk,v 1.3 2012/04/14 10:47:17 obache Exp $
# $NetBSD: dist.mk,v 1.4 2013/11/06 07:25:49 adam Exp $
PY_DISTVERSION= 2.6.8
PY_DISTVERSION= 2.6.9
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python26/distinfo
PATCHDIR= ${.CURDIR}/../../lang/python26/patches
MASTER_SITES= http://www.python.org/ftp/python/${PY_DISTVERSION}/

18
lang/python26/distinfo
View File

@@ -1,12 +1,14 @@
$NetBSD: distinfo,v 1.49 2012/12/21 20:28:36 dholland Exp $
$NetBSD: distinfo,v 1.57 2014/03/27 06:14:57 obache Exp $
SHA1 (Python-2.6.8.tar.bz2) = 348b727a9818146a57aa43203f37d8c6b462fe79
RMD160 (Python-2.6.8.tar.bz2) = fcfa3554af415cbddd3e8d68aead46f1e7b8e616
Size (Python-2.6.8.tar.bz2) = 11127915 bytes
SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8
RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3
Size (Python-2.6.9.tar.xz) = 9333664 bytes
SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490
SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3
SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4
SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
@@ -14,16 +16,16 @@ SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
SHA1 (patch-al) = 8425c119a64d67701e2b94aa9db3359150e0d7c0
SHA1 (patch-am) = 380dfaa8ca90532a52dcca972e34965f6e64fce1
SHA1 (patch-al) = 45dd16af8e7a45aa323138f712c034aa79a91019
SHA1 (patch-am) = 4064aa3cbe34389ce344d7372eb71c7305f38e07
SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb
SHA1 (patch-ap) = 5ad6f248027be369bd27f69210ff3c7b97a297a2
SHA1 (patch-au) = 230d74342997021e957105786e93600f5d03cf7b
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

16
lang/python26/patches/patch-Lib_distutils_unixccompiler.py Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/09/10 14:22:30 joerg Exp $
--- Lib/distutils/unixccompiler.py.orig 2012-04-10 15:32:04.000000000 +0000
+++ Lib/distutils/unixccompiler.py
@@ -292,10 +292,8 @@ class UnixCCompiler(CCompiler):
return ["+s", "-L" + dir]
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
return ["-rpath", dir]
- elif self._is_gcc(compiler):
- return "-Wl,-R" + dir
else:
- return "-R" + dir
+ return "-Wl,-R" + dir
def library_option(self, lib):
return "-l" + lib

45
lang/python26/patches/patch-Modules_readline.c Normal file
View File

@@ -0,0 +1,45 @@
$NetBSD: patch-Modules_readline.c,v 1.1 2014/03/27 06:14:57 obache Exp $
* fixes for readline-6.3
http://bugs.python.org/issue20374
backport from Python 2.7
--- Modules/readline.c.orig 2013-10-29 15:04:39.000000000 +0000
+++ Modules/readline.c
@@ -699,7 +699,11 @@ on_hook(PyObject *func)
}
static int
+#if defined(_RL_FUNCTION_TYPEDEF)
on_startup_hook(void)
+#else
+on_startup_hook()
+#endif
{
return on_hook(startup_hook);
}
@@ -801,7 +805,7 @@ on_completion(const char *text, int stat
* before calling the normal completer */
static char **
-flex_complete(char *text, int start, int end)
+flex_complete(const char *text, int start, int end)
{
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rl_completion_append_character ='\0';
@@ -841,12 +845,12 @@ setup_readline(void)
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
/* Set our hook functions */
- rl_startup_hook = (Function *)on_startup_hook;
+ rl_startup_hook = on_startup_hook;
#ifdef HAVE_RL_PRE_INPUT_HOOK
- rl_pre_input_hook = (Function *)on_pre_input_hook;
+ rl_pre_input_hook = on_pre_input_hook;
#endif
/* Set our completion function */
- rl_attempted_completion_function = (CPPFunction *)flex_complete;
+ rl_attempted_completion_function = flex_complete;
/* Set Python word break characters */
rl_completer_word_break_characters =
strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");

16
lang/python26/patches/patch-al
View File

@@ -1,12 +1,13 @@
$NetBSD: patch-al,v 1.11 2012/12/21 20:28:36 dholland Exp $
$NetBSD: patch-al,v 1.12 2013/11/06 07:25:49 adam Exp $
- recognize OpenBSD, MirBSD, Interix, Solaris 11
- remove special-case library version hack for FreeBSD
- don't set Mac OS X target version: stick to the current one
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
--- configure.orig 2010-05-25 02:27:03.000000000 +0000
+++ configure 2011-09-06 18:58:15.336443123 +0200
--- configure.orig 2013-10-29 15:04:39.000000000 +0000
+++ configure
@@ -2833,7 +2833,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
@@ -59,6 +60,15 @@ $NetBSD: patch-al,v 1.11 2012/12/21 20:28:36 dholland Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -5314,7 +5309,7 @@ $as_echo "$CC" >&6; }
# Calculate the right deployment target for this build.
#
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
- if test ${cur_target} '>' 10.2; then
+ if false; then
cur_target=10.3
if test ${enable_universalsdk}; then
if test "${UNIVERSAL_ARCHS}" = "all"; then
@@ -7359,8 +7354,8 @@ then
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else

4
lang/python26/patches/patch-am
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-am,v 1.19 2011/11/08 07:30:08 sbd Exp $
$NetBSD: patch-am,v 1.22 2014/03/27 05:36:10 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

21
lang/python26/patches/patch-ap
View File

@@ -1,6 +1,10 @@
$NetBSD: patch-ap,v 1.3 2010/09/04 05:12:00 obache Exp $
$NetBSD: patch-ap,v 1.4 2014/02/09 13:47:10 drochner Exp $
--- Modules/socketmodule.c.orig 2010-05-23 15:22:08.000000000 +0000
Fix vulnerability reported in SA56624. Patch taken from here:
http://hg.python.org/cpython/rev/87673659d8f7
--- Modules/socketmodule.c.orig 2014-02-09 12:58:52.000000000 +0000
+++ Modules/socketmodule.c
@@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void
#define SOCKETCLOSE close
@@ -66,7 +70,18 @@ $NetBSD: patch-ap,v 1.3 2010/09/04 05:12:00 obache Exp $
*len_ret = sizeof *addr;
return 1;
}
@@ -4588,9 +4607,13 @@ init_socket(void)
@@ -2625,6 +2644,10 @@ sock_recvfrom_into(PySocketSockObject *s
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
+ } else if (recvlen > buflen) {
+ PyErr_SetString(PyExc_ValueError,
+ "nbytes is greater than the length of the buffer");
+ return NULL;
}
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
@@ -4588,9 +4611,13 @@ init_socket(void)
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);

6
lang/python26/patches/patch-bc
View File

@@ -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.
"""