Updated openssl to 1.0.0a and python to 2.6.6

2026-04-23 04:00:05 +02:00 · 2010-08-30 00:00:00 +00:00
parent 5e0ef90e82
commit ab4115b08b
4 changed files with 301 additions and 0 deletions
--- a/dev-lang/python/patches/python-2.6.6.patch
+++ b/dev-lang/python/patches/python-2.6.6.patch
@@ -0,0 +1,202 @@
+diff -urN Python-2.6.6/Modules/resource.c Python-2.6.6-haiku/Modules/resource.c
+--- Python-2.6.6/Modules/resource.c	2010-05-09 15:15:40.020971520 +0000
+++ Python-2.6.6-haiku/Modules/resource.c	2010-08-29 23:31:01.967311360 +0000
+@@ -86,6 +86,7 @@
+                     PyFloat_FromDouble(doubletime(ru.ru_utime)));
+     PyStructSequence_SET_ITEM(result, 1,
+                     PyFloat_FromDouble(doubletime(ru.ru_stime)));
+#ifndef __HAIKU__
+     PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss));
+     PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss));
+     PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss));
+@@ -100,7 +101,7 @@
+     PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals));
+     PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw));
+     PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw));
+-
+#endif
+     if (PyErr_Occurred()) {
+         Py_DECREF(result);
+         return NULL;
+diff -urN Python-2.6.6/Modules/socketmodule.h Python-2.6.6-haiku/Modules/socketmodule.h
+--- Python-2.6.6/Modules/socketmodule.h	2010-05-09 15:15:40.020971520 +0000
+++ Python-2.6.6-haiku/Modules/socketmodule.h	2010-08-29 23:26:23.269746176 +0000
+@@ -47,6 +47,10 @@
+ #  undef AF_NETLINK
+ #endif
+ 
+#if defined(__HAIKU__)
+#undef HAVE_BLUETOOTH_BLUETOOTH_H
+#endif
+
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
+diff -urN Python-2.6.6/Modules/spwdmodule.c Python-2.6.6-haiku/Modules/spwdmodule.c
+--- Python-2.6.6/Modules/spwdmodule.c	2010-05-09 15:15:40.064749568 +0000
+++ Python-2.6.6-haiku/Modules/spwdmodule.c	2010-08-29 23:33:33.966524928 +0000
+@@ -79,7 +79,9 @@
+ 
+     SETS(setIndex++, p->sp_namp);
+     SETS(setIndex++, p->sp_pwdp);
+#ifndef __HAIKU__
+     SETI(setIndex++, p->sp_lstchg);
+#endif
+     SETI(setIndex++, p->sp_min);
+     SETI(setIndex++, p->sp_max);
+     SETI(setIndex++, p->sp_warn);
+diff -urN Python-2.6.6/Modules/timemodule.c Python-2.6.6-haiku/Modules/timemodule.c
+--- Python-2.6.6/Modules/timemodule.c	2010-05-09 15:15:40.049545216 +0000
+++ Python-2.6.6-haiku/Modules/timemodule.c	2010-08-29 23:35:18.197918720 +0000
+@@ -968,11 +968,11 @@
+         return -1;
+     }
+     Py_END_ALLOW_THREADS
+-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
+     /* This sleep *CAN BE* interrupted. */
+     {
+         if( secs <= 0.0 ) {
+-            return;
+            return 0;
+         }
+ 
+         Py_BEGIN_ALLOW_THREADS
+diff -urN Python-2.6.6/Parser/asdl_c.py Python-2.6.6-haiku/Parser/asdl_c.py
+--- Python-2.6.6/Parser/asdl_c.py	2009-12-13 00:59:01.027000832 +0000
+++ Python-2.6.6-haiku/Parser/asdl_c.py	2010-08-29 23:27:12.271319040 +0000
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
+#! /bin/env python
+ """Generate C code from an ASDL description."""
+ 
+ # TO DO
+diff -urN Python-2.6.6/Python/bltinmodule.c Python-2.6.6-haiku/Python/bltinmodule.c
+--- Python-2.6.6/Python/bltinmodule.c	2010-05-09 15:15:40.032243712 +0000
+++ Python-2.6.6-haiku/Python/bltinmodule.c	2010-08-29 23:27:30.382992384 +0000
+@@ -18,7 +18,7 @@
+ */
+ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
+ const char *Py_FileSystemDefaultEncoding = "mbcs";
+-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__HAIKU__)
+ const char *Py_FileSystemDefaultEncoding = "utf-8";
+ #else
+ const char *Py_FileSystemDefaultEncoding = NULL; /* use default */
+diff -urN Python-2.6.6/Tools/scripts/h2py.py Python-2.6.6-haiku/Tools/scripts/h2py.py
+--- Python-2.6.6/Tools/scripts/h2py.py	2004-08-09 17:27:55.033816576 +0000
+++ Python-2.6.6-haiku/Tools/scripts/h2py.py	2010-08-29 23:28:01.171704320 +0000
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
+#! /bin/env python
+ 
+ # Read #define's and translate to Python code.
+ # Handle #include statements.
+@@ -50,7 +50,7 @@
+         searchdirs=os.environ['INCLUDE'].split(';')
+     except KeyError:
+         try:
+-            if  sys.platform.find("beos") == 0:
+            if  sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0:
+                 searchdirs=os.environ['BEINCLUDES'].split(';')
+             elif sys.platform.startswith("atheos"):
+                 searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
+diff -urN Python-2.6.6/configure.in Python-2.6.6-haiku/configure.in
+--- Python-2.6.6/configure.in	2010-05-25 02:27:03.031195136 +0000
+++ Python-2.6.6-haiku/configure.in	2010-08-29 23:24:40.751828992 +0000
+@@ -745,7 +745,7 @@
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+-    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+@@ -823,7 +823,7 @@
+ AC_SUBST(LN)
+ if test -z "$LN" ; then
+ 	case $ac_sys_system in
+-		BeOS*) LN="ln -s";;
+		BeOS*|Haiku*) LN="ln -s";;
+ 		CYGWIN*) LN="ln -s";;
+ 		atheos*) LN="ln -s";;
+ 		*) LN=ln;;
+@@ -1829,7 +1829,7 @@
+ 			fi
+ 		fi
+ 		;;
+-	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
+	Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';;
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	FreeBSD*)
+ 		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+@@ -1883,7 +1883,7 @@
+ 		 then CCSHARED="-fPIC";
+ 		 else CCSHARED="+z";
+ 		 fi;;
+-	Linux*|GNU*) CCSHARED="-fPIC";;
+	Linux*|GNU*|Haiku*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
+ 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ 	OpenUNIX*|UnixWare*)
+@@ -1916,7 +1916,7 @@
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+	Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*) 
+ 		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
+@@ -2035,6 +2035,9 @@
+ BeOS*)
+ AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
+ ;;
+Haiku*)
+AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku
+;;
+ esac
+ 
+ AC_MSG_CHECKING(for --with-libs)
+@@ -3265,7 +3268,7 @@
+ AC_SUBST(LIBM)
+ case $ac_sys_system in
+ Darwin) ;;
+-BeOS) ;;
+BeOS|Haiku) ;;
+ *) LIBM=-lm
+ esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+diff -urN Python-2.6.6/setup.py Python-2.6.6-haiku/setup.py
+--- Python-2.6.6/setup.py	2010-07-17 12:31:09.024379392 +0000
+++ Python-2.6.6-haiku/setup.py	2010-08-29 23:24:53.418906112 +0000
+@@ -428,6 +428,10 @@
+             inc_dirs += ['/system/include', '/atheos/autolnk/include']
+             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+ 
+        if platform == 'haiku1':
+            inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty', '/boot/common/include']
+            lib_dirs += ['/boot/system/lib', '/boot/develop/lib/x86', '/boot/common/lib']
+
+         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+         if platform in ['osf1', 'unixware7', 'openunix8']:
+             lib_dirs += ['/usr/ccs/lib']
+@@ -451,7 +455,7 @@
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if platform in ['darwin', 'beos', 'mac']:
+        if platform in ['darwin', 'beos', 'haiku1', 'mac']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+@@ -1176,7 +1180,7 @@
+                 missing.append('resource')
+ 
+             # Sun yellow pages. Some systems have the functions in libc.
+-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
+            if (platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and
+                 find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
+                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
+                     libs = ['nsl']
--- a/dev-lang/python/python-2.6.6.bep
+++ b/dev-lang/python/python-2.6.6.bep
@@ -0,0 +1,25 @@
+DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" 
+HOMEPAGE="http://www.python.org" 
+SRC_URI="http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2"
+CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd Python-2.6.6/Modules/_ctypes/libffi
+	libtoolize --force --copy --install
+	cd ../../..
+	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	./configure --prefix=/boot/common --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty
+	make
+}
+
+INSTALL {
+	cd Python-2.6.6
+	make install
+}
+LICENSE="Python"
+COPYRIGHT="1990-2010, Python Software Foundation"
--- a/dev-libs/openssl/openssl-1.0.0a.bep
+++ b/dev-libs/openssl/openssl-1.0.0a.bep
@@ -0,0 +1,20 @@
+DESCRIPTION="openssl" 
+HOMEPAGE="http://www.openssl.org/" 
+SRC_URI="http://www.openssl.org/source/openssl-1.0.0a.tar.gz"
+CHECKSUM_MD5="e3873edfffc783624cfbdb65e2249cbd"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="sys-libs/zlib >= 1.2.3"
+BUILD {
+	cd openssl-1.0.0a
+	config --prefix=/boot/common zlib shared
+	make
+}
+
+INSTALL {
+	cd openssl-1.0.0a
+	make install INSTALL_PREFIX="${DESTDIR}"
+}
+LICENSE="OpenSSL"
+COPYRIGHT="1995-1998 Eric Young
+		1998-2010 The OpenSSL Project."
--- a/dev-libs/openssl/patches/openssl-1.0.0a.patch
+++ b/dev-libs/openssl/patches/openssl-1.0.0a.patch
@@ -0,0 +1,54 @@
+diff -urN openssl-1.0.0a/Configure openssl-1.0.0a-haiku/Configure
+--- openssl-1.0.0a/Configure	2009-11-05 12:07:06.000000000 +0000
+++ openssl-1.0.0a-haiku/Configure	2009-11-07 16:59:19.000000000 +0000
+@@ -545,6 +545,9 @@
+ ##### Compaq Non-Stop Kernel (Tandem)
+ "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
+ 
+##### Haiku
+"haiku-x86",	"gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+ );
+ 
+ my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+diff -urN openssl-1.0.0a/Makefile.shared openssl-1.0.0a-haiku/Makefile.shared
+--- openssl-1.0.0a/Makefile.shared	2008-09-17 15:56:40.000000000 +0000
+++ openssl-1.0.0a-haiku/Makefile.shared	2009-11-07 16:59:19.000000000 +0000
+@@ -552,10 +552,10 @@
+ symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
+ 
+ # Compatibility targets
+-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
+-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
+-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
+-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
+ link_o.bsd-shared: link_o.bsd
+ link_a.bsd-shared: link_a.bsd
+ link_app.bsd-shared: link_app.bsd
+diff -urN openssl-1.0.0a/config openssl-1.0.0a-haiku/config
+--- openssl-1.0.0a/config	2009-02-16 08:43:41.000000000 +0000
+++ openssl-1.0.0a-haiku/config	2009-11-07 16:59:19.000000000 +0000
+@@ -126,6 +126,10 @@
+ 	echo "${MACHINE}-dg-dgux"; exit 0
+ 	;;
+ 
+    Haiku:*:BePC)
+    echo "i586-pc-haiku"; exit 0
+    ;;
+
+     HI-UX:*)
+ 	echo "${MACHINE}-hi-hiux"; exit 0
+ 	;;
+@@ -761,6 +765,8 @@
+ 	    options="$options no-asm"
+ 	fi
+ 	;;
+     i586-*-haiku) OUT="haiku-x86" ;;
+
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;