[arch-commits] Commit in conntrack-tools/trunk (01-config-file-path.patch PKGBUILD)

Sébastien Luttringer seblu at nymeria.archlinux.org
Wed Aug 7 09:35:07 UTC 2013


    Date: Wednesday, August 7, 2013 @ 11:35:06
  Author: seblu
Revision: 95230

upgpkg: conntrack-tools 1.4.2-1

Modified:
  conntrack-tools/trunk/PKGBUILD
Deleted:
  conntrack-tools/trunk/01-config-file-path.patch

---------------------------+
 01-config-file-path.patch |   12 ------------
 PKGBUILD                  |   33 +++++++++++++++++----------------
 2 files changed, 17 insertions(+), 28 deletions(-)

Deleted: 01-config-file-path.patch
===================================================================
--- 01-config-file-path.patch	2013-08-07 09:04:58 UTC (rev 95229)
+++ 01-config-file-path.patch	2013-08-07 09:35:06 UTC (rev 95230)
@@ -1,12 +0,0 @@
---- a/include/conntrackd.h	2012-05-26 15:29:15.630027223 +0200
-+++ b/include/conntrackd.h	2012-05-27 02:26:59.426811589 +0200
-@@ -50,7 +50,7 @@
- #define EXP_DUMP_INT_XML	47	/* dump internal cache in XML	*/
- #define EXP_DUMP_EXT_XML	48	/* dump external cache in XML	*/
- 
--#define DEFAULT_CONFIGFILE	"/etc/conntrackd/conntrackd.conf"
-+#define DEFAULT_CONFIGFILE	"/etc/conntrackd.conf"
--#define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
-+#define DEFAULT_LOCKFILE	"/run/lock/conntrackd.lock"
- #define DEFAULT_LOGFILE		"/var/log/conntrackd.log"
- #define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-07 09:04:58 UTC (rev 95229)
+++ PKGBUILD	2013-08-07 09:35:06 UTC (rev 95230)
@@ -5,8 +5,8 @@
 # Contributor: Kevin Edmonds <edmondskevin at hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.4.2
+pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
@@ -17,33 +17,34 @@
          'libnetfilter_queue')
 backup=('etc/conntrackd.conf')
 options=('!libtool')
-source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
-        'conntrackd.service'
-        '01-config-file-path.patch')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"{,.sig}
+        'conntrackd.service')
 install=$pkgname.install
-sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f'
-          'ab888d59b98b673709d2d89554c668e2bea0cb86'
-          'e7607a9ac14dd839f3716ac68d46e19ab26ef112')
+sha1sums=('50b89305bb689973d42a163c480dc77a5c0f6fe0'
+          'SKIP'
+          'ab888d59b98b673709d2d89554c668e2bea0cb86')
 
+prepare() {
+  sed -i -e 's,/etc/conntrackd/,/etc/,' -e 's,/var/lock/,/run/lock/,' \
+    $pkgname-$pkgver/include/conntrackd.h
+}
+
+
 build() {
   cd $pkgname-$pkgver
-  for i in "$srcdir"/*.patch; do
-    patch -p1 -i "$i"
-  done
   ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make
 }
 
 package() {
   # install binaries
-  pushd $pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  popd
   # systemd
-  install -D -m 644 conntrackd.service \
-    "$pkgdir/usr/lib/systemd/system/conntrackd.service"
+  cd "$pkgdir"
+  install -D -m 644 "$srcdir/conntrackd.service" usr/lib/systemd/system/conntrackd.service
   # install empty configuration files
-  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
+  install -D -m 644 /dev/null etc/conntrackd.conf
 }
 
 # vim:set ts=2 sw=2 et:




More information about the arch-commits mailing list