moved ssl back to openssl

8 files changed, 35 insertions, 62 deletions

diff --git a/repo/system/kmod.xibuild b/repo/system/kmod.xibuild
index efab542..673036a 100644
--- a/repo/system/kmod.xibuild
+++ b/repo/system/kmod.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl zlib libressl xz zstd"
+DEPS="musl zlib openssl xz zstd"
 
 PKG_VER=29
 SOURCE=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-$PKG_VER.tar.xz
@@ -21,10 +21,10 @@ build () {
 package () {
     make DESTDIR=$PKG_DEST install 
     mkdir -p /usr/bin
-    ln -sv kmod $PKG_DEST/usr/bin/depmod
-    ln -sv kmod $PKG_DEST/usr/bin/insmod
-    ln -sv kmod $PKG_DEST/usr/bin/modinfo
-    ln -sv kmod $PKG_DEST/usr/bin/modprobe
-    ln -sv kmod $PKG_DEST/usr/bin/rmmod
-    ln -sv kmod $PKG_DEST/usr/bin/lsmod
+    ln -s kmod $PKG_DEST/usr/bin/depmod
+    ln -s kmod $PKG_DEST/usr/bin/insmod
+    ln -s kmod $PKG_DEST/usr/bin/modinfo
+    ln -s kmod $PKG_DEST/usr/bin/modprobe
+    ln -s kmod $PKG_DEST/usr/bin/rmmod
+    ln -s kmod $PKG_DEST/usr/bin/lsmod
 }
diff --git a/repo/system/krb5.xibuild b/repo/system/krb5.xibuild
index 03492c5..c794be7 100644
--- a/repo/system/krb5.xibuild
+++ b/repo/system/krb5.xibuild
@@ -6,11 +6,6 @@ DEPS="musl e2fsprogs libldap keyutils gdbm"
 PKG_VER=1.19.2
 SOURCE=http://web.mit.edu/kerberos/dist/krb5/${PKG_VER%.*}/krb5-${PKG_VER}.tar.gz
 
-ADDITIONAL="
-https://cgit.freebsd.org/ports/plain/security/krb5-119/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
-https://cgit.freebsd.org/ports/plain/security/krb5-119/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h
-"
-
 DESC="The Kerberos network authentication system"
 
 prepare () {
@@ -24,8 +19,9 @@ prepare () {
 
 
     cd src &&
-    patch -Np0 -i ../patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
-    patch -Np0 -i ../patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h
+    #these were needed for libressl
+    #patch -Np0 -i ../patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
+    #patch -Np0 -i ../patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h
 
    	sed -e "/LDFLAGS=/d" -i build-tools/krb5-config.in
     sed -i -e 's@\^u}@^u cols 300}@' tests/dejagnu/config/default.exp || true
@@ -34,7 +30,7 @@ prepare () {
 }
 
 build () {
-    # would be ideal to use libressl rather than builtin library
+    # would be ideal to use openssl rather than builtin library
     ./configure ${configure_args} --sbindir=/usr/bin \
 		--disable-rpath --with-system-et --without-system-verto --with-ldap \
 		--with-system-ss --enable-shared --without-tcl \
diff --git a/repo/system/ldns.xibuild b/repo/system/ldns.xibuild
index d6799fe..a835ee6 100644
--- a/repo/system/ldns.xibuild
+++ b/repo/system/ldns.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make libpcap"
-DEPS="libressl libpcap"
+DEPS="openssl libpcap"
 
 PKG_VER=1.8.1
 SOURCE=https://www.nlnetlabs.nl/downloads/ldns/ldns-$PKG_VER.tar.gz
diff --git a/repo/system/libarchive.xibuild b/repo/system/libarchive.xibuild
index d023980..29c8095 100644
--- a/repo/system/libarchive.xibuild
+++ b/repo/system/libarchive.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make autoconf libtool libpth libiconv"
-DEPS="acl bzip2 expat lz4 libressl xz zlib zstd"
+DEPS="acl bzip2 expat lz4 openssl xz zlib zstd"
 
 PKG_VER=3.5.2
 SOURCE=https://github.com/libarchive/libarchive/releases/download/v$PKG_VER/libarchive-$PKG_VER.tar.xz
diff --git a/repo/system/libressl.xibuild b/repo/system/libressl.xibuild
deleted file mode 100644
index 72834f3..0000000
--- a/repo/system/libressl.xibuild
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="musl"
-
-PKG_VER=3.4.2
-SOURCE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$PKG_VER.tar.gz
-DESC="The open source management tools and libraries for cryptography"
-
-prepare () {
-    autoreconf -vif
-    case $(uname -m) in
-     x86_64)  export EXTRACONFIG=""
-              export TRUPLE="x86_64-linux-musl"
-             ;;
-     i686)    export EXTRACONFIG="--disable-hardening"
-              export TRUPLE="i686-linux-musl"
-             ;;
-     armv7l)  export TRUPLE="armv7l-linux-musleabihf"
-             ;;
-     armv6l)  export TRUPLE="armv6l-linux-musleabihf"
-             ;;
-     aarch64) export TRUPLE="aarch64-linux-musleabihf"
-             ;;
-    esac
-}
-
-build () {
-    CFLAGS="-L/usr/lib $CFLAGS" \
-    ./configure \
-               --build=$TRUPLE \
-               --host=$TRUPLE \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --mandir=/usr/share/man \
-               --localstatedir=/var $EXTRACONFIG
-    unset EXTRACONFIG TRUPLE
-    make
-}
-
-package () {
-    make MANSUFFIX=ssl DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/system/libssh2.xibuild b/repo/system/libssh2.xibuild
index 3547aa2..ebf8cdf 100644
--- a/repo/system/libssh2.xibuild
+++ b/repo/system/libssh2.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="libressl openssh libgcrypt zlib"
+DEPS="openssl openssh libgcrypt zlib"
 
 PKG_VER=1.10.0
 SOURCE=https://www.libssh2.org/download/libssh2-$PKG_VER.tar.gz
diff --git a/repo/system/openssl.xibuild b/repo/system/openssl.xibuild
new file mode 100644
index 0000000..396710b
--- /dev/null
+++ b/repo/system/openssl.xibuild
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl"
+
+PKG_VER=3.0.1
+SOURCE=https://github.com/openssl/openssl/archive/refs/tags/openssl-$PKG_VER.tar.gz
+DESC="The open source management tools and libraries for cryptography"
+
+build () {
+    ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib shared zlib-dynamic
+    make
+}
+
+package () {
+    sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
+    make MANSUFFIX=ssl DESTDIR=$PKG_DEST install 
+    mkdir -pv $PKG_DEST/usr/share/doc/openssl
+    cp -vfr doc/* $PKG_DEST/usr/share/doc/openssl
+}
diff --git a/repo/system/python.xibuild b/repo/system/python.xibuild
index b17cf04..7198649 100644
--- a/repo/system/python.xibuild
+++ b/repo/system/python.xibuild
@@ -2,7 +2,7 @@
 
 
 MAKEDEPS="make autoconf automake autoconf-archive"
-DEPS="bzip2 expat gdbm libffi libnsl libxcrypt libressl zlib grep"
+DEPS="bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib grep"
 
 PKG_VER=3.10.2
 SOURCE=https://www.python.org/ftp/python/$PKG_VER/Python-$PKG_VER.tgz