From 6439bece358ac4273f8558265d9a1b800727c430 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Wed, 26 Oct 2022 17:10:40 +0200
Subject: [PATCH 1/6] upgpkg: motion-git 3.4.1.r793.db94a89-1

---
 .SRCINFO        | 32 ++++++++++++++------------
 PKGBUILD        | 61 +++++++++++++++++++++++++++++--------------------
 motion.service  | 12 ++++++++++
 motion.sysusers |  2 ++
 motion.tmpfiles |  1 +
 5 files changed, 68 insertions(+), 40 deletions(-)
 create mode 100644 motion.service
 create mode 100644 motion.sysusers
 create mode 100644 motion.tmpfiles

diff --git a/.SRCINFO b/.SRCINFO
index 087c40d..2167de4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
-# Generated by mksrcinfo v8
-# Tue Jun  6 21:41:31 UTC 2017
 pkgbase = motion-git
-	pkgdesc = A software motion detector which grabs images from video4linux devices and/or from webcams
-	pkgver = 4.0.r178.ga801f19
+	pkgdesc = Monitor and record video signals from many types of cameras
+	pkgver = 3.4.1.r793.db94a89
 	pkgrel = 1
-	url = https://motion-project.github.io/
-	arch = i686
+	url = https://motion-project.github.io
 	arch = x86_64
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
 	license = GPL
-	depends = libjpeg
-	depends = v4l-utils
+	makedepends = git
+	depends = sqlite
 	depends = ffmpeg
-	provides = motion
+	depends = libmicrohttpd
+	depends = libwebp
+	depends = mariadb-libs
+	optdepends = gettext: native language support
 	conflicts = motion
 	backup = etc/motion/motion.conf
-	source = motion::git+https://github.com/Motion-Project/motion.git
-	md5sums = SKIP
+	source = git+https://github.com/Motion-Project/motion.git
+	source = motion.service
+	source = motion.sysusers
+	source = motion.tmpfiles
+	b2sums = SKIP
+	b2sums = c66ca8a7723b78f05cf4750377276891cb6025a74ec33960ccaa3939a25edb6eca713d36ded94d20db70cd1bd6694629eb6d43ba63e8165be145bb9d6a668771
+	b2sums = e923b20ceb893fb52cffc530f3d777ccbaffd7aef447f368a6a83b73043795acfb6a26da0bcdeb695a3b356baebe9ad89ea9aabd27e986c482dcd71670957a84
+	b2sums = 3f39854b561200ad052529f187a83f135be3ca4ea20e9897fe41fbae7ed898850017bdd496996199afc00f151a2302314aef8c2f6847337cf1b8e8e7579be4e7
 
 pkgname = motion-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4121042..a35d467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,52 @@
-# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
+# Maintainer: Giovanni Harting <539@idlegandalf.com>
+# Contributor: Felix Yan <felixonmars@archlinux.org>
+# Contributor: mrxx <mrxx at cyberhome dot at>
+# Contributor: Evgeny Kurnevsky <kurnevsky@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion-git
-_pkgname=motion
-pkgver=4.0.r178.ga801f19
+pkgver=3.4.1.r793.db94a89
 pkgrel=1
-pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+pkgdesc="Monitor and record video signals from many types of cameras"
+arch=('x86_64')
 license=('GPL')
-url="https://motion-project.github.io/"
-depends=('libjpeg' 'v4l-utils' 'ffmpeg')
-provides=('motion')
-conflicts=('motion')
+url="https://motion-project.github.io"
+conflicts=(motion)
+depends=('sqlite' 'ffmpeg' 'libmicrohttpd' 'libwebp' 'mariadb-libs')
+makedepends=(git)
+optdepends=('gettext: native language support')
 backup=('etc/motion/motion.conf')
