From c06c16a786d4a7bd1cf7477afafd952e1ca814aa Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 14:15:14 +0200 Subject: [PATCH 1/7] Add PKGBUILD for libsodium --- libsodium/mingw-w64/PKGBUILD | 59 ++++++++ ...A2B8892CC3D6A597B92B6C210627AABA709FE1.asc | 140 ++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 libsodium/mingw-w64/PKGBUILD create mode 100644 libsodium/mingw-w64/keys/pgp/54A2B8892CC3D6A597B92B6C210627AABA709FE1.asc diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD new file mode 100644 index 00000000..b1d38250 --- /dev/null +++ b/libsodium/mingw-w64/PKGBUILD @@ -0,0 +1,59 @@ +# Based on Arch Linux libsodium by +# Felix Yan +# namelessjon +# Alessio Sergi +# and MSYS2 mingw-w64-libsodium by +# Alexey Pavlov +# Contributor: Wolfgang Pupp + + +_realname=libsodium +pkgname="mingw-w64-${_realname}" +pkgver=1.0.19 +pkgrel=1 +pkgdesc="P(ortable|ackageable) NaCl-based crypto library (mingw-w64)" +arch=(any) +url="https://github.com/jedisct1/libsodium" +license=('custom:ISC') +depends=('gcc-libs') +options=(!strip !buildflags staticlibs) +makedepends=('git' 'mingw-w64-gcc') +source=("https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz" + "https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz.sig") +b2sums=('de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c' + 'SKIP') + +validpgpkeys=("54A2B8892CC3D6A597B92B6C210627AABA709FE1") # Frank Denis +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + for _arch in ${_architectures}; do + mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch} + + ../${_realname}-stable/configure \ + --prefix="/usr/${_arch}" \ + --target=${_arch} \ + --build="$CHOST" \ + --host="${_arch}" \ + --enable-shared \ + --enable-static + + make + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}"/build-${_arch} + make DESTDIR="$pkgdir" install + + ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll + ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a + + rm "${pkgdir}/usr/${_arch}/bin/"*.def + rm -rf "${pkgdir}/usr/${_arch}/share" + done + + install -Dm644 ${srcdir}/${_realname}-stable/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/libsodium/mingw-w64/keys/pgp/54A2B8892CC3D6A597B92B6C210627AABA709FE1.asc b/libsodium/mingw-w64/keys/pgp/54A2B8892CC3D6A597B92B6C210627AABA709FE1.asc new file mode 100644 index 00000000..31db9983 --- /dev/null +++ b/libsodium/mingw-w64/keys/pgp/54A2B8892CC3D6A597B92B6C210627AABA709FE1.asc @@ -0,0 +1,140 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +I1dBOYLJoonhOH/lNmxjQvc= +=59kd +-----END PGP PUBLIC KEY BLOCK----- From 5e137021a1a37c7160f00410ce7040dfdc71fc85 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 15:28:48 +0200 Subject: [PATCH 2/7] Fix libsodium runtime dependency Co-authored-by: Martchus --- libsodium/mingw-w64/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index b1d38250..12b93f65 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ pkgdesc="P(ortable|ackageable) NaCl-based crypto library (mingw-w64)" arch=(any) url="https://github.com/jedisct1/libsodium" license=('custom:ISC') -depends=('gcc-libs') +depends=('mingw-w64-crt') options=(!strip !buildflags staticlibs) makedepends=('git' 'mingw-w64-gcc') source=("https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz" From a9097310a1365a777596d027d6497de1aae449b1 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 15:29:26 +0200 Subject: [PATCH 3/7] Fix libsodium PKGBUILD formatting Co-authored-by: Martchus --- libsodium/mingw-w64/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index 12b93f65..d3c795e9 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -6,7 +6,6 @@ # Alexey Pavlov # Contributor: Wolfgang Pupp - _realname=libsodium pkgname="mingw-w64-${_realname}" pkgver=1.0.19 From bccbd802ad02eb744fa183de36f003b98dc4b137 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 15:29:57 +0200 Subject: [PATCH 4/7] Fix libsodium package description Co-authored-by: Martchus --- libsodium/mingw-w64/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index d3c795e9..83c7060a 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _realname=libsodium pkgname="mingw-w64-${_realname}" pkgver=1.0.19 pkgrel=1 -pkgdesc="P(ortable|ackageable) NaCl-based crypto library (mingw-w64)" +pkgdesc="A modern, portable, easy to use crypto library (mingw-w64)" arch=(any) url="https://github.com/jedisct1/libsodium" license=('custom:ISC') From 0cd7a3b75132a0afe65e58265a4964cf54e53f90 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 15:30:34 +0200 Subject: [PATCH 5/7] Update libsodium build dependencies Co-authored-by: Martchus --- libsodium/mingw-w64/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index 83c7060a..bb3b8f20 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -16,7 +16,7 @@ url="https://github.com/jedisct1/libsodium" license=('custom:ISC') depends=('mingw-w64-crt') options=(!strip !buildflags staticlibs) -makedepends=('git' 'mingw-w64-gcc') +makedepends=('mingw-w64-configure') source=("https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz" "https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz.sig") b2sums=('de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c' From e0eec73b6ac25f3bffb064982277c385ed7e1b95 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 16:51:06 +0200 Subject: [PATCH 6/7] Update Maintainers for libsodium --- libsodium/mingw-w64/PKGBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index bb3b8f20..b4de86c9 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -1,10 +1,9 @@ -# Based on Arch Linux libsodium by -# Felix Yan -# namelessjon -# Alessio Sergi -# and MSYS2 mingw-w64-libsodium by -# Alexey Pavlov -# Contributor: Wolfgang Pupp +# Maintainer: Wolfgang Pupp +# Maintainer: Martchus +# Contributor: Felix Yan +# Contributor: namelessjon +# Contributor: Alessio Sergi +# Contributor: Alexey Pavlov _realname=libsodium pkgname="mingw-w64-${_realname}" From fcb822c22f3e0461601339a5740efb86ccaaba42 Mon Sep 17 00:00:00 2001 From: Wolfgang Pupp Date: Fri, 24 May 2024 16:51:54 +0200 Subject: [PATCH 7/7] Improve libsodium PKGBUILD By using configure wrapper. --- libsodium/mingw-w64/PKGBUILD | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libsodium/mingw-w64/PKGBUILD b/libsodium/mingw-w64/PKGBUILD index b4de86c9..d5adfcf3 100644 --- a/libsodium/mingw-w64/PKGBUILD +++ b/libsodium/mingw-w64/PKGBUILD @@ -16,8 +16,7 @@ license=('custom:ISC') depends=('mingw-w64-crt') options=(!strip !buildflags staticlibs) makedepends=('mingw-w64-configure') -source=("https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz" - "https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz.sig") +source=(https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz{,.sig}) b2sums=('de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c' 'SKIP') @@ -28,13 +27,7 @@ build() { for _arch in ${_architectures}; do mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch} - ../${_realname}-stable/configure \ - --prefix="/usr/${_arch}" \ - --target=${_arch} \ - --build="$CHOST" \ - --host="${_arch}" \ - --enable-shared \ - --enable-static + ${_arch}-configure ../${_realname}-stable make done