diff options
53 files changed, 331 insertions, 610 deletions
diff --git a/linhes/calamares-git/.SRCINFO b/linhes/calamares-git/.SRCINFO new file mode 100644 index 0000000..9648782 --- /dev/null +++ b/linhes/calamares-git/.SRCINFO @@ -0,0 +1,30 @@ +pkgbase = calamares-git + pkgdesc = Distribution-independent installer framework (git version with Python support) + pkgver = 3.4.2.r4.g841b47857 + pkgrel = 1 + url = https://codeberg.org/Calamares/calamares + arch = x86_64 + license = GPL-3.0-or-later + makedepends = git + makedepends = cmake + makedepends = extra-cmake-modules + makedepends = ninja + makedepends = qt6-tools + makedepends = qt6-translations + makedepends = libglvnd + makedepends = pybind11 + depends = kcoreaddons + depends = kpmcore + depends = libpwquality + depends = qt6-declarative + depends = qt6-svg + depends = yaml-cpp + depends = python + depends = python-yaml + depends = python-jsonschema + provides = calamares + conflicts = calamares + source = git+https://codeberg.org/Calamares/calamares.git + sha256sums = SKIP + +pkgname = calamares-git diff --git a/linhes/calamares-git/.gitignore b/linhes/calamares-git/.gitignore new file mode 100644 index 0000000..018a3de --- /dev/null +++ b/linhes/calamares-git/.gitignore @@ -0,0 +1,4 @@ +* +!PKGBUILD +!.SRCINFO +!.gitignore diff --git a/linhes/calamares-git/PKGBUILD b/linhes/calamares-git/PKGBUILD new file mode 100644 index 0000000..1703be8 --- /dev/null +++ b/linhes/calamares-git/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Rustmilian Rustmilian@proton.me + +pkgname=calamares-git +_pkgname=calamares + +pkgver=3.4.2.r4.g841b47857 +pkgrel=1 +pkgdesc="Distribution-independent installer framework (git version with Python support)" +url="https://codeberg.org/Calamares/calamares" +license=("GPL-3.0-or-later") +arch=('x86_64') + +provides=("calamares") +conflicts=("calamares") + +depends=( + kcoreaddons + kpmcore + libpwquality + qt6-declarative + qt6-svg + yaml-cpp + python + python-yaml + python-jsonschema +) + +makedepends=( + git + cmake + extra-cmake-modules + ninja + qt6-tools + qt6-translations + libglvnd + pybind11 +) + +source=("git+${url}.git") +sha256sums=('SKIP') + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --long --tags --always | sed 's/^v//;s/-/.r/;s/-/./g' +} + +build() { + cmake -S "$srcdir/$_pkgname" -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QT6=ON \ + -DWITH_PYTHONQT=ON \ + -DBUILD_TESTING=OFF \ + -Wno-dev + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} diff --git a/linhes/calamares/PKGBUILD b/linhes/calamares/PKGBUILD deleted file mode 100644 index 4acad0c..0000000 --- a/linhes/calamares/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Ezarcher Calamares Installer pkgbuild - -pkgname=calamares -pkgver=3.3.12 -_pkgver=3.3.12 -pkgrel=2 -pkgdesc='Distribution-independent installer framework' -arch=('x86_64') -license=(GPL) -url="https://github.com/calamares/calamares" -license=('LGPL') -depends=('cryptsetup' 'dmidecode' 'doxygen' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n' 'kparts' - 'kpmcore' 'kservice' 'kwidgetsaddons' 'libatasmart' 'libplasma' 'libpwquality' 'polkit-qt6' - 'pybind11' 'python' 'qt6-declarative' 'qt6-svg' 'qt6-tools' 'qt6-virtualkeyboard' 'qt6-webengine' - 'rsync' 'solid' 'squashfs-tools' 'udisks2' 'upower' 'yaml-cpp') -makedepends=('cmake' 'extra-cmake-modules' 'gawk' 'git' 'kpmcore' 'python-jsonschema' 'python-pyaml' - 'python-unidecode') - -source=("$pkgname-$pkgver.tar.gz::https://github.com/calamares/calamares/releases/download/v$pkgver/calamares-$pkgver.tar.gz") -sha256sums=('f44110a91a4394f34728042136af4b906541babc37e72b3b33664888b3220f2d') - -build() { - cd ${srcdir}/calamares-${pkgver} - - mkdir -p build - cd build - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DINSTALL_CONFIG=OFF \ - -DWITH_QT6=ON \ - -DWITH_PYBIND11=ON \ - -DSKIP_MODULES="tracking webview interactiveterminal initramfs netinstall \ - initramfscfg dracut dracutlukscfg finishedq summaryq \ - dummyprocess dummypython dummycpp usersq oemid packagechooser \ - dummypythonqt services-openrc keyboardq zfs zfshostid \ - localeq plasmalnf welcomeq notesqml packagechooserq" - make -} - -package() { - cd ${srcdir}/calamares-${pkgver}/build - make DESTDIR="$pkgdir" install - install -Dm644 "../calamares.desktop" "$pkgdir/usr/share/applications/calamares.desktop" -} diff --git a/linhes/certbot-dns-duckdns/PKGBUILD b/linhes/certbot-dns-duckdns/PKGBUILD index 9ca877f..e04e65c 100644 --- a/linhes/certbot-dns-duckdns/PKGBUILD +++ b/linhes/certbot-dns-duckdns/PKGBUILD @@ -4,9 +4,9 @@ # Maintainer: eomanis at web dot de pkgname='certbot-dns-duckdns' -_pkgverUpstream="1.7.1" +_pkgverUpstream="1.8.0" pkgver="$_pkgverUpstream" -pkgrel=3 +pkgrel=1 pkgdesc="Plugin for certbot for a DNS-01 challenge with a DuckDNS domain" arch=('any') url='https://github.com/infinityofspace/certbot_dns_duckdns' @@ -14,7 +14,7 @@ license=('MIT') depends=('certbot' 'python-dnspython' 'python-requests') makedepends=( 'python-build' 'python-installer' 'python-setuptools' ) source=("https://github.com/infinityofspace/certbot_dns_duckdns/archive/refs/tags/v${_pkgverUpstream}.tar.gz") -sha384sums=('781523b5c7fcc217dc750ffb71bad19ee50458a168dfb02e1cc28bda493853f7b37581bfc619a47bea6831e7db844354') +sha384sums=('6b979300c12140862d086fa59075f50e65cb05e106fd3e22e5db852ee620c3f36dd99ff6ed84f80b66f3470fa5d05310') build() { local srcRootDir="${srcdir}/certbot_dns_duckdns-${_pkgverUpstream}" diff --git a/linhes/ckbcomp/.SRCINFO b/linhes/ckbcomp/.SRCINFO index d41c3d6..72e6600 100755 --- a/linhes/ckbcomp/.SRCINFO +++ b/linhes/ckbcomp/.SRCINFO @@ -1,13 +1,13 @@ pkgbase = ckbcomp pkgdesc = Compile a XKB keyboard description to a keymap suitable for loadkeys or kbdcontrol - pkgver = 1.244 + pkgver = 1.247 pkgrel = 1 url = https://salsa.debian.org/installer-team/console-setup arch = any license = GPL-2.0-or-later makedepends = git - source = console-setup-1.244.tar.gz::https://salsa.debian.org/installer-team/console-setup/-/archive/1.244/console-setup-1.244.tar.gz - sha256sums = f20bde550c8080140a062538d4157011152e57dcca3b9945fcdc6f1a8e5db383 + source = console-setup-1.247.tar.gz::https://salsa.debian.org/installer-team/console-setup/-/archive/1.247/console-setup-1.247.tar.gz + sha256sums = b9b8a4df52d8062ce6b311262212da2faf959295a93b75df3d961a69608291e7 pkgname = ckbcomp depends = perl diff --git a/linhes/ckbcomp/PKGBUILD b/linhes/ckbcomp/PKGBUILD index bcd46ce..f4ed577 100644 --- a/linhes/ckbcomp/PKGBUILD +++ b/linhes/ckbcomp/PKGBUILD @@ -4,7 +4,7 @@ _pkgname="ckbcomp" pkgname="$_pkgname" -pkgver=1.244 +pkgver=1.247 pkgrel=1 pkgdesc="Compile a XKB keyboard description to a keymap suitable for loadkeys or kbdcontrol" url="https://salsa.debian.org/installer-team/console-setup" @@ -16,7 +16,7 @@ makedepends=('git') _pkgsrc="console-setup-$pkgver" _pkgext="tar.gz" source=("$_pkgsrc.$_pkgext"::"$url/-/archive/$pkgver/$_pkgsrc.$_pkgext") -sha256sums=('f20bde550c8080140a062538d4157011152e57dcca3b9945fcdc6f1a8e5db383') +sha256sums=('b9b8a4df52d8062ce6b311262212da2faf959295a93b75df3d961a69608291e7') package() { depends+=('perl') diff --git a/linhes/clean-chroot-manager/PKGBUILD b/linhes/clean-chroot-manager/PKGBUILD index 56dccdb..2ab2cb9 100644 --- a/linhes/clean-chroot-manager/PKGBUILD +++ b/linhes/clean-chroot-manager/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: graysky <therealgraysky AT protonmail DOT com> pkgname=clean-chroot-manager -pkgver=2.240 +pkgver=3.04 pkgrel=1 pkgdesc='Wrapper for managing clean chroot builds with local repo therein.' arch=(any) url='https://github.com/graysky2/clean-chroot-manager' license=(MIT) -depends=('devtools>=1:1.0.0-1' rsync 'libarchive>=3.3.3' 'pacman>=7.0.0-1' bc) +depends=(devtools rsync libarchive pacman bc) source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/clean-chroot-manager/archive/v$pkgver.tar.gz") -b2sums=('94f25860f727ec1a34d7c64b0422ed582b356f8fb886adc3b68ac9810179faade028dd473e3297d849680552beb6a312fd90306c317dbbd3ae1a95c0630cfb2f') +b2sums=('3bcc8a5362f0bedf33b8636394d74aa99a52a9275aa074cd28999cd23f932e3bded3fd082442bb5f0428fc3d8d35511b3b4f1d3ff369a276184bb7f442ba7476') install=ccm.install build() { diff --git a/linhes/clean-chroot-manager/ccm.install b/linhes/clean-chroot-manager/ccm.install index d84033d..91faa4d 100644 --- a/linhes/clean-chroot-manager/ccm.install +++ b/linhes/clean-chroot-manager/ccm.install @@ -3,7 +3,7 @@ post_upgrade() { # define the versions for which a change is needed - for test in 2.101-1 2.201-1 2.202-1 2.208-1 2.212-1 2.213-1 2.221-1 2.224-1 2.237-1 2.239-1; do + for test in 2.101-1 2.201-1 2.202-1 2.208-1 2.212-1 2.213-1 2.221-1 2.224-1 2.237-1 2.239-1 3.0-1; do if [ "$(vercmp $2 $test)" -lt 0 ]; then cat <<END diff --git a/linhes/libhdhomerun/PKGBUILD b/linhes/libhdhomerun/PKGBUILD index 74944ce..f6d0bb3 100644 --- a/linhes/libhdhomerun/PKGBUILD +++ b/linhes/libhdhomerun/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: Grey Christoforo <first name [at] last name [dot] net> pkgname=libhdhomerun -pkgver=20250506 +pkgver=20250815 pkgrel=1 pkgdesc="Library and command line utility for interfacing with HDHomeRun device" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://www.silicondust.com/downloads" +url="https://www.silicondust.com/support/downloads" license=('LGPL') optdepends=('hdhomerun-firmware-bin: firmware for hdhomerun devices' 'hdhomerun_config_gui: hdhomerun configuration gui') diff --git a/linhes/libsignal-client/.gitignore b/linhes/libsignal-client/.gitignore new file mode 100644 index 0000000..ba55261 --- /dev/null +++ b/linhes/libsignal-client/.gitignore @@ -0,0 +1,3 @@ +/SparsePostQuantumRatchet.git/ +/boring/ +/curve25519-dalek/ diff --git a/linhes/libsignal-client/PKGBUILD b/linhes/libsignal-client/PKGBUILD index 3002ea6..47cbf16 100644 --- a/linhes/libsignal-client/PKGBUILD +++ b/linhes/libsignal-client/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libsignal-client _pkgname=libsignal _libname=libsignal_jni _java_version=17 -pkgver=0.86.1 +pkgver=0.92.1 pkgrel=1 pkgdesc='Library for the Signal Protocol.' url="https://github.com/signalapp/${_pkgname}" @@ -16,9 +16,16 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') license=('AGPL-3.0-only') source=( "${_pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/refs/tags/v$pkgver.tar.gz" + "boring::git+https://github.com/signalapp/boring" + "curve25519-dalek::git+https://github.com/signalapp/curve25519-dalek" + "SparsePostQuantumRatchet.git::git+https://github.com/signalapp/SparsePostQuantumRatchet.git" + #"boringssl::git+https://github.com/google/boringssl.git" ) -sha512sums=('dcc66b97cdee3439add283935fd72d7ec5d30958d022094775ec508618e863f5da8a0f9cc74200c5e41f723c0a84a9667b23e84b9b27f6b0ef037bc94bc380e3') +sha512sums=('f72bdaa2e9e9fe90cab0d30e51f3876efdcf7a3280f5d4c56c6065fbeed088afa5a168f33a2bc6a44b820290065572285baa5cb46445b8d3bd9d122b9d113500' + 'SKIP' + 'SKIP' + 'SKIP') prepare() { tar xf "${_pkgname}-$pkgver.tar.gz" @@ -29,9 +36,16 @@ prepare() { sed -i 's/exit 2/suffix=""/' java/build_jni.sh sed -i 's/-Xmx4g//' java/gradle.properties - sed -i "s/cargo build/cargo build --frozen/" java/build_jni.sh + sed -i "s/echo_then_run cargo build/__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS=nightly cargo build --frozen -Zgit=shallow-deps -Zgitoxide/" java/build_jni.sh + sed -i "s/cargo fetch//" java/build_jni.sh - cargo fetch --locked --target "$(rustc -vV | awk '/^host: / {print $2}')" + for repo in boring curve25519-dalek SparsePostQuantumRatchet.git; do + sed -i "s|https://github.com/signalapp/${repo}|file://${srcdir}/${repo}|g" Cargo.toml Cargo.lock + done + #(cd ${srcdir}/boringssl && git config submodule.boring-sys/deps/boringssl.url "$srcdir/boringssl" && git -c protocol.file.allow=always submodule update) + + export RUSTUP_TOOLCHAIN=stable + __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS=nightly cargo fetch --locked --target "$(rustc -vV | awk '/^host: / {print $2}')" -Zgit=shallow-deps -Zgitoxide } build() { @@ -39,10 +53,10 @@ build() { export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target - export CARGO_NET_GIT_FETCH_WITH_CLI=true export JAVA_HOME="$(ls -d /usr/lib/jvm/java-${_java_version}-* | head -n1)" ./build_jni.sh desktop GRADLE_USER_HOME="${srcdir}/.gradle" ./gradlew --no-daemon :client:assemble -PskipAndroid=true + #GRADLE_USER_HOME="${srcdir}/.gradle" gradle --no-daemon :client:assemble -PskipAndroid=true zip -d "client/build/libs/libsignal-client-${pkgver}.jar" "${_libname}*.so" } diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 index b29f66d..a36892f 100644 --- a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 +++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 @@ -29,7 +29,7 @@ exfatprogs f2fs-tools fatresize #fsarchiver -gnu-netcat +openbsd-netcat gpart gpm gptfdisk @@ -91,7 +91,6 @@ pv qemu-guest-agent refind reflector -reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo @@ -127,7 +126,7 @@ zsh # LinHES 9 additions # ###################### bash-completion -calamares +calamares-git linhes-system networkmanager network-manager-applet @@ -141,7 +140,6 @@ wireplumber xdg-user-dirs xf86-video-fbdev xf86-video-vesa -xf86-video-vmware xorg-server #################### # XFCE # diff --git a/linhes/linhes-dev/PKGBUILD b/linhes/linhes-dev/PKGBUILD index 5033678..efd182b 100644 --- a/linhes/linhes-dev/PKGBUILD +++ b/linhes/linhes-dev/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-dev pkgver=9.0.0 -pkgrel=17 +pkgrel=18 pkgdesc="Scripts to develop LinHES" arch=('x86_64') license=('GPL2') diff --git a/linhes/linhes-system/PKGBUILD b/linhes/linhes-system/PKGBUILD index 0bde107..125f767 100755 --- a/linhes/linhes-system/PKGBUILD +++ b/linhes/linhes-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-system pkgver=9.0.0 -pkgrel=101 +pkgrel=103 arch=('x86_64') #install=$pkgname.install pkgdesc="Everything that makes LinHES a system" @@ -34,7 +34,7 @@ sha256sums=('1fb11c7f472df9e3066866301962c2678b80c2fbd988dc34db022d51e1101a42' '8b54c31b8efde3917f603c5307bebb0a2a00239ad9a983c2f5d8120003256449' 'ae34515e144830f424d3bd3f6b1b446892d62beed20bca6f0fb19b0bbb779f27' 'a79edfeb88b90a8f5538a159b39ba235caba8c6d6b2a39a20faa3ae0301b770b' - '050d7d44b1636a298ae020807e64637b40d39b4c52eb2f9661fe30090e66cee3' + '575ae8455b4862f68454516718ddb0531755f194ac278794f9ba175da5a30cab' '1c36e4fdf41c1063e0a127ce4a90fbdef19879c381a87f622d7399ca931560cc' '87875d9e5f5ce18208f419698ce69b6bcbcd08955a57a4a13940e715af58b787' '192bfff1b8d46e0ebb969618847d9993aba3b1b578053c8d701dad9f9e758f86' diff --git a/linhes/linhes-system/lh_system_start.sh b/linhes/linhes-system/lh_system_start.sh index b783535..c02e217 100755 --- a/linhes/linhes-system/lh_system_start.sh +++ b/linhes/linhes-system/lh_system_start.sh @@ -61,7 +61,7 @@ function install_lh_apps(){ sleep 5 done msg "Installing apps." - konsole -e /bin/bash -i -c "sudo pacman -Syyy --noconfirm archlinux-keyring && sudo pacman -Syyy --noconfirm mythtv mythplugins-mytharchive mythplugins-mythmusic mythplugins-mythweb && flatpak install tv.plex.PlexHTPC --noninteractive --assumeyes && sudo flatpak override tv.plex.PlexHTPC --filesystem=/run/lirc/lircd" + konsole -e /bin/bash -i -c "sudo pacman -Syyy --noconfirm archlinux-keyring && sudo pacman -Syyyu --noconfirm mythtv mythplugins-mytharchive mythplugins-mythmusic mythplugins-mythweb && flatpak install tv.plex.PlexHTPC --noninteractive --assumeyes && sudo flatpak override tv.plex.PlexHTPC --filesystem=/run/lirc/lircd" status=$? [ $status -eq 1 ] && msg "Cancelling Setup" "Could not connect to the internet to complete setup. Check the internet connection and from Konsole run lh_system_start.sh." && exit 1 gen_lib_xml.py @@ -141,7 +141,7 @@ function start_user_apps() { } function start_myth() { - STARTCMD="/usr/bin/mythfrontend --syslog local6 --quiet" + STARTCMD="/usr/bin/mythfrontend --disable-autodiscovery --noupnp --quiet --syslog local6" if [ ! -f ~/.config/lh_dontrunmythfrontend ]; then msg "Starting MythFrontend..." $STARTCMD 2>&1 & diff --git a/linhes/linhes-templates/PKGBUILD b/linhes/linhes-templates/PKGBUILD index f96c8e4..96f74d7 100644 --- a/linhes/linhes-templates/PKGBUILD +++ b/linhes/linhes-templates/PKGBUILD @@ -1,13 +1,13 @@ pkgname=linhes-templates pkgver=9.0.0 -pkgrel=15 +pkgrel=19 conflicts=() pkgdesc="Templates used for LinHES system configuration" depends=() makedepends=() arch=('x86_64') source=(templates.tar.gz) -sha256sums=('1fe3cb69acab1f006596b9a5bd63d6a6f85c13c00d7d8209af215336ded84a3c') +sha256sums=('3144255b6861af8041c511316341f6eb2d95e6d2d2d45f0696618d2eb4c63cb1') package() { MVDIR=$pkgdir/usr/share/linhes diff --git a/linhes/linhes-templates/templates/db/custom.sql b/linhes/linhes-templates/templates/db/custom.sql index 9be8ab0..8928c53 100644 --- a/linhes/linhes-templates/templates/db/custom.sql +++ b/linhes/linhes-templates/templates/db/custom.sql @@ -3,23 +3,46 @@ DELETE from settings where value in ( 'AllowQuitShutdown', 'AllowConnFromAll', + 'AllowLinkLocal', 'ListenOnAllIps', + 'BackendServerAddr', 'BackendServerIP', 'BackendServerIP6', + 'BackendServerPort', + 'BackendStatusPort', 'HaltCommand', 'RebootCommand', - 'Theme' - ); + 'Theme', + 'OverrideExitMenu', + 'NetworkControlEnabled', + 'SecurityPin', + 'BackendStopCommand', + 'BackendStartCommand', + 'MasterServerIP', + 'MasterServerName', + 'MasterServerPort'); INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES - ('AllowQuitShutdown' ,'4' , 'apheleia'), - ('AllowConnFromAll' ,'0' , 'apheleia'), - ('ListenOnAllIps' ,'0' , 'apheleia'), - ('BackendServerIP' ,'127.0.0.1' , 'apheleia'), - ('BackendServerIP6' ,'::1' , 'apheleia'), - ('HaltCommand' ,'sudo /sbin/halt' , 'apheleia'), - ('RebootCommand' ,'sudo /sbin/reboot' , 'apheleia'), - ('Theme' ,'LinHES' , 'apheleia'); + ('AllowQuitShutdown' ,'4' , 'apheleia'), + ('AllowConnFromAll' ,'0' , 'apheleia'), + ('AllowLinkLocal' ,'0' , 'apheleia'), + ('ListenOnAllIps' ,'0' , 'apheleia'), + ('BackendServerAddr' ,'127.0.0.1' , 'apheleia'), + ('BackendServerIP' ,'127.0.0.1' , 'apheleia'), + ('BackendServerIP6' ,'::1' , 'apheleia'), + ('BackendServerPort' ,'6543' , 'apheleia'), + ('BackendStatusPort' ,'6544' , 'apheleia'), + ('HaltCommand' ,'sudo /bin/halt' , 'apheleia'), + ('RebootCommand' ,'sudo /bin/reboot' , 'apheleia'), + ('Theme' ,'LinHES' , 'apheleia'), + ('OverrideExitMenu' ,'3' , 'apheleia'), + ('NetworkControlEnabled' ,'1' , 'apheleia'), + ('SecurityPin' ,'0000' , 'apheleia'), + ('BackendStopCommand' ,'sudo systemctl stop mythbackend.service' ,NULL), + ('BackendStartCommand' ,'sudo systemctl start mythbackend.service' ,NULL), + ('MasterServerIP' ,'127.0.0.1' ,NULL), + ('MasterServerName' ,'apheleia' ,NULL), + ('MasterServerPort' ,'6543' ,NULL); -- --INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES @@ -61,22 +84,6 @@ INSERT INTO `storagegroup` (`groupname`, `hostname`, `dirname`) VALUES ('DB Backups' ,'apheleia' ,'/data/storage/disk0/backup/mythtv_backups/'); --- Clear out old values because mysql is mysql -DELETE from settings where value in -('OverrideExitMenu', - 'NetworkControlEnabled', - 'SecurityPin', - 'BackendStopCommand', - 'BackendStartCommand'); - -INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES -('OverrideExitMenu','3','apheleia'), -('NetworkControlEnabled','1','apheleia'), -('SecurityPin','0000','apheleia'), -('BackendStopCommand','sudo systemctl stop mythbackend.service' ,NULL), -('BackendStartCommand','sudo systemctl start mythbackend.service' ,NULL); --- - -- Clear out old user jobs DELETE FROM `settings` where value in ('JobAllowUserJob1', @@ -90,7 +97,8 @@ DELETE FROM `settings` where value in 'UserJobDesc1', 'UserJobDesc2', 'UserJobDesc3', - 'UserJobDesc4'); + 'UserJobDesc4', + 'MiscStatusScript'); INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES @@ -105,13 +113,10 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('UserJobDesc1','Copy to Videos','apheleia'), ('UserJobDesc2','Encode to x264 mkv','apheleia'), ('UserJobDesc3','Encode Audio to mp3','apheleia'), - ('UserJobDesc4','','apheleia'); + ('UserJobDesc4','','apheleia'), + ('MiscStatusScript','/usr/bin/misc_status_info.sh','apheleia'); -- -INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES -('MiscStatusScript','/usr/bin/misc_status_info.sh','apheleia'); - - --UPDATE `keybindings` set `keylist` = "Alt+Esc" WHERE `action` = 'EXITPROMPT' ; -- Add a dummy tuner and videosource so BE will at least start diff --git a/linhes/mythplugins/PKGBUILD b/linhes/mythplugins/PKGBUILD index 62f9a52..1df616c 100644 --- a/linhes/mythplugins/PKGBUILD +++ b/linhes/mythplugins/PKGBUILD @@ -12,9 +12,9 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -br=fixes/35 +br=fixes/36 t="${br#*/}+${br%/[0-9][0-9]}" -pkgver=35+fixes.20251230.805e05b7 +pkgver=36+fixes.20260310.ababe58b pkgrel=1 epoch=0 arch=('any') diff --git a/linhes/mythtv/PKGBUILD b/linhes/mythtv/PKGBUILD index 82c69ce..b5046fa 100644 --- a/linhes/mythtv/PKGBUILD +++ b/linhes/mythtv/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: James Bunton <jamesbunton@delx.net.au> +# Maintainer: John Bergqvist <johnlbergqvist@gmail.com> +# Contributor: James Bunton <jamesbunton@delx.net.au> # Contributor: Taijian <taijian@posteo.de> # Contributor: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -7,9 +8,10 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=35+fixes.20260109.487d7e5c -pkgrel=2 +pkgver=36+fixes.20260410.0fb9e4f3 +pkgrel=4 pkgdesc="A Homebrew PVR project" +_mythversion=36 arch=('x86_64') url="https://www.mythtv.org/" license=('GPL') @@ -17,7 +19,6 @@ depends=( 'aom' 'dav1d' 'exiv2' - 'fftw' 'lame' 'libass' 'libavc1394' @@ -33,13 +34,12 @@ depends=( 'libxml2' 'libxrandr' 'libzip' - 'lzo' 'qt5-script' +# 'qt6-base' 'soundtouch' 'taglib' 'x264' 'x265' - 'glew' 'libcec' 'mariadb' 'mariadb-clients' @@ -53,6 +53,7 @@ depends=( 'python-lxml' 'python-mysqlclient' 'python-pyqt5-webengine' +# 'python-pyqt6-webengine' 'python-requests' 'python-requests-cache' 'xmltv' @@ -60,39 +61,27 @@ depends=( ) makedepends=( 'git' - 'help2man' 'libcdio' - 'libcec' 'libmariadbclient' - 'libxml2' 'lirc' - 'perl-dbd-mysql' - 'perl-io-socket-inet6' - 'perl-libwww' - 'perl-net-upnp' - 'perl-xml-simple' - 'perl-xml-xpath' - 'python-lxml' - 'python-mysqlclient' + 'nasm' 'python-pip' - 'python-requests' 'python-setuptools' 'python-wheel' 'qt5-tools' - 'yasm' ) options=(!lto) conflicts=('myththemes' 'mythplugins-mythvideo' 'mythtv-git') replaces=('myththemes' 'mythplugins-mythvideo' 'mythtv-git') -patches="0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch - 0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch +patches="defaultThemeLinHES.patch autoskip_reduce_commskip_jumpback.patch - defaultThemeLinHES.patch" + 0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch" +# 0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch source=( - "git+https://github.com/MythTV/mythtv#branch=fixes/35" + "git+https://github.com/MythTV/mythtv#branch=fixes/${_mythversion}" 'mythbackend.service' 'mythfrontend.desktop' 'mythtv-setup.desktop' @@ -104,20 +93,19 @@ source=( sha256sums=('SKIP' '6adb9d3370111c7d0000b215ae2d83a07a19c1bef5c22657f8caa9593c8efda5' - 'ec4f2330f77f0ac92acf228a4afa3b480cdd2de913cdabedfd43d40b03507557' - 'e7965a0d232aefcf8e5e89a96f46b7582a9590d2ae9b4f5b8ee9ab2baa913527' + '1d989fa50c7c3b45b1aa2bdbb5dc6e446485004afb81c65b4b5be1dc85d4bc5f' + '2f58fc3e30723d2bc1685dc2c6301373cc2f070588ce8865b0d4907d8cd6a436' '12cb52bf9b084a4f16419c9370fef0450ce6a11308b0c3f7240f4f83df7e2ab6' 'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333' '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae' - '276f87058edc6197ab3a53faf6b4c485ef0d2b8447b9caa02ca7234f09ab473f' - '630c80c588a9b278c4421d356c5cbaa0debf149524bc896656b580b89d8fae88' + '3ff9f48ead83a8dd7a87cc08df066c00813b48b9171cc7bf74ba0e3cb2570d00' '8a81e724d902976056dc824e7304df343c230ce67ec6ce1d18e110c5ef818ef6' - '3ff9f48ead83a8dd7a87cc08df066c00813b48b9171cc7bf74ba0e3cb2570d00') + '630c80c588a9b278c4421d356c5cbaa0debf149524bc896656b580b89d8fae88') prepare() { msg2 "PKGBUILD pkgver: $pkgver" cd "${srcdir}/mythtv/mythtv" - gitsrcver=`echo "35+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"` + gitsrcver=`echo "${_mythversion}+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"` msg2 "GIT SOURCE pkgver: $gitsrcver" if [ $pkgver = $gitsrcver ]; then warning "pkgver did NOT change. Consider increasing pkgrel ($pkgrel)." @@ -138,25 +126,15 @@ prepare() { pkgver() { cd "${srcdir}/mythtv/mythtv" - echo -n "35+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)" + echo -n "${_mythversion}+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)" } build() { cd "${srcdir}/mythtv/mythtv" -#CFLAGS="-march=x86-64 -mtune=amdfam10 -O2 -pipe -fno-plt -fexceptions \ -# -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -# -fstack-clash-protection -fcf-protection" -# CFLAGS="${CFLAGS/flto=auto/fPIC}" -# CXXFLAGS="${CXXFLAGS/flto=auto/fPIC}" -# LDFLAGS="${LDFLAGS/flto=auto/fPIC}" - ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ - --disable-altivec \ - --disable-audio-jack \ - --disable-distcc \ --enable-libaom \ --enable-libdav1d \ --enable-libmp3lame \ @@ -164,10 +142,10 @@ build() { --enable-libx264 \ --enable-libx265 \ --enable-libxvid \ - --enable-vaapi \ --with-bindings=python \ --with-bindings=perl \ --perl-config-opts=INSTALLDIRS=vendor + echo "###### STARTING MAKE ####" make } diff --git a/linhes/mythtv/mythfrontend.desktop b/linhes/mythtv/mythfrontend.desktop index 89f8b13..65e725f 100644 --- a/linhes/mythtv/mythfrontend.desktop +++ b/linhes/mythtv/mythfrontend.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=MythFrontend -Comment=MythFrontend is the primary playback application for MythTV -Exec=mythfrontend --syslog local6 --noupnp --quiet +Comment=Record, playback and watch TV +Exec=mythfrontend --disable-autodiscovery --noupnp --quiet --syslog local6 Type=Application +Terminal=false Icon=mythtv diff --git a/linhes/mythtv/mythtv-setup.desktop b/linhes/mythtv/mythtv-setup.desktop index fe49a97..cb17121 100644 --- a/linhes/mythtv/mythtv-setup.desktop +++ b/linhes/mythtv/mythtv-setup.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=MythTV Setup -Comment=Setup application for the MythTV backend server +Comment=Setup the MythTV backend server Exec=mythtv-setup --syslog local6 Type=Application +Terminal=false Icon=mythtv diff --git a/linhes/parsec-bin/PKGBUILD b/linhes/parsec-bin/PKGBUILD index 44c2155..a941d88 100644 --- a/linhes/parsec-bin/PKGBUILD +++ b/linhes/parsec-bin/PKGBUILD @@ -1,31 +1,20 @@ -# Maintainer : tadly <me@tadly.de> +# Maintainer : Zen Wen <zen.8841@gmail.com> +# Contributor : DXC-0 <thecyberarcher@protonmail.ch> +# Contributor : tadly <me@tadly.de> pkgname=parsec-bin pkgver=150_97c -pkgrel=1 +pkgrel=2 pkgdesc='Remotely connect to a gaming pc for a low latency remote computing experience' url='http://parsec.app' license=('custom') arch=('x86_64') provides=('parsec') -depends=('gcc-libs' 'libglvnd' 'libxext' 'libxcb' 'ffmpeg4.4' 'openssl-1.1' 'libxi') +depends=('gcc-libs' 'libglvnd' 'libxext' 'libxcb' 'ffmpeg4.4' 'openssl' 'libxi' 'pipewire-alsa') optdepends=('libva: For hardware accelerated decoding') -source=("$pkgname-$pkgver.deb::https://builds.parsecgaming.com/package/parsec-linux.deb") +source=("$pkgname-$pkgver.deb::https://builds.parsec.app/package/parsec-linux.deb") sha256sums=('f1691ba3a97534604f5f640c26cceafaef672ccf7ab6eed66114d0abafc2cccf') - -#source_arm=("$pkgname-$pkgver.deb::https://builds.parsecgaming.com/package/parsec-rpi.deb") -#sha256sums_arm=('a98e840dc44f4762018895bd0da704c88887815de0e74e0f39aa7737f5b0e802') -# -#source_armv6h=($source_arm) -#sha256sums_armv6h=($sha256sums_arm) -# -#source_armv7h=($source_arm) -#sha256sums_armv7h=($sha256sums_arm) -# -#source_aarch64=($source_arm) -#sha256sums_aarch64=($sha256sums_arm) - options=('!strip') package() { diff --git a/linhes/plex-media-server/PKGBUILD b/linhes/plex-media-server/PKGBUILD index 42ff87f..be19eae 100644 --- a/linhes/plex-media-server/PKGBUILD +++ b/linhes/plex-media-server/PKGBUILD @@ -10,8 +10,8 @@ # Contributor: Praekon <praekon@googlemail.com> pkgname=plex-media-server -pkgver=1.42.2.10156 -_pkgsum=f737b826c +pkgver=1.43.1.10611 +_pkgsum=1e34174b1 pkgrel=1 pkgdesc='The back-end media server component of Plex.' arch=('x86_64' 'i686' 'armv7h' 'aarch64') @@ -39,10 +39,10 @@ sha256sums=('398ba7958598609453f5289b3d5f2389d2756158b340cf28e83c39d9ed60280b' 'c597bee0bcbb59ed791651555a904e5f7e9d2e82f6c6986b6352e5fc38e5b557' 'b7ff6525a3c7a8be885edc85bb523095f8e25ddb38873127e2a4e97b28f2c7ad' 'dbfb5a9a7146a975863c0932f1a68c4b040ec5d7e693361f39ddfbf60885e631') -sha256sums_x86_64=('5092d8ade2a2f0a1dfb1406d0d4f89d05758da8ca706c6faea8b0125836e8542') -sha256sums_i686=('9475c0f27061cf97057b8dd5e79f2ffe78baecb128e2e6939e3fbd05be6f6b0c') -sha256sums_armv7h=('051d072275814384560d700aae07f404f7c2a269be44dbbd57045765b86df25b') -sha256sums_aarch64=('566dfca0efb3845c87072e9f0ee32984395aa8ce3704874b9e243b5490cc0105') +sha256sums_x86_64=('95be7fd202878dca41f153a24a91da4dc44efe1920b445025295dd3dc078bf7b') +sha256sums_i686=('b6e94c2cca4f25c8474f4369797a395eb99c019c73b6c78c77d2b9cd45295947') +sha256sums_armv7h=('0acb57b6c4bae4902ebcfe614dc4c631fb6eadf0c8bb1fe538d57f52a2a9e6f8') +sha256sums_aarch64=('508331fb4b5b424d5ce491ff85cef5d7b69123218cea881df08040850b7e3273') prepare() { if [[ $CARCH = armv7h ]] || [[ $CARCH = aarch64 ]]; then diff --git a/linhes/python-requests-cache/.gitignore b/linhes/python-requests-cache/.gitignore deleted file mode 100644 index 743531c..0000000 --- a/linhes/python-requests-cache/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/src/ -/pkg/ -/*.pkg.* -/*.log -/*.tar.gz diff --git a/linhes/python-requests-cache/PKGBUILD b/linhes/python-requests-cache/PKGBUILD deleted file mode 100644 index 1bde8f5..0000000 --- a/linhes/python-requests-cache/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Jordan Cook <JCook83@gmail.com> -# Maintainer: Carlos Aznarán <caznaranl@uni.pe> -# Maintainer: Philipp A. <flying-sheep@web.de> -# Contributor: Benoit Pierre <benoit.pierre@gmail.com> -# Contributor: Simon Legner <Simon.Legner@gmail.com> -# Contributor: Aniket Pradhan <aniket17133[at]iiitd[dot]ac[dot]in> -# Contributor: Roman Haritonov <reclosedev[at]gmail[dot]com> -_base=requests-cache -pkgname=python-${_base} -pkgdesc="A persistent cache for python requests" -pkgver=1.2.1 -pkgrel=3 -arch=(any) -url="https://github.com/${_base}/${_base}" -license=('custom:BSD-2-clause') -depends=(python-requests python-cattrs python-platformdirs python-url-normalize) -makedepends=(python-build python-installer python-poetry-core python-wheel) -optdepends=('python-boto3: Cache backend for Amazon DynamoDB database' - 'python-botocore: Interface for Amazon Web Services' - 'python-pymongo: Cache backend for MongoDB database' - 'python-redis: Cache backend for Redis cache' - 'python-bson: for BSON codec' - 'python-itsdangerous: for pass trusted data to untrusted environments' - 'python-yaml: for bindings yaml support' - 'python-ujson: for JSON serializer for improved performance' -) -checkdepends=(python-pytest python-requests-mock python-responses python-timeout-decorator - python-time-machine python-rich python-ujson python-itsdangerous) -source=(${_base}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz) -sha512sums=('f8977b1afc005ddd73019d2a0e39da368f376602110602c0b24c317b548f31a3489e686502ecd48ae3583e471fdd70671913e529c73dacdcaecadb1cd1e6c126') - -build() { - cd ${_base}-${pkgver} - # Note: set `GIT_CEILING_DIRECTORIES` to prevent poetry - # from incorrectly using a parent git checkout info. - # https://github.com/pypa/build/issues/384#issuecomment-947675975 - GIT_CEILING_DIRECTORIES="${PWD}/.." python -m build --wheel --skip-dependency-check --no-isolation -} - -check() { - cd ${_base}-${pkgver} - #https://github.com/requests-cache/requests-cache/issues/1033 - python -m pytest --ignore=tests/integration --ignore=tests/unit/test_base_cache.py --ignore=tests/unit/test_session.py -} - -package() { - cd ${_base}-${pkgver} - python -m installer --destdir="${pkgdir}" dist/*.whl - install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/linhes/python-url-normalize/PKGBUILD b/linhes/python-url-normalize/PKGBUILD deleted file mode 100644 index 7ec12cc..0000000 --- a/linhes/python-url-normalize/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Carlos Aznarán <caznaranl@uni.pe> -# Maintainer: Jordan Cook <JCook83@gmail.com> -# Contributor: Benoit Pierre <benoit.pierre@gmail.com> -# Contributor: Marc Plano-Lesay <kernald@enoent.fr> -_base=url-normalize -pkgname=python-${_base} -pkgdesc="URL normalization for Python" -pkgver=2.2.1 -pkgrel=2 -arch=(any) -url="https://github.com/niksite/${_base}" -license=(MIT) -depends=(python-idna) -makedepends=(python-build python-installer python-setuptools python-wheel) -# checkdepends=(python-pytest) -source=(${_base}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz) -sha512sums=('51f57bf6d94863662789321b8965c0ca833d34d0c8095f2a39303a410f61c24f04a56e83258dafaa8a4250b0d1b44ad3c3a63430da2b04f4d906d84a71208f46') - -build() { - cd ${_base}-${pkgver} - python -m build --wheel --skip-dependency-check --no-isolation -} - -# check() { -# cd ${_base}-${pkgver} -# python -m venv --system-site-packages test-env -# test-env/bin/python -m installer dist/*.whl -# test-env/bin/python -m pytest tests -# } - -package() { - cd ${_base}-${pkgver} - PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python -m installer --destdir="${pkgdir}" dist/*.whl - install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/linhes/qbittorrent-vuetorrent-bin/.SRCINFO b/linhes/qbittorrent-vuetorrent-bin/.SRCINFO index 7f67dd4..ad5e8b7 100644 --- a/linhes/qbittorrent-vuetorrent-bin/.SRCINFO +++ b/linhes/qbittorrent-vuetorrent-bin/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = qbittorrent-vuetorrent-bin pkgdesc = The sleekest looking WebUI for qBittorrent made with Vue.js! - pkgver = 2.31.1 + pkgver = 2.32.1 pkgrel = 1 url = https://github.com/WDaan/VueTorrent install = qbittorrent-vuetorrent.install @@ -10,7 +10,7 @@ pkgbase = qbittorrent-vuetorrent-bin optdepends = qbittorrent-nox: for use with qbittorrent-nox provides = qbittorrent-vuetorrent conflicts = qbittorrent-vuetorrent - source = vuetorrent-2.31.1.zip::https://github.com/WDaan/VueTorrent/releases/download/v2.31.1/vuetorrent.zip - sha512sums = c317843fc4bf20ffeedf160574f72dffc3ea19d1062cf0764fee55dcf3d1f3b3af6d02ae2d2a1541047e1c72e29cd47e1014feb3d535b4610d985bdfa3a39e65 + source = vuetorrent-2.32.1.zip::https://github.com/WDaan/VueTorrent/releases/download/v2.32.1/vuetorrent.zip + sha512sums = 0ee40cceae343cd674d76b091e2e145f8c74704a1901e3e31171204154269928fbc2911ba40edd8af41d770dd27f06886796fa27c8b6ef73256c2917841116a2 pkgname = qbittorrent-vuetorrent-bin diff --git a/linhes/qbittorrent-vuetorrent-bin/PKGBUILD b/linhes/qbittorrent-vuetorrent-bin/PKGBUILD index 096d047..b79f9f2 100644 --- a/linhes/qbittorrent-vuetorrent-bin/PKGBUILD +++ b/linhes/qbittorrent-vuetorrent-bin/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qbittorrent-vuetorrent-bin _pkgname=vuetorrent -pkgver=2.31.1 +pkgver=2.32.1 pkgrel=1 pkgdesc='The sleekest looking WebUI for qBittorrent made with Vue.js!' @@ -21,7 +21,7 @@ optdepends=( install=qbittorrent-vuetorrent.install source=("${_pkgname}-$pkgver.zip::${url}/releases/download/v$pkgver/${_pkgname}.zip") -sha512sums=('c317843fc4bf20ffeedf160574f72dffc3ea19d1062cf0764fee55dcf3d1f3b3af6d02ae2d2a1541047e1c72e29cd47e1014feb3d535b4610d985bdfa3a39e65') +sha512sums=('0ee40cceae343cd674d76b091e2e145f8c74704a1901e3e31171204154269928fbc2911ba40edd8af41d770dd27f06886796fa27c8b6ef73256c2917841116a2') package() { cd "$srcdir/vuetorrent" diff --git a/linhes/qt5-location/.nvchecker.toml b/linhes/qt5-location/.nvchecker.toml new file mode 100644 index 0000000..fa4c565 --- /dev/null +++ b/linhes/qt5-location/.nvchecker.toml @@ -0,0 +1,2 @@ +[qt5-location] +source = "manual" diff --git a/linhes/qt5-location/LICENSE b/linhes/qt5-location/LICENSE new file mode 100644 index 0000000..b87c5e4 --- /dev/null +++ b/linhes/qt5-location/LICENSE @@ -0,0 +1,12 @@ +Copyright Arch Linux Contributors + +Permission to use, copy, modify, and/or distribute this software for +any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE +FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/linhes/qt5-location/LICENSES/0BSD.txt b/linhes/qt5-location/LICENSES/0BSD.txt new file mode 120000 index 0000000..ea5b606 --- /dev/null +++ b/linhes/qt5-location/LICENSES/0BSD.txt @@ -0,0 +1 @@ +../LICENSE
\ No newline at end of file diff --git a/linhes/qt5-location/PKGBUILD b/linhes/qt5-location/PKGBUILD new file mode 100644 index 0000000..3564583 --- /dev/null +++ b/linhes/qt5-location/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qt5-location +_basever=5.15.18 +pkgver=5.15.18+kde+r7 +pkgrel=2 +_commit=ba48a8b5cedd157d972c08d371ac2581db166bf7 +arch=('x86_64') +url='https://www.qt.io' +license=('GPL3' 'LGPL3' 'FDL' 'custom') +pkgdesc='Provides access to position, satellite and area monitoring classes' +depends=('qt5-declarative') +makedepends=('git') +groups=('qt5') +_pkgfqn=${pkgname/5-/} +source=(kde-$_pkgfqn::git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit + git+https://invent.kde.org/qt/qt/qtlocation-mapboxgl.git) +sha256sums=('4a6bfee705b322f4cd044949be217f822b9f697e5e1ec228fdc3f31c29558e13' + 'SKIP') + +pkgver() { + cd kde-$_pkgfqn + echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_commit` | sed -e 's|+kde+r0||' +} + +prepare() { + mkdir -p build + + cd kde-$_pkgfqn + git submodule init + git submodule set-url src/3rdparty/mapbox-gl-native "$srcdir"/qtlocation-mapboxgl + git -c protocol.file.allow=always submodule update +} + +build() { + cd build + + qmake ../kde-$_pkgfqn + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} diff --git a/linhes/qt5-location/README.md b/linhes/qt5-location/README.md new file mode 100644 index 0000000..9c4dc74 --- /dev/null +++ b/linhes/qt5-location/README.md @@ -0,0 +1,3 @@ +This package is part of the `qt5` suite, and is managed by the scripts at https://gitlab.archlinux.org/archlinux/kde-build. + +Do not upgrade this package individually, or make any format changes to the PKGBUILD without checking with the Qt package maintainers first. diff --git a/linhes/qt5-location/REUSE.toml b/linhes/qt5-location/REUSE.toml new file mode 100644 index 0000000..8501755 --- /dev/null +++ b/linhes/qt5-location/REUSE.toml @@ -0,0 +1,22 @@ +version = 1 + +[[annotations]] +path = [ + "PKGBUILD", + "README.md", + "keys/**", + ".SRCINFO", + ".nvchecker.toml", + "*.install", + "*.sysusers", + "*.tmpfiles", + "*.logrotate", + "*.pam", + "*.service", + "*.socket", + "*.timer", + "*.desktop", + "*.hook", +] +SPDX-FileCopyrightText = "Arch Linux contributors" +SPDX-License-Identifier = "0BSD" diff --git a/linhes/qt5-webengine/PKGBUILD b/linhes/qt5-webengine/PKGBUILD index eca0c9a..79047db 100644 --- a/linhes/qt5-webengine/PKGBUILD +++ b/linhes/qt5-webengine/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qt5-webengine _basever=5.15.18 pkgver=5.15.19 -pkgrel=4 +pkgrel=5 arch=('x86_64') url='https://www.qt.io' license=('LGPL3' 'LGPL2.1' 'BSD') diff --git a/linhes/rsyslog/PKGBUILD b/linhes/rsyslog/PKGBUILD index 1175a42..2f949f8 100644 --- a/linhes/rsyslog/PKGBUILD +++ b/linhes/rsyslog/PKGBUILD @@ -1,11 +1,11 @@ pkgname=rsyslog -pkgver=8.2510.0 -pkgrel=2 +pkgver=8.2604.0 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('x86_64' 'i686' 'aarch64' 'armv7h') -license=('GPL3') -depends=('libestr' 'liblogging' 'librelp' 'libfastjson') +license=('LGPL-3.0-only' 'GPL-3.0-only' 'Apache-2.0') +depends=('libestr' 'liblogging' 'librelp' 'libfastjson' 'protobuf-c' 'snappy' 'libyaml') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python-docutils' 'libestr' 'liblogging' 'librelp' 'libfastjson' 'bison' 'flex') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -18,12 +18,15 @@ options=('strip' 'zipman') source=("$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/rsyslog/archive/v${pkgver}.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf' - 'rsyslog.service') + 'rsyslog.service' + 'rsyslog.tmpfiles' + ) -sha256sums=('ccc65a73e43318debbd011c05c7e0f2eac9bd8bf556d44aa4f5ee5cebac903cf' +sha256sums=('c8560fba4c419c47497f7c98852a8ef507759482fcce09ec597556201e6439f0' '0f5bea3fd4dff2c9f097bf95768b2e1f6e9cfd9a08eab98bc3b3b4d2ed44119a' '76d3c6f0c094a768ca12e314133080444db19900679b7a82f30d4c63fdabed38' - '81b9f9b78395405b679849143a6709911d00e9317928fdb2a2540f52965847c2') + '81b9f9b78395405b679849143a6709911d00e9317928fdb2a2540f52965847c2' + 'b287a96834da6cbb0b539d50171ac27bcf677505145fb935da72f751987df686') build() { cd "$srcdir"/${pkgname}-${pkgver} @@ -55,4 +58,5 @@ package() { install -D -m644 "$srcdir"/${pkgname}.conf "$pkgdir"/etc/${pkgname}.conf install -D -m644 "$srcdir"/${pkgname}.logrotate "$pkgdir"/etc/logrotate.d/${pkgname} install -D -m644 "$srcdir"/${pkgname}.service "$pkgdir"/usr/lib/systemd/system/${pkgname}.service + install -D -m644 "$srcdir"/${pkgname}.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/${pkgname}.conf } diff --git a/linhes/rsyslog/rsyslog.tmpfiles b/linhes/rsyslog/rsyslog.tmpfiles new file mode 100644 index 0000000..4b72c17 --- /dev/null +++ b/linhes/rsyslog/rsyslog.tmpfiles @@ -0,0 +1,2 @@ +#Type Path Mode User Group Age Argument... +d /var/spool/rsyslog - - - - diff --git a/linhes/signal-cli/PKGBUILD b/linhes/signal-cli/PKGBUILD index b148945..e775aeb 100644 --- a/linhes/signal-cli/PKGBUILD +++ b/linhes/signal-cli/PKGBUILD @@ -1,29 +1,21 @@ # Maintainer: asamk <asamk@gmx.de> pkgname=signal-cli -pkgver=0.13.22 +pkgver=0.14.3 pkgrel=1 pkgdesc="Provides a commandline and dbus interface for secure Signal messaging." arch=('any') url="https://github.com/AsamK/signal-cli" license=('GPL-3.0-only') -depends=('java-runtime-headless>=21' 'java-commons-logging' 'sh' 'libsignal-client') -makedepends=('java-environment>=21' 'gradle' 'asciidoc') +depends=('java-runtime-headless>=25' 'java-commons-logging' 'sh' 'libsignal-client') +makedepends=('java-environment>=25' 'gradle' 'asciidoc') source=("https://github.com/AsamK/${pkgname}/archive/v${pkgver}.tar.gz" - "https://github.com/AsamK/${pkgname}/releases/download/v${pkgver}/v${pkgver}.tar.gz.asc" +# "https://github.com/AsamK/${pkgname}/releases/download/v${pkgver}/v${pkgver}.tar.gz.asc" "${pkgname}.sh") -sha512sums=('d5bcefa6b08b85796fd15441ee29bb5d1913d3dee3c786a4381d5f94a228bfd9c8ca00f4c589ef72eab3e563ec6a1eb854c12826bae881b1c0fce1161bfa04cb' - 'SKIP' +sha512sums=('a84fa66f7ed7f3d84f608e41e666508f40a58097118b73c9d153762a17afbffa3157315dd63d982b11a58b7994be5546f72b73c100a8d9f219a2e3e9061f64d2' '64f181bd9170af5c462899fba765a92b8225e24c3fd2a25deec31d9879dec76a987de9efa065fc3e60e8f5a787e934e0abbdd43ab94445ad3eecacfe1a9de74d') validpgpkeys=('FA10826A74907F9EC6BBB7FC2BA2CD21B5B09570') -prepare() { - cd "${srcdir}" - cd "${pkgname}-${pkgver}" - - echo ';plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" }' >> settings.gradle.kts -} - build() { cd "${srcdir}" cd "${pkgname}-${pkgver}" diff --git a/linhes/zabbix/PKGBUILD b/linhes/zabbix/PKGBUILD deleted file mode 100644 index 879d8da..0000000 --- a/linhes/zabbix/PKGBUILD +++ /dev/null @@ -1,239 +0,0 @@ -# Maintainer: Robin Candau <antiz@archlinux.org> -# Contributor: Florian Pritz <bluewind@xinu.at> -# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> - -pkgbase=zabbix -pkgname=(zabbix-server zabbix-agent{,2} zabbix-proxy zabbix-frontend-php zabbix-web-service) -pkgver=7.0.22 -pkgrel=2 -arch=(x86_64) -url='https://www.zabbix.com/' -license=('GPL-2.0-only') -makedepends=(libxml2 unixodbc net-snmp mariadb-libs libldap libevent go pkgconfig pcre2 openipmi) -source=("https://cdn.zabbix.com/zabbix/sources/stable/${pkgver%.*}/zabbix-${pkgver}.tar.gz" - zabbix-agent.{service,sysusers,tmpfiles} - zabbix-agent2.service - zabbix-server-mysql.service zabbix-server.{sysusers,tmpfiles} - zabbix-proxy-mysql.service zabbix-proxy.{sysusers,tmpfiles} - zabbix-web-service.{service,sysusers,tmpfiles}) - -sha512sums=('476016cfef14c960a688594033956d380e9effbfabd96b31f24d558c83c36c98af64f747af7711c832c13b203536824838242e6d7dbe0e2ba3bb7fbcf4e5ed11' - '8c1fa2676bc0ef91bc39ec5f97b4d3ba5c365d063420455a3785121a54e120bc5afeacde42a48f4509c115f940dcc3b6c2f43044a7fbfb421182fc93b22a2444' - '3ab3ac1acc7e35c8896157aef601ebc30815237ac5252cbd0c1ecb26eeaf9eccf5c49938ae8c85bb79a6f95f607f082f6b80ed660829599ec03aa626cca6d3dc' - 'ca6b4779de23829dfdd80ee21e924fbe4e2754f4e693bed4b1a2aa846cd87d150e399b1169d7fe58d30c50ed837c1b8254e580de420267d0a1834d6dc409c43d' - 'c57dfcc13b290f4120d1185339bd2d6b1ea7a2ca0c98dca8632d4fd8fe462a42cb35e8a88895eb8ee390c55cf0ffb90b544f23fefbf059b49c06e5373d0b8af2' - '130497775093a4198b6b5f734c9da240f1e61800c4c13d9879213c7e62698f7fb885b42900c6186271a5da2d4db438b5c6e858be035bb42319f8fc0b8a8d3ce6' - '4254d3b13ff0d19a8e207f709c10ea59dbb6d4f333d862b1611a0fa4ced199e9a32313e88d8abadc129c1e4001b182c0545bcc84117d218116a8c524de88850e' - 'b6d548a26f845ef1a39724e3273aa521715272e20a0038144f86d377a26dfec6e3e129404cfda77632cad2f5cd6bab4a33f70a26c8c67b0d0b2abb3678ad2d83' - '94701f34fe5df4859c6a4d0459c16062374e8f89f4f51c414e71c9c2db14f61e087721e68dddb3e8d88bf1c097477c1a21e27ba4705fd07d88c60adb41acc1be' - '7c1072a8cd5837095f857b50124cb45d1bdbddbce108f6f067a35c3c9ebb1ad0502ef617dfa10f9c843631220177a6286a97b1c2a46539200be72fa83cb23b99' - '64042ddf511b56b2a5a311e34643f4e049c09d909ea65b7343a8a9637f33dc59f2b1342201290ca0774cbcbf616096b3696982047fb622b7d51afb5eceb298dd' - '545bb284ac28386f8b9f33f0c5066bb73b3634fab8760861bc172fe83897f22e54ecaf186970f0ef178256c9ff152a3e806636145a77af78964f7af0fdcec1a1' - '2766787aaeef2f48909c52deb411b47971931a972282f701c401f8315264c8817fc1f9f49a2672152c78a0ebba7d72329c18b441e134c5ec3db5f12681b6e590' - '309f55c8c381364eca6d31c4709a0ebb7e04cefad9e51f44173d839a58e7f8e95e3c678922f9e1fe42cff90dba5144cc7ee3a6e1c236b079b501c0e08ad2152d') - -prepare() { - cd $pkgbase-$pkgver - sed -i \ - -e '/^LogFile=.*/d' \ - -e 's/# LogType=file/LogType=system/' \ - conf/zabbix_{agentd,proxy,server}.conf src/go/conf/zabbix_web_service.conf - - autoreconf -fi -} - -build() { - export GOPATH="$srcdir"/go - export AGENT_LDFLAGS="${LDFLAGS}" - - _configure_flags=( - --disable-static - --prefix=/usr - --infodir=/usr/share/info - --mandir=/usr/share/man - --sysconfdir=/etc/zabbix - --enable-agent - --enable-agent2 - --enable-ipv6 - --with-ldap - --with-libcurl - --with-libxml2 - --with-net-snmp - --with-openssl - --with-libpcre2 - --with-ssh2 - --with-unixodbc - --with-openipmi - --enable-webservice - ) - - cd $pkgbase-$pkgver - - # Make copies since `make clean` removes the files and they cannot be rebuilt easily - for db in mysql; do - mkdir -p ../copies/database/$db - cp database/$db/*.sql ../copies/database/$db/ - done - - for db in mysql; do - ./configure ${_configure_flags[@]} --enable-server --with-$db - make clean - make - mv src/zabbix_server/zabbix_server{,_$db} - done - - for db in mysql; do - ./configure ${_configure_flags[@]} --enable-proxy --with-$db - make clean - make - mv src/zabbix_proxy/zabbix_proxy{,_$db} - done -} - -package_zabbix-server() { - pkgdesc='Monitoring software for networks and applications' - depends=(net-snmp curl libxml2 unixodbc libldap libevent pcre2 openipmi) - optdepends=('mariadb-libs: for MariaDB support' - 'zabbix-web-service: for scheduled PDF report generation') - backup=(etc/zabbix/zabbix_server.conf) - - cd $pkgbase-$pkgver - - for db in mysql; do - install -Dm755 src/zabbix_server/zabbix_server_$db \ - "$pkgdir/usr/bin/zabbix_server_$db" - - install -d "$pkgdir/usr/share/$pkgname/$db" - install -m644 ../copies/database/$db/*.sql -t "$pkgdir/usr/share/$pkgname/$db" - done - install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get" - - install -Dm644 man/zabbix_server.man "$pkgdir/usr/share/man/man8/zabbix_server.8" - install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1" - - install -Dm644 conf/zabbix_server.conf "$pkgdir/etc/zabbix/zabbix_server.conf" - chown 170:170 "$pkgdir/etc/zabbix/zabbix_server.conf" - - install -Dm644 "$srcdir/zabbix-server-mysql.service" \ - "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service" - - install -Dm644 "$srcdir/zabbix-server.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/zabbix-server.conf" - install -Dm644 "$srcdir/zabbix-server.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf" - - # Fix socket paths to avoid 10 day cleanup in /tmp - echo "d /run/$pkgname 750 $pkgname $pkgname" >> "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - sed -i \ - -e "s/# SocketDir=\/tmp/SocketDir=\/run\/$pkgname/" \ - "$pkgdir/etc/zabbix/"*.conf -} - -package_zabbix-agent() { - pkgdesc='Monitoring agent for Zabbix' - depends=(curl pcre2) - backup=(etc/zabbix/zabbix_agentd.conf) - - cd $pkgbase-$pkgver - install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd" - install -Dm755 src/zabbix_sender/zabbix_sender "$pkgdir/usr/bin/zabbix_sender" - - install -Dm644 conf/zabbix_agentd.conf "$pkgdir/etc/zabbix/zabbix_agentd.conf" - chown 172:172 "$pkgdir/etc/zabbix/zabbix_agentd.conf" - - install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \ - "$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf" - install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \ - "$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf" - - install -Dm644 man/zabbix_agentd.man \ - "$pkgdir/usr/share/man/man8/zabbix_agentd.8" - install -Dm644 man/zabbix_sender.man \ - "$pkgdir/usr/share/man/man1/zabbix_sender.1" - - install -Dm644 "$srcdir/zabbix-agent.service" \ - "$pkgdir/usr/lib/systemd/system/zabbix-agent.service" - install -Dm644 "$srcdir/zabbix-agent.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf" - install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf" -} - -package_zabbix-agent2() { - pkgdesc='Monitoring agent for Zabbix (version 2)' - depends=(curl pcre2) - backup=(etc/zabbix/zabbix_agent2.conf) - - cd $pkgbase-$pkgver - install -Dm755 src/go/bin/zabbix_agent2 "$pkgdir/usr/bin/zabbix_agent2" - install -Dm644 src/go/conf/zabbix_agent2.conf "$pkgdir/etc/zabbix/zabbix_agent2.conf" - chown 172:172 "$pkgdir/etc/zabbix/zabbix_agent2.conf" - mkdir -p "$pkgdir/etc/zabbix/zabbix_agent2.d/plugins.d/" - chown 172:172 "$pkgdir/etc/zabbix/zabbix_agent2.d/plugins.d/" - - install -Dm644 man/zabbix_agent2.man \ - "$pkgdir/usr/share/man/man8/zabbix_agent2.8" - - install -Dm644 "$srcdir/zabbix-agent2.service" \ - "$pkgdir/usr/lib/systemd/system/zabbix-agent2.service" -} - -package_zabbix-proxy() { - pkgdesc='Data collecting proxy for Zabbix' - depends=(net-snmp curl libxml2 unixodbc libldap pcre2 libevent openipmi) - optdepends=('mariadb-libs: for MariaDB support') - backup=(etc/zabbix/zabbix_proxy.conf) - - cd $pkgbase-$pkgver - for db in mysql; do - install -Dm755 src/zabbix_proxy/zabbix_proxy_$db \ - "$pkgdir/usr/bin/zabbix_proxy_$db" - - install -d "$pkgdir/usr/share/$pkgname/$db" - install -m644 ../copies/database/$db/schema.sql -t "$pkgdir/usr/share/$pkgname/$db" - done - install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf" - chown 171:171 "$pkgdir/etc/zabbix/zabbix_proxy.conf" - - install -Dm644 "$srcdir/zabbix-proxy-mysql.service" \ - "$pkgdir/usr/lib/systemd/system/zabbix-proxy-mysql.service" - - install -Dm644 "$srcdir/zabbix-proxy.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/zabbix-proxy.conf" - install -Dm644 "$srcdir/zabbix-proxy.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/zabbix-proxy.conf" - - # Fix socket paths to avoid 10 day cleanup in /tmp - echo "d /run/$pkgname 750 $pkgname $pkgname" >> "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - sed -i \ - -e "s/# SocketDir=\/tmp/SocketDir=\/run\/$pkgname/" \ - "$pkgdir/etc/zabbix/"*.conf -} - -package_zabbix-frontend-php() { - pkgdesc='PHP frontend for Zabbix' - depends=(zabbix-server php php-gd) - - cd $pkgbase-$pkgver - install -d "$pkgdir/usr/share/webapps/zabbix" - cp -a ui/* "$pkgdir/usr/share/webapps/zabbix" - chown 33:33 ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for http user -} - -package_zabbix-web-service() { - pkgdesc='Zabbix web service used to generate and send scheduled reports' - depends=(chromium) - backup=(etc/zabbix/zabbix_web_service.conf) - - cd $pkgbase-$pkgver - install -Dm755 src/go/bin/zabbix_web_service "$pkgdir/usr/bin/zabbix_web_service" - install -Dm644 src/go/conf/zabbix_web_service.conf "$pkgdir/etc/zabbix/zabbix_web_service.conf" - chown 173:173 "$pkgdir/etc/zabbix/zabbix_web_service.conf" - - install -Dm644 "$srcdir/zabbix-web-service.service" \ - "$pkgdir/usr/lib/systemd/system/zabbix-web-service.service" - install -Dm644 "$srcdir/zabbix-web-service.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/zabbix-web-service.conf" - install -Dm644 "$srcdir/zabbix-web-service.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/zabbix-web-service.conf" -} diff --git a/linhes/zabbix/zabbix-agent.service b/linhes/zabbix/zabbix-agent.service deleted file mode 100644 index 98fb499..0000000 --- a/linhes/zabbix/zabbix-agent.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Zabbix Agent -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/zabbix_agentd -f -User=zabbix-agent - -[Install] -WantedBy=multi-user.target diff --git a/linhes/zabbix/zabbix-agent.sysusers b/linhes/zabbix/zabbix-agent.sysusers deleted file mode 100644 index 1e46401..0000000 --- a/linhes/zabbix/zabbix-agent.sysusers +++ /dev/null @@ -1 +0,0 @@ -u zabbix-agent 172 - /var/lib/zabbix-agent diff --git a/linhes/zabbix/zabbix-agent.tmpfiles b/linhes/zabbix/zabbix-agent.tmpfiles deleted file mode 100644 index ffacad7..0000000 --- a/linhes/zabbix/zabbix-agent.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent - diff --git a/linhes/zabbix/zabbix-agent2.service b/linhes/zabbix/zabbix-agent2.service deleted file mode 100644 index 02e340b..0000000 --- a/linhes/zabbix/zabbix-agent2.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Zabbix Agent 2 -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/zabbix_agent2 -User=zabbix-agent - -[Install] -WantedBy=multi-user.target diff --git a/linhes/zabbix/zabbix-proxy-mysql.service b/linhes/zabbix/zabbix-proxy-mysql.service deleted file mode 100644 index 16b9c7f..0000000 --- a/linhes/zabbix/zabbix-proxy-mysql.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Zabbix proxy with MySQL -After=network.target mysql.service -Conflicts=zabbix-proxy.service zabbix-proxy-pgsql.service - -[Service] -Type=simple -ExecStart=/usr/bin/zabbix_proxy_mysql -f -User=zabbix-proxy -PrivateDevices=yes -PrivateTmp=yes -ProtectSystem=full -ProtectHome=yes -CapabilityBoundingSet=cap_net_raw -AmbientCapabilities=cap_net_raw - -[Install] -WantedBy=multi-user.target diff --git a/linhes/zabbix/zabbix-proxy.sysusers b/linhes/zabbix/zabbix-proxy.sysusers deleted file mode 100644 index f02825c..0000000 --- a/linhes/zabbix/zabbix-proxy.sysusers +++ /dev/null @@ -1 +0,0 @@ -u zabbix-proxy 171 - /var/lib/zabbix-proxy diff --git a/linhes/zabbix/zabbix-proxy.tmpfiles b/linhes/zabbix/zabbix-proxy.tmpfiles deleted file mode 100644 index 2b4100b..0000000 --- a/linhes/zabbix/zabbix-proxy.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy - diff --git a/linhes/zabbix/zabbix-server-mysql.service b/linhes/zabbix/zabbix-server-mysql.service deleted file mode 100644 index ba480a6..0000000 --- a/linhes/zabbix/zabbix-server-mysql.service +++ /dev/null @@ -1,19 +0,0 @@ - -[Unit] -Description=Zabbix Server with MySQL -After=network.target mysql.service -Conflicts=zabbix-server.service zabbix-server-pgsql.service - -[Service] -Type=simple -ExecStart=/usr/bin/zabbix_server_mysql -f -User=zabbix-server -#PrivateDevices=yes -PrivateTmp=yes -ProtectSystem=full -ProtectHome=yes -CapabilityBoundingSet=cap_net_raw cap_setuid cap_setgid -AmbientCapabilities=cap_net_raw cap_setuid cap_setgid - -[Install] -WantedBy=multi-user.target diff --git a/linhes/zabbix/zabbix-server.sysusers b/linhes/zabbix/zabbix-server.sysusers deleted file mode 100644 index 82bb6dc..0000000 --- a/linhes/zabbix/zabbix-server.sysusers +++ /dev/null @@ -1 +0,0 @@ -u zabbix-server 170 - /var/lib/zabbix-server diff --git a/linhes/zabbix/zabbix-server.tmpfiles b/linhes/zabbix/zabbix-server.tmpfiles deleted file mode 100644 index c278a2f..0000000 --- a/linhes/zabbix/zabbix-server.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/zabbix-server 0750 zabbix-server zabbix-server - diff --git a/linhes/zabbix/zabbix-web-service.service b/linhes/zabbix/zabbix-web-service.service deleted file mode 100644 index fd3c324..0000000 --- a/linhes/zabbix/zabbix-web-service.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Zabbix Web Service -After=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/zabbix_web_service -f -User=zabbix-web-service - -[Install] -WantedBy=multi-user.target diff --git a/linhes/zabbix/zabbix-web-service.sysusers b/linhes/zabbix/zabbix-web-service.sysusers deleted file mode 100644 index 5c42710..0000000 --- a/linhes/zabbix/zabbix-web-service.sysusers +++ /dev/null @@ -1 +0,0 @@ -u zabbix-web-service 173 - /var/lib/zabbix-web-service diff --git a/linhes/zabbix/zabbix-web-service.tmpfiles b/linhes/zabbix/zabbix-web-service.tmpfiles deleted file mode 100644 index 45d6a63..0000000 --- a/linhes/zabbix/zabbix-web-service.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/zabbix-web-service 0750 zabbix-web-service zabbix-web-service - |