openssl3 renuild
This commit is contained in:
@@ -21,7 +21,7 @@ def setup():
|
||||
enable-cms enable-md2 enable-mdc2 threads"
|
||||
|
||||
if get.buildTYPE() == "_emul32":
|
||||
options += " --prefix=/_emul32 --libdir=lib32"
|
||||
options += " --prefix=/_emul32 --libdir=/usr/lib32"
|
||||
shelltools.export("CC", "%s -m32" % get.CC())
|
||||
shelltools.export("CXX", "%s -m32" % get.CXX())
|
||||
shelltools.system("./Configure linux-elf %s" % options)
|
||||
@@ -38,10 +38,42 @@ def setup():
|
||||
pisitools.dosed("Makefile", "^(SHARED_LDFLAGS=).*", "\\1 ${LDFLAGS}")
|
||||
pisitools.dosed("Makefile", "^(CFLAG=.*)", "\\1 ${CFLAGS}")
|
||||
|
||||
shelltools.cd("../openssl-1.1.1w")
|
||||
pisitools.dosed("Configure", " $prefix/$libdir/engines ", " /%{_lib}/engines ")
|
||||
options = " --prefix=/temp \
|
||||
--libdir=/usr/lib/openssl-1.1 \
|
||||
includedir=/usr/include/openssl-1.1 \
|
||||
DOCDIR=/usr/share/doc/openssl-1.1 \
|
||||
shared -Wa,--noexecstack \
|
||||
zlib enable-camellia enable-idea \
|
||||
enable-seed enable-rfc3779 enable-rc5 \
|
||||
enable-cms enable-md2 enable-mdc2 threads"
|
||||
|
||||
if get.buildTYPE() == "_emul32":
|
||||
options += " --prefix=/temp --libdir=/usr/lib32/openssl-1.1"
|
||||
shelltools.export("CC", "%s -m32" % get.CC())
|
||||
shelltools.export("CXX", "%s -m32" % get.CXX())
|
||||
shelltools.system("./Configure linux-elf %s" % options)
|
||||
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
|
||||
|
||||
elif get.ARCH() == "i686":
|
||||
shelltools.system("./Configure linux-elf %s" % options)
|
||||
pisitools.dosed("Makefile", "^(SHARED_LDFLAGS=).*", "\\1 ${LDFLAGS}")
|
||||
pisitools.dosed("Makefile", "^(CFLAG=.*)", "\\1 ${CFLAGS}")
|
||||
|
||||
else:
|
||||
options += " enable-ec_nistp_64_gcc_128"
|
||||
shelltools.system("./Configure linux-x86_64 %s" % options)
|
||||
pisitools.dosed("Makefile", "^(SHARED_LDFLAGS=).*", "\\1 ${LDFLAGS}")
|
||||
pisitools.dosed("Makefile", "^(CFLAG=.*)", "\\1 ${CFLAGS}")
|
||||
|
||||
def build():
|
||||
autotools.make("depend")
|
||||
autotools.make()
|
||||
#autotools.make("rehash")
|
||||
shelltools.cd("../openssl-1.1.1w")
|
||||
autotools.make("depend")
|
||||
autotools.make()
|
||||
|
||||
def check():
|
||||
#Revert ca-dir patch not to fail test
|
||||
@@ -58,6 +90,10 @@ def check():
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s MANDIR=/usr/share/man" % get.installDIR())
|
||||
|
||||
# opebssl-1.1
|
||||
shelltools.cd("../openssl-1.1.1w")
|
||||
autotools.rawInstall("DESTDIR=%s DOCDIR=/usr/share/doc/openssl-1.1" % get.installDIR())
|
||||
|
||||
# Rename conflicting manpages
|
||||
# pisitools.rename("/usr/share/man/man1/passwd.1", "ssl-passwd.1")
|
||||
#pisitools.rename("/usr/share/man/man3/rand.3", "ssl-rand.3")
|
||||
@@ -65,27 +101,51 @@ def install():
|
||||
|
||||
if get.buildTYPE() == "_emul32":
|
||||
#from distutils.dir_util import copy_tree
|
||||
shelltools.copytree("%s/_emul32/lib32/" % get.installDIR(), "%s/usr/lib32" % get.installDIR())
|
||||
# shelltools.copytree("%s/_emul32/lib32" % get.installDIR(), "%s/usr/lib32" % get.installDIR())
|
||||
pisitools.removeDir("/_emul32")
|
||||
pisitools.remove("/usr/lib32/*.a")
|
||||
pisitools.remove("/usr/lib32/openssl-1.1/*.a")
|
||||
path = "%s/usr/lib32/pkgconfig" % get.installDIR()
|
||||
for f in shelltools.ls(path): pisitools.dosed("%s/%s" % (path, f), "^(prefix=\/)_emul32", r"\1usr")
|
||||
|
||||
# opebssl-1.1
|
||||
path = "%s/usr/lib32/openssl-1.1/pkgconfig" % get.installDIR()
|
||||
for f in shelltools.ls(path): pisitools.dosed("%s/%s" % (path, f), "^(prefix=\/)temp", r"\1usr")
|
||||
path = "%s/usr/lib/openssl-1.1/pkgconfig" % get.installDIR()
|
||||
for f in shelltools.ls(path): pisitools.dosed("%s/%s" % (path, f), "^(prefix=\/)temp", r"\1usr")
|
||||
|
||||
# opebssl-1.1
|
||||
pisitools.dosym("/usr/lib/openssl-1.1/libssl.so", "/usr/lib/libssl.so.1.1")
|
||||
pisitools.dosym("/usr/lib/openssl-1.1/libcrypto.so", "/usr/lib/libcrypto.so.1.1")
|
||||
pisitools.dosym("/usr/lib32/openssl-1.1/libssl.so", "/usr/lib32/libssl.so.1.1")
|
||||
pisitools.dosym("/usr/lib32/openssl-1.1/libcrypto.so", "/usr/lib32/libcrypto.so.1.1")
|
||||
|
||||
# Move engines to /usr/lib/openssl/engines
|
||||
pisitools.dodir("/usr/lib/openssl")
|
||||
#pisitools.domove("/usr/lib/engines", "/usr/lib/openssl")
|
||||
|
||||
# Certificate stuff
|
||||
pisitools.dobin("tools/c_rehash")
|
||||
|
||||
|
||||
# Create needed dirs
|
||||
for cadir in ["misc", "private"]:
|
||||
pisitools.dodir("/etc/ssl/%s" % cadir)
|
||||
|
||||
# No static libs
|
||||
pisitools.remove("/usr/lib/*.a")
|
||||
pisitools.remove("/usr/lib/openssl-1.1/*.a")
|
||||
|
||||
# opebssl-1.1
|
||||
shelltools.move("%s/temp/include/openssl" % get.installDIR(), "%s/usr/include/openssl-1.1" % get.installDIR())
|
||||
shelltools.system("sed -e 's|/include$|/include/openssl-1.1|' -i %s/usr/lib/openssl-1.1/pkgconfig/*.pc" % get.installDIR())
|
||||
shelltools.system("sed -e 's|/include$|/include/openssl-1.1|' -i %s/usr/lib32/openssl-1.1/pkgconfig/*.pc" % get.installDIR())
|
||||
shelltools.move("%s/temp/bin/openssl" % get.installDIR(), "%s/usr/bin/openssl-1.1" % get.installDIR())
|
||||
shelltools.move("%s/temp/bin/c_rehash" % get.installDIR(), "%s/usr/bin/c_rehash-1.1" % get.installDIR())
|
||||
pisitools.removeDir("/temp")
|
||||
return
|
||||
|
||||
# Move engines to /usr/lib/openssl/engines
|
||||
pisitools.dodir("/usr/lib/openssl")
|
||||
#pisitools.domove("/usr/lib/engines", "/usr/lib/openssl")
|
||||
|
||||
# Certificate stuff
|
||||
pisitools.dobin("tools/c_rehash")
|
||||
|
||||
|
||||
# Create needed dirs
|
||||
for cadir in ["misc", "private"]:
|
||||
pisitools.dodir("/etc/ssl/%s" % cadir)
|
||||
|
||||
# No static libs
|
||||
pisitools.remove("/usr/lib/*.a")
|
||||
|
||||
pisitools.dohtml("doc/*")
|
||||
pisitools.dodoc("CHANGES*", "LICENSE*", "NEWS*", "README*", "doc/*.txt")
|
||||
|
||||
Reference in New Issue
Block a user