1495

5 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29d91f530a41..53bd21d78ed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freenet
 	pkgdesc = A peer-to-peer platform for censorship-resistant communication and publishing
-	pkgver = 0.7.5.1494
+	pkgver = 0.7.5.1495
 	pkgrel = 1
 	url = https://freenetproject.org
 	install = freenet.install
@@ -14,7 +14,7 @@ pkgbase = freenet
 	depends = nss
 	depends = java-service-wrapper
 	backup = opt/freenet/wrapper.config
-	source = git+https://github.com/freenet/fred.git?signed#tag=build01494
+	source = git+https://github.com/freenet/fred.git?signed#tag=build01495
 	source = git+https://github.com/freenet/plugin-WebOfTrust.git#branch=next
 	source = git+https://github.com/freenet/seedrefs.git
 	source = run.sh
@@ -27,9 +27,9 @@ pkgbase = freenet
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = 043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a
-	b2sums = d8c628a79c912855a34b30cd3f1dfee40a6a629591c2a7e08221850bfd314f34fe60c9dadf23ff486949e587a7396bf1cc728b32a89571ce5825f86d782c884e
-	b2sums = 83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04
-	b2sums = 540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b
+	b2sums = ca5e878db039bb683395f3a5587c6c352db57fc4cbdf703ec8deacb9829fe882d8bba9efb008d9f6ea4bd636a3b4dced711d4e1df008d4a94bbf20057c1fc516
+	b2sums = dc0c468eb6a691868f17c1dc85e161cec30e318638f8aea14f46e7480943ee146058a546ee578d5d37e9ad74b9394a6ddbbaa5ac00c02553cdd8f790a2b5e2e0
+	b2sums = 63bf5cd76cea610b362144c207121f9de54febcccf8347c21aecc25382f564292493a8a3b4fd2c7af18ca6feb041978164241d81d77dd1542619482cd7cbadbb
 	b2sums = 54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d
 
 pkgname = freenet
diff --git a/PKGBUILD b/PKGBUILD
index ee6723d1e54e..657a275a653d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,15 @@
 # detect java version
 # javac -version 2>&1 |awk '{split($2,v,"."); print v[1]}'
 
-_fred=build01494
+# TODO: https://github.com/freenet/fred/pull/807
+
+_fred=build01495
 _wot=next
 
 _plugins=('WebOfTrust')
 
 pkgname=freenet
-pkgver=0.7.5.1494
+pkgver=0.7.5.1495
 pkgrel=1
 pkgdesc="A peer-to-peer platform for censorship-resistant communication and publishing"
 url="https://freenetproject.org"
@@ -33,9 +35,9 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         '043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a'
-        'd8c628a79c912855a34b30cd3f1dfee40a6a629591c2a7e08221850bfd314f34fe60c9dadf23ff486949e587a7396bf1cc728b32a89571ce5825f86d782c884e'
-        '83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04'
-        '540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b'
+        'ca5e878db039bb683395f3a5587c6c352db57fc4cbdf703ec8deacb9829fe882d8bba9efb008d9f6ea4bd636a3b4dced711d4e1df008d4a94bbf20057c1fc516'
+        'dc0c468eb6a691868f17c1dc85e161cec30e318638f8aea14f46e7480943ee146058a546ee578d5d37e9ad74b9394a6ddbbaa5ac00c02553cdd8f790a2b5e2e0'
+        '63bf5cd76cea610b362144c207121f9de54febcccf8347c21aecc25382f564292493a8a3b4fd2c7af18ca6feb041978164241d81d77dd1542619482cd7cbadbb'
         '54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d')
 
 pkgver() {
@@ -47,8 +49,8 @@ pkgver() {
 prepare() {
     cd fred
 
-    # java 17 support
-    git pull -r -v https://github.com/skydrome/fred.git gradle-7.6-aur -q
+    # java 19 support
+    git pull -r -v https://github.com/skydrome/fred.git gradle-7.6-aur-1 -q
 
     # create seednodes file for bootstrapping
     rm -f seednodes.fref
@@ -65,6 +67,7 @@ build() {
     export GRADLE_OPTS="-Dorg.gradle.internal.launcher.welcomeMessageEnabled=false"
 
     msg "Building Freenet..."
+    rm -rf build
     ./gradlew --no-build-cache --no-daemon copyRuntimeLibs
 
     for plugin in "${_plugins[@]}"; do
@@ -86,7 +89,7 @@ package() {
     install -dm755 "$pkgdir"/usr/bin
     install -dm750 "$pkgdir"/opt/freenet
     install -dm700 "$pkgdir"/opt/freenet/tmp
-    install -dm750 "$pkgdir"/opt/freenet/{downloads,lib,conf,noderef,persistent-temp,plugins,user}
+    install -dm750 "$pkgdir"/opt/freenet/{downloads,lib,conf,noderef,plugins,user}
     install -dm750 "$pkgdir"/opt/freenet/{plugins/data,user/{data,certs}}
 
     # install freenet
diff --git a/freenet.ini.dist b/freenet.ini.dist
index 362bae4566bb..e5a57d47a151 100644
--- a/freenet.ini.dist
+++ b/freenet.ini.dist
@@ -1,7 +1,7 @@
 fcp.enabled=true
 fcp.port=9481
 fproxy.advancedModeEnabled=true
-fproxy.css=clean
+fproxy.css=sky-dark-static
 fproxy.enabled=true
 fproxy.port=8888
 logger.dirname=/opt/freenet/logs
diff --git a/freenet.service b/freenet.service
index 3831989ced2d..4ab63a37e1d0 100644
--- a/freenet.service
+++ b/freenet.service
@@ -6,6 +6,7 @@ After=network.target time-sync.target
 Type=forking
 User=freenet
 PIDFile=/run/freenet/freenet.pid
+UMask=0027
 LimitNOFILE=4096
 
 NoNewPrivileges=yes
diff --git a/wrapper.config b/wrapper.config
index d9cbe0b8c4d7..58d71a017da9 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -136,8 +136,8 @@ wrapper.console.title=Freenet Router Service
 # Set permissions used when creating files
 # See http://wrapper.tanukisoftware.com/doc/english/prop-umask.html
 # for a detailed explanation of these settings.
-wrapper.umask=0022
-wrapper.java.umask=0022
+wrapper.umask=0027
+wrapper.java.umask=0027
 wrapper.logfile.umask=077
 wrapper.max_failed_invocations=1