From 00a209032393b9bcb0acef0ab0343c55f277da99 Mon Sep 17 00:00:00 2001
From: Idris Kalp <idriskalp@gmail.com>
Date: Tue, 30 Mar 2021 21:03:10 +0300
Subject: [PATCH] python rebuild

---
 system/base/python/actions.py | 27 +++++++++++++++------------
 system/base/python/pspec.xml  | 13 +++++++++++--
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/system/base/python/actions.py b/system/base/python/actions.py
index 863bc0bb..225b87ab 100644
--- a/system/base/python/actions.py
+++ b/system/base/python/actions.py
@@ -8,7 +8,6 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
-
 import os
 
 WorkDir = "Python-%s" % get.srcVERSION()
@@ -17,20 +16,20 @@ PythonVersion = "2.7"
 
 def setup():
     #shelltools.system("echo -e '\033[0;36mBuilding Bzip2\033[0m' ")
-    #shelltools.makedirs("%s/temp/lib" %get.workDIR())
+    shelltools.makedirs("%s/temp/lib" %get.workDIR())
     #shelltools.cd("bzip2-1.0.8")
     #autotools.make('CC=%s AR=%s RANLIB=%s CFLAGS="%s -D_FILE_OFFSET_BITS=64 -fPIC" libbz2.a' % (get.CC(), get.AR(), get.RANLIB(), get.CFLAGS()))
     #shelltools.system("cp libbz2.a %s/temp/lib/libbz2.a" % get.workDIR())
     #shelltools.cd("..")
-    #shelltools.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ")
+    os.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ")
     
-    #shelltools.cd("openssl-1.1.1g")
-    #shelltools.system("./Configure --prefix=%s/temp --openssldir=%s/openssl/etc/ssl --libdir=lib no-shared enable-ec_nistp_64_gcc_128 linux-x86_64 -Wa,--noexecstack" %(get.workDIR(), get.workDIR()))
-    #autotools.make()
-    #autotools.make("install")
-    #shelltools.cd("..")
+    shelltools.cd("openssl-1.1.1k")
+    shelltools.system("./Configure --prefix=%s/temp --openssldir=%s/openssl/etc/ssl --libdir=lib no-shared enable-ec_nistp_64_gcc_128 linux-x86_64 -Wa,--noexecstack" %(get.workDIR(), get.workDIR()))
+    autotools.make()
+    autotools.make("install")
+    shelltools.cd("..")
     
-    shelltools.system("echo -e '\033[0;36mBuilding Python\033[0m' ")
+    os.system("echo -e '\033[0;36mBuilding Python\033[0m' ")
 	
     pisitools.cflags.add("-fwrapv")
 
@@ -46,8 +45,11 @@ def setup():
         shelltools.unlinkDir("Modules/%s" % dir)
         
     #shelltools.export("CFLAGS", "-I%s/temp/include -O3" %get.workDIR())
-    #shelltools.export("LDFLAGS", "-L%s/temp/lib -lssl -lcrypto -lbz2 -lpthread -ldl" %get.workDIR())
-    #shelltools.export("PKG_CONFIG_PATH", "-$PKG_CONFIG_PATH:%s/temp/lib/pkgconfig" %get.workDIR())
+    #shelltools.export("LDFLAGS", "-L%s/temp/lib -lssl -lcrypto -lpthread -ldl" %get.workDIR())
+    shelltools.export("PKG_CONFIG_PATH", "$PKG_CONFIG_PATH:%s/temp/lib/pkgconfig" %get.workDIR())
+    
+    pisitools.cflags.add("-I%s/temp/include -O3" %get.workDIR())
+    pisitools.ldflags.add("-L%s/temp/lib -lssl -lcrypto -lpthread -ldl" %get.workDIR())
 
     autotools.autoreconf("-vif")
 
@@ -66,7 +68,8 @@ def setup():
                          --with-system-expat \
                          --with-system-ffi \
                          --with-dbmliborder=gdbm \
-                        ")
+                         PKG_CONFIG_PATH=%s/temp/lib/pkgconfig \
+                        " %get.workDIR())
 
 def build():
     autotools.make()
diff --git a/system/base/python/pspec.xml b/system/base/python/pspec.xml
index 624e1700..e20bd996 100755
--- a/system/base/python/pspec.xml
+++ b/system/base/python/pspec.xml
@@ -13,8 +13,8 @@
         <Summary>An interpreted, interactive, object-orientated programming language</Summary>
         <Description>Python is a dynamic object-oriented programming language that can be used for many kinds of software development. It offers strong support for integration with other languages and tools, comes with extensive standard libraries, and can be learned in a few days.</Description>
         <Archive sha1sum="678d4cf483a1c92efd347ee8e1e79326dc82810b" type="tarxz">https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz</Archive>
-<!--		<Archive sha1sum="bf7badf7e248e0ecf465d33c2f5aeec774209227" type="targz" target="Python-2.7.18">https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz</Archive>
-		<Archive sha1sum="b213a293f2127ec3e323fb3cfc0c9807664fd997" type="targz" target="Python-2.7.18">https://www.openssl.org/source/openssl-1.1.1g.tar.gz</Archive>-->
+		<!--		<Archive sha1sum="bf7badf7e248e0ecf465d33c2f5aeec774209227" type="targz" target="Python-2.7.18">https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz</Archive> -->
+		<Archive sha1sum="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" type="targz" target="Python-2.7.18">https://www.openssl.org/source/openssl-1.1.1k.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>bzip2</Dependency>
             <!--<Dependency>tcl-devel</Dependency>-->
@@ -27,6 +27,7 @@
             <Dependency>ncurses-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>readline-devel</Dependency>
+            <Dependency versionFrom="2.32">glibc-devel</Dependency>
             <!-- Bootstrap -->
             <!-- Comment these deps when bootstrapping -->
         </BuildDependencies>
@@ -69,6 +70,7 @@
             <Dependency>ncurses</Dependency>
             <Dependency>openssl</Dependency>
             <Dependency>readline</Dependency>
+            <Dependency versionFrom="2.32">glibc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -149,6 +151,13 @@
     </Package>-->
 
     <History>
+    <Update release="11">
+            <Date>2021-03-30</Date>-
+            <Version>2.7.18</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
     <Update release="10">
             <Date>2021-03-18</Date>-
             <Version>2.7.18</Version>