Compare commits

...

3 Commits

Author SHA1 Message Date
Martchus 9de196dc51 Update OpenSSL packages to 3.3.1 2024-06-08 21:45:54 +02:00
Martchus 004d122465
Merge pull request #183 from achilleas-k/syncthing/temphome
Use temporary directory as HOME for syncthingtray tests
2024-06-06 22:21:03 +02:00
Achilleas Koutsou 6049a70f58 Use temporary directory as HOME for syncthingtray tests
Some part of the syncthingtray or syncthing tests creates a Sync
directory under $HOME if it doesn't exist.  This can be annoying for
users building or testing the package when they don't use the default
$HOME/Sync directory as it leaves behind test artifacts in their home.

Use a temporary directory in the source tree when testing instead.
Don't export the variable in case the overridden $HOME leaks into other
parts of the build process.
2024-06-06 20:14:09 +02:00
10 changed files with 40 additions and 20 deletions

View File

@ -5,7 +5,7 @@ _pkg_arch=aarch64
_android_arch=arm64-v8a _android_arch=arm64-v8a
_android_platform_arch=arch-arm64 _android_platform_arch=arch-arm64
_pkgname=openssl _pkgname=openssl
_pkgver=3.3.0 _pkgver=3.3.1
pkgname=android-$_pkg_arch-$_pkgname pkgname=android-$_pkg_arch-$_pkgname
# use a pacman compatible version scheme # use a pacman compatible version scheme
@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
conflicts=("android-$_pkgname-$_android_arch") conflicts=("android-$_pkgname-$_android_arch")
replaces=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch")
source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc}) source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP') 'SKIP')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
@ -76,4 +76,9 @@ package() {
# strip binaries # strip binaries
find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \; find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \; find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
# create symlinks for library names expected by Qt 6
for lib_name in crypto ssl; do
ln -vrs "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}.so" "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}_3.so"
done
} }

View File

@ -5,7 +5,7 @@ _pkg_arch=armv7a-eabi
_android_arch=armeabi-v7a _android_arch=armeabi-v7a
_android_platform_arch=arch-arm _android_platform_arch=arch-arm
_pkgname=openssl _pkgname=openssl
_pkgver=3.3.0 _pkgver=3.3.1
pkgname=android-$_pkg_arch-$_pkgname pkgname=android-$_pkg_arch-$_pkgname
# use a pacman compatible version scheme # use a pacman compatible version scheme
@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
conflicts=("android-$_pkgname-$_android_arch") conflicts=("android-$_pkgname-$_android_arch")
replaces=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch")
source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc}) source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP') 'SKIP')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
@ -76,4 +76,9 @@ package() {
# strip binaries # strip binaries
find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \; find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \; find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
# create symlinks for library names expected by Qt 6
for lib_name in crypto ssl; do
ln -vrs "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}.so" "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}_3.so"
done
} }

View File

@ -5,7 +5,7 @@ _pkg_arch=x86-64
_android_arch=x86_64 _android_arch=x86_64
_android_platform_arch=arch-x86_64 _android_platform_arch=arch-x86_64
_pkgname=openssl _pkgname=openssl
_pkgver=3.3.0 _pkgver=3.3.1
pkgname=android-$_pkg_arch-$_pkgname pkgname=android-$_pkg_arch-$_pkgname
# use a pacman compatible version scheme # use a pacman compatible version scheme
@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
conflicts=("android-$_pkgname-$_android_arch") conflicts=("android-$_pkgname-$_android_arch")
replaces=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch")
source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc}) source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP') 'SKIP')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
@ -76,4 +76,9 @@ package() {
# strip binaries # strip binaries
find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \; find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \; find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
# create symlinks for library names expected by Qt 6
for lib_name in crypto ssl; do
ln -vrs "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}.so" "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}_3.so"
done
} }

View File

@ -5,7 +5,7 @@ _pkg_arch=x86
_android_arch=x86 _android_arch=x86
_android_platform_arch=arch-x86 _android_platform_arch=arch-x86
_pkgname=openssl _pkgname=openssl
_pkgver=3.3.0 _pkgver=3.3.1
pkgname=android-$_pkg_arch-$_pkgname pkgname=android-$_pkg_arch-$_pkgname
# use a pacman compatible version scheme # use a pacman compatible version scheme
@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
conflicts=("android-$_pkgname-$_android_arch") conflicts=("android-$_pkgname-$_android_arch")
replaces=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch")
source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc}) source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP') 'SKIP')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
@ -76,4 +76,9 @@ package() {
# strip binaries # strip binaries
find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \; find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \; find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
# create symlinks for library names expected by Qt 6
for lib_name in crypto ssl; do
ln -vrs "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}.so" "$pkgdir/${ANDROID_PREFIX_LIB}/lib${lib_name}_3.so"
done
} }

View File

@ -4,7 +4,7 @@
# Contributor: Filip Brcic < brcha at gna dot org > # Contributor: Filip Brcic < brcha at gna dot org >
# Contributor: Martchus < martchus at gmx dot net > # Contributor: Martchus < martchus at gmx dot net >
_pkgver=3.3.0 _pkgver=3.3.1
_architectures="i686-w64-mingw32 x86_64-w64-mingw32" _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
pkgname=mingw-w64-openssl pkgname=mingw-w64-openssl
@ -20,7 +20,7 @@ makedepends=('mingw-w64-gcc'
'perl') 'perl')
options=('!strip' 'staticlibs' '!buildflags' '!lto') options=('!strip' 'staticlibs' '!buildflags' '!lto')
source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc}) source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP') 'SKIP')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

View File

@ -2,7 +2,7 @@
_pkgname=openssl _pkgname=openssl
pkgname=static-compat-$_pkgname pkgname=static-compat-$_pkgname
_ver=3.3.0 _ver=3.3.1
# use a pacman compatible version scheme # use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1 pkgrel=1
@ -16,7 +16,7 @@ optdepends=('ca-certificates')
options=(!emptydirs staticlibs) options=(!emptydirs staticlibs)
source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc} source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
'ca-dir.patch') 'ca-dir.patch')
sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02' sha256sums=('777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e'
'SKIP' 'SKIP'
'0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7') '0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'

View File

@ -74,8 +74,8 @@ build() {
check() { check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
export HOME=${HOME:-/} # https://github.com/syncthing/syncthing/issues/8785 # https://github.com/syncthing/syncthing/issues/8785
QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check HOME="$(mktemp -p . -d testhome.XXX)" QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check
} }
package() { package() {

View File

@ -92,8 +92,8 @@ build() {
check() { check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
export HOME=${HOME:-/} # https://github.com/syncthing/syncthing/issues/8785 # https://github.com/syncthing/syncthing/issues/8785
QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check HOME="$(mktemp -p . -d testhome.XXX)" QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check
} }
package() { package() {

View File

@ -92,8 +92,8 @@ build() {
check() { check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
export HOME=${HOME:-/} # https://github.com/syncthing/syncthing/issues/8785 # https://github.com/syncthing/syncthing/issues/8785
QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check HOME="$(mktemp -p . -d testhome.XXX)" QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check
} }
package() { package() {

View File

@ -124,8 +124,8 @@ check() {
source static-compat-environment source static-compat-environment
export PATH=$PWD:$PATH export PATH=$PWD:$PATH
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
export HOME=${HOME:-/} # https://github.com/syncthing/syncthing/issues/8785 # https://github.com/syncthing/syncthing/issues/8785
QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check HOME="$(mktemp -p . -d testhome.XXX)" QT_QPA_PLATFORM=offscreen SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check
} }
package() { package() {