commit 6ae0f34edc3ba7ab730991a8958d05411944c419 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Fri Sep 1 11:57:19 2023 -0500 Update to 7.5.174. Requires Java 17. Updated SystemD service file. Removed conditionals for arches no longer supported. unifi.service | 9 +++++---- unifi.spec | 33 ++++++++++++++++++++------------- version-scan.sh | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-) --- diff --git a/unifi.service b/unifi.service index ee28f92..30961a7 100644 --- a/unifi.service +++ b/unifi.service @@ -1,5 +1,5 @@ [Unit] -Description=Ubiquiti UniFi server +Description=UniFi Network Application After=local-fs.target remote-fs.target network-online.target Wants=network-online.target @@ -8,9 +8,10 @@ Type=simple User=unifi WorkingDirectory=/usr/share/unifi EnvironmentFile=-/etc/sysconfig/unifi -Environment=JAVA_HOME=/usr/lib/jvm/jre-11 -ExecStart=/usr/lib/jvm/jre-11/bin/java $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar start -ExecStop=/usr/lib/jvm/jre-11/bin/java $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar stop +Environment=JAVA_HOME=/usr/lib/jvm/jre-17 +ExecStart=/usr/lib/jvm/jre-17/bin/java --add-opens=java.base/java.time=ALL-UNNAMED $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar start +ExecStop=/usr/lib/jvm/jre-17/bin/java $JAVA_OPTS -jar /usr/share/unifi/lib/ace.jar stop +SuccessExitStatus=143 Restart=on-success [Install] diff --git a/unifi.spec b/unifi.spec index 274181a..e82eaff 100644 --- a/unifi.spec +++ b/unifi.spec @@ -4,8 +4,8 @@ %global __strip /bin/true Name: unifi -Version: 7.4.162 -Release: 2%{?dist} +Version: 7.5.174 +Release: 1%{?dist} Summary: Ubiquiti UniFi controller License: Proprietary @@ -30,7 +30,7 @@ BuildRequires: %{_bindir}/execstack # https://fedoraproject.org/wiki/Changes/MongoDB_Removal #Requires: /usr/bin/mongod -Requires: java-11-headless +Requires: java-17-headless Requires(post): policycoreutils-python-utils Requires(postun): policycoreutils-python-utils @@ -51,9 +51,9 @@ Provides: bundled(ubnt-fonts) ### BEGIN AUTOMATION ### Provides: bundled(ace) = 9999 Provides: bundled(activation) = 1.1.1 -Provides: bundled(analytics-api) = 1.2.1 -Provides: bundled(analytics-client) = 1.2.1 -Provides: bundled(analytics-privacy) = 1.2.1 +Provides: bundled(analytics-api) = 1.3.0 +Provides: bundled(analytics-client) = 1.3.0 +Provides: bundled(analytics-privacy) = 1.3.0 Provides: bundled(annotations) = 3.0.1 Provides: bundled(api-common) = 1.7.0 Provides: bundled(apigateway-generic-java-sdk) = 1.3 @@ -136,6 +136,7 @@ Provides: bundled(jul-to-slf4j) = 1.7.36 Provides: bundled(lazysodium-java) = 5.1.2 Provides: bundled(log4j-api) = 2.17.2 Provides: bundled(log4j-to-slf4j) = 2.17.2 +Provides: bundled(logback-access) = 1.2.11 Provides: bundled(logback-classic) = 1.2.11 Provides: bundled(logback-core) = 1.2.11 Provides: bundled(minimal-json) = 0.9.5 @@ -256,16 +257,12 @@ install -pm 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/firewalld/services/ # Remove non-native executables rm -rf %{buildroot}%{_datadir}/unifi/lib/native/{Windows,Mac} -# Bundled libs are only supported on x86_64, aarch64 and armv7hf. +# Bundled libs are only supported on x86_64, aarch64. # Move libraries to the correct location and symlink back mv %{buildroot}%{_datadir}/unifi/lib/native/Linux ./ -%ifarch x86_64 armv7hl aarch64 +%ifarch x86_64 aarch64 # Set the correct arch for the webrtc library. -%ifarch armv7hl -%global unifi_arch armv7 -%else %global unifi_arch %{_target_cpu} -%endif mkdir -p %{buildroot}%{_libdir}/unifi \ %{buildroot}%{_datadir}/unifi/lib/native/Linux/%{unifi_arch} install -pm 0755 Linux/%{unifi_arch}/*.so %{buildroot}%{_libdir}/%{name}/ @@ -337,7 +334,7 @@ fi %files %doc readme.txt SETUP %license PERMISSION*.html -%ifarch x86_64 armv7hl aarch64 +%ifarch x86_64 aarch64 %{_libdir}/unifi/ %{_datadir}/unifi/lib/native/ %endif @@ -360,6 +357,16 @@ fi %changelog +* Fri Sep 01 2023 Richard Shaw <hobbes1069(a)gmail.com&gt; +- Update to 7.5.174. +- Requires Java 17. +- Updated SystemD service file. +- Removed conditionals for arches no longer supported. + +* Mon Aug 28 2023 Richard Shaw <hobbes1069(a)gmail.com&gt; - 7.5.172-1 +- Update to 7.5.172. +- Requires Java 17. + * Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 7.4.162-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/version-scan.sh b/version-scan.sh index 3600c8d..afc9be8 100755 --- a/version-scan.sh +++ b/version-scan.sh @@ -3,11 +3,11 @@ SPECFILE=$(pwd)/unifi.spec SOURCES=$( spectool -l -s 0 $SPECFILE ) -DLURL=$( echo $SOURCES | egrep '^Source0:\s+' | sed 's/^Source0://' ) +DLURL=$( echo $SOURCES | grep -E '^Source0:\s+' | sed 's/^Source0://' ) SOURCEFILE=$(pwd)/$( echo $DLURL | sed 's/http.*\///' ) TEMPDIR=$( mktemp -d -t unifi_XXXXXXXXXX ) TEMPLIBDIR=$TEMPDIR/UniFi/lib -VERSION=$( egrep '^Version:\s+' $SPECFILE | sed 's/^Version://' ) +VERSION=$( grep -E '^Version:\s+' $SPECFILE | sed 's/^Version://' ) VERSIONFILE=$TEMPDIR/provides.list if [ x"$VERSION" = x ]; then echo "Unable to determine the version to scan from $SPECFILE. Exiting!"