From 26477da178fa7c84edff5fd9d3c8ef28c0c3ad7d Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 23 Feb 2022 16:55:01 +0000 Subject: replaced openssl with libressl --- repo/devel/git.xibuild | 2 +- repo/meta/all.xibuild | 2 +- repo/meta/system.xibuild | 2 +- repo/system/coreutils.xibuild | 2 +- repo/system/kmod.xibuild | 2 +- repo/system/krb5.xibuild | 2 +- repo/system/ldns.xibuild | 2 +- repo/system/libarchive.xibuild | 2 +- repo/system/libressl.xibuild | 20 ++++++++++++++++++++ repo/system/libssh2.xibuild | 2 +- repo/system/openssl.xibuild | 20 -------------------- repo/system/python.xibuild | 2 +- repo/util/curl.xibuild | 4 ++-- repo/util/lynx.xibuild | 2 +- repo/util/make-ca.xibuild | 2 +- repo/util/openssh.xibuild | 2 +- repo/util/rsync.xibuild | 2 +- repo/util/sudo.xibuild | 2 +- repo/util/webfs.xibuild | 2 +- repo/util/wget.xibuild | 2 +- repo/util/wpa_supplicant.xibuild | 2 +- repo/xi/xibuild.xibuild | 2 +- repo/xi/xipkg.xibuild | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 repo/system/libressl.xibuild delete mode 100644 repo/system/openssl.xibuild diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild index d897a80..175aa13 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 openssl pcre grep shadow zlib openssh" +DEPS="curl perl libressl pcre 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 bf82434..0441677 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 coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc 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 pcre 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 coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc 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 pcre 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 4430290..c12e577 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 coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc 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 pcre 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 coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc 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 pcre 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/coreutils.xibuild b/repo/system/coreutils.xibuild index 5f93eef..f261cf9 100644 --- a/repo/system/coreutils.xibuild +++ b/repo/system/coreutils.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="glibc acl attr gmp libcap openssl libiconv" +DEPS="glibc acl attr gmp libcap libressl libiconv" PKG_VER=9.0 SOURCE=https://ftp.gnu.org/gnu/coreutils/coreutils-$PKG_VER.tar.xz diff --git a/repo/system/kmod.xibuild b/repo/system/kmod.xibuild index 29accd5..95056ec 100644 --- a/repo/system/kmod.xibuild +++ b/repo/system/kmod.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="glibc zlib openssl xz zstd" +DEPS="glibc zlib libressl xz zstd" PKG_VER=29 SOURCE=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-$PKG_VER.tar.xz diff --git a/repo/system/krb5.xibuild b/repo/system/krb5.xibuild index 0139ab3..f95ec27 100644 --- a/repo/system/krb5.xibuild +++ b/repo/system/krb5.xibuild @@ -24,7 +24,7 @@ prepare () { } build () { - # would be ideal to use openssl rather than builtin library + # would be ideal to use libressl rather than builtin library autoreconf ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/repo/system/ldns.xibuild b/repo/system/ldns.xibuild index c3224b7..372b9da 100644 --- a/repo/system/ldns.xibuild +++ b/repo/system/ldns.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make libpcap" -DEPS="openssl libpcap" +DEPS="libressl 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 29c8095..d023980 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 openssl xz zlib zstd" +DEPS="acl bzip2 expat lz4 libressl 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 new file mode 100644 index 0000000..68c5973 --- /dev/null +++ b/repo/system/libressl.xibuild @@ -0,0 +1,20 @@ +#!/bin/sh + +MAKEDEPS="make " +DEPS="glibc" + +PKG_VER=3.0.1 +SOURCE=https://github.com/libressl/libressl/archive/refs/tags/libressl-$PKG_VER.tar.gz +DESC="The open source management tools and libraries for cryptography" + +build () { + ./config --prefix=/usr --libressldir=/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/libressl + cp -vfr doc/* $PKG_DEST/usr/share/doc/libressl +} diff --git a/repo/system/libssh2.xibuild b/repo/system/libssh2.xibuild index ebf8cdf..3547aa2 100644 --- a/repo/system/libssh2.xibuild +++ b/repo/system/libssh2.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="openssl openssh libgcrypt zlib" +DEPS="libressl 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 deleted file mode 100644 index c2d5141..0000000 --- a/repo/system/openssl.xibuild +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="glibc" - -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 5023ba0..d3c7fe8 100644 --- a/repo/system/python.xibuild +++ b/repo/system/python.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib" +DEPS="bzip2 expat gdbm libffi libnsl libxcrypt libressl zlib" PKG_VER=3.10.0 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 957311b..eee52b6 100644 --- a/repo/util/curl.xibuild +++ b/repo/util/curl.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="openssl zlib zstd libnghttp libpsl cacerts" +DEPS="libressl zlib zstd libnghttp libpsl cacerts" PKG_VER=7.80.0 SOURCE=https://curl.se/download/curl-$PKG_VER.tar.xz @@ -10,7 +10,7 @@ DESC="A utility for transfering files with URL syntax" build () { ./configure --prefix=/usr \ --disable-static \ - --with-openssl \ + --with-libressl \ --enable-threaded-resolver \ --with-ca-path=/etc/ssl/certs && make diff --git a/repo/util/lynx.xibuild b/repo/util/lynx.xibuild index b669c9b..d5a0dab 100644 --- a/repo/util/lynx.xibuild +++ b/repo/util/lynx.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="libidn openssl" +DEPS="libidn libressl" PKG_VER=2.8.9rel.1 diff --git a/repo/util/make-ca.xibuild b/repo/util/make-ca.xibuild index 7093e25..ff49b05 100644 --- a/repo/util/make-ca.xibuild +++ b/repo/util/make-ca.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="libp11-kit nss openssl" +DEPS="libp11-kit nss libressl" PKG_VER=1.7 SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz diff --git a/repo/util/openssh.xibuild b/repo/util/openssh.xibuild index b789906..3b03a6f 100644 --- a/repo/util/openssh.xibuild +++ b/repo/util/openssh.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="glibc krb5 openssl libedit ldns libxcrypt zlib pam" +DEPS="glibc krb5 libressl 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 8e09cfa..f700139 100644 --- a/repo/util/rsync.xibuild +++ b/repo/util/rsync.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="acl lz4 openssl perl popt xxhash zlib zstd" +DEPS="acl lz4 libressl 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 b446ce1..70d826c 100644 --- a/repo/util/sudo.xibuild +++ b/repo/util/sudo.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="glibc libldap openssl pam zlib" +DEPS="glibc libldap libressl 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 5b09682..a520a08 100644 --- a/repo/util/webfs.xibuild +++ b/repo/util/webfs.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="openssl mime-types " +DEPS="libressl 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 09cc4e8..2187c5d 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=openssl && + --with-ssl=libressl && make } diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild index b79237e..59376bc 100644 --- a/repo/util/wpa_supplicant.xibuild +++ b/repo/util/wpa_supplicant.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make libxml2" -DEPS="libnl openssl readline dbus" +DEPS="libnl libressl readline dbus" PKG_VER=2.10 diff --git a/repo/xi/xibuild.xibuild b/repo/xi/xibuild.xibuild index 7c5e321..cee1aaf 100644 --- a/repo/xi/xibuild.xibuild +++ b/repo/xi/xibuild.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="" -DEPS="bash tar git hg curl openssl " +DEPS="bash tar git hg curl libressl " 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 ed177a4..565ba03 100644 --- a/repo/xi/xipkg.xibuild +++ b/repo/xi/xipkg.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="openssl curl dash xiutils findutils diffutils sed xichroot" +DEPS="libressl curl dash xiutils findutils diffutils sed xichroot" PKG_VER=1.0.1 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git -- cgit v1.2.1