Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cef807a941cd5fcdef598ad63e3a8b14813f9c06
commit cef807a941cd5fcdef598ad63e3a8b14813f9c06 Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Aug 28 11:47:12 2011 +0200 connman-0.77-1-x86_64 *version bump diff --git a/source/network-extra/connman/FrugalBuild b/source/network-extra/connman/FrugalBuild index e2703cb..920d98d 100644 --- a/source/network-extra/connman/FrugalBuild +++ b/source/network-extra/connman/FrugalBuild @@ -2,21 +2,19 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=connman -pkgver=0.76 +pkgver=0.77 pkgrel=1 url="http://connman.net/"; pkgdesc="open source connection manager" up2date="Flasttar http://www.kernel.org/pub/linux/network/connman/"; -source=(http://www.kernel.org/pub/linux/network/connman/$pkgname-$pkgver.tar.gz allow_group_netdev.diff \ - fix-for-iptables-1.4.11.patch) +source=(http://www.kernel.org/pub/linux/network/connman/$pkgname-$pkgver.tar.gz allow_group_netdev.diff) depends=('wpa_supplicant' 'bluez>=4.61' 'dhclient' 'polkit' 'udev' 'ppp' 'wireless_tools' 'iptables>=1.4.11.1' 'openvpn' 'gnutls') makedepends=('systemd') groups=('network-extra') archs=('i686' 'x86_64') replaces=("connman-gnome") -sha1sums=('f13ebb7b8aeca7777b96b8c69a9a37d9ec7408c6' \ - 'c9dd34f11a2d9313152171e60f2775c95b47e323' \ - 'd4705f7cb64849c83cff9f0d29c8b8fa35689914') +sha1sums=('e56cb832f5edc35270f06f5304ea3896500661c6' \ + 'c9dd34f11a2d9313152171e60f2775c95b47e323') Fconfopts="$Fconfopts \ --sysconfdir=/etc --localstatedir=/var \ diff --git a/source/network-extra/connman/fix-for-iptables-1.4.11.patch b/source/network-extra/connman/fix-for-iptables-1.4.11.patch deleted file mode 100644 index b63c93b..0000000 --- a/source/network-extra/connman/fix-for-iptables-1.4.11.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 88c1dba4f9d28df97c996672f0267f6b2eb03f32 Mon Sep 17 00:00:00 2001 -From: Robert Piasek <dag...@gentoo.org> -Date: Thu, 16 Jun 2011 12:42:25 +0100 -Subject: [PATCH] Fix compilation against iptables 1.4.11 - ---- - src/iptables.c | 16 ++++++++++++---- - tools/iptables-test.c | 16 ++++++++++++---- - 2 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/src/iptables.c b/src/iptables.c -index c799c25..f70be45 100644 ---- a/src/iptables.c -+++ b/src/iptables.c -@@ -1088,9 +1088,13 @@ static int iptables_command(int argc, char *argv[]) - if (xt_t->init != NULL) - xt_t->init(xt_t->t); - iptables_globals.opts = -- xtables_merge_options(iptables_globals.opts, -- xt_t->extra_opts, -- &xt_t->option_offset); -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ iptables_globals.orig_opts, -+#endif -+ iptables_globals.opts, -+ xt_t->extra_opts, -+ &xt_t->option_offset); - if (iptables_globals.opts == NULL) - goto out; - -@@ -1112,7 +1116,11 @@ static int iptables_command(int argc, char *argv[]) - xt_m->init(xt_m->m); - if (xt_m != xt_m->next) { - iptables_globals.opts = -- xtables_merge_options(iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ iptables_globals.orig_opts, -+#endif -+ iptables_globals.opts, - xt_m->extra_opts, - &xt_m->option_offset); - if (iptables_globals.opts == NULL) -diff --git a/tools/iptables-test.c b/tools/iptables-test.c -index e316cc9..7c5f05e 100644 ---- a/tools/iptables-test.c -+++ b/tools/iptables-test.c -@@ -1075,9 +1075,13 @@ int main(int argc, char *argv[]) - if (xt_t->init != NULL) - xt_t->init(xt_t->t); - connman_iptables_globals.opts = -- xtables_merge_options(connman_iptables_globals.opts, -- xt_t->extra_opts, -- &xt_t->option_offset); -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ connman_iptables_globals.orig_opts, -+#endif -+ connman_iptables_globals.opts, -+ xt_t->extra_opts, -+ &xt_t->option_offset); - if (connman_iptables_globals.opts == NULL) - goto out; - -@@ -1101,7 +1105,11 @@ int main(int argc, char *argv[]) - xt_m->init(xt_m->m); - if (xt_m != xt_m->next) { - connman_iptables_globals.opts = -- xtables_merge_options(connman_iptables_globals.opts, -+ xtables_merge_options( -+#if XTABLES_VERSION_CODE > 5 -+ connman_iptables_globals.orig_opts, -+#endif -+ connman_iptables_globals.opts, - xt_m->extra_opts, - &xt_m->option_offset); - if (connman_iptables_globals.opts == NULL) --- -1.7.5.3 - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
