0.3.81

7 files changed, 109 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70be698ecaec..af767351f8a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,26 @@
 pkgbase = freenet-fms
 	pkgdesc = Freenet Messaging System
-	pkgver = 0.3.79
+	pkgver = 0.3.81
 	pkgrel = 1
-	url = http://127.0.0.1:8888/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/140/
+	url = http://127.0.0.1:8888/freenet:USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/149/
 	install = fms.install
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	makedepends = cmake
-	depends = poco>=1.7.6
-	depends = sqlite3>3.6.14
-	depends = freenet
-	source = http://127.0.0.1:8888/?forcedownload&max-size=99999999&key=CHK@5K1KMp7PRVL4ViePzUeidqWd1L5AS2EM3VM8p~AlaZo,4xnRHnAJxNrXCgnnVurrSWEL4L-qPafthoE8AZS0EKk,AAMC--8/fms-src-0.3.79.zip
+	depends = poco
+	depends = sqlite3
+	depends = mbedtls
+	source = http://127.0.0.1:8888/?forcedownload&max-size=99999999&key=CHK@Mz90LzeG9CJPQKkN3kKeYreTBedPEu-ND-QFMCDIsM8,HOOYUT8KqNK5QLkLFIRxi5AwBJiduTTxdBzNbEcRB4I,AAMC--8/fms-src-0.3.81.zip
 	source = fms.install
+	source = fms.tmpfiles
 	source = fms.service
-	sha256sums = b5dbb1e1d075e2134c692038ea95805a528807b0d777e2752f806f6935508f30
-	sha256sums = 5c7db16d80a0af8e80447c8753cc1be66a834634798ea4ff913c6586d40a8da4
-	sha256sums = 0d276666a39efe3ba139259ec567f04b6767f26a13f2d2bf455a2005cf61791a
+	source = use-system-mbedtls.patch
+	b2sums = a873fe4458a4abf4d19c7849d2045e49f556e001315d9112f50fd5c544481c64e00d0db5672ca20f1974e8d8b46e88b98e6a339536659a8a4c06b1a3c4439d21
+	b2sums = 496875c2960675684e7ac3b055e033f50828cff30a71ff6d04b1ff23e45681b42cc6a30c04ac1e277704f00ebc716c66944da153f6e34bc9b624afd33561ab9d
+	b2sums = 8e1618c6d01a3e62bf56d2db87612ec68d1cc825e5eb85e829afc95215bca17bbf1dee79945d1170ccdd9f992525c6a1f396710ecfe50669062910ce01c60bad
+	b2sums = 2fa023fd0c5c0dbb99e1fe6aba0d66fbc0d939592b4ab6fb9ec862d65d3961b333cebb7ed95897a5bf9d2402ab5771818024255e4eba4be4407311b61f4320a8
+	b2sums = 841e9bcbf2bb0a620e27fa02ff3ae70c4b100b50d64c43558168a6c4aea58d331aff37982480317f599a8ff60fe4c158531738ba79808af8f1058a9afe8420cf
 
 pkgname = freenet-fms
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7df78ac524ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+src/
+pkg/
+
+*.jar
+*.zip
+*.pkg.tar
diff --git a/PKGBUILD b/PKGBUILD
index 97a9bc55c0bb..2fae0c368548 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,67 @@
-# Maintainer: Andrew <darkseed2007@yandex.ru>
+# Maintainer: skydrome <skydrome at@at proton mail dot com>
+# Contributor: Andrew <darkseed2007@yandex.ru>
 # Contributor: Robert Štětka <robert dot stetka at gmail dot com>
+
 pkgname=freenet-fms
-_realname=fms
-pkgver=0.3.79
+pkgver=0.3.81
 pkgrel=1
-url="http://127.0.0.1:8888/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/140/"
 pkgdesc="Freenet Messaging System"
+url="http://127.0.0.1:8888/freenet:USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/149/"
+license=('GPL2')
 arch=('i686' 'x86_64')
-license=('GPL')
-depends=('poco>=1.7.6' 'sqlite3>3.6.14' 'freenet' )
-makedepends=('cmake')
 install=fms.install
