[arch-commits] Commit in licq/trunk (3 files)

Juergen Hoetzel juergen at archlinux.org
Tue Oct 21 14:44:14 EDT 2008


    Date: Tuesday, October 21, 2008 @ 14:44:14
  Author: juergen
Revision: 16625

removed obsolete patches

Deleted:
  licq/trunk/CVE-2008-1996.patch
  licq/trunk/gcc4.3.patch
  licq/trunk/icq-protocol-version.patch

----------------------------+
 CVE-2008-1996.patch        |  111 -------------------------------------------
 gcc4.3.patch               |  111 -------------------------------------------
 icq-protocol-version.patch |   13 -----
 3 files changed, 235 deletions(-)

Deleted: CVE-2008-1996.patch
===================================================================
--- CVE-2008-1996.patch	2008-10-21 18:43:29 UTC (rev 16624)
+++ CVE-2008-1996.patch	2008-10-21 18:44:14 UTC (rev 16625)
@@ -1,111 +0,0 @@
-Source: http://www.licq.org/changeset/6146
-Reason: DoS via large number of connections, bug #219708
---- /trunk/licq/include/licq_socket.h
-+++ /trunk/licq/include/licq_socket.h
-@@ -251,4 +251,5 @@
-   fd_set SocketSet()   {  return m_sSockets.SocketSet(); }
-   int LargestSocket()  {  return m_sSockets.Largest(); }
-+  unsigned short Num() {  return m_sSockets.Num(); }
- 
- protected:
---- /trunk/licq/src/socket.cpp
-+++ /trunk/licq/src/socket.cpp
-@@ -818,6 +818,24 @@
-   socklen_t sizeofSockaddr = sizeof(struct sockaddr_in);
- 
--  newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
--  newSocket.SetLocalAddress();
-+  // Make sure we stay under FD_SETSIZE
-+  // See:
-+  // * http://www.securityfocus.com/archive/1/490711
-+  // * http://securityvulns.com/docs7669.html
-+  // for more details
-+  // This probably has no affect, since we are using multiple threads, but keep it here 
-+  // to be used as a sanity check.
-+  int newDesc = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr);
-+  if (newDesc < FD_SETSIZE)
-+  {
-+    newSocket.m_nDescriptor = newDesc;
-+    newSocket.SetLocalAddress();
-+  }
-+  else
-+  {
-+    gLog.Error(tr("%sCannot accept new connection, too many descriptors in use.\n"), L_ERRORxSTR);
-+    close(newDesc);
-+
-+    // TODO throw an exception, or do something to tell the caller it failed
-+  }
- }
- 
---- /trunk/licq/src/icqd-threads.cpp
-+++ /trunk/licq/src/icqd-threads.cpp
-@@ -24,4 +24,5 @@
- #include "gettext.h"
- 
-+#define MAX_CONNECTS  256
- #define DEBUG_THREADS(x)
- //#define DEBUG_THREADS(x) gLog.Info(x)
-@@ -781,6 +782,19 @@
-               tcp->RecvConnection(*newSocket);
-               gSocketManager.DropSocket(tcp);
--              gSocketManager.AddSocket(newSocket);
--              gSocketManager.DropSocket(newSocket);
-+
-+              // Make sure we can handle another socket before accepting it
-+              if (gSocketManager.Num() > MAX_CONNECTS)
-+              {
-+                // Too many sockets, drop this one
-+                char remoteIp[32];
-+                gLog.Warn(tr("%sToo many connected sockets, rejecting connection from %s.\n"),
-+                    L_WARNxSTR, newSocket->RemoteIpStr(remoteIp));
-+                delete newSocket;
-+              }
-+              else
-+              {
-+                gSocketManager.AddSocket(newSocket);
-+                gSocketManager.DropSocket(newSocket);
-+              }
-             }
-           }
---- /trunk/licq/src/icqd-chat.cpp
-+++ /trunk/licq/src/icqd-chat.cpp
-@@ -24,4 +24,5 @@
- #include "gettext.h"
- 
-+#define MAX_CONNECTS  256
- #define DEBUG_THREADS(x)
- 
-@@ -2384,14 +2385,22 @@
-         else if (nCurrentSocket == chatman->chatServer.Descriptor())
-         {
--          CChatUser *u = new CChatUser;
--          u->m_pClient = new CChatClient;
--
--          chatman->chatServer.RecvConnection(u->sock);
--          chatman->sockman.AddSocket(&u->sock);
--          chatman->sockman.DropSocket(&u->sock);
--
--          u->state = CHAT_STATE_HANDSHAKE;
--          chatman->chatUsers.push_back(u);
--          gLog.Info(tr("%sChat: Received connection.\n"), L_TCPxSTR);
-+          if (chatman->sockman.Num() >= MAX_CONNECTS)
-+          {
-+            // Too many sockets, drop this one
-+            gLog.Warn(tr("%sToo many connected clients, rejecting new connection.\n"), L_WARNxSTR);
-+          }
-+          else
-+          {
-+            CChatUser *u = new CChatUser;
-+            u->m_pClient = new CChatClient;
-+
-+            chatman->chatServer.RecvConnection(u->sock);
-+            chatman->sockman.AddSocket(&u->sock);
-+            chatman->sockman.DropSocket(&u->sock);
-+
-+            u->state = CHAT_STATE_HANDSHAKE;
-+            chatman->chatUsers.push_back(u);
-+            gLog.Info(tr("%sChat: Received connection.\n"), L_TCPxSTR);
-+          }
-         }
- 
-

