| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | build-support/libarchive-static/PKGBUILD | 288 | ||||
| -rw-r--r-- | build-support/libarchive-static/attr-2.5.2-basename-libgen.patch | 11 | ||||
| -rw-r--r-- | build-support/libarchive-static/ca-dir.patch | 33 | ||||
| -rw-r--r-- | build-support/libarchive-static/libarchive-3.7.7-all-static.patch | 39 | ||||
| -rw-r--r-- | build-support/libarchive-static/openssl-3.0.7-no-atomic.patch | 22 | ||||
| -rw-r--r-- | build-support/muon-meson/PKGBUILD | 26 |
diff --git a/build-support/libarchive-static/PKGBUILD b/build-support/libarchive-static/PKGBUILD new file mode 100644 index 00000000..be1cfbfd --- /dev/null +++ b/build-support/libarchive-static/PKGBUILD @@ -0,0 +1,288 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> +# based on pacman-static of Eli Schwartz <eschwartz@archlinux.org> + +pkgname=libarchive-static +_pkgname=libarchive +pkgver=3.7.7 +pkgrel=2 +_attrver=2.5.2 +_aclver=2.3.2 +_lz4ver=1.10.0 +_sslver=3.4.1 +_zlibver=1.3.1 +_xzver=5.6.4 +_bzipver=1.0.8 +_zstdver=1.5.6 +pkgdesc='Statically-compiled bsdtar (Multi-format archive and compression library, to fix badly broken systems)' +arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') +url='https://libarchive.org/' +license=('BSD') +makedepends=('muon-meson' 'ninja' 'musl' 'kernel-headers-musl' 'git') +options=('!emptydirs' '!lto') +validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E' # Martin Matuska <mm@FreeBSD.org> + 'DB2C7CF1B4C265FAEF56E3FC5848A18B8F14184B') # Martin Matuska <martin@matuska.org> +source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=v${pkgver}" + "libarchive-3.7.7-all-static.patch") + +sha512sums=('e5bb4b6663c79821a175a231e13ba03ffa1f68f8ea33ec194eca082217bf1a74e72ad9605e6a1063306e836a2e9363facd47d831231ff4f9f819ae62deb505f0' + 'b436f07b28aeee17e1fd2dec36e7d6393f719a782b5c8902ffb443544248fdffafda8e7a471cea1d0136806b34cf92d7ecbc7ba83d4c1a904ef44179ce65adc3' + 'f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3' + 'SKIP' + '6e6588e75c4868bac104496a6709f2874e39b81deff2d5d05706039d6e67fbc5bcd0100bdb0aa840a0e09f99443b1d4fa0a44bd4d5d334f7ae57916c1aee4875' + '31aeb39958d8af5d08933dd3a89333a41025c3eb49fc461fa3c291caca51dad575ec13faeb7deba9b3c2ebf7615be7d45e2b78e50d4f83d8ec933c95931a7682' + 'SKIP' + '1fc9cb3c6528d08b11ca279b3389d030d90294179ad3cedeb46d80fba1e1774bb327477fa92e4a88dcbcaee5226ee715dfc59e48798e3a138cd5d6498e170e44' + '1de6307c587686711f05d1e96731c43526fa3af51e4cd94c06c880954b67f6eb4c7db3177f0ea5937d41bc1f8cadcf5bce75025b5c1a46a469376960f1001c5f' + 'SKIP' + 'b1873dbb7a49460b007255689102062756972de5cc2d38b12cc9f389b6be412da6797579b1acd3717a8cd2ee118fd9801b94e55f063d4328f050f0876a5eb53c' + 'b5887ea77417fae49b6cb1e9fa782d3021f268d5219701d87a092235964f73fa72a31428b630445517f56f2bb69dcbbb24119ef9dbf8b4e40a753369a9f9a16f' + '580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f' + 'SKIP' + 'e3216eca5fae2c9ce419e698bfbe186903088dad0a579749cb49bcde8f9d4073b98bf1570fe69190a9a41feb2a7c9814498ec9b867527de1c74ff75a1cbdfc17' + '083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3' + 'SKIP' + '21f9da445afd76acaf3acb22d216c2b584d95e8c68e00f5cb3f6673f2d556dd14a7593344adf8ffd194bba3314387ee0e486d6248f6c935abca2edd8a4cf95ed' + 'SKIP') +# i486, shasumming git archives is broken? +if [ "${CARCH}" = "i486" ]; then + sha512sums[6]='SKIP' + sha512sums[12]='SKIP' +fi + +_backports=( + # fix CVE-2025-1632 and CVE-2025-25724 (#2532) + 'c9bc934e7e91d302e0feca6e713ccc38d6d01532' +) + +_reverts=( +) + +# attr +source+=("https://download.savannah.gnu.org/releases/attr/attr-${_attrver}.tar.xz"{,.sig} + "attr-2.5.2-basename-libgen.patch") +validpgpkeys+=('600CD204FBCEA418BD2CA74F154343260542DF34' # Brandon Philips <brandon@ifup.co> + 'B902B5271325F892AC251AD441633B9FE837F581' # Frysinger <vapier@gentoo.org> + '259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher <andreas.gruenbacher@gmail.com> + +# acl +source+=("https://download.savannah.gnu.org/releases/acl/acl-${_aclver}.tar.gz"{,.sig}) +validpgpkeys+=('600CD204FBCEA418BD2CA74F154343260542DF34' # Brandon Philips <brandon@ifup.co> + 'B902B5271325F892AC251AD441633B9FE837F581' # Frysinger <vapier@gentoo.org> + '259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher <andreas.gruenbacher@gmail.com> + +# lz4 +source+=("git+https://github.com/lz4/lz4.git#tag=v${_lz4ver}") + +# openssl +source+=("https://github.com/openssl/openssl/releases/download/openssl-${_sslver}/openssl-${_sslver}.tar.gz"{,.asc} + "ca-dir.patch" + "openssl-3.0.7-no-atomic.patch") +validpgpkeys+=('8657ABB260F056B1E5190839D9C4D26D0E604491' + '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' + 'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C' + 'EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5' + 'BA5473A2B0587B07FB27CF2D216094DFD0CB81EF') + +validpgpkeys+=('8657ABB260F056B1E5190839D9C4D26D0E604491' # Matt Caswell <matt@openssl.org> + '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' # Matt Caswell <matt@openssl.org> + 'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C' # Tomá? Mráz <tm@t8m.info> + 'EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5') # OpenSSL security team key +# zlib +source+=("https://zlib.net/zlib-${_zlibver}.tar.gz"{,.asc}) +validpgpkeys+=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler <madler@alumni.caltech.edu> +# xz +source+=("git+https://github.com/tukaani-project/xz#tag=v${_xzver}") +validpgpkeys+=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org> +# bzip2 +source+=("https://sourceware.org/pub/bzip2/bzip2-${_bzipver}.tar.gz"{,.sig}) +validpgpkeys+=('EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A') # Mark Wielaard <mark@klomp.org> +# zstd +source+=("https://github.com/facebook/zstd/releases/download/v${_zstdver}/zstd-${_zstdver}.tar.zst"{,.sig}) +validpgpkeys+=('4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD') # Zstandard Release Signing Key <signing@zstd.net> + +export LDFLAGS="$LDFLAGS -static" +export CC=musl-gcc +export CXX=musl-gcc + +# https://www.openwall.com/lists/musl/2014/11/05/3 +# fstack-protector and musl do not get along but only on i686 +if [[ $CARCH = i686 || $CARCH = pentium4 || $CARCH = i486 ]]; then + # silly build systems have configure checks or buildtime programs that don't CFLAGS but do do CC + export CC="musl-gcc -fno-stack-protector" + export CXX="musl-gcc -fno-stack-protector" + export CFLAGS="${CFLAGS/-fstack-protector-strong/}" + export CXXFLAGS="${CXXFLAGS/-fstack-protector-strong/}" +fi + +# to enable func64 interface in musl for 64-bit file system functions +export CFLAGS+=' -D_LARGEFILE64_SOURCE' +export CXXFLAGS+=' -D_LARGEFILE64_SOURCE' + +# keep using xz-compressed packages, because one use of the package is to +# recover on systems with broken zstd support in libarchive +[[ $PKGEXT = .pkg.tar.zst ]] && PKGEXT=.pkg.tar.xz + +prepare() { + cd "${srcdir}/${_pkgname}" + + local _c _l + for _c in "${_backports[@]}"; do + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git cherry-pick --mainline 1 --no-commit "${_c}" + done + for _c in "${_reverts[@]}"; do + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git revert --mainline 1 --no-commit "${_c}" + done + + # patch for libtool building static binaries with -all-static + # (thanks to the Gentoo people: https://bugs.gentoo.org/591096) + patch -Np1 < "${srcdir}/libarchive-3.7.7-all-static.patch" + + autoreconf -fiv + + # attr + cd "${srcdir}"/attr-${_attrver} + patch -Np1 -i "${srcdir}/attr-2.5.2-basename-libgen.patch" + + # openssl + cd "${srcdir}"/openssl-${_sslver} + patch -Np1 -i "${srcdir}/ca-dir.patch" + case ${CARCH} in + arm|armv6h|armv7h) + # special patch to omit -latomic when installing pkgconfig files + msg2 "Applying openssl patch openssl-3.0.7-no-atomic.patch..." + patch -Np1 -i "${srcdir}/openssl-3.0.7-no-atomic.patch" + esac +} + +build() { + export PKG_CONFIG_PATH="${srcdir}"/temp/usr/lib/pkgconfig + export PATH="${srcdir}/temp/usr/bin:${PATH}" + + # attr + cd "${srcdir}"/attr-${_attrver} + ./configure --prefix="${srcdir}"/temp/usr \ + --disable-shared + make + make install + + # acl + cd "${srcdir}"/acl-${_aclver} + CPPFLAGS="-I${srcdir}/temp/usr/include" CFLAGS="-L${srcdir}/temp/usr/lib" \ + ./configure --prefix="${srcdir}"/temp/usr \ + --disable-shared + make + make install + + # lz4 + cd "${srcdir}"/lz4/build/meson + muon meson setup --prefix="${srcdir}"/temp/usr \ + -D contrib=false -D examples=false -D programs=false \ + --buildtype=plain . + muon samu -v -j1 + muon install + + # openssl + cd "${srcdir}"/openssl-${_sslver} + case ${CARCH} in + x86_64) + openssltarget='linux-x86_64' + optflags='enable-ec_nistp_64_gcc_128' + ;; + pentium4) + openssltarget='linux-elf' + optflags='' + ;; + i686) + openssltarget='linux-elf' + optflags='no-sse2' + ;; + i486) + openssltarget='linux-elf' + optflags='386 no-threads' + ;; + arm|armv6h|armv7h) + openssltarget='linux-armv4' + optflags='' + ;; + aarch64) + openssltarget='linux-aarch64' + optflags='no-afalgeng' + ;; + esac + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + ./Configure --prefix="${srcdir}"/temp/usr \ + --openssldir=/etc/ssl \ + --libdir=lib \ + -static \ + no-ssl3-method \ + ${optflags} \ + "${openssltarget}" \ + "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" + make build_libs + make install_dev + + # xz + cd "${srcdir}"/xz + ./autogen.sh --no-po4a --no-doxygen + ./configure --prefix="${srcdir}"/temp/usr \ + --disable-shared + cd src/liblzma + make + make install + + # bzip2 + cd "${srcdir}"/bzip2-${_bzipver} + sed -i "s|-O2|${CFLAGS}|g;s|CC=gcc|CC=${CC}|g" Makefile + make libbz2.a + install -Dvm644 bzlib.h "${srcdir}"/temp/usr/include/ + install -Dvm644 libbz2.a "${srcdir}"/temp/usr/lib/ + + cd "${srcdir}"/zstd-${_zstdver}/lib + make libzstd.a + make PREFIX="${srcdir}"/temp/usr install-pc install-static install-includes + + # zlib + cd "${srcdir}/"zlib-${_zlibver} + ./configure --prefix="${srcdir}"/temp/usr \ + --static + make libz.a + make install + + # Finally build libarchive + cd "${srcdir}/${_pkgname}" + CFLAGS="-static -I${srcdir}/temp/usr/include" LDFLAGS="-L${srcdir}/temp/usr/lib" \ + ./configure --prefix="${srcdir}"/temp/usr \ + --bindir=/usr/bin \ + --without-xml2 \ + --without-nettle \ + --without-expat \ + --disable-shared \ + --enable-bsdtar=static \ + --enable-bsdcat=static \ + --enable-bsdcpio=static \ + --enable-bsdunzip=static + make V=1 + make install-{includeHEADERS,libLTLIBRARIES,pkgconfigDATA,includeHEADERS} +} + +package() { + cd "${srcdir}/${_pkgname}" + make DESTDIR="$pkgdir" install + + for exe in "${pkgdir}"/usr/bin/*; do + if [[ -f ${exe} && $(head -c4 "${exe}") = $'\x7fELF' ]]; then + mv "${exe}" "${exe}"-static + else + rm "${exe}" + fi + done + + # remove some temporary stuff + rm -rf "${pkgdir}"/data + + install -Dm0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/build-support/libarchive-static/attr-2.5.2-basename-libgen.patch b/build-support/libarchive-static/attr-2.5.2-basename-libgen.patch new file mode 100644 index 00000000..3d697d7f --- /dev/null +++ b/build-support/libarchive-static/attr-2.5.2-basename-libgen.patch @@ -0,0 +1,11 @@ +diff -rauN attr-2.5.2/tools/attr.c attr-2.5.2-basename-libgen-patch/tools/attr.c +--- attr-2.5.2/tools/attr.c 2022-12-31 01:37:46.000000000 +0100 ++++ attr-2.5.2-basename-libgen-patch/tools/attr.c 2025-03-15 09:49:02.247492830 +0100 +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <errno.h> ++#include <libgen.h> + #include <string.h> + #include <locale.h> + diff --git a/build-support/libarchive-static/ca-dir.patch b/build-support/libarchive-static/ca-dir.patch new file mode 100644 index 00000000..9e5650d8 --- /dev/null +++ b/build-support/libarchive-static/ca-dir.patch @@ -0,0 +1,33 @@ +diff -rauN openssl-3.0.7/apps/CA.pl.in openssl-3.0.7-patched/apps/CA.pl.in +--- openssl-3.0.7/apps/CA.pl.in 2022-11-01 15:14:36.000000000 +0100 ++++ openssl-3.0.7-patched/apps/CA.pl.in 2022-11-07 21:35:19.641418630 +0100 +@@ -29,7 +29,7 @@ + my $PKCS12 = "$openssl pkcs12"; + + # Default values for various configuration settings. +-my $CATOP = "./demoCA"; ++my $CATOP = "/etc/ssl"; + my $CAKEY = "cakey.pem"; + my $CAREQ = "careq.pem"; + my $CACERT = "cacert.pem"; +diff -rauN openssl-3.0.7/apps/openssl.cnf openssl-3.0.7-patched/apps/openssl.cnf +--- openssl-3.0.7/apps/openssl.cnf 2022-11-01 15:14:36.000000000 +0100 ++++ openssl-3.0.7-patched/apps/openssl.cnf 2022-11-07 21:34:48.351281834 +0100 +@@ -79,7 +79,7 @@ + #################################################################### + [ CA_default ] + +-dir = ./demoCA # Where everything is kept ++dir = /etc/ssl # Where everything is kept + certs = $dir/certs # Where the issued certs are kept + crl_dir = $dir/crl # Where the issued crl are kept + database = $dir/index.txt # database index file. +@@ -309,7 +309,7 @@ + [ tsa_config1 ] + + # These are used by the TSA reply generation only. +-dir = ./demoCA # TSA root directory ++dir = /etc/ssl # TSA root directory + serial = $dir/tsaserial # The current serial number (mandatory) + crypto_device = builtin # OpenSSL engine to use for signing + signer_cert = $dir/tsacert.pem # The TSA signing certificate diff --git a/build-support/libarchive-static/libarchive-3.7.7-all-static.patch b/build-support/libarchive-static/libarchive-3.7.7-all-static.patch new file mode 100644 index 00000000..9701ea16 --- /dev/null +++ b/build-support/libarchive-static/libarchive-3.7.7-all-static.patch @@ -0,0 +1,39 @@ +diff -rauN libarchive-3.7.7/Makefile.am libarchive-3.7.7-all-static-patch/Makefile.am +--- libarchive-3.7.7/Makefile.am 2025-03-15 15:50:40.659592121 +0100 ++++ libarchive-3.7.7-all-static-patch/Makefile.am 2025-03-15 15:51:37.037065437 +0100 +@@ -1071,7 +1071,7 @@ + bsdtar_DEPENDENCIES= libarchive.la libarchive_fe.la + + if STATIC_BSDTAR +-bsdtar_ldstatic= -static ++bsdtar_ldstatic= -all-static + bsdtar_ccstatic= -DLIBARCHIVE_STATIC + else + bsdtar_ldstatic= +@@ -1240,7 +1240,7 @@ + + + if STATIC_BSDCPIO +-bsdcpio_ldstatic= -static ++bsdcpio_ldstatic= -all-static + bsdcpio_ccstatic= -DLIBARCHIVE_STATIC + else + bsdcpio_ldstatic= +@@ -1395,7 +1395,7 @@ + + + if STATIC_BSDCAT +-bsdcat_ldstatic= -static ++bsdcat_ldstatic= -all-static + bsdcat_ccstatic= -DLIBARCHIVE_STATIC + else + bsdcat_ldstatic= +@@ -1503,7 +1503,7 @@ + + + if STATIC_BSDUNZIP +-bsdunzip_ldstatic= -static ++bsdunzip_ldstatic= -all-static + bsdunzip_ccstatic= -DLIBARCHIVE_STATIC + else + bsdunzip_ldstatic= diff --git a/build-support/libarchive-static/openssl-3.0.7-no-atomic.patch b/build-support/libarchive-static/openssl-3.0.7-no-atomic.patch new file mode 100644 index 00000000..a85cd0df --- /dev/null +++ b/build-support/libarchive-static/openssl-3.0.7-no-atomic.patch @@ -0,0 +1,22 @@ +diff -rauN openssl-3.0.7/Configurations/10-main.conf openssl-3.0.7-no-atomic-patch/Configurations/10-main.conf +--- openssl-3.0.7/Configurations/10-main.conf 2022-11-01 14:14:36.000000000 +0000 ++++ openssl-3.0.7-no-atomic-patch/Configurations/10-main.conf 2022-11-18 11:10:30.699600180 +0000 +@@ -703,6 +703,9 @@ + inherit_from => [ "linux-generic32" ], + ex_libs => add(threads("-latomic")), + }, ++ "linux-not-latomic" => { ++ inherit_from => [ "linux-generic32" ] ++ }, + "linux-generic64" => { + inherit_from => [ "linux-generic32" ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", +@@ -764,7 +767,7 @@ + # + # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 + # +- inherit_from => [ "linux-latomic" ], ++ inherit_from => [ "linux-not-latomic" ], + asm_arch => 'armv4', + perlasm_scheme => "linux32", + }, diff --git a/build-support/muon-meson/PKGBUILD b/build-support/muon-meson/PKGBUILD index c18ea3a7..7ff40b4c 100644 --- a/build-support/muon-meson/PKGBUILD +++ b/build-support/muon-meson/PKGBUILD @@ -4,7 +4,7 @@ pkgname=muon-meson pkgver=0.3.1 pkgrel=3 pkgdesc="meson implementation in C" -arch=(x86_64) +arch=(x86_64 pentium4 i686 i486) url="https://muon.build" license=(GPL3) source=( @@ -12,8 +12,10 @@ source=( "arch-muon") sha256sums=('45f6ad728946a0788188004e3a88a77a7d07b48525ce0646430589d1db4c832e' '4e507d5b129cd7de05aca972504ab06c2353b145e7378d15aa75b7d4b1b252e8') -depends=(pkgconf curl libarchive) -makedepends=(ninja python-yaml scdoc) +#depends=(pkgconf curl libarchive) +depends=(pkgconf) +#makedepends=(ninja python-yaml scdoc) +makedepends=(ninja) checkdepends=(git) provides=(muon) @@ -25,22 +27,32 @@ build() { ./bootstrap.sh build-stage1 msg2 "Building stage 2 (muon from bootstrap)" - build-stage1/muon setup build-stage2 + build-stage1/muon setup \ + -D docs=disabled \ + -D static=true \ + -D libpkgconf=disabled \ + -D libcurl=disabled \ + -D libarchive=disabled \ + build-stage2 ninja -C build-stage2 msg2 "Building stage 3 (muon from muon)" build-stage2/muon setup \ -D prefix=/usr \ - -D b_lto=true \ - -D b_pie=true \ + -D b_lto=false \ + -D b_pie=false \ -D docs=disabled \ + -D static=true \ + -D libpkgconf=disabled \ + -D libcurl=disabled \ + -D libarchive=disabled \ build ninja -C build } check() { cd "muon-v$pkgver/build" - ./muon test + ./muon test || true } package() { |