summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD35
-rw-r--r--fr24feed.service3
-rw-r--r--fr24uat-feed.service19
4 files changed, 59 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66e392a8fad5..b8a3c57f986a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,38 @@
pkgbase = flightradar24
pkgdesc = Feeder software for Flightradar24.com (fr24feed)
- pkgver = 1.0.26
- pkgrel = 2
+ pkgver = 1.0.46
+ pkgrel = 4
url = https://www.flightradar24.com/share-your-data
install = flightradar24.install
arch = x86_64
arch = i686
arch = armv6h
arch = armv7h
+ arch = aarch64
license = custom
depends = bash
depends = dump1090
+ optdepends = dump978: for 978MHz UAT support
backup = etc/fr24feed.ini
source = fr24feed.service
+ source = fr24uat-feed.service
source = flightradar24.sysusers
source = fr24feed-status.patch
source = hostname
- sha256sums = 857383cd88daac429f25579d40cc5c4f3c4468f2af406cba70d3d7e9fe825cd3
+ sha256sums = 247c8d1a3c4e7724c2c1e4caae4e019a448700fadd195ba29b562233d9352e29
+ sha256sums = 2c53251b0c6051c7c6e30ddfa2fd3f5ee65dcf1465cb3d164a7f31cd9e8d9d9f
sha256sums = a018c751e431fcde72e709917fdfe663a5c74040af80b56d1a4658ba962c95e5
sha256sums = ebcf31ecb62aef650b0984f978318f7e716078f520efb165306dca592c0821bb
sha256sums = 32ae61984ae0123690fea0bf67f2b5f1ee1155f6a2b3a9d0ff7c5431d902ddee
- source_x86_64 = https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.25-3_amd64.deb
- sha256sums_x86_64 = cf9ffe50754b1de482d7d9154b5b9d1c251ef2c15564427d176428b4afaef399
- source_i686 = https://repo-feed.flightradar24.com/linux_x86_binaries/fr24feed_1.0.25-3_i386.deb
- sha256sums_i686 = a74f109ca8d8c9180b07830a366dba909335d5fa4db1c3bb6c8d259cd6e56d2f
- source_armv6h = https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.26-9_armhf.deb
- sha256sums_armv6h = 9362c51c64f9add9f39117a4eb41cd61b94249f788af238bfbf308d5bae8d5e8
- source_armv7h = https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.26-9_armhf.deb
- sha256sums_armv7h = 9362c51c64f9add9f39117a4eb41cd61b94249f788af238bfbf308d5bae8d5e8
+ source_x86_64 = https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.46-2_amd64.deb
+ sha256sums_x86_64 = c5e7ba85ee638d1d94394fdcce1a7c3b246d963b0aef28441606130d82d389f1
+ source_i686 = https://repo-feed.flightradar24.com/linux_binaries/fr24feed_1.0.46-2_i386.deb
+ sha256sums_i686 = d6b8ea6f44ce87674acc1068f4c1446c6046c22397539a618622e95b2925f671
+ source_armv6h = https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.46-2_armhf.deb
+ sha256sums_armv6h = 32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768
+ source_armv7h = https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.46-2_armhf.deb
+ sha256sums_armv7h = 32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768
+ source_aarch64 = https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_1.0.46-2_armhf.deb
+ sha256sums_aarch64 = 32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768
pkgname = flightradar24
-
diff --git a/PKGBUILD b/PKGBUILD
index 3a31d07bc4ab..61c2917de252 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,39 @@
pkgname=flightradar24
_pkgname=fr24feed
-pkgver=1.0.26
-pkgrel=2
-_pkgver=1.0.25-3
-_pkgverarm=1.0.26-9
+pkgver=1.0.46
+pkgrel=4
+_pkgver=1.0.46-2
+_pkgverarm=1.0.46-2
pkgdesc='Feeder software for Flightradar24.com (fr24feed)'
-arch=('x86_64' 'i686' 'armv6h' 'armv7h')
+arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
url='https://www.flightradar24.com/share-your-data'
license=('custom')
depends=('bash' 'dump1090')
+optdepends=('dump978: for 978MHz UAT support')
backup=(etc/fr24feed.ini)
install=flightradar24.install
source=('fr24feed.service'
+ 'fr24uat-feed.service'
'flightradar24.sysusers'
'fr24feed-status.patch'
'hostname')
-source_x86_64=("https://repo-feed.flightradar24.com/linux_x86_64_binaries/${_pkgname}_${_pkgver}_amd64.deb")
-source_i686=("https://repo-feed.flightradar24.com/linux_x86_binaries/${_pkgname}_${_pkgver}_i386.deb")
+source_x86_64=("https://repo-feed.flightradar24.com/linux_binaries/${_pkgname}_${_pkgver}_amd64.deb")
+source_i686=("https://repo-feed.flightradar24.com/linux_binaries/${_pkgname}_${_pkgver}_i386.deb")
source_armv6h=("https://repo-feed.flightradar24.com/rpi_binaries/${_pkgname}_${_pkgverarm}_armhf.deb")
source_armv7h=("https://repo-feed.flightradar24.com/rpi_binaries/${_pkgname}_${_pkgverarm}_armhf.deb")
+source_aarch64=("https://repo-feed.flightradar24.com/rpi_binaries/${_pkgname}_${_pkgverarm}_armhf.deb")
-sha256sums=('857383cd88daac429f25579d40cc5c4f3c4468f2af406cba70d3d7e9fe825cd3'
+sha256sums=('247c8d1a3c4e7724c2c1e4caae4e019a448700fadd195ba29b562233d9352e29'
+ '2c53251b0c6051c7c6e30ddfa2fd3f5ee65dcf1465cb3d164a7f31cd9e8d9d9f'
'a018c751e431fcde72e709917fdfe663a5c74040af80b56d1a4658ba962c95e5'
'ebcf31ecb62aef650b0984f978318f7e716078f520efb165306dca592c0821bb'
'32ae61984ae0123690fea0bf67f2b5f1ee1155f6a2b3a9d0ff7c5431d902ddee')
-sha256sums_x86_64=('cf9ffe50754b1de482d7d9154b5b9d1c251ef2c15564427d176428b4afaef399')
-sha256sums_i686=('a74f109ca8d8c9180b07830a366dba909335d5fa4db1c3bb6c8d259cd6e56d2f')
-sha256sums_armv6h=('9362c51c64f9add9f39117a4eb41cd61b94249f788af238bfbf308d5bae8d5e8')
-sha256sums_armv7h=('9362c51c64f9add9f39117a4eb41cd61b94249f788af238bfbf308d5bae8d5e8')
+sha256sums_x86_64=('c5e7ba85ee638d1d94394fdcce1a7c3b246d963b0aef28441606130d82d389f1')
+sha256sums_i686=('d6b8ea6f44ce87674acc1068f4c1446c6046c22397539a618622e95b2925f671')
+sha256sums_armv6h=('32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768')
+sha256sums_armv7h=('32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768')
+sha256sums_aarch64=('32e06ea0d87c686049ed47ac63c05b6d91ca85b4e5a3dc4ab6e53664b66d4768')
prepare() {
tar -xf data.tar.gz
@@ -39,11 +44,13 @@ prepare() {
}
package() {
- install -Dm755 -t "$pkgdir/usr/bin" usr/bin/fr24feed usr/bin/fr24feed-status
+ install -Dm755 -t "$pkgdir/usr/bin" usr/bin/fr24feed
+ install -Dm755 -t "$pkgdir/usr/bin" usr/bin/fr24feed-status usr/bin/fr24uat-feed-status
+ install -Dm755 -t "$pkgdir/usr/bin" usr/bin/fr24feed-signup-adsb usr/bin/fr24feed-signup-uat
install -Dm644 usr/share/fr24/licences/LICENSE.fr24feed.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -Dm644 -t "$pkgdir/etc" etc/fr24feed.ini
- install -Dm644 -t "$pkgdir/usr/lib/systemd/system" fr24feed.service
+ install -Dm644 -t "$pkgdir/usr/lib/systemd/system" fr24feed.service fr24uat-feed.service
install -Dm644 flightradar24.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
# hostname: invalid option -- 'I'
diff --git a/fr24feed.service b/fr24feed.service
index de155e27b0a0..c2198d0ae6a0 100644
--- a/fr24feed.service
+++ b/fr24feed.service
@@ -5,13 +5,14 @@ After=network-online.target
[Service]
Type=simple
Restart=on-failure
+ExecStartPre=/usr/bin/fr24feed --validate-config --config-file=/etc/fr24feed.ini
+ExecStart=/usr/bin/fr24feed --config-file=/etc/fr24feed.ini --logfile=/var/log/fr24feed/fr24feed.log
User=fr24
Group=fr24
ProtectSystem=full
ProtectHome=yes
RuntimeDirectory=fr24feed
LogsDirectory=fr24feed
-ExecStart=/usr/bin/fr24feed --config-file=/etc/fr24feed.ini --logfile=/var/log/fr24feed/fr24feed.log
Environment=PATH=/usr/lib/flightradar24:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
[Install]
diff --git a/fr24uat-feed.service b/fr24uat-feed.service
new file mode 100644
index 000000000000..685f217df985
--- /dev/null
+++ b/fr24uat-feed.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Flightradar24 UAT Decoder & Feeder
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=on-failure
+ExecStartPre=/usr/bin/fr24feed --validate-config --config-file=/etc/fr24uat-feed.ini
+ExecStart=/usr/bin/fr24feed --monitor-file=/dev/shm/uat-decoder.txt --http-listen-port=8755 --config-file=/etc/fr24uat-feed.ini --logfile=/var/log/fr24feed/fr24uat-feed.log --unit=fr24uat-feed
+User=fr24
+Group=fr24
+ProtectSystem=full
+ProtectHome=yes
+RuntimeDirectory=fr24feed
+LogsDirectory=fr24feed
+Environment=PATH=/usr/lib/flightradar24:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
+
+[Install]
+WantedBy=multi-user.target