Deleted: gcc4.3.patch
===================================================================
--- gcc4.3.patch	2008-10-21 18:43:29 UTC (rev 16624)
+++ gcc4.3.patch	2008-10-21 18:44:14 UTC (rev 16625)
@@ -1,111 +0,0 @@
-Source: Anders Olofsson, zimous, Peter Alfredsen, maybe others too.
-Upstream: Probably fixed in next release.
-Reason: gcc-4.3 and glibc-2.8 errors, bugs #218814 and #228373
-diff -NrU5 licq-1.3.5.orig/plugins/auto-reply/configure.ac licq-1.3.5/plugins/auto-reply/configure.ac
---- licq-1.3.5.orig/plugins/auto-reply/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/auto-reply/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -44,11 +44,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- AC_OUTPUT(
-diff -NrU5 licq-1.3.5.orig/plugins/auto-reply/src/autoreply.cpp licq-1.3.5/plugins/auto-reply/src/autoreply.cpp
---- licq-1.3.5.orig/plugins/auto-reply/src/autoreply.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/auto-reply/src/autoreply.cpp	2008-06-21 14:52:18.000000000 +0200
-@@ -10,10 +10,11 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/wait.h>
- #include <signal.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/plugins/email/configure.ac licq-1.3.5/plugins/email/configure.ac
---- licq-1.3.5.orig/plugins/email/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/email/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -46,11 +46,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- AC_OUTPUT(
-diff -NrU5 licq-1.3.5.orig/plugins/email/src/forwarder.cpp licq-1.3.5/plugins/email/src/forwarder.cpp
---- licq-1.3.5.orig/plugins/email/src/forwarder.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/email/src/forwarder.cpp	2008-06-21 15:17:53.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/plugins/msn/configure.ac licq-1.3.5/plugins/msn/configure.ac
---- licq-1.3.5.orig/plugins/msn/configure.ac	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/msn/configure.ac	2008-06-21 14:52:18.000000000 +0200
-@@ -51,11 +51,11 @@
- 
- dnl Switch to C++ mode and check for needed C++ headers
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- 
--AC_CHECK_HEADER(vector.h,,
-+AC_CHECK_HEADER(vector,,
-   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
- 
- AC_LANG_RESTORE
- 
- msn_gcc_major_version=0
-diff -NrU5 licq-1.3.5.orig/plugins/rms/src/rms.cpp licq-1.3.5/plugins/rms/src/rms.cpp
---- licq-1.3.5.orig/plugins/rms/src/rms.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/plugins/rms/src/rms.cpp	2008-06-21 15:08:27.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <climits>
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else
- extern int errno;
- #endif
-diff -NrU5 licq-1.3.5.orig/src/fifo.cpp licq-1.3.5/src/fifo.cpp
---- licq-1.3.5.orig/src/fifo.cpp	2008-06-21 14:49:20.000000000 +0200
-+++ licq-1.3.5/src/fifo.cpp	2008-06-21 14:52:18.000000000 +0200
-@@ -28,10 +28,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <climits>
- #include "time-fix.h"
- 
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #else

Deleted: icq-protocol-version.patch
===================================================================
--- icq-protocol-version.patch	2008-10-21 18:43:29 UTC (rev 16624)
+++ icq-protocol-version.patch	2008-10-21 18:44:14 UTC (rev 16625)
@@ -1,13 +0,0 @@
-Index: src/icqpacket.cpp
-===================================================================
---- src/icqpacket.cpp	(revision 6387)
-+++ src/icqpacket.cpp	(working copy)
-@@ -821,7 +821,7 @@
- 
-   // Static versioning
-   buffer->PackUnsignedLongBE(0x00160002);
--  buffer->PackUnsignedShortBE(0x010A);
-+  buffer->PackUnsignedShortBE(0x010B);
-   // Client version major (4 == ICQ2000, 5 == ICQ2001)
-   buffer->PackUnsignedLongBE(0x00170002);
-   buffer->PackUnsignedShortBE(0x0014);




More information about the arch-commits mailing list