From c09c60a280521fa0a6adf64d5208bb95c70bf34a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Mon, 15 Oct 2012 22:19:01 +0300
Subject: [PATCH] up to 3.0.6

---
 bitlbee.spec            | 10 +++++-----
 skyped-FD_CLOEXEC.patch | 32 --------------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 skyped-FD_CLOEXEC.patch

diff --git a/bitlbee.spec b/bitlbee.spec
index 31dc6b9..338d3ca 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -8,19 +8,19 @@
 Summary:	An IRC to other chat networks gateway
 Summary(pl.UTF-8):	Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:		bitlbee
-Version:	3.0.5
-Release:	2
+Version:	3.0.6
+Release:	1
 License:	GPL v2+ and MIT
 Group:		Daemons
 Source0:	http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	9ff97260a2a7f3a7d102db158a8d9887
+# Source0-md5:	0ab9c9159bd9bac9210fdb5d2f66448a
 URL:		http://www.bitlbee.org/
 Patch0:		config.patch
 Patch1:		systemd.patch
-Patch2:		skyped-FD_CLOEXEC.patch
 Patch3:		skype-no-groups.patch
 Patch4:		skyped-transport.patch
 BuildRequires:	asciidoc
+BuildRequires:	glib2-devel >= 1:2.14
 BuildRequires:	gnutls-devel
 %{?with_otr:BuildRequires:	libotr-devel >= 3.2.0}
 %{?with_purple:BuildRequires:	libpurple-devel}
@@ -94,7 +94,6 @@ communication is done via SSL.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -121,6 +120,7 @@ CFLAGS="%{rpmcflags}" \
 	--strip=0 \
 	--plugins=1 \
 	--ssl=gnutls \
+	--pie=1 \
 %if %{with purple}
 	--purple=1 \
 %endif
diff --git a/skyped-FD_CLOEXEC.patch b/skyped-FD_CLOEXEC.patch
deleted file mode 100644
index 2b99416..0000000
--- a/skyped-FD_CLOEXEC.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-set FD_CLOEXEC on listening socket
-
-Skype4Py uses os.execlp() to spawn skype if it is not yet started, this leaks
-our listening FD to skype process and can't get it back even if we ourself exit
-meanwhile.
-
-and we can't startup again:
-error: [Errno 98] Address already in use
-
-Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
-Tested-by: Elan Ruusamäe <glen@delfi.ee>
---- bitlbee-3.0.5/protocols/skype/skyped.py~	2012-04-15 12:42:34.110550155 +0300
-+++ bitlbee-3.0.5/protocols/skype/skyped.py	2012-04-15 13:50:51.089559368 +0300
-@@ -31,6 +31,7 @@
- import hashlib
- from ConfigParser import ConfigParser, NoOptionError
- from traceback import print_exception
-+from fcntl import fcntl, F_SETFD, FD_CLOEXEC
- import ssl
- 
- __version__ = "0.1.1"
-@@ -184,8 +185,10 @@
- 	else:
- 		sock = socket.socket()
- 	sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-+	fcntl(sock, F_SETFD, FD_CLOEXEC);
- 	sock.bind((host, port))
- 	sock.listen(1)
-+
- 	if hasgobject:
- 		gobject.io_add_watch(sock, gobject.IO_IN, listener)
- 	else:
-- 
2.44.0