moved ssl back to openssl

21 files changed, 48 insertions, 75 deletions

diff --git a/repo/apps/lynx.xibuild b/repo/apps/lynx.xibuild
index e773a3a..1b1592d 100644
--- a/repo/apps/lynx.xibuild
+++ b/repo/apps/lynx.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="libidn libressl"
+DEPS="libidn openssl"
 
 PKG_VER=2.8.9rel.1
 
diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild
index 4cf143f..f7bcd27 100644
--- a/repo/devel/git.xibuild
+++ b/repo/devel/git.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="grep python make xmlto"
-DEPS="curl perl libressl pcre2 grep shadow zlib openssh"
+DEPS="curl perl openssl pcre2 grep shadow zlib openssh"
 
 PKG_VER=2.34.1
 SOURCE=https://www.kernel.org/pub/software/scm/git/git-$PKG_VER.tar.xz
diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild
index cb24e69..e3ec869 100644
--- a/repo/meta/all.xibuild
+++ b/repo/meta/all.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="AlL tHe pacKageS!!"
-DEPS=" feh rxvt-unicode xterm asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux cacert-utils fakechroot fakeroot acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xibuild xib xipkg xiutils"
+DEPS=" feh rxvt-unicode xterm asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux cacert-utils fakechroot fakeroot acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xibuild xib xipkg xiutils"
diff --git a/repo/meta/system.xibuild b/repo/meta/system.xibuild
index e8b91e3..de9f389 100644
--- a/repo/meta/system.xibuild
+++ b/repo/meta/system.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in system"
-DEPS=" acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss libressl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd"
+DEPS=" acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd"
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
diff --git a/repo/util/curl.xibuild b/repo/util/curl.xibuild
index e5c1264..957311b 100644
--- a/repo/util/curl.xibuild
+++ b/repo/util/curl.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="libressl zlib zstd libnghttp libpsl cacerts"
+DEPS="openssl zlib zstd libnghttp libpsl cacerts"
 
 PKG_VER=7.80.0
 SOURCE=https://curl.se/download/curl-$PKG_VER.tar.xz
diff --git a/repo/util/openssh.xibuild b/repo/util/openssh.xibuild
index 662fc23..c60a2ed 100644
--- a/repo/util/openssh.xibuild
+++ b/repo/util/openssh.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl krb5 libressl libedit ldns libxcrypt zlib pam"
+DEPS="musl krb5 openssl libedit ldns libxcrypt zlib pam"
 
 PKG_VER=8.8p1
 SOURCE=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$PKG_VER.tar.gz
diff --git a/repo/util/rsync.xibuild b/repo/util/rsync.xibuild
index f700139..8e09cfa 100644
--- a/repo/util/rsync.xibuild
+++ b/repo/util/rsync.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="acl lz4 libressl perl popt xxhash zlib zstd"
+DEPS="acl lz4 openssl perl popt xxhash zlib zstd"
 
 PKG_VER=3.2.3
 SOURCE=https://www.samba.org/ftp/rsync/src/rsync-$PKG_VER.tar.gz
diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild
index 55df72d..3f54bfa 100644
--- a/repo/util/sudo.xibuild
+++ b/repo/util/sudo.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl libldap libressl pam zlib"
+DEPS="musl libldap openssl pam zlib"
 
 PKG_VER=1.9.9
 SOURCE=https://www.sudo.ws/dist/sudo-$PKG_VER.tar.gz
diff --git a/repo/util/webfs.xibuild b/repo/util/webfs.xibuild
index a520a08..5b09682 100644
--- a/repo/util/webfs.xibuild
+++ b/repo/util/webfs.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="libressl mime-types "
+DEPS="openssl mime-types "
 
 PKG_VER=1.21
 SOURCE=https://www.kraxel.org/releases/webfs/webfs-$PKG_VER.tar.gz
diff --git a/repo/util/wget.xibuild b/repo/util/wget.xibuild
index 035e231..46b772a 100644
--- a/repo/util/wget.xibuild
+++ b/repo/util/wget.xibuild
@@ -10,7 +10,7 @@ DESC="A utility for transfering files with URL syntax"
 build () {
     ./configure --prefix=/usr      \
             --sysconfdir=/etc  \
-            --with-ssl=libressl &&
+            --with-ssl=openssl &&
     make
 }
 
diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild
index 59376bc..b79237e 100644
--- a/repo/util/wpa_supplicant.xibuild
+++ b/repo/util/wpa_supplicant.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make libxml2"
-DEPS="libnl libressl readline dbus"
+DEPS="libnl openssl readline dbus"
 
 PKG_VER=2.10
 
diff --git a/repo/xi/xibuild.xibuild b/repo/xi/xibuild.xibuild
index cee1aaf..7c5e321 100644
--- a/repo/xi/xibuild.xibuild
+++ b/repo/xi/xibuild.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS=""
-DEPS="bash tar git hg curl libressl "
+DEPS="bash tar git hg curl openssl "
 
 SOURCE=https://git.davidovski.xyz/xilinux/xibuild.git
 DESC="The depricated xilinux build system, use XiB"
diff --git a/repo/xi/xipkg.xibuild b/repo/xi/xipkg.xibuild
index 0c35503..32dc857 100644
--- a/repo/xi/xipkg.xibuild
+++ b/repo/xi/xipkg.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make"
-DEPS="libressl curl dash xiutils findutils diffutils sed xichroot grep"
+DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep"
 
 PKG_VER=1.0.2
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git