Merge pull request #1312 from Rmys/master

python-2.7 rebuild

system/base/python/actions.py

@@ -16,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("..")
-    os.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ")
+    #os.system("echo -e '\033[0;36mBuilding OpenSSL\033[0m' ")
     
-    shelltools.cd("openssl-1.1.1l")
+    #shelltools.cd("openssl-1.1.1l")
-    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()))
+    #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()
-    autotools.make("install")
+    #autotools.make("install")
-    shelltools.cd("..")
+    #shelltools.cd("..")
     
-    os.system("echo -e '\033[0;36mBuilding Python\033[0m' ")
+    #os.system("echo -e '\033[0;36mBuilding Python\033[0m' ")
 	
     pisitools.cflags.add("-fwrapv")
 
@@ -46,10 +46,10 @@ def setup():
         
     #shelltools.export("CFLAGS", "-I%s/temp/include -O3" %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())
+    #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.cflags.add("-I%s/temp/include -O3" %get.workDIR())
-    pisitools.ldflags.add("-L%s/temp/lib -lssl -lcrypto -lpthread -ldl" %get.workDIR())
+    #pisitools.ldflags.add("-L%s/temp/lib -lssl -lcrypto -lpthread -ldl" %get.workDIR())
 
     autotools.autoreconf("-vif")
 
@@ -67,9 +67,7 @@ def setup():
                          --with-wctype-functions \
                          --with-system-expat \
                          --with-system-ffi \
-                         --with-dbmliborder=gdbm \
+                         --with-dbmliborder=gdbm")
-                         PKG_CONFIG_PATH=%s/temp/lib/pkgconfig \
-                        " %get.workDIR())
 
 def build():
     autotools.make()

system/base/python/pspec.xml

@@ -44,21 +44,7 @@
 			<Patch level="1">allowZip64.patch</Patch>
 			
             <!-- Gentoo patches -->
-            <Patch>gentoo/0001-bpo-39017-Avoid-infinite-loop-in-the-tarfile-module-.patch</Patch>
-            <Patch>gentoo/0002-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch</Patch>
-            <Patch>gentoo/0003-bpo-39603-Prevent-header-injection-in-http-methods-G.patch</Patch>
-            <Patch>gentoo/0004-bpo-42051-Reject-XML-entity-declarations-in-plist-fi.patch</Patch>
-            <Patch>gentoo/0005-bpo-41944-No-longer-call-eval-on-content-received-vi.patch</Patch>
-            <Patch>gentoo/0006-bpo-40791-Make-compare_digest-more-constant-time.-GH.patch</Patch>
-            <Patch>gentoo/0007-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch</Patch>
-            <Patch>gentoo/0011-Non-zero-exit-status-on-failure.patch</Patch>
             <Patch>gentoo/0015-Turkish-locale.patch</Patch>
-            <Patch>gentoo/0022-Force-using-system-libffi.patch</Patch>
-            <Patch>gentoo/0024-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch</Patch>
-            <Patch>gentoo/0026-3.6-bpo-43285-Make-ftplib-not-trust-the-PASV-respons.patch</Patch>
-            <Patch>gentoo/0027-bpo-43075-Fix-ReDoS-in-urllib-AbstractBasicAuthHandl.patch</Patch>
-            <Patch>gentoo/0028-3.9-bpo-43882-urllib.parse-should-sanitize-urls-cont.patch</Patch>
-            <Patch>gentoo/0030-Backport-bpo-44022-Fix-http-client-infinite-line-rea.patch</Patch>
         </Patches>
     </Source>
 
@@ -154,6 +140,13 @@
     </Package>-->
 
     <History>
+        <Update release="15">
+            <Date>2022-01-18</Date>-
+            <Version>2.7.18</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
 	    <Update release="14">
             <Date>2021-11-06</Date>-
             <Version>2.7.18</Version>