[arch-commits] Commit in cryptsetup/repos (10 files)

2017-11-04 Thread Christian Hesse
Date: Saturday, November 4, 2017 @ 23:11:22
  Author: eworm
Revision: 308919

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 308918, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 308918, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 308918, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 308918, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 308918, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 308918, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 308918, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 308918, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  144 +++
 testing-i686/encrypt_install   |   44 +++
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  144 +++
 testing-x86_64/encrypt_install |   44 +++
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 542 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 308918, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-11-04 23:11:22 UTC (rev 308919)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Thomas Bächler 
+
+pkgname=cryptsetup
+pkgver=1.7.5
+pkgrel=2
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://gitlab.com/cryptsetup/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz 

+sha256sums=('2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd'
+'SKIP'
+'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 308918, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2017-11-04 23:11:22 UTC (rev 308919)
@@ -0,0 +1,144 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated

[arch-commits] Commit in cryptsetup/repos (10 files)

2017-04-27 Thread Christian Hesse
Date: Thursday, April 27, 2017 @ 11:09:11
  Author: eworm
Revision: 294906

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 294905, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 294905, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 294905, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 294905, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 294905, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 294905, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 294905, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 294905, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 294905, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-04-27 11:09:11 UTC (rev 294906)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Thomas Bächler 
+
+pkgname=cryptsetup
+pkgver=1.7.5
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://gitlab.com/cryptsetup/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz 

+sha256sums=('2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd'
+'SKIP'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 294905, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2017-04-27 11:09:11 UTC (rev 294906)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated

[arch-commits] Commit in cryptsetup/repos (10 files)

2017-03-16 Thread Bartłomiej Piotrowski
Date: Thursday, March 16, 2017 @ 07:28:45
  Author: bpiotrowski
Revision: 290909

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 290908, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 290908, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 290908, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 290908, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 290908, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 290908, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 290908, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 290908, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 290908, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-03-16 07:28:45 UTC (rev 290909)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Thomas Bächler 
+
+pkgname=cryptsetup
+pkgver=1.7.4
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://gitlab.com/cryptsetup/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz 

+sha256sums=('7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016'
+'SKIP'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 290908, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2017-03-16 07:28:45 UTC (rev 290909)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && 

[arch-commits] Commit in cryptsetup/repos (10 files)

2016-10-31 Thread Bartłomiej Piotrowski
Date: Monday, October 31, 2016 @ 08:52:16
  Author: bpiotrowski
Revision: 279514

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 279513, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 279513, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 279513, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 279513, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 279513, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 279513, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 279513, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 279513, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 279513, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-10-31 08:52:16 UTC (rev 279514)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Thomas Bächler 
+
+pkgname=cryptsetup
+pkgver=1.7.3
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://gitlab.com/cryptsetup/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz 

+sha256sums=('af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02'
+'SKIP'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 279513, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2016-10-31 08:52:16 UTC (rev 279514)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && 

[arch-commits] Commit in cryptsetup/repos (10 files)

2016-06-04 Thread Bartłomiej Piotrowski
Date: Saturday, June 4, 2016 @ 15:54:10
  Author: bpiotrowski
Revision: 268949

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 268948, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 268948, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 268948, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 268948, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 268948, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 268948, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 268948, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 268948, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   39 ++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   39 ++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 528 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 268948, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-06-04 13:54:10 UTC (rev 268949)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Thomas Bächler 
+pkgname=cryptsetup
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://gitlab.com/cryptsetup/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz 

+sha256sums=('dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342'
+'SKIP'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 268948, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2016-06-04 13:54:10 UTC (rev 268949)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
+dopassphrase=1
+# If keyfile exists, try 

[arch-commits] Commit in cryptsetup/repos (10 files)

2015-11-04 Thread Bartłomiej Piotrowski
Date: Wednesday, November 4, 2015 @ 22:55:31
  Author: bpiotrowski
Revision: 250117

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 250116, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 250116, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 250116, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 250116, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 250116, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 250116, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 250116, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 250116, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 250116, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-11-04 21:55:31 UTC (rev 250117)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler 
+pkgname=cryptsetup
+pkgver=1.7.0
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+#prepare() {
+#  cd "${srcdir}"/$pkgname-${pkgver}
+#}
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 250116, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2015-11-04 21:55:31 UTC (rev 250117)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
+dopassphrase=1
+# If keyfile exists, try to use that
+if [ -f ${ckeyfile} ]; then
+ 

[arch-commits] Commit in cryptsetup/repos (10 files)

2015-10-08 Thread Bartłomiej Piotrowski
Date: Thursday, October 8, 2015 @ 16:27:10
  Author: bpiotrowski
Revision: 248503

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 248502, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 248502, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 248502, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 248502, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 248502, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 248502, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 248502, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 248502, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 248502, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-10-08 14:27:10 UTC (rev 248503)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler 
+pkgname=cryptsetup
+pkgver=1.6.8
+pkgrel=1
+pkgdesc="Userspace setup tool for transparent encryption of block devices 
using dm-crypt"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+#prepare() {
+#  cd "${srcdir}"/$pkgname-${pkgver}
+#}
+
+build() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # install hook
+  install -D -m644 "${srcdir}"/encrypt_hook 
"${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 "${srcdir}"/encrypt_install 
"${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt 
"${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 248502, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2015-10-08 14:27:10 UTC (rev 248503)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt >/dev/null 2>&1
+[ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
+
+# Get keyfile if specified
+ckeyfile="/crypto_keyfile.bin"
+if [ -n "$cryptkey" ]; then
+IFS=: read ckdev ckarg1 ckarg2 &1
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" 
count="$ckarg2" >/dev/null 2>&1
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting 
to passphrase."
+fi
+
+if [ -n "${cryptdevice}" ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions <&2
+;;
+esac
+done
+
+if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
+if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+[ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
+dopassphrase=1
+# If keyfile exists, try to use that
+if [ -f ${ckeyfile} ]; then
+   

[arch-commits] Commit in cryptsetup/repos (10 files)

2015-06-17 Thread Bartłomiej Piotrowski
Date: Thursday, June 18, 2015 @ 01:02:58
  Author: bpiotrowski
Revision: 241004

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 241003, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 241003, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 241003, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 241003, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 241003, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 241003, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 241003, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 241003, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 241003, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-06-17 23:02:58 UTC (rev 241004)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.7
+pkgrel=1
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+#prepare() {
+#  cd ${srcdir}/$pkgname-${pkgver}
+#}
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 241003, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2015-06-17 23:02:58 UTC (rev 241004)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+

[arch-commits] Commit in cryptsetup/repos (10 files)

2014-08-23 Thread Thomas Bächler
Date: Saturday, August 23, 2014 @ 12:25:23
  Author: thomas
Revision: 220594

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 220593, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 220593, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 220593, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 220593, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 220593, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 220593, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 220593, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 220593, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 220593, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-08-23 10:25:23 UTC (rev 220594)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.6
+pkgrel=1
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux')
+makedepends=('util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+#prepare() {
+#  cd ${srcdir}/$pkgname-${pkgver}
+#}
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 220593, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2014-08-23 10:25:23 UTC (rev 220594)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+

[arch-commits] Commit in cryptsetup/repos (10 files)

2014-07-03 Thread Felix Yan
Date: Thursday, July 3, 2014 @ 11:43:54
  Author: fyan
Revision: 216394

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 216393, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 216393, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 216393, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 216393, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 216393, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 216393, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 216393, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 216393, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   36 ++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   36 ++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 522 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 216393, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-07-03 09:43:54 UTC (rev 216394)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.5
+pkgrel=1
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 216393, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2014-07-03 09:43:54 UTC (rev 216394)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions EOF
+$cryptdevice
+EOF
+else
+   

[arch-commits] Commit in cryptsetup/repos (10 files)

2014-02-27 Thread Thomas Bächler
Date: Thursday, February 27, 2014 @ 18:38:43
  Author: thomas
Revision: 206488

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 206487, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 206487, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 206487, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 206487, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 206487, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 206487, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 206487, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 206487, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   36 ++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   36 ++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 522 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 206487, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-02-27 17:38:43 UTC (rev 206488)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.4
+pkgrel=1
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!emptydirs')
+source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz
+
#https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign
+encrypt_hook
+encrypt_install
+sd-encrypt)
+sha256sums=('70b8e86eef94bbb4441ad38460d87138130d7fe5d01131c3ba50b9f0dca0'
+'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --sbindir=/usr/bin --disable-static 
--enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 206487, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2014-02-27 17:38:43 UTC (rev 206488)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions EOF
+$cryptdevice
+EOF
+else

[arch-commits] Commit in cryptsetup/repos (10 files)

2013-12-16 Thread Thomas Bächler
Date: Monday, December 16, 2013 @ 23:42:05
  Author: thomas
Revision: 201603

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 201602, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 201602, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 201602, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 201602, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 201602, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 201602, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 201602, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 201602, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 201602, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-12-16 22:42:05 UTC (rev 201603)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.3
+pkgrel=1
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!emptydirs')
+source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
+encrypt_hook
+encrypt_install
+sd-encrypt)
+md5sums=('a7aeb549a543eeac433eadfb6bc67837'
+ 'SKIP'
+ 'c279d86d6dc18322c054d2272ebb9e90'
+ '21c45f9cab3e0b5165f68358884fbd0f'
+ '6cf7e170ecd13e42fe829209628fdb4d')
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+
+  # usrmove
+  cd $pkgdir/usr
+  mv sbin bin
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 201602, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2013-12-16 22:42:05 UTC (rev 201603)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions EOF
+$cryptdevice
+EOF
+else
+DEPRECATED_CRYPT=1
+cryptdev=${root}
+cryptname=root
+fi
+
+warn_deprecated() {
+

[arch-commits] Commit in cryptsetup/repos (10 files)

2013-12-16 Thread Thomas Bächler
Date: Tuesday, December 17, 2013 @ 00:23:35
  Author: thomas
Revision: 201613

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  cryptsetup/repos/staging-i686/
  cryptsetup/repos/staging-i686/PKGBUILD
(from rev 201612, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/staging-i686/encrypt_hook
(from rev 201612, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/staging-i686/encrypt_install
(from rev 201612, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/staging-i686/sd-encrypt
(from rev 201612, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/staging-x86_64/
  cryptsetup/repos/staging-x86_64/PKGBUILD
(from rev 201612, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/staging-x86_64/encrypt_hook
(from rev 201612, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/staging-x86_64/encrypt_install
(from rev 201612, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/staging-x86_64/sd-encrypt
(from rev 201612, cryptsetup/trunk/sd-encrypt)

+
 staging-i686/PKGBUILD  |   41 +++
 staging-i686/encrypt_hook  |  139 +++
 staging-i686/encrypt_install   |   44 
 staging-i686/sd-encrypt|   42 +++
 staging-x86_64/PKGBUILD|   41 +++
 staging-x86_64/encrypt_hook|  139 +++
 staging-x86_64/encrypt_install |   44 
 staging-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/staging-i686/PKGBUILD (from rev 201612, 
cryptsetup/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-12-16 23:23:35 UTC (rev 201613)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.3
+pkgrel=2
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!emptydirs')
+source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
+encrypt_hook
+encrypt_install
+sd-encrypt)
+md5sums=('a7aeb549a543eeac433eadfb6bc67837'
+ 'SKIP'
+ 'c279d86d6dc18322c054d2272ebb9e90'
+ '21c45f9cab3e0b5165f68358884fbd0f'
+ '6cf7e170ecd13e42fe829209628fdb4d')
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+
+  # usrmove
+  cd $pkgdir/usr
+  mv sbin bin
+}

Copied: cryptsetup/repos/staging-i686/encrypt_hook (from rev 201612, 
cryptsetup/trunk/encrypt_hook)
===
--- staging-i686/encrypt_hook   (rev 0)
+++ staging-i686/encrypt_hook   2013-12-16 23:23:35 UTC (rev 201613)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions EOF
+$cryptdevice
+EOF
+else
+DEPRECATED_CRYPT=1
+cryptdev=${root}
+cryptname=root
+fi
+
+warn_deprecated() {
+

[arch-commits] Commit in cryptsetup/repos (10 files)

2013-09-28 Thread Thomas Bächler
Date: Sunday, September 29, 2013 @ 02:43:57
  Author: thomas
Revision: 195244

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cryptsetup/repos/testing-i686/
  cryptsetup/repos/testing-i686/PKGBUILD
(from rev 195243, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-i686/encrypt_hook
(from rev 195243, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-i686/encrypt_install
(from rev 195243, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-i686/sd-encrypt
(from rev 195243, cryptsetup/trunk/sd-encrypt)
  cryptsetup/repos/testing-x86_64/
  cryptsetup/repos/testing-x86_64/PKGBUILD
(from rev 195243, cryptsetup/trunk/PKGBUILD)
  cryptsetup/repos/testing-x86_64/encrypt_hook
(from rev 195243, cryptsetup/trunk/encrypt_hook)
  cryptsetup/repos/testing-x86_64/encrypt_install
(from rev 195243, cryptsetup/trunk/encrypt_install)
  cryptsetup/repos/testing-x86_64/sd-encrypt
(from rev 195243, cryptsetup/trunk/sd-encrypt)

+
 testing-i686/PKGBUILD  |   41 +++
 testing-i686/encrypt_hook  |  139 +++
 testing-i686/encrypt_install   |   44 
 testing-i686/sd-encrypt|   42 +++
 testing-x86_64/PKGBUILD|   41 +++
 testing-x86_64/encrypt_hook|  139 +++
 testing-x86_64/encrypt_install |   44 
 testing-x86_64/sd-encrypt  |   42 +++
 8 files changed, 532 insertions(+)

Copied: cryptsetup/repos/testing-i686/PKGBUILD (from rev 195243, 
cryptsetup/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-09-29 00:43:57 UTC (rev 195244)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Thomas Bächler tho...@archlinux.org
+pkgname=cryptsetup
+pkgver=1.6.2
+pkgrel=2
+pkgdesc=Userspace setup tool for transparent encryption of block devices 
using dm-crypt
+arch=(i686 x86_64)
+license=('GPL')
+url=http://code.google.com/p/cryptsetup/;
+groups=('base')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!libtool' '!emptydirs')
+source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
+encrypt_hook
+encrypt_install
+sd-encrypt)
+md5sums=('cd834da49fbe92dd66df02cc5c61280f'
+ 'SKIP'
+ 'c279d86d6dc18322c054d2272ebb9e90'
+ '21c45f9cab3e0b5165f68358884fbd0f'
+ '6cf7e170ecd13e42fe829209628fdb4d')
+
+build() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-${pkgver}
+  make DESTDIR=${pkgdir} install
+  # install hook
+  install -D -m644 ${srcdir}/encrypt_hook 
${pkgdir}/usr/lib/initcpio/hooks/encrypt
+  install -D -m644 ${srcdir}/encrypt_install 
${pkgdir}/usr/lib/initcpio/install/encrypt
+  install -D -m644 ${srcdir}/sd-encrypt 
${pkgdir}/usr/lib/initcpio/install/sd-encrypt
+
+  # usrmove
+  cd $pkgdir/usr
+  mv sbin bin
+}

Copied: cryptsetup/repos/testing-i686/encrypt_hook (from rev 195243, 
cryptsetup/trunk/encrypt_hook)
===
--- testing-i686/encrypt_hook   (rev 0)
+++ testing-i686/encrypt_hook   2013-09-29 00:43:57 UTC (rev 195244)
@@ -0,0 +1,139 @@
+#!/usr/bin/ash
+
+run_hook() {
+modprobe -a -q dm-crypt /dev/null 21
+[ ${quiet} = y ]  CSQUIET=/dev/null
+
+# Get keyfile if specified
+ckeyfile=/crypto_keyfile.bin
+if [ -n $cryptkey ]; then
+IFS=: read ckdev ckarg1 ckarg2 EOF
+$cryptkey
+EOF
+
+if [ $ckdev = rootfs ]; then
+ckeyfile=$ckarg1
+elif resolved=$(resolve_device ${ckdev} ${rootdelay}); then
+case ${ckarg1} in
+*[!0-9]*)
+# Use a file on the device
+# ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
+mkdir /ckey
+mount -r -t $ckarg1 $resolved /ckey
+dd if=/ckey/$ckarg2 of=$ckeyfile /dev/null 21
+umount /ckey
+;;
+*)
+# Read raw data from the block device
+# ckarg1 is numeric: ckarg1=offset, ckarg2=length
+dd if=$resolved of=$ckeyfile bs=1 skip=$ckarg1 
count=$ckarg2 /dev/null 21
+;;
+esac
+fi
+[ ! -f ${ckeyfile} ]  echo Keyfile could not be opened. Reverting 
to passphrase.
+fi
+
+if [ -n ${cryptdevice} ]; then
+DEPRECATED_CRYPT=0
+IFS=: read cryptdev cryptname cryptoptions EOF
+$cryptdevice
+EOF
+else
+DEPRECATED_CRYPT=1
+cryptdev=${root}
+cryptname=root
+fi
+
+warn_deprecated() {