Wed Oct 9 03:18:48 PDT 2013

3 files changed, 51 insertions, 19 deletions

diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index a4693ca3f..f57c8bcbf 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 193403 2013-08-19 17:24:15Z thomas $
+# $Id: PKGBUILD 196179 2013-10-07 23:45:54Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.100
+pkgver=2.02.103
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
-makedepends=('systemd')
+makedepends=('systemd' 'thin-provisioning-tools')
 groups=('base')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
         lvm2_hook
+        sd-lvm2
         11-dm-initramfs.rules
         lvm2.conf
         dmeventd.service
@@ -21,10 +22,11 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm-monitoring.service
         lvmetad.service
         lvmetad.socket)
-sha1sums=('95a4478e4a19bba2c6eb8c36b08b310a96e3944b'
+sha1sums=('1194babd8d3cd5a9620bec1fe98a3be060465daf'
           'SKIP'
           '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
+          '30777d42e31cb7fe1f4fadc1e8f4c4d4cdd8ffed'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
           'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
           '01782ce8e10718c1513e3906b126f30f682f5cab'
@@ -48,7 +50,7 @@ build() {
     --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
-    --enable-lvmetad
+    --enable-lvmetad --with-thin=internal
   make
 }
 
@@ -74,6 +76,7 @@ package_lvm2() {
   conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
+  optdepends=('thin-provisioning-tools: For thin provisioning support.')
   install=lvm2.install
 
   cd LVM2.${pkgver}
@@ -85,6 +88,7 @@ package_lvm2() {
   # mkinitcpio hook
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+  install -D -m644 "${srcdir}/sd-lvm2" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
   # systemd support
   install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
   install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"
diff --git a/core/lvm2/sd-lvm2 b/core/lvm2/sd-lvm2
new file mode 100644
index 000000000..07cb19a09
--- /dev/null
+++ b/core/lvm2/sd-lvm2
@@ -0,0 +1,31 @@
+#!/usr/bin/bash
+
+build() {
+    local mod
+    for mod in dm-mod dm-snapshot dm-mirror; do
+        add_module "$mod"
+    done
+
+    add_binary "/usr/bin/lvm"
+    add_binary "/usr/bin/lvmetad"
+    add_binary "/usr/bin/dmsetup"
+    add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+    add_file "/etc/lvm/lvm.conf"
+
+    add_file "/usr/lib/systemd/system/lvmetad.service"
+    add_file "/usr/lib/systemd/system/lvmetad.socket"
+    add_symlink "/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+}
+
+help() {
+  cat <<HELPEOF
+This hook enables LVM2 volumes in systemd-based initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 3a9653c82..f2cf755d6 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195886 2013-10-03 16:52:03Z bisson $
+# $Id: PKGBUILD 196202 2013-10-08 07:40:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
 
 pkgname=s-nail
-pkgver=14.4.3
+pkgver=14.4.4
 pkgrel=1
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://sourceforge.net/projects/s-nail/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64')
 depends=('openssl')
 optdepends=('smtp-forwarder: for sending mail')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz")
-sha1sums=('39fdade9b622a6addc5e70a5d929b0bc5ef49d00')
+sha1sums=('6aaa2ca4c269a073cdfd778de0f05d8eb2303737')
 
 groups=('base')
 backup=('etc/mail.rc')
@@ -30,23 +30,20 @@ build() {
 		MANDIR=/usr/share/man \
 		MAILSPOOL=/var/spool/mail \
 		SID= NAIL=mail \
-		CFLAGS="$CFLAGS $CPPFLAGS" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		DESTDIR="${pkgdir}" \
 		all
 }
 
-package() {
+check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make \
-		PREFIX=/usr \
-		SYSCONFDIR=/etc \
-		MANDIR=/usr/share/man \
-		MAILSPOOL=/var/spool/mail \
-		SID= NAIL=mail \
-		CFLAGS="$CFLAGS $CPPFLAGS" \
-		DESTDIR="${pkgdir}" \
-		install
+	#./cc-test.sh
+}
 
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make -f mk.mk install
 	ln -sf mail "${pkgdir}"/usr/bin/mailx
 	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"