[poldi] Bump to 0.4.1-1, adopting package.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@262 df209809-8e4a-0410-9a64-c169741eb0fc

3 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20bf718c2d11..e18f7b94a60f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = poldi
 	pkgdesc = PAM module for authentication using a smartcard
-	pkgver = 0.4
-	pkgrel = 3
+	pkgver = 0.4.1
+	pkgrel = 1
 	url = http://http://www.g10code.com/p-poldi.html
 	install = poldi.install
 	arch = i686
@@ -11,9 +11,9 @@ pkgbase = poldi
 	depends = libgpg-error
 	depends = libksba
 	depends = pam
-	source = ftp://ftp.gnupg.org/gcrypt/alpha/poldi/poldi-0.4.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/alpha/poldi/poldi-0.4.1.tar.bz2
 	source = poldi-arch.patch
-	md5sums = 5a0312c3124e3dbb558a24f1017c169c
+	md5sums = 197986f9ba6aec9a91ee4610f4c6be8b
 	md5sums = 3533f7b428e2c9a4bbfff2271ba24e5d
 
 pkgname = poldi
diff --git a/PKGBUILD b/PKGBUILD
index 6bc9857008c0..ac124b0133a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
-# Maintainer: Peter Lewis <prlewis@letterboxes.org>
+# $Id$
+# Contributro: Peter Lewis <prlewis@letterboxes.org>
+# Maintainer: Olivier Mehani <shtrom-arch@ssji.net>
 
 pkgname=poldi
-pkgver=0.4
-pkgrel=3
+pkgver=0.4.1
+pkgrel=1
 pkgdesc="PAM module for authentication using a smartcard"
 arch=('i686' 'x86_64')
 url="http://http://www.g10code.com/p-poldi.html"
@@ -13,14 +15,13 @@ options=()
 backup=()
 install=('poldi.install')
 source=("ftp://ftp.gnupg.org/gcrypt/alpha/poldi/$pkgname-$pkgver.tar.bz2" "poldi-arch.patch")
-md5sums=('5a0312c3124e3dbb558a24f1017c169c' '3533f7b428e2c9a4bbfff2271ba24e5d')
 
 build() {
 
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 < ../poldi-arch.patch
 
-  ./configure --prefix=/usr --with-pam-module-directory=/lib/security --sysconfdir="$pkgdir/usr/share/doc/poldi/example_etc"
+  ./configure --prefix=/usr --with-pam-module-directory=/lib/security --sysconfdir=/etc
   make
 }
 
@@ -30,9 +31,18 @@ package() {
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" install-conf-skeleton
 
-  mkdir "$pkgdir/lib"
-  mkdir "$pkgdir/lib/security"
+  mkdir -p "$pkgdir/usr/share/poldi"
+  mv "$pkgdir/etc" "$pkgdir/usr/share/poldi"
+  sed -i "s#^log-file.*#log-file /var/log/poldi.log#" "$pkgdir/usr/share/poldi/etc/poldi/poldi.conf"
+
+  mkdir -p "$pkgdir/lib/security"
   cp src/pam/pam_poldi.so "$pkgdir/lib/security/"
+  cp tests/pam-test "$pkgdir/usr/bin/pam-test-poldi"
+
+  mkdir -p "$pkgdir/etc/pam.d"
+  echo -e "auth\tsufficient\tpam_poldi.so" > $pkgdir/etc/pam.d/poldi
 
   rm "$pkgdir/usr/share/info/dir"
 }
+md5sums=('197986f9ba6aec9a91ee4610f4c6be8b'
+         '3533f7b428e2c9a4bbfff2271ba24e5d')
diff --git a/poldi.install b/poldi.install
index 262ad7c1bb79..6067c4dd0e99 100644
--- a/poldi.install
+++ b/poldi.install
@@ -16,10 +16,10 @@ post_install() {
   echo "Poldi is now installed."
   echo
   echo "Since this is the first time you've installed poldi, the template configuration files have been placed in /etc/poldi. Take a look and edit them to your needs."
-  echo "The original templates will remain in /usr/share/doc/poldi/example_etc/poldi."
+  echo "The original templates will remain in /usr/share/poldi/etc/poldi."
 
   mkdir -p /etc/poldi
-  cp -fR /usr/share/doc/poldi/example_etc/poldi/* /etc/poldi/
+  cp -fR /usr/share/poldi/etc/poldi/* /etc/poldi/
 
   echo
   echo "Future upgrades to this package will NOT overwrite your configuration files in /etc/poldi, since this might seriously break things. The latest version of the template configuration files can always be found in /usr/share/doc/poldi/example_etc/poldi."
@@ -42,7 +42,7 @@ post_upgrade() {
   echo "Poldi has now been upgraded."
   echo
   echo "Warning: Upgrades to this package will not replace any configuration files in /etc/poldi, in order to prevent serious logging in problems."
-  echo "The updated sample configuration files are now in /usr/share/doc/poldi/example_etc/poldi. Take a look and update your own files in /etc/poldi if necessary."
+  echo "The updated sample configuration files are now in /usr/share/poldi/etc/poldi. Take a look and update your own files in /etc/poldi if necessary."
 }
 
 ## arg 1:  the old package version