-source=($_pkgname::git+https://github.com/Motion-Project/${_pkgname}.git)
-md5sums=('SKIP')
+source=("git+https://github.com/Motion-Project/motion.git"
+        'motion.service'
+        'motion.sysusers'
+        'motion.tmpfiles')
+b2sums=('SKIP'
+        'c66ca8a7723b78f05cf4750377276891cb6025a74ec33960ccaa3939a25edb6eca713d36ded94d20db70cd1bd6694629eb6d43ba63e8165be145bb9d6a668771'
+        'e923b20ceb893fb52cffc530f3d777ccbaffd7aef447f368a6a83b73043795acfb6a26da0bcdeb695a3b356baebe9ad89ea9aabd27e986c482dcd71670957a84'
+        '3f39854b561200ad052529f187a83f135be3ca4ea20e9897fe41fbae7ed898850017bdd496996199afc00f151a2302314aef8c2f6847337cf1b8e8e7579be4e7')
 
 pkgver() {
-  cd "${_pkgname}"
-  # cutting off 'release-' prefix that presents in the git tag
-  git describe --long --tags | sed 's/^release-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	cd "$srcdir/${pkgname%-git}"
+	printf "%s" "$(git describe --long | sed 's/release-//g;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --without-mysql --without-pgsql
+  cd ${pkgname%-git}
+  autoreconf -fi
+  ./configure --prefix=/usr \
+    --without-pgsql \
+    --without-mysql \
+    --sysconfdir=/etc \
+    --with-ffmpeg \
+    --with-webp
   make
 }
 
 package(){
-  cd "${srcdir}/${_pkgname}"
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/etc/motion/motion{-dist,}.conf
-  mv "${pkgdir}"/etc/motion/camera1{-dist,}.conf
-  mv "${pkgdir}"/etc/motion/camera2{-dist,}.conf
-  mv "${pkgdir}"/etc/motion/camera3{-dist,}.conf
-  mv "${pkgdir}"/etc/motion/camera4{-dist,}.conf
-  install -Dm644 "${pkgdir}/usr/share/motion/examples/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service"
+  cd ${pkgname%-git}
+  make DESTDIR="$pkgdir" install
+  install -Dm644 data/motion-dist.conf "$pkgdir"/etc/motion/motion.conf
+  install -Dm644 "$srcdir"/motion.service "$pkgdir"/usr/lib/systemd/system/motion.service
+  install -Dm644 "$srcdir"/motion.sysusers "$pkgdir"/usr/lib/sysusers.d/motion.conf
+  install -Dm644 "$srcdir"/motion.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/motion.conf
 }
diff --git a/motion.service b/motion.service
new file mode 100644
index 0000000..943585b
--- /dev/null
+++ b/motion.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Motion daemon
+After=local-fs.target network.target
+
+[Service]
+User=motion
+ExecStart=/usr/bin/motion -n
+Type=simple
+StandardError=null
+
+[Install]
+WantedBy=multi-user.target
diff --git a/motion.sysusers b/motion.sysusers
new file mode 100644
index 0000000..1489a53
--- /dev/null
+++ b/motion.sysusers
@@ -0,0 +1,2 @@
+u motion - - /var/lib/motion
+m motion video
diff --git a/motion.tmpfiles b/motion.tmpfiles
new file mode 100644
index 0000000..8342ff3
--- /dev/null
+++ b/motion.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/motion 0700 motion motion - -

From 498cf42297018b36beef9510f00835983c99f874 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Wed, 26 Oct 2022 17:27:18 +0200
Subject: [PATCH 2/6] upgpkg: motion-git 4.4.0.r44.db94a89-1

---
 .SRCINFO | 2 +-
 PKGBUILD | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 2167de4..b73e706 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = motion-git
 	pkgdesc = Monitor and record video signals from many types of cameras
-	pkgver = 3.4.1.r793.db94a89
+	pkgver = 4.4.0.r44.db94a89
 	pkgrel = 1
 	url = https://motion-project.github.io
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index a35d467..bcc32da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion-git
-pkgver=3.4.1.r793.db94a89
+pkgver=4.4.0.r44.db94a89
 pkgrel=1
 pkgdesc="Monitor and record video signals from many types of cameras"
 arch=('x86_64')
@@ -27,7 +27,7 @@ b2sums=('SKIP'
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
-	printf "%s" "$(git describe --long | sed 's/release-//g;s/\([^-]*-\)g/r\1/;s/-/./g')"
+	printf "%s" "$(git describe --long --tags | sed 's/release-//g;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {

From 811b11e118557a635be62a27edb60754567a3b40 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sat, 13 Jan 2024 16:00:20 +0100
Subject: [PATCH 3/6] upgpkg: adguardhome 1:0.107.43-1 upgpkg: alhp-keyring
 20230504-4 upgpkg: alhp-mirrorlist 20230831-1 upgpkg: antidot 0.6.3-1 upgpkg:
 asus-numpad 0.4.1-6 upgpkg: coreapps-meta 1-1 upgpkg: eggdrop 1.9.3-1 upgpkg:
 hide-client 0.9.8-2 upgpkg: jellyfin-mpv-shim 2.6.0-1 upgpkg: mmdbinspect
 0.1.1-1 upgpkg: motion-git 4.4.0.r44.db94a89-1 upgpkg: motionplus 0.1.1-4
 upgpkg: mpv-shim-default-shaders 2.1.0-1 upgpkg: perl-filehandle-unget
 0.1634-2 upgpkg: perl-mail-mbox-messageparser 1.5111-1 upgpkg:
 perl-net-ftpssl 0.42-1 upgpkg: pyfan 1.6.1-1 upgpkg: python-derpconf 0.8.4-1
 upgpkg: python-jellyfin-apiclient 1.9.2-1 upgpkg: python-libthumbor 2.0.2-2
 upgpkg: python-mpv-jsonipc 1.2.0-1 upgpkg: python-preggy 1.4.4-1 upgpkg:
 python-pyssim 0.6-1 upgpkg: python-pystray 0.19.5-1 upgpkg: python-simple-pid
 1.0.1-1 upgpkg: python-socketfromfd 0.2.0-1 upgpkg: rvpk 1.1.0-1 upgpkg:
 thumbor 7.7.3-1 upgpkg: unvpk-git r108.1f1f44f-1 upgpkg: victoriametrics
 1.93.5-1

syntax changes
---
 PKGBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index bcc32da..3ecc159 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,11 @@ pkgname=motion-git
 pkgver=4.4.0.r44.db94a89
 pkgrel=1
 pkgdesc="Monitor and record video signals from many types of cameras"
-arch=('x86_64')
-license=('GPL')
+arch=(x86_64)
+license=(GPL)
 url="https://motion-project.github.io"
 conflicts=(motion)
-depends=('sqlite' 'ffmpeg' 'libmicrohttpd' 'libwebp' 'mariadb-libs')
+depends=(sqlite ffmpeg libmicrohttpd libwebp mariadb-libs)
 makedepends=(git)
 optdepends=('gettext: native language support')
 backup=('etc/motion/motion.conf')
@@ -50,3 +50,5 @@ package(){
   install -Dm644 "$srcdir"/motion.sysusers "$pkgdir"/usr/lib/sysusers.d/motion.conf
   install -Dm644 "$srcdir"/motion.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/motion.conf
 }
+
+# vim:set ts=2 sw=2 et:

From 3f5f1b576f45a8e5280b0b67a12b9dc4aa8db3f4 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sat, 23 Mar 2024 19:31:54 +0100
Subject: [PATCH 4/6] upgpkg: motion-git 4.6.0.r10.11e5ca7-1

---
 .SRCINFO |  6 ++++--
 PKGBUILD | 14 ++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b73e706..0125b28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = motion-git
 	pkgdesc = Monitor and record video signals from many types of cameras
-	pkgver = 4.4.0.r44.db94a89
+	pkgver = 4.6.0.r10.11e5ca7
 	pkgrel = 1
 	url = https://motion-project.github.io
 	arch = x86_64
-	license = GPL
+	license = GPL-2.0-or-later
 	makedepends = git
+	depends = glibc
+	depends = libjpeg-turbo
 	depends = sqlite
 	depends = ffmpeg
 	depends = libmicrohttpd
diff --git a/PKGBUILD b/PKGBUILD
index 3ecc159..d190829 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,19 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion-git
-pkgver=4.4.0.r44.db94a89
+pkgver=4.6.0.r10.11e5ca7
 pkgrel=1
-pkgdesc="Monitor and record video signals from many types of cameras"
+pkgdesc='Monitor and record video signals from many types of cameras'
 arch=(x86_64)
-license=(GPL)
-url="https://motion-project.github.io"
+license=(GPL-2.0-or-later)
+url='https://motion-project.github.io'
 conflicts=(motion)
-depends=(sqlite ffmpeg libmicrohttpd libwebp mariadb-libs)
+depends=(glibc libjpeg-turbo sqlite ffmpeg libmicrohttpd libwebp mariadb-libs)
 makedepends=(git)
 optdepends=('gettext: native language support')
 backup=('etc/motion/motion.conf')
 source=("git+https://github.com/Motion-Project/motion.git"
-        'motion.service'
-        'motion.sysusers'
-        'motion.tmpfiles')
+        ${pkgname%-git}.{service,sysusers,tmpfiles})
 b2sums=('SKIP'
         'c66ca8a7723b78f05cf4750377276891cb6025a74ec33960ccaa3939a25edb6eca713d36ded94d20db70cd1bd6694629eb6d43ba63e8165be145bb9d6a668771'
         'e923b20ceb893fb52cffc530f3d777ccbaffd7aef447f368a6a83b73043795acfb6a26da0bcdeb695a3b356baebe9ad89ea9aabd27e986c482dcd71670957a84'

From f13c057f6cc047b49729497455dcfe4ad2fe713c Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 19 May 2024 14:01:17 +0200
Subject: [PATCH 5/6] upgpkg: motion-git 4.6.0.r11.629b3ba-1

harden systemd service
---
 .SRCINFO       |  4 ++--
 PKGBUILD       | 12 ++++++------
 motion.service | 11 +++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 0125b28..22581f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = motion-git
 	pkgdesc = Monitor and record video signals from many types of cameras
-	pkgver = 4.6.0.r10.11e5ca7
+	pkgver = 4.6.0.r11.629b3ba
 	pkgrel = 1
 	url = https://motion-project.github.io
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = motion-git
 	source = motion.sysusers
 	source = motion.tmpfiles
 	b2sums = SKIP
-	b2sums = c66ca8a7723b78f05cf4750377276891cb6025a74ec33960ccaa3939a25edb6eca713d36ded94d20db70cd1bd6694629eb6d43ba63e8165be145bb9d6a668771
+	b2sums = f2ecae6cdf3e650edca4b69c859c9f16b1a8541d94a880cb29a73237a2b1abd65d3e20ca701603c250d96564294c6967d6bfe917e0aa9aface0c0b41fe65d90f
 	b2sums = e923b20ceb893fb52cffc530f3d777ccbaffd7aef447f368a6a83b73043795acfb6a26da0bcdeb695a3b356baebe9ad89ea9aabd27e986c482dcd71670957a84
 	b2sums = 3f39854b561200ad052529f187a83f135be3ca4ea20e9897fe41fbae7ed898850017bdd496996199afc00f151a2302314aef8c2f6847337cf1b8e8e7579be4e7
 
diff --git a/PKGBUILD b/PKGBUILD
index d190829..6b37a61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion-git
-pkgver=4.6.0.r10.11e5ca7
+pkgver=4.6.0.r11.629b3ba
 pkgrel=1
 pkgdesc='Monitor and record video signals from many types of cameras'
 arch=(x86_64)
@@ -19,12 +19,12 @@ backup=('etc/motion/motion.conf')
 source=("git+https://github.com/Motion-Project/motion.git"
         ${pkgname%-git}.{service,sysusers,tmpfiles})
 b2sums=('SKIP'
-        'c66ca8a7723b78f05cf4750377276891cb6025a74ec33960ccaa3939a25edb6eca713d36ded94d20db70cd1bd6694629eb6d43ba63e8165be145bb9d6a668771'
+        'f2ecae6cdf3e650edca4b69c859c9f16b1a8541d94a880cb29a73237a2b1abd65d3e20ca701603c250d96564294c6967d6bfe917e0aa9aface0c0b41fe65d90f'
         'e923b20ceb893fb52cffc530f3d777ccbaffd7aef447f368a6a83b73043795acfb6a26da0bcdeb695a3b356baebe9ad89ea9aabd27e986c482dcd71670957a84'
         '3f39854b561200ad052529f187a83f135be3ca4ea20e9897fe41fbae7ed898850017bdd496996199afc00f151a2302314aef8c2f6847337cf1b8e8e7579be4e7')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
+	cd ${pkgname%-git}
 	printf "%s" "$(git describe --long --tags | sed 's/release-//g;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
@@ -44,9 +44,9 @@ package(){
   cd ${pkgname%-git}
   make DESTDIR="$pkgdir" install
   install -Dm644 data/motion-dist.conf "$pkgdir"/etc/motion/motion.conf
-  install -Dm644 "$srcdir"/motion.service "$pkgdir"/usr/lib/systemd/system/motion.service
-  install -Dm644 "$srcdir"/motion.sysusers "$pkgdir"/usr/lib/sysusers.d/motion.conf
-  install -Dm644 "$srcdir"/motion.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/motion.conf
+  install -Dm644 ../motion.service "$pkgdir"/usr/lib/systemd/system/motion.service
+  install -Dm644 ../motion.sysusers "$pkgdir"/usr/lib/sysusers.d/motion.conf
+  install -Dm644 ../motion.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/motion.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/motion.service b/motion.service
index 943585b..1d35f4d 100644
--- a/motion.service
+++ b/motion.service
@@ -8,5 +8,16 @@ ExecStart=/usr/bin/motion -n
 Type=simple
 StandardError=null
 
+ProtectSystem=strict
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+NoNewPrivileges=true
+MemoryDenyWriteExecute=true
+LockPersonality=true
+ProtectHostname=true
+
 [Install]
 WantedBy=multi-user.target

From 2f906abe48735948211d75765f972bd7977607a2 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Mon, 3 Jun 2024 20:19:57 +0200
Subject: [PATCH 6/6] upgpkg: motion-git 4.6.0.r11.629b3ba-2

add missing provides

upgpkg: python-pystray 0.19.5-4

rename package function

upgpkg: rvpk 1.1.0-3

formatting

upgpkg: unvpk-git r108.1f1f44f-2

formatting
---
 .SRCINFO | 3 ++-
 PKGBUILD | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 22581f7..23ed646 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = motion-git
 	pkgdesc = Monitor and record video signals from many types of cameras
 	pkgver = 4.6.0.r11.629b3ba
-	pkgrel = 1
+	pkgrel = 2
 	url = https://motion-project.github.io
 	arch = x86_64
 	license = GPL-2.0-or-later
@@ -14,6 +14,7 @@ pkgbase = motion-git
 	depends = libwebp
 	depends = mariadb-libs
 	optdepends = gettext: native language support
+	provides = motion
 	conflicts = motion
 	backup = etc/motion/motion.conf
 	source = git+https://github.com/Motion-Project/motion.git
diff --git a/PKGBUILD b/PKGBUILD
index 6b37a61..bc06837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,13 @@
 
 pkgname=motion-git
 pkgver=4.6.0.r11.629b3ba
-pkgrel=1
+pkgrel=2
 pkgdesc='Monitor and record video signals from many types of cameras'
 arch=(x86_64)
 license=(GPL-2.0-or-later)
 url='https://motion-project.github.io'
 conflicts=(motion)
+provides=(motion)
 depends=(glibc libjpeg-turbo sqlite ffmpeg libmicrohttpd libwebp mariadb-libs)
 makedepends=(git)
 optdepends=('gettext: native language support')