--- PKGBUILD.old	2005-11-07 19:12:29.000000000 +0100
+++ PKGBUILD	2005-11-08 11:00:47.000000000 +0100
@@ -2,25 +2,26 @@
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=cryptsetup
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="http://luks.endorphin.org/dm-crypt"
 depends=('device-mapper' 'libgcrypt' 'popt')
-source=(http://luks.endorphin.org/source/cryptsetup-luks-$pkgver.tar.bz2)
-md5sums=('b2415f67ceed3ad2c7dd2e878cf7787d')
+source=(http://luks.endorphin.org/source/cryptsetup-luks-$pkgver.tar.bz2 cryptsetup-luks-$pkgver-help.patch)
+md5sums=('b2415f67ceed3ad2c7dd2e878cf7787d' '54d82e36a31fe92e1959692171d5a565')
 
 build() {
   cd $startdir/src/$pkgname-luks-$pkgver
-  ./configure --prefix=/usr --enable-static
+  patch -p1 -i ../cryptsetup-luks-$pkgver-help.patch || return 1
+  ./configure --prefix=/usr --disable-static
   make || return 1
   make DESTDIR=$startdir/pkg install
   # include a static cryptsetup binary for initrd setups
-  #  (the Makefile says it will build static binaries, but libtool is dumb)
-  cd src
-  gcc $CFLAGS -o cryptsetup.static \
-    cryptsetup.o -static ../lib/.libs/libcryptsetup.a \
-    -lgcrypt -lgpg-error -ldevmapper -lpopt -luuid || return 1
-  install -D -m755 cryptsetup.static $startdir/pkg/sbin/cryptsetup.static
+  make clean
+  cd $startdir/src/$pkgname-luks-$pkgver
+  ./configure --prefix=/usr --enable-static
+  make || return 1
+  # include a static cryptsetup binary for initrd setups
+  install -D -m755 src/cryptsetup $startdir/pkg/sbin/cryptsetup.static || return 1
 
   find $startdir/pkg -name "*.la" -exec rm -f {} \;
 }