lvm2: update to 2.02.121.

srcpkgs/lvm2/files/dmeventd.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Device-mapper event daemon
-Documentation=man:dmeventd(8)
-Requires=dmeventd.socket
-After=dmeventd.socket
-DefaultDependencies=no
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/dmeventd
-ExecReload=/usr/sbin/dmeventd -R
-Environment=SD_ACTIVATION=1
-PIDFile=/run/dmeventd.pid
-OOMScoreAdjust=-1000

srcpkgs/lvm2/files/dmeventd.socket

@@ -1,11 +0,0 @@
-[Unit]
-Description=Device-mapper event daemon FIFOs
-Documentation=man:dmeventd(8)
-Before=sockets.target
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Socket]
-ListenFIFO=/run/dmeventd-server
-ListenFIFO=/run/dmeventd-client
-SocketMode=0600

srcpkgs/lvm2/files/lvm-monitoring.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
-Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
-Requires=dmeventd.socket
-After=dmeventd.socket lvmetad.socket
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
-ExecStart=/usr/sbin/lvm vgchange --monitor y
-ExecStop=/usr/sbin/lvm vgchange --monitor n
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target

srcpkgs/lvm2/files/lvm-on-crypt.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation of encrypted devices
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service cryptsetup.target
-Before=shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --sysinit --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target

srcpkgs/lvm2/files/lvm2.tmpfiles

@@ -1,2 +0,0 @@
-d /run/lock/lvm 0755 root root -
-d /run/lvm 0755 root root -

srcpkgs/lvm2/files/lvmetad.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM2 metadata daemon
-Documentation=man:lvmetad(8)
-Requires=lvmetad.socket
-After=lvmetad.socket
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-Type=forking
-NonBlocking=true
-ExecStart=/usr/sbin/lvmetad
-ExecReload=/usr/sbin/lvmetad -R
-Environment=SD_ACTIVATION=1
-Restart=on-abort
-PIDFile=/run/lvmetad.pid

srcpkgs/lvm2/files/lvmetad.socket

@@ -1,10 +0,0 @@
-[Unit]
-Description=LVM2 metadata daemon socket
-Documentation=man:lvmetad(8)
-Before=sockets.target systemd-udev-trigger.service
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Socket]
-ListenStream=/run/lvm/lvmetad.socket
-SocketMode=0600

srcpkgs/lvm2/template

@@ -1,7 +1,7 @@
 # Template file for 'lvm2'
 pkgname=lvm2
-version=2.02.120
+version=2.02.121
-revision=4
+revision=1
 wrksrc=LVM2.${version}
 build_style=gnu-configure
 configure_args="--disable-selinux --enable-readline --enable-pkgconfig
@@ -9,32 +9,21 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig
  --enable-dmeventd --enable-cmdlib --enable-udev_sync --enable-udev_rules
  --with-udevdir=/usr/lib/udev/rules.d --with-default-pid-dir=/run
  --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm
- --with-default-locking-dir=/run/lock/lvm --enable-lvmetad
+ --with-default-locking-dir=/run/lock/lvm --enable-lvmetad"
- $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)"
 hostmakedepends="pkg-config"
-# By using eudev we avoid a cyclic dependency:
-# 	device-mapper -> systemd -> cryptsetup -> device-mapper
 makedepends="libblkid-devel readline-devel eudev-libudev-devel"
 make_dirs="
  /etc/lvm/archive 0755 root root
  /etc/lvm/backup 0755 root root"
 conf_files="/etc/lvm/lvm.conf"
-build_options="systemd"
 short_desc="Logical Volume Manager 2 utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://sourceware.org/lvm2/"
 license="GPL-2, LGPL-2.1"
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
-checksum=8d6bd02f7d00315482538ece3e831cd81709c29d74ce71229c60192fb166081a
+checksum=a50762196f995d1ad83eec9f1e59140ecd23b04cc4a770345ee6f4544688c71a
 
 post_install() {
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/lvm2.tmpfiles 644 usr/lib/tmpfiles.d lvm2.conf
-		vinstall ${FILESDIR}/lvm-monitoring.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/lvmetad.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/lvmetad.socket 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/lvm-on-crypt.service 644 usr/lib/systemd/system
-	fi
 	sed -i 's,use_lvmetad = 1,use_lvmetad = 0,' ${DESTDIR}/etc/lvm/lvm.conf
 	vsv lvmetad
 }
@@ -63,13 +52,6 @@ device-mapper_package() {
 		for f in 10-dm 13-dm-disk 95-dm-notify; do
 			vmove usr/lib/udev/rules.d/${f}.rules
 		done
-		if [ "$build_option_systemd" ]; then
-			vmkdir usr/lib/systemd/system/sockets.target.wants
-			vinstall ${FILESDIR}/dmeventd.service 644 usr/lib/systemd/system
-			vinstall ${FILESDIR}/dmeventd.socket 644 usr/lib/systemd/system
-			ln -sf /usr/lib/systemd/system/dmeventd.socket \
-				${PKGDESTDIR}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket
-		fi
 		vsv dmeventd
 	}
 }