From 79062a39e9bcb9731adbacd0bd9bcd0b59d19d0a Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 22 May 2022 17:47:09 +0100 Subject: fixes to allow for full build --- repo/apps/neovim/neovim.xibuild | 2 +- repo/devel/cmake/cmake-toolchain.xibuild | 34 -- repo/devel/doxygen/doxygen.xibuild | 23 ++ repo/devel/help2man/help2man.xibuild | 2 +- repo/devel/llvm/llvm.xibuild | 18 +- repo/devel/rustc/rustc.xibuild | 2 +- repo/devel/sgml-common/sgml-common.xibuild | 2 +- repo/font/fontconfig/fontconfig.xibuild | 4 +- repo/media/opus/opus.xibuild | 2 +- repo/python/python-Jinja2/python-Jinja2.xibuild | 2 +- .../python/python-html5lib/python-html5lib.xibuild | 2 +- repo/python/python-mako/python-mako.xibuild | 2 +- .../python/python-requests/python-requests.xibuild | 2 +- repo/python/python-sphinx/python-sphinx.xibuild | 2 +- .../python-sphinxcontrib-applehelp.xibuild | 2 +- .../python-sphinxcontrib-devhelp.xibuild | 2 +- .../python-sphinxcontrib-htmlhelp.xibuild | 2 +- .../python-sphinxcontrib-jsmath.xibuild | 2 +- .../python-sphinxcontrib-qthelp.xibuild | 2 +- .../python-sphinxcontrib-serializinghtml.xibuild | 2 +- repo/python/python-urllib3/python-urllib3.xibuild | 2 +- .../python-webencodings.xibuild | 2 +- repo/python/python/python.xibuild | 1 - .../system/argp-standalone/argp-standalone.xibuild | 2 +- repo/system/brotli/brotli.xibuild | 13 +- repo/system/cairo/cairo.xibuild | 2 +- .../gobject-introspection.xibuild | 2 +- repo/system/icu/icu.xibuild | 2 +- repo/system/krb5/krb5.xibuild | 2 +- repo/system/libaio/libaio.xibuild | 2 +- repo/system/libnsl/libnsl.xibuild | 2 +- repo/system/lua/CVE-2022-28805.patch | 336 +++++++++++++++++ repo/system/lua/extern-c-for-cpp.patch | 336 +++++++++++++++++ repo/system/lua/fix-double-free.patch | 402 +++++++++++++++++++++ repo/system/lua/lua-5.4.4-shared_library-1.patch | 78 ++++ repo/system/lua/lua.xibuild | 8 +- repo/system/psmisc/psmisc.xibuild | 2 +- repo/system/sqlite3/sqlite3.xibuild | 2 +- repo/util/fmt/fmt.xibuild | 17 + repo/util/llvm2/device-mapper.xibuild | 11 - repo/util/llvm2/dmeventd.initd | 26 -- repo/util/llvm2/fix-stdio-usage.patch | 49 --- repo/util/llvm2/llvm2.xibuild | 47 --- repo/util/llvm2/lvm.confd | 5 - repo/util/llvm2/lvm.initd | 38 -- repo/util/llvm2/mallinfo.patch | 11 - repo/util/llvm2/mlockall-default-config.patch | 22 -- repo/util/lvm2/device-mapper.xibuild | 11 + repo/util/lvm2/dmeventd.initd | 26 ++ repo/util/lvm2/fix-stdio-usage.patch | 49 +++ repo/util/lvm2/lvm.confd | 5 + repo/util/lvm2/lvm.initd | 38 ++ repo/util/lvm2/lvm2.xibuild | 48 +++ repo/util/lvm2/mallinfo.patch | 11 + repo/util/lvm2/mlockall-default-config.patch | 22 ++ repo/util/util-linux/util-linux.xibuild | 2 +- repo/x11/harfbuzz/harfbuzz.xibuild | 2 +- repo/x11/libdrm/libdrm.xibuild | 2 +- repo/x11/libva/libva.xibuild | 2 +- repo/x11/libvdpau-va-gl/libvdpau-va-gl.xibuild | 2 +- repo/x11/libvdpau/libvdpau.xibuild | 2 +- repo/x11/libxi/libxi.xibuild | 2 +- repo/x11/libxrandr/libxrandr.xibuild | 2 +- repo/x11/libxtst/libxtst.xibuild | 2 +- repo/x11/libxvmc/libxvmc.xibuild | 2 +- repo/x11/libxxf86vm/libxxf86vm.xibuild | 2 +- repo/x11/mesa/mesa.xibuild | 2 +- repo/x11/wayland/wayland.xibuild | 2 +- repo/x11/xbitmaps/xbitmaps.xibuild | 2 +- 69 files changed, 1469 insertions(+), 302 deletions(-) delete mode 100644 repo/devel/cmake/cmake-toolchain.xibuild create mode 100644 repo/devel/doxygen/doxygen.xibuild create mode 100644 repo/system/lua/CVE-2022-28805.patch create mode 100644 repo/system/lua/extern-c-for-cpp.patch create mode 100644 repo/system/lua/fix-double-free.patch create mode 100644 repo/system/lua/lua-5.4.4-shared_library-1.patch create mode 100644 repo/util/fmt/fmt.xibuild delete mode 100644 repo/util/llvm2/device-mapper.xibuild delete mode 100644 repo/util/llvm2/dmeventd.initd delete mode 100644 repo/util/llvm2/fix-stdio-usage.patch delete mode 100644 repo/util/llvm2/llvm2.xibuild delete mode 100644 repo/util/llvm2/lvm.confd delete mode 100644 repo/util/llvm2/lvm.initd delete mode 100644 repo/util/llvm2/mallinfo.patch delete mode 100644 repo/util/llvm2/mlockall-default-config.patch create mode 100644 repo/util/lvm2/device-mapper.xibuild create mode 100644 repo/util/lvm2/dmeventd.initd create mode 100644 repo/util/lvm2/fix-stdio-usage.patch create mode 100644 repo/util/lvm2/lvm.confd create mode 100644 repo/util/lvm2/lvm.initd create mode 100644 repo/util/lvm2/lvm2.xibuild create mode 100644 repo/util/lvm2/mallinfo.patch create mode 100644 repo/util/lvm2/mlockall-default-config.patch diff --git a/repo/apps/neovim/neovim.xibuild b/repo/apps/neovim/neovim.xibuild index 0b22d0e..389bc7e 100644 --- a/repo/apps/neovim/neovim.xibuild +++ b/repo/apps/neovim/neovim.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="libintl libluv libtermkey libuv libvterm luajit msgpack-c musl tree-sitter unibilium lua-lpeg lua-mpack" +DEPS="intltool libluv libtermkey libuv libvterm luajit msgpack-c musl tree-sitter unibilium lua-lpeg lua-mpack" PKG_VER=0.6.1 SOURCE=https://github.com/neovim/neovim/archive/v$PKG_VER.tar.gz diff --git a/repo/devel/cmake/cmake-toolchain.xibuild b/repo/devel/cmake/cmake-toolchain.xibuild deleted file mode 100644 index 44e8535..0000000 --- a/repo/devel/cmake/cmake-toolchain.xibuild +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="musl" - -DESC="$DESC - xilinux toolchain version" - -prepare () { - export CMARGS=" - -DCMAKE_USE_OPENSSL=OFF - -DBUILD_CursesDialog=ON - " -} - - -build () { - ./bootstrap --prefix=/usr \ - --no-system-jsoncpp \ - --no-system-librhash \ - --no-system-curl \ - --no-system-libarchive \ - --no-system-nghttp2 \ - --no-system-expat \ - --no-system-zlib \ - --no-system-zstd \ - --no-system-libuv \ - -- ${CMARGS} - make -} - -package () { - echo $PKG_DEST - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/doxygen/doxygen.xibuild b/repo/devel/doxygen/doxygen.xibuild new file mode 100644 index 0000000..3c852c9 --- /dev/null +++ b/repo/devel/doxygen/doxygen.xibuild @@ -0,0 +1,23 @@ +#!/bin/sh + +NAME="doxygen" +DESC="A documentation system for C++, C, Java, IDL and PHP" + +MAKEDEPS="cmake " +DEPS="musl " + +PKG_VER=1.9.4 +SOURCE="https://doxygen.nl/files/doxygen-$PKG_VER.src.tar.gz" + +build () { + cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DBUILD_SHARED_LIBS=True \ + -DBUILD_STATIC_LIBS=OFF + cmake --build build +} + +package () { + DESTDIR="$PKG_DEST" cmake --install build +} diff --git a/repo/devel/help2man/help2man.xibuild b/repo/devel/help2man/help2man.xibuild index 6d91935..1386c01 100644 --- a/repo/devel/help2man/help2man.xibuild +++ b/repo/devel/help2man/help2man.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make " +MAKEDEPS="make perl" DEPS="sh" PKG_VER=1.48.5 diff --git a/repo/devel/llvm/llvm.xibuild b/repo/devel/llvm/llvm.xibuild index e2a4943..9d42a9c 100644 --- a/repo/devel/llvm/llvm.xibuild +++ b/repo/devel/llvm/llvm.xibuild @@ -1,9 +1,9 @@ #!/bin/sh -MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-setuptools python-sphinx" +MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-sphinx binutils lua python-six" DEPS="perl zlib libffi libedit ncurses" -PKG_VER=13.0.0 +PKG_VER=13.0.1 SOURCE="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-project-$PKG_VER.src.tar.xz" DESC="Low Level Virtual Machine" @@ -13,19 +13,20 @@ clang-002-add-musl-triples.patch libcxx-musl.patch libcxx-ssp-nonshared.patch libcxxabi-dl.patch -lldb-musl.patch llvm-001-musl.patch llvm-004-override-opt.patch" prepare () { + enabled_projects="clang;clang-tools-extra;libcxx;libcxxabi;libunwind;openmp;lld" + apply_patches cd llvm - sed -i 's|__ptrace_request|int|g' \ - ../lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp + #sed -i 's|__ptrace_request|int|g' \ + #../lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp # disable lldb docs, since they fail to generate - sed -i '/add_subdirectory(docs)/d' \ - ../lldb/CMakeLists.txt + #sed -i '/add_subdirectory(docs)/d' \ + #../lldb/CMakeLists.txt sed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \ @@ -47,7 +48,6 @@ build () { cmake \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_LINKER_BUILD_ID=YES \ - -DLLVM_USE_LINKER=lld \ -DLLDB_USE_SYSTEM_SIX=YES \ -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES \ @@ -76,7 +76,7 @@ build () { -DLLVM_HOST_TRIPLE="x86_64-linux-musl" \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_APPEND_VC_REV=OFF \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lldb;lld;openmp" \ + -DLLVM_ENABLE_PROJECTS="$enabled_projects" \ -Wno-dev -G Ninja .. && ninja llvm-tblgen && diff --git a/repo/devel/rustc/rustc.xibuild b/repo/devel/rustc/rustc.xibuild index 758dafe..090aa01 100644 --- a/repo/devel/rustc/rustc.xibuild +++ b/repo/devel/rustc/rustc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="cmake llvm clang llvm-ar" +MAKEDEPS="cmake clang llvm-ar" DEPS="curl libssh2 openssl" PKG_VER=1.58.1 diff --git a/repo/devel/sgml-common/sgml-common.xibuild b/repo/devel/sgml-common/sgml-common.xibuild index 70fe070..0e0ac23 100644 --- a/repo/devel/sgml-common/sgml-common.xibuild +++ b/repo/devel/sgml-common/sgml-common.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="unzip patch" -DEPS="libxml2 sgml-common" +DEPS="libxml2" PKG_VER=0.6.3 SOURCE=https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-$PKG_VER.tgz diff --git a/repo/font/fontconfig/fontconfig.xibuild b/repo/font/fontconfig/fontconfig.xibuild index 7814f4a..e5dbb6f 100644 --- a/repo/font/fontconfig/fontconfig.xibuild +++ b/repo/font/fontconfig/fontconfig.xibuild @@ -1,7 +1,7 @@ #!/bin/sh -MAKEDEPS="make libxml2 texlive" -DEPS="freetype2 json" +MAKEDEPS="make libxml2" +DEPS="freetype2" PKG_VER=2.13.1 SOURCE=https://www.freedesktop.org/software/fontconfig/release/fontconfig-$PKG_VER.tar.bz2 diff --git a/repo/media/opus/opus.xibuild b/repo/media/opus/opus.xibuild index bb254e2..0ec5624 100644 --- a/repo/media/opus/opus.xibuild +++ b/repo/media/opus/opus.xibuild @@ -9,7 +9,7 @@ PKG_VER=1.3.1 SOURCE=https://archive.mozilla.org/pub/opus/opus-$PKG_VER.tar.gz build () { - ./configure --prefix=/usr \ + CFLAGS="$(echo "$CFLAGS" | sed 's/-Os/-O2/g')" ./configure --prefix=/usr \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/repo/python/python-Jinja2/python-Jinja2.xibuild b/repo/python/python-Jinja2/python-Jinja2.xibuild index 7f69b7d..8775e02 100644 --- a/repo/python/python-Jinja2/python-Jinja2.xibuild +++ b/repo/python/python-Jinja2/python-Jinja2.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-MarkupSafe python-Babel" +DEPS="" PKG_VER=3.0.3 SOURCE=https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6/Jinja2-$PKG_VER.tar.gz diff --git a/repo/python/python-html5lib/python-html5lib.xibuild b/repo/python/python-html5lib/python-html5lib.xibuild index cc89547..d0a66fe 100644 --- a/repo/python/python-html5lib/python-html5lib.xibuild +++ b/repo/python/python-html5lib/python-html5lib.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-six python-webencodings python-genshi python-chardet python-lxml python-chardet python-genshi python-lxml" +DEPS="python-six python-webencodings python-chardet python-lxml python-chardet python-lxml" PKG_VER=1.1 SOURCE=https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-$PKG_VER.tar.gz diff --git a/repo/python/python-mako/python-mako.xibuild b/repo/python/python-mako/python-mako.xibuild index be10b64..938a930 100644 --- a/repo/python/python-mako/python-mako.xibuild +++ b/repo/python/python-mako/python-mako.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python " -DEPS="python-markupsafe python-beaker python-setuptools" +DEPS="python-markupsafe" PKG_VER=1.1.6 SOURCE=https://files.pythonhosted.org/packages/source/M/Mako/Mako-$PKG_VER.tar.gz diff --git a/repo/python/python-requests/python-requests.xibuild b/repo/python/python-requests/python-requests.xibuild index db1d920..b2dd292 100644 --- a/repo/python/python-requests/python-requests.xibuild +++ b/repo/python/python-requests/python-requests.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-urllib3 python-certifi python-chardet python-idna python-charset-python-normalizer python-idna python-PySocks python-win-python-inet-python-pton python-chardet" +DEPS="python-urllib3 python-certifi python-chardet python-idna python-idna python-chardet" PKG_VER=2.27.1 SOURCE=https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77/requests-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinx/python-sphinx.xibuild b/repo/python/python-sphinx/python-sphinx.xibuild index 7d24130..0f97c99 100644 --- a/repo/python/python-sphinx/python-sphinx.xibuild +++ b/repo/python/python-sphinx/python-sphinx.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-importlib-metadata python-mypy python-html5lib" +DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-html5lib" PKG_VER=4.4.0 SOURCE=https://files.pythonhosted.org/packages/c9/08/c2932e66460cfbc8973928d276dc82ccde2d24b365055eeda9f0afc1951e/Sphinx-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp.xibuild b/repo/python/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp.xibuild index bcc2de5..e1c4a19 100644 --- a/repo/python/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp.xibuild +++ b/repo/python/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-flake8 python-mypy python-docutils-python-stubs python-pytest" +DEPS="" PKG_VER=1.0.2 SOURCE=https://files.pythonhosted.org/packages/9f/01/ad9d4ebbceddbed9979ab4a89ddb78c9760e74e6757b1880f1b2760e8295/sphinxcontrib-applehelp-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp.xibuild b/repo/python/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp.xibuild index c623fc0..09d5728 100644 --- a/repo/python/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp.xibuild +++ b/repo/python/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-flake8 python-mypy python-docutils-python-stubs python-pytest" +DEPS="" PKG_VER=1.0.2 SOURCE=https://files.pythonhosted.org/packages/98/33/dc28393f16385f722c893cb55539c641c9aaec8d1bc1c15b69ce0ac2dbb3/sphinxcontrib-devhelp-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp.xibuild b/repo/python/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp.xibuild index 29a4a9b..440b1f6 100644 --- a/repo/python/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp.xibuild +++ b/repo/python/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-flake8 python-mypy python-docutils-python-stubs python-pytest python-html5lib" +DEPS="" PKG_VER=2.0.0 SOURCE=https://files.pythonhosted.org/packages/eb/85/93464ac9bd43d248e7c74573d58a791d48c475230bcf000df2b2700b9027/sphinxcontrib-htmlhelp-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-jsmath/python-sphinxcontrib-jsmath.xibuild b/repo/python/python-sphinxcontrib-jsmath/python-sphinxcontrib-jsmath.xibuild index 3ada466..72352f3 100644 --- a/repo/python/python-sphinxcontrib-jsmath/python-sphinxcontrib-jsmath.xibuild +++ b/repo/python/python-sphinxcontrib-jsmath/python-sphinxcontrib-jsmath.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-pytest python-flake8 python-mypy" +DEPS="" PKG_VER=1.0.1 SOURCE=https://files.pythonhosted.org/packages/b2/e8/9ed3830aeed71f17c026a07a5097edcf44b692850ef215b161b8ad875729/sphinxcontrib-jsmath-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp.xibuild b/repo/python/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp.xibuild index b16dd94..f1d8008 100644 --- a/repo/python/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp.xibuild +++ b/repo/python/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-flake8 python-mypy python-docutils-python-stubs python-pytest" +DEPS="" PKG_VER=1.0.3 SOURCE=https://files.pythonhosted.org/packages/b1/8e/c4846e59f38a5f2b4a0e3b27af38f2fcf904d4bfd82095bf92de0b114ebd/sphinxcontrib-qthelp-$PKG_VER.tar.gz diff --git a/repo/python/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.xibuild b/repo/python/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.xibuild index dc5fe54..8daac85 100644 --- a/repo/python/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.xibuild +++ b/repo/python/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-flake8 python-mypy python-docutils-python-stubs python-pytest" +DEPS="" PKG_VER=1.1.5 SOURCE=https://files.pythonhosted.org/packages/b5/72/835d6fadb9e5d02304cf39b18f93d227cd93abd3c41ebf58e6853eeb1455/sphinxcontrib-serializinghtml-$PKG_VER.tar.gz diff --git a/repo/python/python-urllib3/python-urllib3.xibuild b/repo/python/python-urllib3/python-urllib3.xibuild index fc75750..cac9aff 100644 --- a/repo/python/python-urllib3/python-urllib3.xibuild +++ b/repo/python/python-urllib3/python-urllib3.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python" -DEPS="python-brotlipy python-pyOpenSSL python-cryptography python-idna python-certifi python-ipaddress python-PySocks" +DEPS="python-idna python-certifi " PKG_VER=1.26.8 SOURCE=https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243/urllib3-$PKG_VER.tar.gz diff --git a/repo/python/python-webencodings/python-webencodings.xibuild b/repo/python/python-webencodings/python-webencodings.xibuild index 5a29aa8..2f0a82d 100644 --- a/repo/python/python-webencodings/python-webencodings.xibuild +++ b/repo/python/python-webencodings/python-webencodings.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="python python-setuptools" +MAKEDEPS="python " DEPS="" PKG_VER=0.5.1 diff --git a/repo/python/python/python.xibuild b/repo/python/python/python.xibuild index 3876d8b..d821632 100644 --- a/repo/python/python/python.xibuild +++ b/repo/python/python/python.xibuild @@ -14,7 +14,6 @@ prepare () { } build () { - CFLAGS="-flto" autoreconf -i GREP="/usr/bin/ggrep" ./configure --prefix=/usr \ --enable-shared \ diff --git a/repo/system/argp-standalone/argp-standalone.xibuild b/repo/system/argp-standalone/argp-standalone.xibuild index 4c2a722..a5179f1 100644 --- a/repo/system/argp-standalone/argp-standalone.xibuild +++ b/repo/system/argp-standalone/argp-standalone.xibuild @@ -9,7 +9,7 @@ SOURCE=https://www.lysator.liu.se/~nisse/misc/argp-standalone-$PKG_VER.tar.gz DESC="Standalone implementation for the argp interface" build () { - CFLAGS=" -fPIC" ./configure \ + CFLAGS=" -std=c89 -fPIC" ./configure \ --prefix=/usr \ --disable-static \ --sysconfdir=/etc \ diff --git a/repo/system/brotli/brotli.xibuild b/repo/system/brotli/brotli.xibuild index dbdd973..d45bb4b 100644 --- a/repo/system/brotli/brotli.xibuild +++ b/repo/system/brotli/brotli.xibuild @@ -6,16 +6,21 @@ DEPS="musl" SOURCE=https://github.com/google/brotli DESC="A generic-purpose lossless compression algorithm" +prepare () { + sed -i 's,/usr/bin/env bash,/bin/sh,' tests/*.sh + sh ./bootstrap +} + build () { - mkdir out && cd out - ../configure-cmake + ./configure \ + --prefix=/usr \ + --disable-static make } check () { - make test + make check } package () { make DESTDIR=$PKG_DEST install - mv $PKG_DEST/usr/local/* $PKG_DEST/usr/ } diff --git a/repo/system/cairo/cairo.xibuild b/repo/system/cairo/cairo.xibuild index 4bc7041..4dec347 100644 --- a/repo/system/cairo/cairo.xibuild +++ b/repo/system/cairo/cairo.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="musl libx11 freetype libpng libxcb libxext libxrender pixman zlib glib" +DEPS="musl libx11 freetype2 libpng libxcb libxext libxrender pixman zlib glib" PKG_VER=1.17.4 SOURCE=https://cairographics.org/snapshots/cairo-$PKG_VER.tar.xz diff --git a/repo/system/gobject-introspection/gobject-introspection.xibuild b/repo/system/gobject-introspection/gobject-introspection.xibuild index 5d5a117..c49d787 100644 --- a/repo/system/gobject-introspection/gobject-introspection.xibuild +++ b/repo/system/gobject-introspection/gobject-introspection.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="meson ninja patch flex" -DEPS="python-mako python-markdown glib" +DEPS="python-mako glib" PKG_VER=1.72.0 SOURCE=https://download.gnome.org/sources/gobject-introspection/$(echo $PKG_VER | cut -d. -f-2)/gobject-introspection-$PKG_VER.tar.xz diff --git a/repo/system/icu/icu.xibuild b/repo/system/icu/icu.xibuild index 0d8d798..1fc2fae 100644 --- a/repo/system/icu/icu.xibuild +++ b/repo/system/icu/icu.xibuild @@ -13,7 +13,7 @@ fix-ucptrietest-golden-diff.patch prepare () { cd source autoreconf -fi - sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure + #sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure } build () { diff --git a/repo/system/krb5/krb5.xibuild b/repo/system/krb5/krb5.xibuild index 4ed4ef7..a6ca171 100644 --- a/repo/system/krb5/krb5.xibuild +++ b/repo/system/krb5/krb5.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl e2fsprogs libldap keyutils gdbm" +DEPS="musl e2fsprogs libldap gdbm" PKG_VER=1.19.2 SOURCE=http://kerberos.org/dist/krb5/${PKG_VER%.*}/krb5-${PKG_VER}.tar.gz diff --git a/repo/system/libaio/libaio.xibuild b/repo/system/libaio/libaio.xibuild index 6c9b45f..56102d9 100644 --- a/repo/system/libaio/libaio.xibuild +++ b/repo/system/libaio/libaio.xibuild @@ -15,7 +15,7 @@ prepare () { } build () { - CFLAGS="-Wgnu-designator" make PREFIX=/usr + make PREFIX=/usr } check() { diff --git a/repo/system/libnsl/libnsl.xibuild b/repo/system/libnsl/libnsl.xibuild index 051272b..555edd9 100644 --- a/repo/system/libnsl/libnsl.xibuild +++ b/repo/system/libnsl/libnsl.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make autoconf automake gettext libtirpc libtool" -DEPS="libintl libtirpc musl" +DEPS="intltool libtirpc musl" PKG_VER=1.2.0 SOURCE=https://github.com/thkukuk/libnsl/archive/v$PKG_VER.tar.gz diff --git a/repo/system/lua/CVE-2022-28805.patch b/repo/system/lua/CVE-2022-28805.patch new file mode 100644 index 0000000..95c66fc --- /dev/null +++ b/repo/system/lua/CVE-2022-28805.patch @@ -0,0 +1,336 @@ + + + +CVE-2022-28805.patch « lua5.4 « main - aports - Alpine packages build scripts + + + + + + + + + +
+ + + + +
+aboutsummaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/main/lua5.4/CVE-2022-28805.patch
blob: b00fcc63f7c8ce53208dfc10c9c275f50ca8a8c9 (plain) (blame) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+
Patch-Source: https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa
+From 1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001
+From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
+Date: Tue, 15 Feb 2022 12:28:46 -0300
+Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is <const>
+
+---
+ lparser.c         |  1 +
+ testes/attrib.lua | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/lparser.c b/lparser.c
+index 3abe3d751..a5cd55257 100644
+--- a/src/lparser.c
++++ b/src/lparser.c
+@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) {
+     expdesc key;
+     singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
+     lua_assert(var->k != VVOID);  /* this one must exist */
++    luaK_exp2anyregup(fs, var);  /* but could be a constant */
+     codestring(&key, varname);  /* key is variable name */
+     luaK_indexed(fs, var, &key);  /* env[varname] */
+   }
+
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2022-05-19 21:36:56 +0000
+
+ + diff --git a/repo/system/lua/extern-c-for-cpp.patch b/repo/system/lua/extern-c-for-cpp.patch new file mode 100644 index 0000000..6c49c1c --- /dev/null +++ b/repo/system/lua/extern-c-for-cpp.patch @@ -0,0 +1,336 @@ + + + +extern-c-for-cpp.patch « lua5.4 « main - aports - Alpine packages build scripts + + + + + + + + + +
+ + + + +
+aboutsummaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/main/lua5.4/extern-c-for-cpp.patch
blob: c2268c76db839cf9272a3099563b6f80f72e0b0c (plain) (blame) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+
Patch-Source: https://salsa.debian.org/lua-team/lua5.4/-/blob/bc284bb404e51d27feb5ffc705de8e32959c2048/debian/patches/0003-extern_C.patch
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Fri, 14 Aug 2015 09:36:52 +0200
+Subject: extern_C
+
+---
+ src/luaconf.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -287,7 +287,11 @@
+ 
+ #else				/* }{ */
+ 
++#ifdef __cplusplus
++#define LUA_API                extern "C"
++#else
+ #define LUA_API		extern
++#endif
+ 
+ #endif				/* } */
+ 
+
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2022-05-19 21:36:44 +0000
+
+ + diff --git a/repo/system/lua/fix-double-free.patch b/repo/system/lua/fix-double-free.patch new file mode 100644 index 0000000..2b6c476 --- /dev/null +++ b/repo/system/lua/fix-double-free.patch @@ -0,0 +1,402 @@ + + + +fix-double-free.patch « lua5.4 « main - aports - Alpine packages build scripts + + + + + + + + + +
+ + + + +
+aboutsummaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/main/lua5.4/fix-double-free.patch
blob: ad87fafc29d2694ba5daf79d5afc337ef1cfa84b (plain) (blame) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+
Lua5.4 frees the lineinfo memory twice. Once via combine() and once
+via close_state() this causes a segfault on musl. The segfault double
+free can be fixed by having combine assign NULL to f->lineinfo after
+it has been freed. Thus not freeing it again in close_state().
+
+Valgrind output for the double-free:
+
+	==29903== Invalid free() / delete / delete[] / realloc()
+	==29903==    at 0x48A4B0D: free (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
+	==29903==    by 0x11E5D2: l_alloc (lauxlib.c:1014)
+	==29903==    by 0x112F51: luaM_free_ (lmem.c:135)
+	==29903==    by 0x11111B: luaF_freeproto (lfunc.c:271)
+	==29903==    by 0x112ABB: deletelist (lgc.c:1494)
+	==29903==    by 0x112ABB: luaC_freeallobjects (lgc.c:1511)
+	==29903==    by 0x116D54: close_state (lstate.c:276)
+	==29903==    by 0x10B549: main (luac.c:210)
+	==29903==  Address 0x48ec220 is 0 bytes inside a block of size 10 free'd
+	==29903==    at 0x48A4B0D: free (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
+	==29903==    by 0x11E5D2: l_alloc (lauxlib.c:1014)
+	==29903==    by 0x112F51: luaM_free_ (lmem.c:135)
+	==29903==    by 0x10C60C: combine (luac.c:158)
+	==29903==    by 0x10C60C: pmain (luac.c:183)
+	==29903==    by 0x10FF38: precallC (ldo.c:506)
+	==29903==    by 0x11020C: luaD_precall (ldo.c:572)
+	==29903==    by 0x110340: ccall (ldo.c:607)
+	==29903==    by 0x10F7CA: luaD_rawrunprotected (ldo.c:144)
+	==29903==    by 0x110668: luaD_pcall (ldo.c:926)
+	==29903==    by 0x10DB2F: lua_pcallk (lapi.c:1067)
+	==29903==    by 0x10B528: main (luac.c:209)
+	==29903==  Block was alloc'd at
+	==29903==    at 0x48A6FC9: realloc (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
+	==29903==    by 0x112F7E: luaM_realloc_ (lmem.c:166)
+	==29903==    by 0x112FC5: luaM_saferealloc_ (lmem.c:180)
+	==29903==    by 0x113074: luaM_shrinkvector_ (lmem.c:116)
+	==29903==    by 0x114B02: close_func (lparser.c:764)
+	==29903==    by 0x116B1B: mainfunc (lparser.c:1937)
+	==29903==    by 0x116B1B: luaY_parser (lparser.c:1959)
+	==29903==    by 0x10F718: f_parser (ldo.c:971)
+	==29903==    by 0x10F7CA: luaD_rawrunprotected (ldo.c:144)
+	==29903==    by 0x110668: luaD_pcall (ldo.c:926)
+	==29903==    by 0x11074B: luaD_protectedparser (ldo.c:988)
+	==29903==    by 0x10DC13: lua_load (lapi.c:1097)
+	==29903==    by 0x10C5B1: combine (luac.c:151)
+	==29903==    by 0x10C5B1: pmain (luac.c:183)
+
+diff -upr lua5.4.4.orig/src/luac.c lua-5.4.4/src/luac.c
+--- lua5.4.4.orig/src/luac.c	2022-04-14 20:57:01.927447850 +0200
++++ lua-5.4.4/src/luac.c	2022-04-14 20:57:35.260900910 +0200
+@@ -156,6 +156,7 @@ static const Proto* combine(lua_State* L
+    if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
+   }
+   luaM_freearray(L,f->lineinfo,f->sizelineinfo);
++  f->lineinfo=NULL;
+   f->sizelineinfo=0;
+   return f;
+  }
+
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2022-05-19 21:37:05 +0000
+
+ + diff --git a/repo/system/lua/lua-5.4.4-shared_library-1.patch b/repo/system/lua/lua-5.4.4-shared_library-1.patch new file mode 100644 index 0000000..f1dfad9 --- /dev/null +++ b/repo/system/lua/lua-5.4.4-shared_library-1.patch @@ -0,0 +1,78 @@ +Submitted By: Douglas R. Reno +Date: 2020-06-30 +Initial Package Version: 5.4.0 +Upstream Status: Rejected +Origin: Arch Linux, with some modifications +Description: Creates a shared liblua library, as well as + removes optimization since it causes SIGBUS errors, + and sets the search path to /usr from /usr/local. + The initial version of this patch was created by + Igor Zivkovic, before being rediffed for 5.4.0 by + myself with some modifications made. + +diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile +--- lua-5.4.0.orig/Makefile 2020-04-15 07:55:07.000000000 -0500 ++++ lua-5.4.0/Makefile 2020-06-30 13:22:00.997938585 -0500 +@@ -52,7 +52,7 @@ R= $V.0 + all: $(PLAT) + + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h +--- lua-5.4.0.orig/src/luaconf.h 2020-06-18 09:25:54.000000000 -0500 ++++ lua-5.4.0/src/luaconf.h 2020-06-30 13:24:59.294932289 -0500 +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + +diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile +--- lua-5.4.0.orig/src/Makefile 2020-04-15 08:00:29.000000000 -0500 ++++ lua-5.4.0/src/Makefile 2020-06-30 13:24:15.746933827 -0500 +@@ -7,7 +7,7 @@ + PLAT= guess + + CC= gcc -std=gnu99 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm ++ $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/repo/system/lua/lua.xibuild b/repo/system/lua/lua.xibuild index fdcf8ab..167fd70 100644 --- a/repo/system/lua/lua.xibuild +++ b/repo/system/lua/lua.xibuild @@ -6,18 +6,22 @@ DEPS="readline" PKG_VER=5.4.4 SOURCE=https://www.lua.org/ftp/lua-$PKG_VER.tar.gz ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/lua-$PKG_VER-shared_library-1.patch lua5.4.pc + +CVE-2022-28805.patch +extern-c-for-cpp.patch +fix-double-free.patch +lua-5.4.4-shared_library-1.patch " DESC="A powerful lightweight scripting language" prepare () { + apply_patches sed -e "s|@MAJOR_VER@|${PKG_VER%.*}|g" \ -e "s|@MINOR_VER@|${PKG_VER}|g" \ -i lua5.4.pc - patch -Np1 -i lua-$PKG_VER-shared_library-1.patch cat > configure.ac <<-EOF top_buildir=. diff --git a/repo/system/psmisc/psmisc.xibuild b/repo/system/psmisc/psmisc.xibuild index 61d767f..72311ee 100644 --- a/repo/system/psmisc/psmisc.xibuild +++ b/repo/system/psmisc/psmisc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make gettext-tiny libintl" +MAKEDEPS="make gettext" DEPS="ncurses" PKG_VER=23.4 diff --git a/repo/system/sqlite3/sqlite3.xibuild b/repo/system/sqlite3/sqlite3.xibuild index 12f7210..777c5a0 100644 --- a/repo/system/sqlite3/sqlite3.xibuild +++ b/repo/system/sqlite3/sqlite3.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="libedit" +DEPS="musl" PKG_VER=3370200 SOURCE=https://sqlite.org/2022/sqlite-autoconf-$PKG_VER.tar.gz diff --git a/repo/util/fmt/fmt.xibuild b/repo/util/fmt/fmt.xibuild new file mode 100644 index 0000000..5c17a60 --- /dev/null +++ b/repo/util/fmt/fmt.xibuild @@ -0,0 +1,17 @@ +#!/bin/sh + +MAKEDEPS="make" +DEPS="musl sh" + +PKG_VER=0.8.6 +SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz +DESC="fmt from toybox" + +build () { + ./configure + make fmt +} + +package () { + install -Dm755 fmt $PKG_DEST/usr/bin/ +} diff --git a/repo/util/llvm2/device-mapper.xibuild b/repo/util/llvm2/device-mapper.xibuild deleted file mode 100644 index 8db667b..0000000 --- a/repo/util/llvm2/device-mapper.xibuild +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -DESC="Device-mapper event daemon" - -package() { - install -Dm755 dmeventd.initd "$PKG_DEST"/etc/init.d/dmeventd - - add_from_main sbin/dmeventd - add_from_main usr/lib/libdevmapper.a "sbin/dm*" - add_from_main lib/libdevmapper* -} - diff --git a/repo/util/llvm2/dmeventd.initd b/repo/util/llvm2/dmeventd.initd deleted file mode 100644 index c46f8ba..0000000 --- a/repo/util/llvm2/dmeventd.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $ - -PIDFILE=/run/dmeventd.pid -BIN=/sbin/dmeventd - -depend() { - # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that - # means dmeventd is NOT notified, as it cannot be safely running - after lvm device-mapper -} - -start() { - ebegin "Starting dmeventd" - start-stop-daemon --start --exec $BIN --pidfile $PIDFILE - eend $? -} - -stop() { - ebegin "Stopping dmeventd" - start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE - eend $? -} - diff --git a/repo/util/llvm2/fix-stdio-usage.patch b/repo/util/llvm2/fix-stdio-usage.patch deleted file mode 100644 index 5ac99fd..0000000 --- a/repo/util/llvm2/fix-stdio-usage.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- ./tools/lvmcmdline.c -+++ ./tools/lvmcmdline.c -@@ -1252,7 +1252,7 @@ - int err = is_valid_fd(STDERR_FILENO); - - if (!is_valid_fd(STDIN_FILENO) && -- !(stdin = fopen(_PATH_DEVNULL, "r"))) { -+ !freopen(_PATH_DEVNULL, "r", stdin)) { - if (err) - perror("stdin stream open"); - else -@@ -1262,7 +1262,7 @@ - } - - if (!is_valid_fd(STDOUT_FILENO) && -- !(stdout = fopen(_PATH_DEVNULL, "w"))) { -+ !freopen(_PATH_DEVNULL, "w", stdout)) { - if (err) - perror("stdout stream open"); - /* else no stdout */ -@@ -1270,7 +1270,7 @@ - } - - if (!is_valid_fd(STDERR_FILENO) && -- !(stderr = fopen(_PATH_DEVNULL, "w"))) { -+ !freopen(_PATH_DEVNULL, "w", stderr)) { - printf("stderr stream open: %s\n", - strerror(errno)); - return 0; ---- ./lib/commands/toolcontext.c -+++ ./lib/commands/toolcontext.c -@@ -1869,7 +1869,7 @@ - /* FIXME Make this configurable? */ - reset_lvm_errno(1); - --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - /* Set in/out stream buffering before glibc */ - if (set_buffering - #ifdef SYS_gettid -@@ -2274,7 +2274,7 @@ - - if (cmd->pending_delete_mem) - dm_pool_destroy(cmd->pending_delete_mem); --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - if (cmd->linebuffer) { - /* Reset stream buffering to defaults */ - if (is_valid_fd(STDIN_FILENO) && diff --git a/repo/util/llvm2/llvm2.xibuild b/repo/util/llvm2/llvm2.xibuild deleted file mode 100644 index cb364ec..0000000 --- a/repo/util/llvm2/llvm2.xibuild +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -NAME="llvm2" -DESC="Logical Volume Manager 2 utilities" - -MAKEDEPS="make " -DEPS="libaio util-linux musl device-mapper" - -PKG_VER=2.02.187 -SOURCE="https://mirrors.kernel.org/sourceware/lvm2/LVM2.$PKG_VER.tgz" -ADDITIONAL="mlockall-default-config.patch mallinfo.patch lvm.initd lvm.confd fix-stdio-usage.patch dmeventd.initd " - -prepare () { - apply_patches -} - -build () { - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/etc \ - --disable-static \ - --enable-static_link \ - --disable-nls \ - --disable-readline \ - --enable-pkgconfig \ - --enable-applib \ - --with-thin=internal \ - --enable-dmeventd \ - --enable-cmdlib \ - --with-thin-check=/sbin/thin_check \ - --with-thin-dump=/sbin/thin_dump \ - --with-thin-repair=/sbin/thin_repair \ - --with-dmeventd-path=/sbin/dmeventd \ - --enable-udev_rules - - make -} - -package () { - make DESTDIR="$PKG_DEST" install - install -d "$PKG_DEST"/etc/lvm/archive "$PKG_DEST"/etc/lvm/backup - install -Dm755 lvm.initd "$PKG_DEST"/etc/init.d/lvm - install -Dm644 lvm.confd "$PKG_DEST"/etc/conf.d/lvm - ln -s libdevmapper.so.1.02 "$PKG_DEST"/lib/libdevmapper.so - -} diff --git a/repo/util/llvm2/lvm.confd b/repo/util/llvm2/lvm.confd deleted file mode 100644 index 9d150f6..0000000 --- a/repo/util/llvm2/lvm.confd +++ /dev/null @@ -1,5 +0,0 @@ -# LVM should normally only be started after mdadm-raid is available -# this is because LVM physical volumes are very often MD devices. - -rc_after="mdadm-raid" - diff --git a/repo/util/llvm2/lvm.initd b/repo/util/llvm2/lvm.initd deleted file mode 100644 index db6adbe..0000000 --- a/repo/util/llvm2/lvm.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run - -depend() { - before checkfs fsck swap - after hwdrivers modules device-mapper -} - -dm_in_proc() { - local rc=0 i= - for i in devices misc; do - grep -qs 'device-mapper' /proc/$i - rc=$(($rc + $?)) - done - return $rc -} - -start() { - local rc=0 msg= - ebegin "Setting up the Logical Volume Manager" - if [ -e /proc/modules ] && ! dm_in_proc; then - modprobe dm-mod 2>/dev/null - fi - if [ -d /proc/lvm ] || dm_in_proc; then - vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 - vgchange --sysinit --activate y >/dev/null 2>&1 - rc=$? - else - rc=1 - fi - eend $rc -} - -stop() { - ebegin "Shutting down the Logical Volume Manager" - vgchange --ignorelockingfailure -a n >/dev/null 2>&1 - eend $? -} - diff --git a/repo/util/llvm2/mallinfo.patch b/repo/util/llvm2/mallinfo.patch deleted file mode 100644 index 471a6b2..0000000 --- a/repo/util/llvm2/mallinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 -+++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 -@@ -137,7 +137,7 @@ - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/repo/util/llvm2/mlockall-default-config.patch b/repo/util/llvm2/mlockall-default-config.patch deleted file mode 100644 index 305ddee..0000000 --- a/repo/util/llvm2/mlockall-default-config.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./conf/example.conf.in.orig -+++ ./conf/example.conf.in -@@ -1352,7 +1352,7 @@ - # Use the old behavior of mlockall to pin all memory. - # Prior to version 2.02.62, LVM used mlockall() to pin the whole - # process's memory while activating devices. -- use_mlockall = 0 -+ use_mlockall = 1 - - # Configuration option activation/monitoring. - # Monitor LVs that are activated. ---- ./lib/config/defaults.h.orig -+++ ./lib/config/defaults.h -@@ -55,7 +55,7 @@ - #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3 - #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10 - #define DEFAULT_PRIORITISE_WRITE_LOCKS 1 --#define DEFAULT_USE_MLOCKALL 0 -+#define DEFAULT_USE_MLOCKALL 1 - #define DEFAULT_METADATA_READ_ONLY 0 - #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0 - #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]" diff --git a/repo/util/lvm2/device-mapper.xibuild b/repo/util/lvm2/device-mapper.xibuild new file mode 100644 index 0000000..8db667b --- /dev/null +++ b/repo/util/lvm2/device-mapper.xibuild @@ -0,0 +1,11 @@ +#!/bin/sh +DESC="Device-mapper event daemon" + +package() { + install -Dm755 dmeventd.initd "$PKG_DEST"/etc/init.d/dmeventd + + add_from_main sbin/dmeventd + add_from_main usr/lib/libdevmapper.a "sbin/dm*" + add_from_main lib/libdevmapper* +} + diff --git a/repo/util/lvm2/dmeventd.initd b/repo/util/lvm2/dmeventd.initd new file mode 100644 index 0000000..c46f8ba --- /dev/null +++ b/repo/util/lvm2/dmeventd.initd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $ + +PIDFILE=/run/dmeventd.pid +BIN=/sbin/dmeventd + +depend() { + # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that + # means dmeventd is NOT notified, as it cannot be safely running + after lvm device-mapper +} + +start() { + ebegin "Starting dmeventd" + start-stop-daemon --start --exec $BIN --pidfile $PIDFILE + eend $? +} + +stop() { + ebegin "Stopping dmeventd" + start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE + eend $? +} + diff --git a/repo/util/lvm2/fix-stdio-usage.patch b/repo/util/lvm2/fix-stdio-usage.patch new file mode 100644 index 0000000..5ac99fd --- /dev/null +++ b/repo/util/lvm2/fix-stdio-usage.patch @@ -0,0 +1,49 @@ +--- ./tools/lvmcmdline.c ++++ ./tools/lvmcmdline.c +@@ -1252,7 +1252,7 @@ + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && +- !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++ !freopen(_PATH_DEVNULL, "r", stdin)) { + if (err) + perror("stdin stream open"); + else +@@ -1262,7 +1262,7 @@ + } + + if (!is_valid_fd(STDOUT_FILENO) && +- !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stdout)) { + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -1270,7 +1270,7 @@ + } + + if (!is_valid_fd(STDERR_FILENO) && +- !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stderr)) { + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; +--- ./lib/commands/toolcontext.c ++++ ./lib/commands/toolcontext.c +@@ -1869,7 +1869,7 @@ + /* FIXME Make this configurable? */ + reset_lvm_errno(1); + +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + /* Set in/out stream buffering before glibc */ + if (set_buffering + #ifdef SYS_gettid +@@ -2274,7 +2274,7 @@ + + if (cmd->pending_delete_mem) + dm_pool_destroy(cmd->pending_delete_mem); +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + if (cmd->linebuffer) { + /* Reset stream buffering to defaults */ + if (is_valid_fd(STDIN_FILENO) && diff --git a/repo/util/lvm2/lvm.confd b/repo/util/lvm2/lvm.confd new file mode 100644 index 0000000..9d150f6 --- /dev/null +++ b/repo/util/lvm2/lvm.confd @@ -0,0 +1,5 @@ +# LVM should normally only be started after mdadm-raid is available +# this is because LVM physical volumes are very often MD devices. + +rc_after="mdadm-raid" + diff --git a/repo/util/lvm2/lvm.initd b/repo/util/lvm2/lvm.initd new file mode 100644 index 0000000..db6adbe --- /dev/null +++ b/repo/util/lvm2/lvm.initd @@ -0,0 +1,38 @@ +#!/sbin/openrc-run + +depend() { + before checkfs fsck swap + after hwdrivers modules device-mapper +} + +dm_in_proc() { + local rc=0 i= + for i in devices misc; do + grep -qs 'device-mapper' /proc/$i + rc=$(($rc + $?)) + done + return $rc +} + +start() { + local rc=0 msg= + ebegin "Setting up the Logical Volume Manager" + if [ -e /proc/modules ] && ! dm_in_proc; then + modprobe dm-mod 2>/dev/null + fi + if [ -d /proc/lvm ] || dm_in_proc; then + vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 + vgchange --sysinit --activate y >/dev/null 2>&1 + rc=$? + else + rc=1 + fi + eend $rc +} + +stop() { + ebegin "Shutting down the Logical Volume Manager" + vgchange --ignorelockingfailure -a n >/dev/null 2>&1 + eend $? +} + diff --git a/repo/util/lvm2/lvm2.xibuild b/repo/util/lvm2/lvm2.xibuild new file mode 100644 index 0000000..eff7a0f --- /dev/null +++ b/repo/util/lvm2/lvm2.xibuild @@ -0,0 +1,48 @@ +#!/bin/sh + +NAME="lvm2" +DESC="Logical Volume Manager 2 utilities" + +MAKEDEPS="make " +DEPS="libaio util-linux musl device-mapper" + +PKG_VER=2.02.187 +SOURCE="https://mirrors.kernel.org/sourceware/lvm2/LVM2.$PKG_VER.tgz" +ADDITIONAL="mlockall-default-config.patch mallinfo.patch lvm.initd lvm.confd fix-stdio-usage.patch dmeventd.initd " + +prepare () { + apply_patches + autoreconf -fi +} + +build () { + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --sysconfdir=/etc \ + --disable-static \ + --enable-static_link \ + --disable-nls \ + --disable-readline \ + --enable-pkgconfig \ + --enable-applib \ + --with-thin=internal \ + --enable-dmeventd \ + --enable-cmdlib \ + --with-thin-check=/sbin/thin_check \ + --with-thin-dump=/sbin/thin_dump \ + --with-thin-repair=/sbin/thin_repair \ + --with-dmeventd-path=/sbin/dmeventd \ + --enable-udev_rules + + make +} + +package () { + make DESTDIR="$PKG_DEST" install + install -d "$PKG_DEST"/etc/lvm/archive "$PKG_DEST"/etc/lvm/backup + install -Dm755 lvm.initd "$PKG_DEST"/etc/init.d/lvm + install -Dm644 lvm.confd "$PKG_DEST"/etc/conf.d/lvm + ln -s libdevmapper.so.1.02 "$PKG_DEST"/lib/libdevmapper.so + +} diff --git a/repo/util/lvm2/mallinfo.patch b/repo/util/lvm2/mallinfo.patch new file mode 100644 index 0000000..471a6b2 --- /dev/null +++ b/repo/util/lvm2/mallinfo.patch @@ -0,0 +1,11 @@ +--- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 ++++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 +@@ -137,7 +137,7 @@ + + static void _allocate_memory(void) + { +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + void *stack_mem; + struct rlimit limit; + int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/repo/util/lvm2/mlockall-default-config.patch b/repo/util/lvm2/mlockall-default-config.patch new file mode 100644 index 0000000..305ddee --- /dev/null +++ b/repo/util/lvm2/mlockall-default-config.patch @@ -0,0 +1,22 @@ +--- ./conf/example.conf.in.orig ++++ ./conf/example.conf.in +@@ -1352,7 +1352,7 @@ + # Use the old behavior of mlockall to pin all memory. + # Prior to version 2.02.62, LVM used mlockall() to pin the whole + # process's memory while activating devices. +- use_mlockall = 0 ++ use_mlockall = 1 + + # Configuration option activation/monitoring. + # Monitor LVs that are activated. +--- ./lib/config/defaults.h.orig ++++ ./lib/config/defaults.h +@@ -55,7 +55,7 @@ + #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3 + #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10 + #define DEFAULT_PRIORITISE_WRITE_LOCKS 1 +-#define DEFAULT_USE_MLOCKALL 0 ++#define DEFAULT_USE_MLOCKALL 1 + #define DEFAULT_METADATA_READ_ONLY 0 + #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0 + #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]" diff --git a/repo/util/util-linux/util-linux.xibuild b/repo/util/util-linux/util-linux.xibuild index 327d0db..92a6f38 100644 --- a/repo/util/util-linux/util-linux.xibuild +++ b/repo/util/util-linux/util-linux.xibuild @@ -12,7 +12,7 @@ build () { --libdir=/usr/lib \ --docdir=/usr/share/doc/util-linux-$PKG_VER\ --disable-static \ - runstatedir=/run + --runstatedir=/run make } diff --git a/repo/x11/harfbuzz/harfbuzz.xibuild b/repo/x11/harfbuzz/harfbuzz.xibuild index d86a83e..bd82257 100644 --- a/repo/x11/harfbuzz/harfbuzz.xibuild +++ b/repo/x11/harfbuzz/harfbuzz.xibuild @@ -3,7 +3,7 @@ NAME="harfbuzz" DESC="Text shaping library" -MAKEDEPS="meson ninja gtk-doc python-pygments gobject-introspection" +MAKEDEPS="cairo meson ninja gtk-doc python-pygments gobject-introspection" DEPS="freetype2 glib graphite musl " PKG_VER=4.2.0 diff --git a/repo/x11/libdrm/libdrm.xibuild b/repo/x11/libdrm/libdrm.xibuild index 5e9b11c..83ad4f7 100644 --- a/repo/x11/libdrm/libdrm.xibuild +++ b/repo/x11/libdrm/libdrm.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="meson ninja docbook-xml docbook-xsl docutils libxslt" +MAKEDEPS="meson ninja docbook-xml docbook-xsl python-docutils libxslt" DEPS="libpciaccess" PKG_VER=2.4.109 diff --git a/repo/x11/libva/libva.xibuild b/repo/x11/libva/libva.xibuild index 7d6c66b..db3b0f9 100644 --- a/repo/x11/libva/libva.xibuild +++ b/repo/x11/libva/libva.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="libdrm libgl libx11 libxext libxfixes wayland" +DEPS="libdrm mesa libx11 libxext libxfixes wayland" DESC="Video Acceleration API" diff --git a/repo/x11/libvdpau-va-gl/libvdpau-va-gl.xibuild b/repo/x11/libvdpau-va-gl/libvdpau-va-gl.xibuild index 074dece..9f18934 100644 --- a/repo/x11/libvdpau-va-gl/libvdpau-va-gl.xibuild +++ b/repo/x11/libvdpau-va-gl/libvdpau-va-gl.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="cmake" -DEPS="musl libgl libvdpau libx11 libva" +DEPS="musl libvdpau libx11 libva" DESC="VPAU driver with OpenGL backend" diff --git a/repo/x11/libvdpau/libvdpau.xibuild b/repo/x11/libvdpau/libvdpau.xibuild index f36957f..5054564 100644 --- a/repo/x11/libvdpau/libvdpau.xibuild +++ b/repo/x11/libvdpau/libvdpau.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="meson doxygen texlive" +MAKEDEPS="meson doxygen" DEPS="libxext graphviz" DESC="X.org amdgpu video driver" diff --git a/repo/x11/libxi/libxi.xibuild b/repo/x11/libxi/libxi.xibuild index 6741cfe..0b24abd 100644 --- a/repo/x11/libxi/libxi.xibuild +++ b/repo/x11/libxi/libxi.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc xmlto lynx" -DEPS="fontconfig libxcb elogind" +DEPS="fontconfig libxcb elogind libxfixes" PKG_VER=1.8 SOURCE=https://www.x.org/pub/individual/lib/libXi-$PKG_VER.tar.bz2 diff --git a/repo/x11/libxrandr/libxrandr.xibuild b/repo/x11/libxrandr/libxrandr.xibuild index 8d8b790..b41ffbd 100644 --- a/repo/x11/libxrandr/libxrandr.xibuild +++ b/repo/x11/libxrandr/libxrandr.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc xmlto lynx" -DEPS="fontconfig libxcb elogind" +DEPS="fontconfig libxrender libxcb elogind" PKG_VER=1.5.2 SOURCE=https://www.x.org/pub/individual/lib/libXrandr-$PKG_VER.tar.bz2 diff --git a/repo/x11/libxtst/libxtst.xibuild b/repo/x11/libxtst/libxtst.xibuild index 45093e1..3df8477 100644 --- a/repo/x11/libxtst/libxtst.xibuild +++ b/repo/x11/libxtst/libxtst.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc xmlto lynx" -DEPS="fontconfig libxcb elogind" +DEPS="fontconfig libxcb elogind libxi" PKG_VER=1.2.3 SOURCE=https://www.x.org/pub/individual/lib/libXtst-$PKG_VER.tar.bz2 diff --git a/repo/x11/libxvmc/libxvmc.xibuild b/repo/x11/libxvmc/libxvmc.xibuild index 76b445c..7fcd0a8 100644 --- a/repo/x11/libxvmc/libxvmc.xibuild +++ b/repo/x11/libxvmc/libxvmc.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc xmlto lynx" -DEPS="fontconfig libxcb elogind" +DEPS="fontconfig libxcb elogind libxv" PKG_VER=1.0.12 SOURCE=https://www.x.org/pub/individual/lib/libXvMC-$PKG_VER.tar.bz2 diff --git a/repo/x11/libxxf86vm/libxxf86vm.xibuild b/repo/x11/libxxf86vm/libxxf86vm.xibuild index d45959e..c3995c0 100644 --- a/repo/x11/libxxf86vm/libxxf86vm.xibuild +++ b/repo/x11/libxxf86vm/libxxf86vm.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc xmlto lynx" -DEPS="fontconfig libxcb elogind" +DEPS="fontconfig libxcb elogind libxext" PKG_VER=1.1.4 SOURCE=https://www.x.org/pub/individual/lib/libXxf86vm-$PKG_VER.tar.bz2 diff --git a/repo/x11/mesa/mesa.xibuild b/repo/x11/mesa/mesa.xibuild index 1177345..d315b37 100644 --- a/repo/x11/mesa/mesa.xibuild +++ b/repo/x11/mesa/mesa.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="meson ninja python-mako libva libvdpau llvm libxxf86vm libelf lm_sensors libexpat libvulkan wayland-protocols" +MAKEDEPS="meson ninja python-mako libva libvdpau llvm libxxf86vm libelf lm-sensors libexpat wayland-protocols" DEPS="xorg-libs libdrm" PKG_VER=21.3.7 diff --git a/repo/x11/wayland/wayland.xibuild b/repo/x11/wayland/wayland.xibuild index c26f903..0a5cdf1 100644 --- a/repo/x11/wayland/wayland.xibuild +++ b/repo/x11/wayland/wayland.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="meson ninja xmlto docbook-xml-4.5 docbook-xsl libxslt" +MAKEDEPS="meson ninja xmlto docbook4-xml docbook-xsl libxslt" DEPS="libxml2" PKG_VER=1.20.0 diff --git a/repo/x11/xbitmaps/xbitmaps.xibuild b/repo/x11/xbitmaps/xbitmaps.xibuild index 591adc8..cb7b0f8 100644 --- a/repo/x11/xbitmaps/xbitmaps.xibuild +++ b/repo/x11/xbitmaps/xbitmaps.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="util-macros" +DEPS="xorg-util-macros" PKG_VER=1.1.2 SOURCE=https://www.x.org/pub/individual/data/xbitmaps-$PKG_VER.tar.bz2 -- cgit v1.2.1