Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/virtualbox/PKGBUILD

1 files changed, 7 insertions, 6 deletions

diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 6a850f19c..ae06f501d 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60002 2011-12-03 04:09:30Z seblu $
+# $Id: PKGBUILD 60046 2011-12-03 18:18:50Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
@@ -6,22 +6,23 @@
 
 pkgname=conntrack-tools
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
 depends=('libnetfilter_conntrack')
+backup=('etc/conntrackd/conntrackd.conf')
 source=("http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.bz2"
         'conntrackd.rc'
         'conntrackd.conf')
 md5sums=('5add24d4761baf17af630d5627a71752'
          '619ab1e15837436b47cbdc739d69ee78'
-         '728570bd7a13263606d97f6cc7f2d095')
+         '92a7fc6ab5cba5e48cde4cac0ac403b1')
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
@@ -30,8 +31,8 @@ package() {
   install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd"
   install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd"
 
-  # install configuration directories
-  install -d "${pkgdir}/etc/conntrackd"
+  # install empty configuration files
+  install -D -m 644 /dev/null "${pkgdir}/etc/conntrackd/conntrackd.conf"
 
   # install binaries
   cd ${pkgname}-${pkgver}