[arch-commits] Commit in conntrack-tools/repos (10 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sun Feb 3 13:25:08 UTC 2013
Date: Sunday, February 3, 2013 @ 14:25:07
Author: seblu
Revision: 83583
archrelease: copy trunk to community-i686, community-x86_64
Added:
conntrack-tools/repos/community-i686/01-config-file-path.patch
(from rev 83582, conntrack-tools/trunk/01-config-file-path.patch)
conntrack-tools/repos/community-i686/PKGBUILD
(from rev 83582, conntrack-tools/trunk/PKGBUILD)
conntrack-tools/repos/community-i686/conntrack-tools.install
(from rev 83582, conntrack-tools/trunk/conntrack-tools.install)
conntrack-tools/repos/community-i686/conntrackd.service
(from rev 83582, conntrack-tools/trunk/conntrackd.service)
conntrack-tools/repos/community-x86_64/01-config-file-path.patch
(from rev 83582, conntrack-tools/trunk/01-config-file-path.patch)
conntrack-tools/repos/community-x86_64/PKGBUILD
(from rev 83582, conntrack-tools/trunk/PKGBUILD)
conntrack-tools/repos/community-x86_64/conntrack-tools.install
(from rev 83582, conntrack-tools/trunk/conntrack-tools.install)
conntrack-tools/repos/community-x86_64/conntrackd.service
(from rev 83582, conntrack-tools/trunk/conntrackd.service)
Deleted:
conntrack-tools/repos/community-i686/conntrackd.service
conntrack-tools/repos/community-x86_64/conntrackd.service
--------------------------------------------+
community-i686/01-config-file-path.patch | 12 ++++++
community-i686/PKGBUILD | 49 +++++++++++++++++++++++++++
community-i686/conntrack-tools.install | 9 ++++
community-i686/conntrackd.service | 16 ++++----
community-x86_64/01-config-file-path.patch | 12 ++++++
community-x86_64/PKGBUILD | 49 +++++++++++++++++++++++++++
community-x86_64/conntrack-tools.install | 9 ++++
community-x86_64/conntrackd.service | 16 ++++----
8 files changed, 156 insertions(+), 16 deletions(-)
Copied: conntrack-tools/repos/community-i686/01-config-file-path.patch (from rev 83582, conntrack-tools/trunk/01-config-file-path.patch)
===================================================================
--- community-i686/01-config-file-path.patch (rev 0)
+++ community-i686/01-config-file-path.patch 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,12 @@
+--- 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"
Copied: conntrack-tools/repos/community-i686/PKGBUILD (from rev 83582, conntrack-tools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Valere Monseur <valere_monseur at hotmail.com>
+# Contributor: Alessandro Sagratini <ale_sagra at hotmail.com>
+# Contributor: Kevin Edmonds <edmondskevin at hotmail.com>
+
+pkgname=conntrack-tools
+pkgver=1.4.0
+pkgrel=2
+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'
+ 'libnetfilter_cttimeout'
+ 'libnetfilter_cthelper'
+ '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')
+install=$pkgname.install
+md5sums=('ee737c774e01349f75e935228a2d851b'
+ 'bd135eaefb47923bb8e8d26f084d3e9d'
+ 'e71ff7b8c4997b797cab3eaaccb693f4')
+
+build() {
+ cd $pkgname-$pkgver
+ for i in "$srcdir"/*.patch; do
+ patch -p1 -i "$i"
+ done
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ # install binaries
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+ # systemd
+ install -D -m 644 conntrackd.service \
+ "$pkgdir/usr/lib/systemd/system/conntrackd.service"
+ # install empty configuration files
+ install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: conntrack-tools/repos/community-i686/conntrack-tools.install (from rev 83582, conntrack-tools/trunk/conntrack-tools.install)
===================================================================
--- community-i686/conntrack-tools.install (rev 0)
+++ community-i686/conntrack-tools.install 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,9 @@
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF
+Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf.
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-i686/conntrackd.service
===================================================================
--- community-i686/conntrackd.service 2013-02-03 13:24:28 UTC (rev 83582)
+++ community-i686/conntrackd.service 2013-02-03 13:25:07 UTC (rev 83583)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Conntrack Daemon
-
-[Service]
-ExecStart=/usr/sbin/conntrackd
-
-[Install]
-WantedBy=multi-user.target
Copied: conntrack-tools/repos/community-i686/conntrackd.service (from rev 83582, conntrack-tools/trunk/conntrackd.service)
===================================================================
--- community-i686/conntrackd.service (rev 0)
+++ community-i686/conntrackd.service 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/sbin/conntrackd
+
+[Install]
+WantedBy=multi-user.target
Copied: conntrack-tools/repos/community-x86_64/01-config-file-path.patch (from rev 83582, conntrack-tools/trunk/01-config-file-path.patch)
===================================================================
--- community-x86_64/01-config-file-path.patch (rev 0)
+++ community-x86_64/01-config-file-path.patch 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,12 @@
+--- 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"
Copied: conntrack-tools/repos/community-x86_64/PKGBUILD (from rev 83582, conntrack-tools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Valere Monseur <valere_monseur at hotmail.com>
+# Contributor: Alessandro Sagratini <ale_sagra at hotmail.com>
+# Contributor: Kevin Edmonds <edmondskevin at hotmail.com>
+
+pkgname=conntrack-tools
+pkgver=1.4.0
+pkgrel=2
+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'
+ 'libnetfilter_cttimeout'
+ 'libnetfilter_cthelper'
+ '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')
+install=$pkgname.install
+md5sums=('ee737c774e01349f75e935228a2d851b'
+ 'bd135eaefb47923bb8e8d26f084d3e9d'
+ 'e71ff7b8c4997b797cab3eaaccb693f4')
+
+build() {
+ cd $pkgname-$pkgver
+ for i in "$srcdir"/*.patch; do
+ patch -p1 -i "$i"
+ done
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ # install binaries
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+ # systemd
+ install -D -m 644 conntrackd.service \
+ "$pkgdir/usr/lib/systemd/system/conntrackd.service"
+ # install empty configuration files
+ install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: conntrack-tools/repos/community-x86_64/conntrack-tools.install (from rev 83582, conntrack-tools/trunk/conntrack-tools.install)
===================================================================
--- community-x86_64/conntrack-tools.install (rev 0)
+++ community-x86_64/conntrack-tools.install 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,9 @@
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF
+Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf.
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-x86_64/conntrackd.service
===================================================================
--- community-x86_64/conntrackd.service 2013-02-03 13:24:28 UTC (rev 83582)
+++ community-x86_64/conntrackd.service 2013-02-03 13:25:07 UTC (rev 83583)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Conntrack Daemon
-
-[Service]
-ExecStart=/usr/sbin/conntrackd
-
-[Install]
-WantedBy=multi-user.target
Copied: conntrack-tools/repos/community-x86_64/conntrackd.service (from rev 83582, conntrack-tools/trunk/conntrackd.service)
===================================================================
--- community-x86_64/conntrackd.service (rev 0)
+++ community-x86_64/conntrackd.service 2013-02-03 13:25:07 UTC (rev 83583)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/sbin/conntrackd
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list