[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Add more versions of python; apply ROOTARG patch from M...



Update of /home/minion/cvsroot/src/minion
In directory moria:/tmp/cvs-serv11753

Modified Files:
	Makefile 
Log Message:
Add more versions of python; apply ROOTARG patch from Matteo; make openssl version into 0.9.8a.

Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- Makefile	7 Aug 2004 14:08:23 -0000	1.70
+++ Makefile	2 Dec 2005 18:22:48 -0000	1.71
@@ -13,6 +13,7 @@
 # XXXX This fails when PYTHON is set to a version of Python earlier than 1.3
 
 PYTHON_CANDIDATES = python \
+        python2p4 python2.4 python2.4x \
         python2p3 python2.3 python2.3x \
         python2p2 python2.2 python2.2x \
         python2p1 python2.1 python2.1x \
@@ -110,7 +111,7 @@
 	  PREFIXARG=--prefix="$(PREFIX)";                                    \
 	fi;                                                                  \
 	if [ 'x' != "x$(DESTDIR)" ] ; then                                   \
-	  ROOTARG=--root="$(ROOTARG)";                                       \
+	  ROOTARG=--root="$(DESTDIR)";                                       \
         fi;                                                                  \
 	echo $$PYTHON -tt setup.py $$ARGS $$PREFIXARG $$ROOTARG;             \
 	$$PYTHON -tt setup.py $$ARGS $$PREFIXARG $$ROOTARG
@@ -218,10 +219,10 @@
 #======================================================================
 # OpenSSL-related targets
 
-OPENSSL_URL = ftp://ftp.openssl.org/source/openssl-0.9.7d.tar.gz
-OPENSSL_FILE = openssl-0.9.7d.tar.gz
+OPENSSL_URL = http://www.openssl.org/source/openssl-0.9.8a.tar.gz
+OPENSSL_FILE = openssl-0.9.8a.tar.gz
 OPENSSL_SRC = ./contrib/openssl
-OPENSSL_SHA = 697d7f3b7ab3bf980373f7f41899362a0b507c2f
+OPENSSL_SHA = 2aaba0f728179370fb3e86b43209205bc6c06a3a
 # I have verified that the above digest matches the tarball signed by the
 # openssl maintainer.  If you are paranoid, you should doublecheck. -Nick.