summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO27
-rw-r--r--.gitignore7
-rw-r--r--PKGBUILD56
-rw-r--r--PKGBUILD_master50
-rw-r--r--lib_path.patch21
-rw-r--r--systemd-netlogd.sysusers3
6 files changed, 126 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d82306cf5938..76443fd4e63f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,6 @@
pkgbase = systemd-netlogd
pkgdesc = Forwards messages from the journal to other hosts over the network using syslog format RFC 5424
- pkgver = 1.0
- pkgrel = 1
- url = https://github.com/systemd/systemd-netlogd
- arch = x86_64
- license = LGPL
- makedepends = meson
- depends = libsystemd
- source = systemd-netlogd-1.0.tar.gz::https://github.com/systemd/systemd-netlogd/archive/v1.0.tar.gz
- source = systemd-netlogd.sysusers
- md5sums = eb7c9a9c24ef0b6acb10d9756b62f03c
- md5sums = bfee4a55b61044b0e3a76f13525f3788
-
-pkgname = systemd-netlogd
-
-pkgbase = systemd-netlogd
- pkgdesc = Forwards messages from the journal to other hosts over the network using syslog format RFC 5424
- pkgver = 1.0
+ pkgver = 1.2
pkgrel = 1
url = https://github.com/systemd/systemd-netlogd
arch = x86_64
@@ -25,10 +9,11 @@ pkgbase = systemd-netlogd
makedepends = meson
makedepends = python-sphinx
depends = libsystemd
- source = systemd-netlogd-1.0.tar.gz::https://github.com/systemd/systemd-netlogd/archive/v1.0.tar.gz
+ source = systemd-netlogd-1.2.tar.gz::https://github.com/systemd/systemd-netlogd/archive/v1.2.tar.gz
source = systemd-netlogd.sysusers
- md5sums = eb7c9a9c24ef0b6acb10d9756b62f03c
- md5sums = bfee4a55b61044b0e3a76f13525f3788
+ source = lib_path.patch
+ md5sums = 54308f7b8cbdc4452a538397a6dce100
+ md5sums = 4c2740c72e455d37f1304c4a1e1c3952
+ md5sums = f62b0f23529966a0eb69f4087216b177
pkgname = systemd-netlogd
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..cecb1ddd0db8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+/pkg/
+/src/
+*.bak
+*.zst
+
+/systemd-netlogd-*
+
diff --git a/PKGBUILD b/PKGBUILD
index 6cacedfa71b8..aee251626265 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
-# Maintainer: Michael Corcoran <michael.corcoran@outlook.com>
-pkgname=systemd-netlogd
-pkgver=1.0
+# Maintainer: hitsmaxft <mfthits at gmail.com>
+_name=systemd-netlogd
+
+pkgname=$_name
+pkgver=1.2
pkgrel=1
pkgdesc="Forwards messages from the journal to other hosts over the network using syslog format RFC 5424 "
arch=('x86_64')
@@ -8,13 +10,41 @@ url="https://github.com/systemd/systemd-netlogd"
license=('LGPL')
depends=('libsystemd')
makedepends=('gperf' 'meson' 'python-sphinx')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
- "systemd-netlogd.sysusers")
-md5sums=('eb7c9a9c24ef0b6acb10d9756b62f03c'
- 'bfee4a55b61044b0e3a76f13525f3788')
+
+#options=(!emptydirs)
+
+pkgver_git() {
+ cd "${srcdir}/$pkgname"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ ( set -o pipefail
+ git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ )
+}
+
+source_git=( "${pkgname}::git+https://github.com/hitsmaxft/systemd-netlogd.git#branch=config_install_prefix"
+ "systemd-netlogd.sysusers")
+
+source=( "${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+ "systemd-netlogd.sysusers"
+ "lib_path.patch"
+)
+
+md5sums_git=('SKIP'
+ '4c2740c72e455d37f1304c4a1e1c3952'
+ 'f62b0f23529966a0eb69f4087216b177')
+
+md5sums=('54308f7b8cbdc4452a538397a6dce100'
+ '4c2740c72e455d37f1304c4a1e1c3952'
+ 'f62b0f23529966a0eb69f4087216b177')
+
+prepare(){
+ cd "$pkgname-$pkgver"
+ patch --strip=1 --input="${srcdir}/lib_path.patch"
+}
build() {
- arch-meson "${srcdir}/${pkgname}-${pkgver}" build --sysconfdir='/etc/systemd/system'
+ arch-meson "${srcdir}/${pkgname}-${pkgver}" build --prefix='/usr/lib/systemd/' --sysconfdir='/etc/systemd/'
ninja -C build
}
@@ -26,13 +56,7 @@ check() {
package() {
DESTDIR="${pkgdir}" ninja -C build install
- mkdir -p "${pkgdir}/usr/lib/systemd/system"
-
- mv "${pkgdir}/lib/systemd/systemd-netlogd" "${pkgdir}/usr/lib/systemd/"
- rm -r "${pkgdir}/lib"
-
- mv "${pkgdir}/etc/systemd/system/systemd-netlogd.service" "${pkgdir}/usr/lib/systemd/system"
- mv "${pkgdir}/etc/systemd/system/systemd-netlogd.conf" "${pkgdir}/etc/systemd/system/systemd-netlogd.conf.example"
-
install -Dm644 "$srcdir"/systemd-netlogd.sysusers "${pkgdir}/usr/lib/sysusers.d/systemd-netlogd.conf"
+
+ mv "${pkgdir}/etc/systemd/systemd-netlogd.conf" "${pkgdir}/etc/systemd/systemd-netlogd.conf.example"
}
diff --git a/PKGBUILD_master b/PKGBUILD_master
new file mode 100644
index 000000000000..568b88635419
--- /dev/null
+++ b/PKGBUILD_master
@@ -0,0 +1,50 @@
+# Maintainer: hitsmaxft <mfthits at gmail.com>
+_name=systemd-netlogd
+
+pkgname=$_name-git
+pkgver=r46.c9b20df
+pkgrel=1
+pkgdesc="Forwards messages from the journal to other hosts over the network using syslog format RFC 5424 "
+arch=('x86_64')
+url="https://github.com/systemd/systemd-netlogd"
+license=('LGPL')
+depends=('libsystemd')
+makedepends=('gperf' 'meson' 'python-sphinx')
+
+svcbranch='master'
+
+options=(!emptydirs)
+
+pkgver() {
+ cd "${srcdir}/$pkgname"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ ( set -o pipefail
+ git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ )
+}
+
+source=( "${pkgname}::git+https://github.com/hitsmaxft/systemd-netlogd.git#branch=config_install_prefix"
+ "systemd-netlogd.sysusers")
+
+
+md5sums=('SKIP'
+ '4c2740c72e455d37f1304c4a1e1c3952')
+
+build() {
+ arch-meson "${srcdir}/${pkgname}" build --prefix='/usr/lib/systemd/' --sysconfdir='/etc/systemd/'
+ ninja -C build
+}
+
+check() {
+ cd build
+ meson test
+}
+
+package() {
+ DESTDIR="${pkgdir}" ninja -C build install
+
+ install -Dm644 "$srcdir"/systemd-netlogd.sysusers "${pkgdir}/usr/lib/sysusers.d/systemd-netlogd.conf"
+
+ mv "${pkgdir}/etc/systemd/systemd-netlogd.conf" "${pkgdir}/etc/systemd/systemd-netlogd.conf.example"
+}
diff --git a/lib_path.patch b/lib_path.patch
new file mode 100644
index 000000000000..42bde7ff455a
--- /dev/null
+++ b/lib_path.patch
@@ -0,0 +1,21 @@
+diff --unified --recursive --text systemd-netlogd-1.2/meson.build systemd-netlogd-1.2-mod/meson.build
+--- systemd-netlogd-1.2/meson.build 2022-05-13 23:28:01.000000000 +0800
++++ systemd-netlogd-1.2-mod/meson.build 2022-10-04 21:10:09.719999945 +0800
+@@ -166,4 +166,4 @@
+ libcap,
+ libsystemd],
+ install : true,
+- install_dir : '/lib/systemd')
++ install_dir : '/usr/lib/systemd')
+diff --unified --recursive --text systemd-netlogd-1.2/units/systemd-netlogd.service.in systemd-netlogd-1.2-mod/units/systemd-netlogd.service.in
+--- systemd-netlogd-1.2/units/systemd-netlogd.service.in 2022-05-13 23:28:01.000000000 +0800
++++ systemd-netlogd-1.2-mod/units/systemd-netlogd.service.in 2022-10-04 21:05:00.656666607 +0800
+@@ -7,7 +7,7 @@
+ After=network.target
+
+ [Service]
+-ExecStart=/lib/systemd/systemd-netlogd
++ExecStart=/usr/lib/systemd/systemd-netlogd
+ PrivateTmp=yes
+ PrivateDevices=yes
+ WatchdogSec=20min
diff --git a/systemd-netlogd.sysusers b/systemd-netlogd.sysusers
index 9bf0c20a171c..a2460dbc5690 100644
--- a/systemd-netlogd.sysusers
+++ b/systemd-netlogd.sysusers
@@ -1 +1,2 @@
-m systemd-journal-netlog systemd-journal
+#Type Name ID GECOS Home directory Shell
+u systemd-journal-netlog -:systemd-journal - / /bin/nologin