[poldi] New package 0.4.1-4

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

4 files changed, 30 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cee6f8e4fa60..197828de423d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = poldi
 	pkgdesc = PAM module for authentication using a smartcard
 	pkgver = 0.4.1
-	pkgrel = 2
+	pkgrel = 4
 	url = http://www.g10code.com/p-poldi.html
 	install = poldi.install
 	arch = i686
@@ -11,10 +11,12 @@ pkgbase = poldi
 	depends = libgpg-error
 	depends = libksba
 	depends = pam
+	backup = etc/poldi/poldi.conf
+	backup = etc/pam.d/system-auth-poldi
 	source = ftp://ftp.gnupg.org/gcrypt/alpha/poldi/poldi-0.4.1.tar.bz2
 	source = poldi-arch.patch
 	md5sums = 197986f9ba6aec9a91ee4610f4c6be8b
-	md5sums = 3533f7b428e2c9a4bbfff2271ba24e5d
+	md5sums = a4187baaacc764d20909345865668280
 
 pkgname = poldi
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c929602f5df..df7c3492abad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=poldi
 pkgver=0.4.1
-pkgrel=2
+pkgrel=4
 pkgdesc="PAM module for authentication using a smartcard"
 arch=('i686' 'x86_64')
 url="http://www.g10code.com/p-poldi.html"
@@ -12,7 +12,7 @@ license="GPL"
 depends=('libgcrypt' 'libgpg-error' 'libksba' 'pam')
 makedepends=()
 options=()
-backup=()
+backup=("etc/poldi/poldi.conf" "etc/pam.d/system-auth-poldi")
 install=poldi.install
 source=("ftp://ftp.gnupg.org/gcrypt/alpha/poldi/$pkgname-$pkgver.tar.bz2" "poldi-arch.patch")
 
@@ -34,16 +34,16 @@ package() {
   install -d -m 755 "$pkgdir/usr/share"
   mv "$pkgdir/etc/poldi" "$pkgdir/usr/share/poldi"
   rmdir $pkgdir/etc
-  sed -i "s#^log-file.*#log-file /var/log/poldi.log#" "$pkgdir/usr/share/poldi/poldi.conf"
+  install -D -m 644 "$pkgdir/usr/share/poldi/poldi.conf"  "$pkgdir/etc/poldi/poldi.conf"
 
   install -d -m 755 "$pkgdir/usr/lib/security"
   cp src/pam/pam_poldi.so "$pkgdir/usr/lib/security/"
   cp tests/pam-test "$pkgdir/usr/bin/pam-test-poldi"
 
   install -d -m 755 "$pkgdir/etc/pam.d"
-  echo -e "auth\tsufficient\tpam_poldi.so" > $pkgdir/etc/pam.d/poldi
+  echo -e "auth\tsufficient\tpam_poldi.so" > $pkgdir/etc/pam.d/system-auth-poldi
 
   rm "$pkgdir/usr/share/info/dir"
 }
 md5sums=('197986f9ba6aec9a91ee4610f4c6be8b'
-         '3533f7b428e2c9a4bbfff2271ba24e5d')
+         'a4187baaacc764d20909345865668280')
diff --git a/poldi-arch.patch b/poldi-arch.patch
index 25fd848a2a92..149401f47936 100644
--- a/poldi-arch.patch
+++ b/poldi-arch.patch
@@ -9,3 +9,18 @@ diff -ur poldi-0.4-orig/src/util/support.c poldi-0.4/src/util/support.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <assert.h>
+--- poldi-0.4.1-orig/conf/poldi.conf.skel	2013-11-21 12:06:29.740052210 +1100
++++ poldi-0.4.1/conf/poldi.conf.skel		2013-11-21 12:05:35.573383899 +1100
+@@ -5,10 +5,10 @@
+ auth-method localdb
+ 
+ # Specify the log file:
+-log-file /home/moritz/logs/poldi.txt
++log-file /var/log/poldi.log
+ 
+ # Enable debugging messages
+ debug
+ 
+ # Specify SCDaemon executable
+-scdaemon-program /usr/bin/scdaemon
++scdaemon-program /usr/lib/gnupg/scdaemon
diff --git a/poldi.install b/poldi.install
index 6067c4dd0e99..27a60c0e469b 100644
--- a/poldi.install
+++ b/poldi.install
@@ -13,16 +13,14 @@ post_install() {
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
 
-  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/poldi/etc/poldi."
-
-  mkdir -p /etc/poldi
-  cp -fR /usr/share/poldi/etc/poldi/* /etc/poldi/
-
+  echo "*** Poldi is now installed."
+  echo
+  echo "A PAM configuration file has been installed as '/etc/pam.d/system-auth-poldi'."
+  echo -e "To enable its use, you need to put 'auth include system-auth-poldi'\nin the relevant files (/etc/pam.d/system-auth is a good starting point)."
+  echo
+  echo "You can test the installation with 'pam-test-poldi SERVICE'."
   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."
 }
 
 ## arg 1:  the new package version
@@ -38,11 +36,6 @@ post_upgrade() {
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
-
-  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/poldi/etc/poldi. Take a look and update your own files in /etc/poldi if necessary."
 }
 
 ## arg 1:  the old package version