60fbe387c7
This is a bug-fix release. It contains the fix for http://www.python.org/security/PSF-2005-001/ which we added in 2.3.4nb7.
110 lines
4 KiB
Text
110 lines
4 KiB
Text
$NetBSD: patch-al,v 1.11 2005/02/15 12:25:07 drochner Exp $
|
|
|
|
--- configure.orig 2005-01-11 14:48:52.000000000 +0100
|
|
+++ configure
|
|
@@ -1481,6 +1481,8 @@ case $ac_sys_system/$ac_sys_release in
|
|
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
|
|
OpenBSD/2.* | OpenBSD/3.[01234])
|
|
define_xopen_source=no;;
|
|
+ NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S])
|
|
+ define_xopen_source=no;;
|
|
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
|
|
# of union __?sigval. Reported by Stuart Bishop.
|
|
SunOS/5.6)
|
|
@@ -3733,7 +3735,7 @@ _ACEOF
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
- Linux*|GNU*|NetBSD*)
|
|
+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*)
|
|
LDLIBRARY='libpython$(VERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
@@ -3754,6 +3756,14 @@ _ACEOF
|
|
BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
|
|
;;
|
|
+ Darwin*)
|
|
+ if test -z "$enable_framework"; then
|
|
+ LDLIBRARY='libpython$(VERSION).dylib'
|
|
+ BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
+ RUNSHARED=DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}
|
|
+ fi
|
|
+ ;;
|
|
+
|
|
esac
|
|
# DG/UX requires some fancy ld contortions to produce a .so from an .a
|
|
case $MACHDEP in
|
|
@@ -4152,7 +4162,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
|
|
;;
|
|
# is there any other compiler on Darwin besides gcc?
|
|
Darwin*)
|
|
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
|
|
+ if [[ `/usr/bin/arch` = 'ppc' ]]
|
|
+ then
|
|
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
|
|
+ else
|
|
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
|
|
+ fi
|
|
;;
|
|
esac
|
|
;;
|
|
@@ -10979,7 +10994,7 @@ then
|
|
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
else
|
|
# No framework. Ignore undefined symbols, assuming they come from Python
|
|
- LDSHARED="$LDSHARED -undefined suppress"
|
|
+ LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
|
|
fi ;;
|
|
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
|
|
LDSHARED='$(CC) $(LDFLAGS) -bundle'
|
|
@@ -11009,12 +11024,12 @@ then
|
|
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
else
|
|
# No framework, use the Python app as bundle-loader
|
|
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
|
|
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
|
|
+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
|
|
fi
|
|
fi
|
|
;;
|
|
- Linux*|GNU*) LDSHARED='$(CC) -shared';;
|
|
+ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
|
|
dgux*) LDSHARED="ld -G";;
|
|
BSD/OS*/4*) LDSHARED="gcc -shared";;
|
|
OpenBSD*|FreeBSD*)
|
|
@@ -11024,7 +11039,8 @@ then
|
|
else
|
|
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
|
fi;;
|
|
- NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
|
|
+ NetBSD*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
|
|
+ Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then LDSHARED='$(CC) -shared'
|
|
@@ -11057,6 +11073,7 @@ then
|
|
Linux*|GNU*) CCSHARED="-fPIC";;
|
|
BSD/OS*/4*) CCSHARED="-fpic";;
|
|
FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
|
|
+ Interix*) CCSHARED="";;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
then CCSHARED="-fPIC"
|
|
@@ -11116,6 +11133,7 @@ then
|
|
then
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
fi;;
|
|
+ Interix*) LINKFORSHARED="-Wl,-E";;
|
|
SunOS/5*) case $CC in
|
|
*gcc*)
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
|
@@ -15127,6 +15145,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
|
|
#include "confdefs.h"
|
|
+#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|