rpms/sylpheed/devel sylpheed-2.5.0-socket-redefine.patch, NONE, 1.1 sylpheed.spec, 1.88, 1.89
Michael Schwendt
mschwendt at fedoraproject.org
Thu Aug 28 17:05:35 UTC 2008
Author: mschwendt
Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16600
Modified Files:
sylpheed.spec
Added Files:
sylpheed-2.5.0-socket-redefine.patch
Log Message:
* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-4.2029svn
- patch libsylph/socket.* to not redefine SOCK_NONBLOCK from
/usr/include/bits/socket.h
- rediff some patches for Fedora fuzz=0 pedantry
sylpheed-2.5.0-socket-redefine.patch:
--- NEW FILE sylpheed-2.5.0-socket-redefine.patch ---
diff -Nur sylpheed-2.5.0-orig/libsylph/socket.c sylpheed-2.5.0/libsylph/socket.c
--- sylpheed-2.5.0-orig/libsylph/socket.c 2008-02-15 09:32:49.000000000 +0100
+++ sylpheed-2.5.0/libsylph/socket.c 2008-08-28 19:01:35.000000000 +0200
@@ -383,9 +383,9 @@
sock = sock_find_from_fd(fd);
if (sock) {
if (nonblock) {
- SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
+ SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
} else {
- SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
+ SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
}
}
debug_print("set nonblocking mode to %d\n", nonblock);
@@ -418,9 +418,9 @@
ret = set_nonblocking_mode(sock->sock, nonblock);
if (ret == 0) {
if (nonblock) {
- SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
+ SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
} else {
- SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
+ SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
}
}
@@ -950,7 +950,7 @@
sockinfo->hostname = g_strdup(conn_data->hostname);
sockinfo->port = conn_data->port;
sockinfo->state = CONN_ESTABLISHED;
- sockinfo->flags = SOCK_NONBLOCK;
+ sockinfo->flags = LIBSYLPH_SOCK_NONBLOCK;
sock_list = g_list_prepend(sock_list, sockinfo);
diff -Nur sylpheed-2.5.0-orig/libsylph/socket.h sylpheed-2.5.0/libsylph/socket.h
--- sylpheed-2.5.0-orig/libsylph/socket.h 2007-06-11 10:06:45.000000000 +0200
+++ sylpheed-2.5.0/libsylph/socket.h 2008-08-28 19:01:34.000000000 +0200
@@ -46,13 +46,13 @@
typedef enum
{
- SOCK_NONBLOCK = 1 << 0,
+ LIBSYLPH_SOCK_NONBLOCK = 1 << 0,
SOCK_CHECK_IO = 1 << 1
} SockFlags;
#define SOCK_SET_FLAGS(flags, set) { (flags) |= (set); }
#define SOCK_UNSET_FLAGS(flags, set) { (flags) &= ~(set); }
-#define SOCK_IS_NONBLOCK(flags) ((flags & SOCK_NONBLOCK) != 0)
+#define SOCK_IS_NONBLOCK(flags) ((flags & LIBSYLPH_SOCK_NONBLOCK) != 0)
#define SOCK_IS_CHECK_IO(flags) ((flags & SOCK_CHECK_IO) != 0)
typedef gint (*SockConnectFunc) (SockInfo *sock,
Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sylpheed.spec 28 Aug 2008 16:25:01 -0000 1.88
+++ sylpheed.spec 28 Aug 2008 17:05:04 -0000 1.89
@@ -5,7 +5,7 @@
Summary: GTK+ based, lightweight, and fast email client
Name: sylpheed
Version: 2.5.0
-Release: 3.2029svn%{?dist}
+Release: 4.2029svn%{?dist}
License: GPLv2+
URL: http://sylpheed.sraoss.jp/
Group: Applications/Internet
@@ -30,6 +30,7 @@
Patch4: sylpheed-2.5.0-prefs_common.patch
Patch6: sylpheed-2.5.0rc2-gtk-2.13.1.patch
Patch7: sylpheed-2.5.0-svn2029.patch
+Patch8: sylpheed-2.5.0-socket-redefine.patch
# For xdg-open in patch1.
Requires: xdg-utils
@@ -57,6 +58,7 @@
%patch4 -p1 -b .prefs_common
%patch6 -p1 -b .gtk-2.13.1
%patch7 -p0 -b .svn2029
+%patch8 -p1 -b .socket-redefine
%build
%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -103,7 +105,9 @@
%{_mandir}/man1/*
%changelog
-* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-3.2029svn
+* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-4.2029svn
+- patch libsylph/socket.* to not redefine SOCK_NONBLOCK from
+ /usr/include/bits/socket.h
- rediff some patches for Fedora fuzz=0 pedantry
* Tue Jul 22 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2.2029svn
More information about the fedora-extras-commits
mailing list