Remove already merged patch, fix the spec file for 1.0

diff --git a/configure b/configure
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/install-sh b/install-sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/packaging/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch b/packaging/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch
deleted file mode 100644 (file)
index 3f446e2..0000000
--- a/packaging/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4ae1cf0ac362fdda02522eb8bed94059d3ed3e8 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <zonque@gmail.com>
-Date: Wed, 21 Dec 2011 11:18:20 +0100
-Subject: [PATCH] iptables: Avoid NULL pointer dereference in table_cleanup()
-
----
- src/iptables.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/iptables.c b/src/iptables.c
-index 807f22c..1494216 100644
---- a/src/iptables.c
-+++ b/src/iptables.c
-@@ -1152,6 +1152,9 @@ static void table_cleanup(struct connman_iptables *table)
-       GList *list;
-       struct connman_iptables_entry *entry;
- 
-+      if (table == NULL)
-+              return;
-+
-       close(table->ipt_sock);
- 
-       for (list = table->entries; list; list = list->next) {
--- 
-1.7.2.2
-

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 156ed54..ff002ad 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -7,12 +7,10 @@ License:    GPLv2
 URL:        http://connman.net/
 Source0:    %{name}-%{version}.tar.bz2
 Source1:    settings
-Patch0:     0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch
 Requires:   dbus
 Requires:   wpa_supplicant >= 0.7.1
 Requires:   bluez
 Requires:   ofono
-Requires:   ntp
 Requires:   systemd
 Requires(post):   systemd 
 Requires(preun):  systemd
@@ -28,6 +26,7 @@ BuildRequires:  pkgconfig(libudev) >= 145
 ##BuildRequires:  openconnect
 ##BuildRequires:  openvpn
 BuildRequires:  iptables-devel
+BuildRequires:  pkgconfig(gnutls)
 
 
 %description
@@ -69,8 +68,6 @@ Scripts for testing Connman and its functionality
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-./bootstrap
 
 %build
 %configure --disable-static \
@@ -81,9 +78,6 @@ Scripts for testing Connman and its functionality
     --enable-loopback=builtin \
     --enable-dnsproxy=builtin \
     --enable-portal=builtin \
-    --enable-meego=builtin \
-    --enable-ntpd=builtin \
-    --with-ntpd=/usr/sbin/ntpd \
     --enable-threads \
     --enable-test \
     --with-systemdunitdir=/%{_lib}/systemd/system