Date: Wednesday, August 7, 2013 @ 11:35:16
Author: seblu
Revision: 95231
archrelease: copy trunk to community-i686, community-x86_64
Added:
conntrack-tools/repos/community-i686/PKGBUILD
(from rev 95230, conntrack-tools/trunk/PKGBUILD)
conntrack-tools/repos/community-i686/conntrack-tools.install
(from rev 95230, conntrack-tools/trunk/conntrack-tools.install)
conntrack-tools/repos/community-i686/conntrackd.service
(from rev 95230, conntrack-tools/trunk/conntrackd.service)
conntrack-tools/repos/community-x86_64/PKGBUILD
(from rev 95230, conntrack-tools/trunk/PKGBUILD)
conntrack-tools/repos/community-x86_64/conntrack-tools.install
(from rev 95230, conntrack-tools/trunk/conntrack-tools.install)
conntrack-tools/repos/community-x86_64/conntrackd.service
(from rev 95230, conntrack-tools/trunk/conntrackd.service)
Deleted:
conntrack-tools/repos/community-i686/01-config-file-path.patch
conntrack-tools/repos/community-i686/PKGBUILD
conntrack-tools/repos/community-i686/conntrack-tools.install
conntrack-tools/repos/community-i686/conntrackd.service
conntrack-tools/repos/community-x86_64/01-config-file-path.patch
conntrack-tools/repos/community-x86_64/PKGBUILD
conntrack-tools/repos/community-x86_64/conntrack-tools.install
conntrack-tools/repos/community-x86_64/conntrackd.service
--------------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++
/conntrack-tools.install | 18 ++++
/conntrackd.service | 16 ++++
community-i686/01-config-file-path.patch | 12 ---
community-i686/PKGBUILD | 49 -------------
community-i686/conntrack-tools.install | 9 --
community-i686/conntrackd.service | 8 --
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 | 8 --
11 files changed, 134 insertions(+), 156 deletions(-)
Deleted: community-i686/01-config-file-path.patch
===================================================================
--- community-i686/01-config-file-path.patch 2013-08-07 09:35:06 UTC (rev
95230)
+++ community-i686/01-config-file-path.patch 2013-08-07 09:35:16 UTC (rev
95231)
@@ -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"
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-07 09:35:06 UTC (rev 95230)
+++ community-i686/PKGBUILD 2013-08-07 09:35:16 UTC (rev 95231)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Valere Monseur <[email protected]>
-# Contributor: Alessandro Sagratini <[email protected]>
-# Contributor: Kevin Edmonds <[email protected]>
-
-pkgname=conntrack-tools
-pkgver=1.4.1
-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
-sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f'
- 'ab888d59b98b673709d2d89554c668e2bea0cb86'
- 'e7607a9ac14dd839f3716ac68d46e19ab26ef112')
-
-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
- 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/PKGBUILD (from rev 95230,
conntrack-tools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-07 09:35:16 UTC (rev 95231)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Valere Monseur <[email protected]>
+# Contributor: Alessandro Sagratini <[email protected]>
+# Contributor: Kevin Edmonds <[email protected]>
+
+pkgname=conntrack-tools
+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'
+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"{,.sig}
+ 'conntrackd.service')
+install=$pkgname.install
+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
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
+ make
+}
+
+package() {
+ # install binaries
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # systemd
+ 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 etc/conntrackd.conf
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/conntrack-tools.install
===================================================================
--- community-i686/conntrack-tools.install 2013-08-07 09:35:06 UTC (rev
95230)
+++ community-i686/conntrack-tools.install 2013-08-07 09:35:16 UTC (rev
95231)
@@ -1,9 +0,0 @@
-## 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:
Copied: conntrack-tools/repos/community-i686/conntrack-tools.install (from rev
95230, conntrack-tools/trunk/conntrack-tools.install)
===================================================================
--- community-i686/conntrack-tools.install (rev 0)
+++ community-i686/conntrack-tools.install 2013-08-07 09:35:16 UTC (rev
95231)
@@ -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-08-07 09:35:06 UTC (rev 95230)
+++ community-i686/conntrackd.service 2013-08-07 09:35:16 UTC (rev 95231)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Conntrack Daemon
-
-[Service]
-ExecStart=/usr/bin/conntrackd
-
-[Install]
-WantedBy=multi-user.target
Copied: conntrack-tools/repos/community-i686/conntrackd.service (from rev
95230, conntrack-tools/trunk/conntrackd.service)
===================================================================
--- community-i686/conntrackd.service (rev 0)
+++ community-i686/conntrackd.service 2013-08-07 09:35:16 UTC (rev 95231)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/bin/conntrackd
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/01-config-file-path.patch
===================================================================
--- community-x86_64/01-config-file-path.patch 2013-08-07 09:35:06 UTC (rev
95230)
+++ community-x86_64/01-config-file-path.patch 2013-08-07 09:35:16 UTC (rev
95231)
@@ -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"
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-07 09:35:06 UTC (rev 95230)
+++ community-x86_64/PKGBUILD 2013-08-07 09:35:16 UTC (rev 95231)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Valere Monseur <[email protected]>
-# Contributor: Alessandro Sagratini <[email protected]>
-# Contributor: Kevin Edmonds <[email protected]>
-
-pkgname=conntrack-tools
-pkgver=1.4.1
-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
-sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f'
- 'ab888d59b98b673709d2d89554c668e2bea0cb86'
- 'e7607a9ac14dd839f3716ac68d46e19ab26ef112')
-
-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
- 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/PKGBUILD (from rev 95230,
conntrack-tools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-07 09:35:16 UTC (rev 95231)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Valere Monseur <[email protected]>
+# Contributor: Alessandro Sagratini <[email protected]>
+# Contributor: Kevin Edmonds <[email protected]>
+
+pkgname=conntrack-tools
+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'
+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"{,.sig}
+ 'conntrackd.service')
+install=$pkgname.install
+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
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
+ make
+}
+
+package() {
+ # install binaries
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # systemd
+ 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 etc/conntrackd.conf
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/conntrack-tools.install
===================================================================
--- community-x86_64/conntrack-tools.install 2013-08-07 09:35:06 UTC (rev
95230)
+++ community-x86_64/conntrack-tools.install 2013-08-07 09:35:16 UTC (rev
95231)
@@ -1,9 +0,0 @@
-## 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:
Copied: conntrack-tools/repos/community-x86_64/conntrack-tools.install (from
rev 95230, conntrack-tools/trunk/conntrack-tools.install)
===================================================================
--- community-x86_64/conntrack-tools.install (rev 0)
+++ community-x86_64/conntrack-tools.install 2013-08-07 09:35:16 UTC (rev
95231)
@@ -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-08-07 09:35:06 UTC (rev 95230)
+++ community-x86_64/conntrackd.service 2013-08-07 09:35:16 UTC (rev 95231)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Conntrack Daemon
-
-[Service]
-ExecStart=/usr/bin/conntrackd
-
-[Install]
-WantedBy=multi-user.target
Copied: conntrack-tools/repos/community-x86_64/conntrackd.service (from rev
95230, conntrack-tools/trunk/conntrackd.service)
===================================================================
--- community-x86_64/conntrackd.service (rev 0)
+++ community-x86_64/conntrackd.service 2013-08-07 09:35:16 UTC (rev 95231)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/bin/conntrackd
+
+[Install]
+WantedBy=multi-user.target
