mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

51 lines
1.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/licq/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./src/socket.cpp.orig 2003-06-16 19:09:46.000000000 +0200
  20. +++ ./src/socket.cpp 2004-07-14 18:13:25.755288679 +0200
  21. @@ -1078,7 +1078,7 @@
  22. bool TCPSocket::SecureConnect()
  23. {
  24. pthread_mutex_init(&mutex_ssl, NULL);
  25. - m_pSSL = SSL_new(gSSL_CTX);
  26. + m_p_SSL = SSL_new(gSSL_CTX);
  27. #ifdef SSL_DEBUG
  28. m_pSSL->debug = 1;
  29. #endif
  30. @@ -1111,7 +1111,7 @@
  31. {
  32. pthread_mutex_init(&mutex_ssl, NULL);
  33. - m_pSSL = SSL_new(gSSL_CTX);
  34. + m_p_SSL = SSL_new(gSSL_CTX);
  35. SSL_set_session(m_pSSL, NULL);
  36. SSL_set_fd(m_pSSL, m_nDescriptor);
  37. int i = SSL_accept(m_pSSL);
  38. --- ./src/user.cpp.orig 2003-06-16 19:09:46.000000000 +0200
  39. +++ ./src/user.cpp 2004-07-14 18:16:41.356402533 +0200
  40. @@ -3184,7 +3184,9 @@
  41. m_fConf.ReadBool("HideIP", m_bHideIp, false);
  42. m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
  43. m_fConf.ReadStr("AutoResponse", szTemp, "");
  44. - m_fConf.ReadNum("SSTime", (unsigned long)m_nSSTime, 0L);
  45. + long unsigned int t = m_nSSTime;
  46. + m_fConf.ReadNum("SSTime", t, 0L);
  47. + m_nSSTime = t;
  48. m_fConf.ReadNum("SSCount", m_nSSCount, 0);
  49. SetAutoResponse(szTemp);