summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD23
-rw-r--r--arm64-compile-fix.patch11
3 files changed, 34 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae0adef27a4b..3e92ff3e4b58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,32 @@
pkgbase = freenet-fms
pkgdesc = Freenet Messaging System
- pkgver = 0.3.83
+ pkgver = 0.3.84
pkgrel = 1
url = http://127.0.0.1:8888/freenet:USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/150
install = fms.install
arch = i686
arch = x86_64
+ arch = armv7h
+ arch = aarch64
license = GPL2
makedepends = cmake
depends = poco
depends = sqlite3
depends = mbedtls
- source = http://127.0.0.1:8888/?forcedownload&max-size=99999999&key=CHK@Ldm6Qd86MRZIchi7ndUJ7T6je5prtsh~lQRUzCBAgoY,uGyzqboNRt6G2sFHStJIpJWItpFgXw7lC0bjXyPa2mc,AAMC--8/fms-src-0.3.83.zip
+ depends = freeimage
+ source = http://127.0.0.1:8888/?forcedownload&max-size=99999999&key=CHK@HI6TvnJgm48Q5feXC6VAco2MdfmDVY2RODh52tEsbuQ,KC45MY5kpW11d89jsN7NazORI0HyplJuMNUGYFRxIvE,AAMC--8/fms-src-0.3.84.zip
source = fms.install
source = fms.tmpfiles
source = fms.service
source = use-system-mbedtls.patch
source = mbedtls-3.patch
- b2sums = 07b28fa1ef151ca75e547515c8771fc425aa78003980f20134c4d3b670ccaa4c20b24dc0517194dd4675d9b3b8c8f84e929a94921945d156ae5b0b898a7fad56
+ source = arm64-compile-fix.patch
+ b2sums = ec96d26ea5fedaf2109c0b1aa00d1dfa82e5b45bfe7db8a58cab9f682c16f41b05a2d3e51a4ece2a148101d36472499d1592d9dab66dd544402e8cc8cc37a5ff
b2sums = 496875c2960675684e7ac3b055e033f50828cff30a71ff6d04b1ff23e45681b42cc6a30c04ac1e277704f00ebc716c66944da153f6e34bc9b624afd33561ab9d
b2sums = 8e1618c6d01a3e62bf56d2db87612ec68d1cc825e5eb85e829afc95215bca17bbf1dee79945d1170ccdd9f992525c6a1f396710ecfe50669062910ce01c60bad
b2sums = 2fa023fd0c5c0dbb99e1fe6aba0d66fbc0d939592b4ab6fb9ec862d65d3961b333cebb7ed95897a5bf9d2402ab5771818024255e4eba4be4407311b61f4320a8
b2sums = 841e9bcbf2bb0a620e27fa02ff3ae70c4b100b50d64c43558168a6c4aea58d331aff37982480317f599a8ff60fe4c158531738ba79808af8f1058a9afe8420cf
b2sums = e12a4f87513eb922b93d58238f76b4a3a704ba22da6ec32dbf11fc4f3700459344c692e31a2518f94d652e78227d5e38e267a43dd21932c6a53a0ea37407874f
+ b2sums = 07edd864df8c508d8207e7d64ded07441b0f1de651fbecea5364d82ec09cd66924f352f529f850e63ded37bba877e35864d43196d6dbce39cfe16678f41a933c
pkgname = freenet-fms
diff --git a/PKGBUILD b/PKGBUILD
index 1a938bf1504a..00191e4df2af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,33 @@
# Contributor: Robert Štětka <robert dot stetka at gmail dot com>
pkgname=freenet-fms
-pkgver=0.3.83
+pkgver=0.3.84
pkgrel=1
pkgdesc="Freenet Messaging System"
url="http://127.0.0.1:8888/freenet:USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/150"
license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h' 'aarch64')
install=fms.install
-depends=('poco' 'sqlite3' 'mbedtls')
+depends=('poco' 'sqlite3' 'mbedtls' 'freeimage')
makedepends=('cmake')
_FREENET=${FREENET_PROXY:-http://127.0.0.1:8888}
-_URI='CHK@Ldm6Qd86MRZIchi7ndUJ7T6je5prtsh~lQRUzCBAgoY,uGyzqboNRt6G2sFHStJIpJWItpFgXw7lC0bjXyPa2mc'
+_URI='CHK@HI6TvnJgm48Q5feXC6VAco2MdfmDVY2RODh52tEsbuQ,KC45MY5kpW11d89jsN7NazORI0HyplJuMNUGYFRxIvE'
source=("${_FREENET}/?forcedownload&max-size=99999999&key=${_URI},AAMC--8/fms-src-${pkgver}.zip"
#"https://dev.gentoo.org/~tommy/distfiles/fms-src-${pkgver}.zip"
fms.{install,tmpfiles,service}
'use-system-mbedtls.patch'
- 'mbedtls-3.patch')
+ 'mbedtls-3.patch'
+ 'arm64-compile-fix.patch')
-b2sums=('07b28fa1ef151ca75e547515c8771fc425aa78003980f20134c4d3b670ccaa4c20b24dc0517194dd4675d9b3b8c8f84e929a94921945d156ae5b0b898a7fad56'
+b2sums=('ec96d26ea5fedaf2109c0b1aa00d1dfa82e5b45bfe7db8a58cab9f682c16f41b05a2d3e51a4ece2a148101d36472499d1592d9dab66dd544402e8cc8cc37a5ff'
'496875c2960675684e7ac3b055e033f50828cff30a71ff6d04b1ff23e45681b42cc6a30c04ac1e277704f00ebc716c66944da153f6e34bc9b624afd33561ab9d'
'8e1618c6d01a3e62bf56d2db87612ec68d1cc825e5eb85e829afc95215bca17bbf1dee79945d1170ccdd9f992525c6a1f396710ecfe50669062910ce01c60bad'
'2fa023fd0c5c0dbb99e1fe6aba0d66fbc0d939592b4ab6fb9ec862d65d3961b333cebb7ed95897a5bf9d2402ab5771818024255e4eba4be4407311b61f4320a8'
'841e9bcbf2bb0a620e27fa02ff3ae70c4b100b50d64c43558168a6c4aea58d331aff37982480317f599a8ff60fe4c158531738ba79808af8f1058a9afe8420cf'
- 'e12a4f87513eb922b93d58238f76b4a3a704ba22da6ec32dbf11fc4f3700459344c692e31a2518f94d652e78227d5e38e267a43dd21932c6a53a0ea37407874f')
+ 'e12a4f87513eb922b93d58238f76b4a3a704ba22da6ec32dbf11fc4f3700459344c692e31a2518f94d652e78227d5e38e267a43dd21932c6a53a0ea37407874f'
+ '07edd864df8c508d8207e7d64ded07441b0f1de651fbecea5364d82ec09cd66924f352f529f850e63ded37bba877e35864d43196d6dbce39cfe16678f41a933c')
prepare() {
rm -rf libs
@@ -35,6 +37,7 @@ prepare() {
perl -pi -e 's/\r\n/\n/' include/freenet/fcpv2.h
patch -Np0 -i use-system-mbedtls.patch
patch -Np0 -i mbedtls-3.patch
+ patch -Np0 --binary -i arm64-compile-fix.patch
}
build() {
@@ -42,12 +45,17 @@ build() {
mkdir build
cd build
+ # using clang breaks runtime
+ export CC=gcc
+ export CXX=g++
+
cmake -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-endif-labels -Wno-narrowing" \
-DI_HAVE_READ_THE_README=ON \
-DDO_CHARSET_CONVERSION=ON \
-DFROST_SUPPORT=ON \
-DFCP_SSL_SUPPORT=ON \
-DUSE_BUNDLED_SQLITE=OFF \
+ -DALTERNATE_CAPTCHA=ON \
..
make
}
@@ -65,7 +73,6 @@ package() {
# systemd
install -Dm644 fms.service "$pkgdir"/usr/lib/systemd/system/fms.service
install -Dm644 fms.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/fms.conf
-
echo "u fms - \"Freenet Message System\" /opt/$pkgname /bin/false" |
install -Dm644 /dev/stdin "$pkgdir"/usr/lib/sysusers.d/fms.conf
}
diff --git a/arm64-compile-fix.patch b/arm64-compile-fix.patch
new file mode 100644
index 000000000000..d8e6b5cbd79b
--- /dev/null
+++ b/arm64-compile-fix.patch
@@ -0,0 +1,11 @@
+--- src/nntp/mime/Mime.cpp 2022-06-28 17:07:04.610994313 -0400
++++ src/nntp/mime/Mime.cpp 2022-06-28 17:07:04.610994313 -0400
+@@ -532,7 +532,7 @@
+ #ifdef _WIN32
+ #include <io.h>
+ #else
+- #if !defined(__APPLE__) && !defined(__DARWIN__)
++ #if !defined(__APPLE__) && !defined(__DARWIN__) && !defined(__aarch64__)
+ #if !defined(__FreeBSD__) && !defined(solaris) && !defined(__sun) && !defined(__OpenBSD__)
+ #include <sys/io.h>
+ #else