-# You have to start freenet before down installation
-# or download the package manually and place it to the
-# build directory
-source=("http://127.0.0.1:8888/?forcedownload&max-size=99999999&key=CHK@5K1KMp7PRVL4ViePzUeidqWd1L5AS2EM3VM8p~AlaZo,4xnRHnAJxNrXCgnnVurrSWEL4L-qPafthoE8AZS0EKk,AAMC--8/${_realname}-src-${pkgver}.zip"
-        'fms.install'
-        'fms.service')
-sha256sums=('b5dbb1e1d075e2134c692038ea95805a528807b0d777e2752f806f6935508f30'
-            '5c7db16d80a0af8e80447c8753cc1be66a834634798ea4ff913c6586d40a8da4'
-            '0d276666a39efe3ba139259ec567f04b6767f26a13f2d2bf455a2005cf61791a')
+depends=('poco' 'sqlite3' 'mbedtls')
+makedepends=('cmake')
+
+_FREENET=${FREENET_PROXY:-http://127.0.0.1:8888}
+_URI='CHK@Mz90LzeG9CJPQKkN3kKeYreTBedPEu-ND-QFMCDIsM8,HOOYUT8KqNK5QLkLFIRxi5AwBJiduTTxdBzNbEcRB4I,AAMC--8'
+
+source=("$_FREENET/?forcedownload&max-size=99999999&key=$_URI/fms-src-${pkgver}.zip"
+        #"https://dev.gentoo.org/~tommy/distfiles/fms-src-${pkgver}.zip"
+        fms.{install,tmpfiles,service}
+        'use-system-mbedtls.patch')
+
+b2sums=('a873fe4458a4abf4d19c7849d2045e49f556e001315d9112f50fd5c544481c64e00d0db5672ca20f1974e8d8b46e88b98e6a339536659a8a4c06b1a3c4439d21'
+        '496875c2960675684e7ac3b055e033f50828cff30a71ff6d04b1ff23e45681b42cc6a30c04ac1e277704f00ebc716c66944da153f6e34bc9b624afd33561ab9d'
+        '8e1618c6d01a3e62bf56d2db87612ec68d1cc825e5eb85e829afc95215bca17bbf1dee79945d1170ccdd9f992525c6a1f396710ecfe50669062910ce01c60bad'
+        '2fa023fd0c5c0dbb99e1fe6aba0d66fbc0d939592b4ab6fb9ec862d65d3961b333cebb7ed95897a5bf9d2402ab5771818024255e4eba4be4407311b61f4320a8'
+        '841e9bcbf2bb0a620e27fa02ff3ae70c4b100b50d64c43558168a6c4aea58d331aff37982480317f599a8ff60fe4c158531738ba79808af8f1058a9afe8420cf')
+
+prepare() {
+    rm -rf libs
+    perl -pi -e 's/\r\n/\n/' CMakeLists.txt
+    patch -Np0 -i use-system-mbedtls.patch
+}
+
 build() {
-  cd "${srcdir}/"
+    rm -rf build
+    mkdir build
+    cd build
 
-  cmake -D I_HAVE_READ_THE_README=ON -D USE_BUNDLED_SQLITE=OFF . || return 1
-  make || return 1
+    cmake -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-endif-labels" \
+          -DI_HAVE_READ_THE_README=ON \
+          -DDO_CHARSET_CONVERSION=ON \
+          -DFROST_SUPPORT=ON \
+          -DFCP_SSL_SUPPORT=ON \
+          -DUSE_BUNDLED_SQLITE=OFF \
+          ..
+    make
 }
 
 package() {
-  mkdir -p ${pkgdir}/opt/${_realname}/ || return 1
-  cp fms ${pkgdir}/opt/${_realname}/ || return 1
-  cp *.htm ${pkgdir}/opt/${_realname}/ || return 1
-  cp readme.txt ${pkgdir}/opt/${_realname}/ || return 1
-  cp -a fonts/ ${pkgdir}/opt/${_realname}/|| return 1
-  cp -R images/ ${pkgdir}/opt/${_realname}/ || return 1
-  cp -a styles/ ${pkgdir}/opt/${_realname}/ || return 1
-  cp -a translations/ ${pkgdir}/opt/${_realname}/ || return 1
-
-  chown -R 114:114 ${pkgdir}/opt/${_realname} || return 1
-  chmod -R ug=rwX,o=rX ${pkgdir}/opt/${_realname}|| return 1
-
-  # systemd service
-  install -Dm644 ${_realname}.service ${pkgdir}/usr/lib/systemd/system/${_realname}.service
-}
+    install -dm770 "$pkgdir/opt/$pkgname"
+    install -dm750 "$pkgdir/usr/share/doc/$pkgname"
 
+    install -m755 build/fms  "$pkgdir/opt/$pkgname"
+    install -m644 *.htm      "$pkgdir/opt/$pkgname"
+    install -m644 readme.txt "$pkgdir/usr/share/doc/$pkgname"
 
-# vim:set ts=2 sw=2 et:
+    cp -r fonts images styles translations "$pkgdir/opt/$pkgname"
+
+    # 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/fms.install b/fms.install
index 69daf5a40abb..9050f2edf52a 100644
--- a/fms.install
+++ b/fms.install
@@ -1,18 +1,7 @@
-## arg 1:  the new package version
 post_install() {
-  echo "==> An user "fms" is created which own the /opt/fms directory"
-  groupadd -g 114 fms
-  useradd -u 114 -g fms -d /opt/fms/ -s /bin/false fms &>/dev/null
-  echo "==> To start your node:"
-  echo "==>   systemctl start fms.service"
-  echo "==> Go to http://127.0.0.1:8080/ to configure your node" 
-  echo "==> Read /opt/fms/readme.txt for further info"
+    echo "==> To start your node: systemctl start fms"
+    echo "==> By default, the FMS NNTP server will listen on port 1119," 
+    echo "==> and the web configuration interface will be running at"
+    echo "==> http://localhost:8080. For more information, read"
+    echo "==> /usr/share/doc/freenet-fms/readme.txt"
 }
-
-## arg 1:  the old package version
-pre_remove() {
-  userdel fms &>/dev/null
-  groupdel fms &>/dev/null 
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/fms.service b/fms.service
index a20531a1858a..907549d8a872 100644
--- a/fms.service
+++ b/fms.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 User=fms
-ExecStart=/opt/fms/fms --daemon
-WorkingDirectory=/opt/fms
+ExecStart=/opt/freenet-fms/fms --daemon
+WorkingDirectory=/opt/freenet-fms
 
 [Install]
 WantedBy=multi-user.target
diff --git a/fms.tmpfiles b/fms.tmpfiles
new file mode 100644
index 000000000000..cdeb5a8ba94f
--- /dev/null
+++ b/fms.tmpfiles
@@ -0,0 +1,2 @@
+d /opt/freenet-fms 0770 fms fms
+d /opt/freenet-fms/translations 0770 fms fms
diff --git a/use-system-mbedtls.patch b/use-system-mbedtls.patch
new file mode 100644
index 000000000000..64a8b5278d4e
--- /dev/null
+++ b/use-system-mbedtls.patch
@@ -0,0 +1,26 @@
+--- CMakeLists.txt	2016-06-04 22:18:20.000000000 -0400
++++ CMakeLists1.txt	2020-02-02 13:58:37.898519666 -0500
+@@ -373,11 +373,18 @@
+ ENDIF(AUDIO_CAPTCHA)
+ 
+ IF(FROST_SUPPORT OR FCP_SSL_SUPPORT)
+-	ADD_SUBDIRECTORY(libs/mbedtls)
+-	TARGET_LINK_LIBRARIES(fms mbedtls)
+-	TARGET_LINK_LIBRARIES(fms mbedcrypto)
+-	TARGET_LINK_LIBRARIES(fms mbedx509)
+-	INCLUDE_DIRECTORIES(libs/mbedtls/include)
++	MESSAGE(STATUS "Linking against system MbedTLS library.")
++	FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls )
++	FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto mbedx509)
++	FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509)
++
++	IF(MBEDTLS_LIBRARY)
++		TARGET_LINK_LIBRARIES(fms ${MBEDTLS_LIBRARY})
++		TARGET_LINK_LIBRARIES(fms ${MBEDCRYPTO_LIBRARY})
++		TARGET_LINK_LIBRARIES(fms ${MBEDX509_LIBRARY})
++	ELSE(MBEDTLS_LIBRARY)
++		MESSAGE(FATAL ERROR: "Could not find mbedtls library.")
++	ENDIF(MBEDTLS_LIBRARY)
+ 
+ 	IF(FROST_SUPPORT)
+ 		ADD_DEFINITIONS(-DFROST_SUPPORT)