rpms/centerim/devel centerim-20071003-git20071022.patch, NONE, 1.1 centerim.spec, 1.3, 1.4 centerim-4.22.1-libyahoo.patch, 1.1, NONE centerim-4.22.1-ljtags.patch, 1.1, NONE centerim-4.22.1-ljtypo.patch, 1.1, NONE centerim-4.22.1-msn-NOT.patch, 1.1, NONE centerim-4.22.1-overflows.patch, 1.1, NONE centerim-4.22.1-quitask.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Tue Oct 23 10:54:49 UTC 2007
Author: lkundrak
Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/devel
Modified Files:
centerim.spec
Added Files:
centerim-20071003-git20071022.patch
Removed Files:
centerim-4.22.1-libyahoo.patch centerim-4.22.1-ljtags.patch
centerim-4.22.1-ljtypo.patch centerim-4.22.1-msn-NOT.patch
centerim-4.22.1-overflows.patch centerim-4.22.1-quitask.patch
Log Message:
I forgot -b at previous import :/
This is synced with upstream git, contains all our fixes and
MSN fix and german translation adjustments.
centerim-20071003-git20071022.patch:
--- NEW FILE centerim-20071003-git20071022.patch ---
From: Stephane Bisinger <stephane.bisinger at gmail.com>
Date: Mon, 22 Oct 2007 19:46:37 +0000 (+0100)
Subject: Merge with git+ssh://sb@repo.or.cz/srv/git/centerim.git#mob
X-Git-Url: http://repo.or.cz/w/centerim.git?a=commitdiff_plain;h=d39fc856c640234e3a956e18a466df307973c1a8;hp=725c4fcdb5db5d358717a12e82cb7461d4e3801f
Merge ... git+ssh://sb@repo.or.cz/srv/git/centerim.git#mob
---
The .po file patches were repoved, as .po-s were obviously regenerated
for the tarball and did not correspond to the actual GIT status.
German translation fix was regererated and added to this patch
so it should be feature-complete when compared to git.
-- <lkundrak at redhat.com>
diff --git a/ChangeLog b/ChangeLog
index d7a5537..75c3a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2098,5 +2098,10 @@ Changes since 4.21.0
connection. "
* patch by Sebastien Delafond <seb at debian.org> which sdd user setting to
display timestamps up to the second.
-
+ * german translation update
+ * fixes for Jabber, see Bugs #1740881 and #1710218
+ * updated MSN to MSNP9
+ * support for lzo2 (gnutls)
+ * updated firetalk library (this includes many fixes for AIM and IRC)
+ * added experimental libotr support
diff --git a/connwrap/connwrap.c b/connwrap/connwrap.c
index afc573f..929f46d 100644
--- a/connwrap/connwrap.c
+++ b/connwrap/connwrap.c
@@ -331,8 +331,10 @@ int cw_nb_connect(int sockfd, const struct sockaddr *serv_addr, int addrlen, int
else{ /* check if the socket is connected correctly */
int optlen = sizeof(int), optval;
if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) || optval){
- fprintf(stderr,"getsockopt error!!");
- return -1;
+
+ /* Look for a better solution to print errors */
+ //fprintf(stderr,"getsockopt error!!");
+ return -1;
}
}
diff --git a/libmsn/msn/notificationserver.cpp b/libmsn/msn/notificationserver.cpp
index 3104f8f..73b293e 100644
--- a/libmsn/msn/notificationserver.cpp
+++ b/libmsn/msn/notificationserver.cpp
@@ -152,6 +152,7 @@ namespace MSN
commandHandlers["CHL"] = &NotificationServerConnection::handle_CHL;
commandHandlers["ILN"] = &NotificationServerConnection::handle_ILN;
commandHandlers["NLN"] = &NotificationServerConnection::handle_NLN;
+ commandHandlers["NOT"] = &NotificationServerConnection::handle_NOT;
commandHandlers["FLN"] = &NotificationServerConnection::handle_FLN;
commandHandlers["MSG"] = &NotificationServerConnection::handle_MSG;
commandHandlers["ADG"] = &NotificationServerConnection::handle_ADG;
@@ -282,6 +283,13 @@ namespace MSN
this->myNotificationServer()->externalCallbacks.buddyChangedStatus(this, args[2], decodeURL(args[3]), buddyStatusFromString(args[1]));
}
+ void NotificationServerConnection::handle_NOT(std::vector<std::string> & args)
+ {
+ this->assertConnectionStateIsAtLeast(NS_CONNECTED);
+ int notlen = decimalFromString(args[1]);
+ this->readBuffer = this->readBuffer.substr(notlen);
+ }
+
void NotificationServerConnection::handle_FLN(std::vector<std::string> & args)
{
this->assertConnectionStateIsAtLeast(NS_CONNECTED);
@@ -570,10 +578,12 @@ public:
else
dataLength = decimalFromString(args[1]);
- if (this->readBuffer.find("\r\n") + 2 + dataLength > this->readBuffer.size())
+ if (this->readBuffer.find("\r\n", 0) + 2 + dataLength > this->readBuffer.size()) {
+ this->myNotificationServer()->externalCallbacks.showError(this, "Could not read buffer: too small");
return;
+ }
}
- this->readBuffer = this->readBuffer.substr(this->readBuffer.find("\r\n") + 2);
+ this->readBuffer = this->readBuffer.substr(this->readBuffer.find("\r\n", 0) + 2);
int trid = 0;
if (args.size() >= 6 && args[0] == "XFR" && args[2] == "NS")
@@ -602,7 +612,7 @@ public:
// QNG
// 0
- this->_nextPing = decimalFromString(args[1]);
+ this->_nextPing = decimalFromString(args[1]);
return;
}
@@ -779,7 +789,7 @@ public:
}
std::ostringstream buf_;
- buf_ << "CVR " << this->trID << " 0x0409 winnt 5.2 i386 MSNMSGR 6.0.0250 MSMSGS " << info->username << "\r\n";
+ buf_ << "CVR " << this->trID << " 0x0409 winnt 5.2 i386 MSNMSGR 7.5.0324 MSMSGS " << info->username << "\r\n";
if (this->write(buf_) != buf_.str().size())
return;
this->addCallback(&NotificationServerConnection::callback_RequestUSR, this->trID++, (void *) data);
diff --git a/libmsn/msn/notificationserver.h b/libmsn/msn/notificationserver.h
index 5fba4ea..b7f3c5a 100644
--- a/libmsn/msn/notificationserver.h
+++ b/libmsn/msn/notificationserver.h
@@ -285,13 +285,13 @@ public:
};
NotificationServerState connectionState() const { return this->_connectionState; };
- unsigned int nextPing() { return this->_nextPing; };
+ unsigned int nextPing() { return this->_nextPing; };
Callbacks & externalCallbacks;
virtual NotificationServerConnection *myNotificationServer() { return this; };
protected:
virtual void handleIncomingData();
NotificationServerState _connectionState;
- unsigned int _nextPing;
+ unsigned int _nextPing;
void setConnectionState(NotificationServerState s) { this->_connectionState = s; };
void assertConnectionStateIs(NotificationServerState s) { assert(this->_connectionState == s); };
@@ -315,6 +315,7 @@ private:
void handle_CHL(std::vector<std::string> & args);
void handle_ILN(std::vector<std::string> & args);
void handle_NLN(std::vector<std::string> & args);
+ void handle_NOT(std::vector<std::string> & args);
void handle_FLN(std::vector<std::string> & args);
void handle_MSG(std::vector<std::string> & args);
void handle_RNG(std::vector<std::string> & args);
diff --git a/libyahoo2/yahoo_util.h b/libyahoo2/yahoo_util.h
index 677d83d..9e4a724 100644
--- a/libyahoo2/yahoo_util.h
+++ b/libyahoo2/yahoo_util.h
@@ -68,10 +68,6 @@ int strncasecmp(const char * s1, const char * s2, size_t n);
int strcasecmp(const char * s1, const char * s2);
//char * strdup(const char *s);
-
-int snprintf(char *str, size_t size, const char *format, ...);
-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-
#endif
#ifndef TRUE
diff --git a/src/Makefile.am b/src/Makefile.am
index eb090b0..af15393 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/connwra
bin_PROGRAMS = centerim
centerim_SOURCES = centerim.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc imotr.cc icqface.cc centermain.cc icqgroup.cc captcha.cc
centerim_LDFLAGS = -L$(top_builddir)/connwrap -L$(top_builddir)/kkconsui -L$(top_builddir)/kkstrtext -L$(top_builddir)/kksystr -L$(top_builddir)/libicq2000
-centerim_LDADD = $(top_builddir)/src/hooks/libhooks.a -lconnwrap -lkkconsui -lkkstrtext -lkksystr -llibicq2000
+centerim_LDADD = $(top_builddir)/src/hooks/libhooks.a -lkkconsui -lkkstrtext -lkksystr -llibicq2000
if BUILD_FIRETALK
centerim_LDFLAGS += -L$(top_builddir)/firetalk
centerim_LDADD += -lfiretalk
@@ -23,7 +23,7 @@ if BUILD_YAHOO
centerim_LDFLAGS += -L$(top_builddir)/libyahoo2
centerim_LDADD += -llibyahoo2
endif
-centerim_LDADD += @LTLIBINTL@
+centerim_LDADD += -lconnwrap @LTLIBINTL@
SUBDIRS = hooks
EXTRA_DIST = centerim.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc imotr.cc icqface.cc centermain.cc icqgroup.cc icqmlist.h imcontroller.h icqcommon.h icqcontacts.h centerim.h icqgroup.h imcontact.h accountmanager.h eventmanager.h imevents.h icqcontact.h imlogger.h icqconf.h impgp.h imotr.h icqface.h icqgroups.h icqhist.h imexternal.h captcha.h
AUTOMAKE_OPTIONS = foreign
diff --git a/src/accountmanager.cc b/src/accountmanager.cc
index 49390a9..4765417 100644
--- a/src/accountmanager.cc
+++ b/src/accountmanager.cc
@@ -241,7 +241,7 @@ void accountmanager::exec() {
case 11:
a.additional["importfriends"] =
- (a.additional["importfriends"] == "") ? "1" : "0";
+ (a.additional["importfriends"] == "1") ? "0" : "1";
break;
case 12:
diff --git a/src/centerim.cc b/src/centerim.cc
index 328e86f..b72d533 100644
--- a/src/centerim.cc
+++ b/src/centerim.cc
@@ -71,10 +71,10 @@ void centerim::exec() {
if(regmode = !conf.getouridcount()) {
bool rus = false;
- char *p = getenv("LANG");
+ char *p = setlocale(LC_MESSAGES, NULL);
if(p)
- if(rus = (((string) p).substr(0, 2) == "ru")) {
+ if(rus = ((string(p)).substr(0, 2) == "ru")) {
conf.setcharsets("cp1251", "koi8-r");
[...2601 lines suppressed...]
-#: src/icqface.cc:1475
+#: src/icqface.cc:1470
msgid " [gg] Gadu-Gadu"
msgstr " [gg] Gadu-Gadu"
-#: src/icqface.cc:1516
+#: src/icqface.cc:1511
msgid " All protocols"
msgstr " Alle Protokolle"
-#: src/icqface.cc:1517
+#: src/icqface.cc:1512
msgid " Already logged in only"
msgstr " Nur bereits eingeloggte"
-#: src/icqface.cc:1617
+#: src/icqface.cc:1612
msgid " <Space> or <Enter> confirm, <Esc> cancel "
msgstr " <Leertaste> oder <Enter> bestätigen, <ESC> abbrechen "
-#: src/icqface.cc:1646
+#: src/icqface.cc:1641
msgid " <Space> confirm, <Esc> cancel "
msgstr " <Leertaste> bestätigen, <ESC> abbrechen "
-#: src/icqface.cc:1790
+#: src/icqface.cc:1785
msgid "Move to contacts"
msgstr "Versch. zu Kontakte"
-#: src/icqface.cc:1802
+#: src/icqface.cc:1797
msgid "Ignore list"
msgstr "Ignoriert-Liste"
-#: src/icqface.cc:1803
+#: src/icqface.cc:1798
msgid "Visible list"
msgstr "Sichtbar-Liste"
-#: src/icqface.cc:1804
+#: src/icqface.cc:1799
msgid "Invisible list"
msgstr "Unsichtbar-Liste"
-#: src/icqface.cc:1826
+#: src/icqface.cc:1821
msgid "Select contacts to add to the list"
msgstr "Wähle Kontakte zum Aufnehmen in die Liste"
-#: src/icqface.cc:1831
+#: src/icqface.cc:1826
#, c-format
msgid "Remove the %d contacts from the contact list as well?"
msgstr "Entferne die %d Kontakte auch aus der Liste?"
-#: src/icqface.cc:1890
+#: src/icqface.cc:1885
msgid "Event recipients"
msgstr "Ereignisempfänger"
-#: src/icqface.cc:2101
+#: src/icqface.cc:2096
#, c-format
msgid "QuickSearch: type to find, %s find again, Enter finish"
msgstr "Schnellsuche: Tippen um zu finden, %s wieder Suchen, Enter Ende"
-#: src/icqface.cc:2104
+#: src/icqface.cc:2099
msgid "contact list quick search"
msgstr "Kontaktlisten-Schnellsuche"
-#: src/icqface.cc:2218
+#: src/icqface.cc:2213
msgid "+ no URLs within the current context"
msgstr "+ hier gibt es keine URLs"
-#: src/icqface.cc:2231
+#: src/icqface.cc:2226
msgid "URLs within the current context"
msgstr "URLs"
-#: src/icqface.cc:2247
+#: src/icqface.cc:2242
#, c-format
msgid "+ no external actions defined for %s"
msgstr "+ keine externe Aktion für %s definiert"
-#: src/icqface.cc:2267
+#: src/icqface.cc:2262
#, c-format
msgid "Result of the external action %s:"
msgstr "Ergebnis der externen Aktion %s:"
-#: src/icqface.cc:2285
+#: src/icqface.cc:2280
#, c-format
msgid ""
"%s send, %s multi, %s/%s pr/nxt chat, %s hist, %s URLs, %s expand, %s memb"
@@ -3343,7 +3135,7 @@
"%s senden, %s mehrere, %s/%s vor/zurück, %s gesch., %s URLs, %s vergrößern, %"
"s Mitgl."
-#: src/icqface.cc:2286
+#: src/icqface.cc:2281
#, c-format
msgid ""
"%s send, %s multi, %s/%s pr/nxt chat, %s hist, %s URLs, %s expand, %s info"
@@ -3351,74 +3143,74 @@
"%s senden, %s mehrere, %s/%s vor/zurück, %s gesch., %s URLs, %s vergrößern, %"
"s info"
-#: src/icqface.cc:2321
+#: src/icqface.cc:2316
#, c-format
msgid "Outgoing %s"
msgstr "Rausgehend %s"
-#: src/icqface.cc:2454
+#: src/icqface.cc:2449
msgid "Send contacts.."
-msgstr "Kontakte senden.."
+msgstr "Kontakte senden..."
-#: src/icqface.cc:2514
+#: src/icqface.cc:2509
msgid "file name: "
msgstr "Dateiname: "
-#: src/icqface.cc:2876
+#: src/icqface.cc:2869
#, c-format
msgid "Outgoing %s to %s"
msgstr "Raus gehend %s an %s"
-#: src/icqface.cc:2877
+#: src/icqface.cc:2870
#, c-format
msgid "Sent on %s"
msgstr "Geschickt am %s"
-#: src/icqface.cc:2880
+#: src/icqface.cc:2873
#, c-format
msgid "Incoming %s from %s"
msgstr "Ankommend %s von %s"
-#: src/icqface.cc:2881
+#: src/icqface.cc:2874
#, c-format
msgid "Received on %s"
msgstr "Erhalten am %s"
-#: src/icqface.cc:2927
+#: src/icqface.cc:2920
#, c-format
msgid "%s to URLs, %s to full-screenize, %s close"
msgstr "%s zu URLs, %s Vollbild, %s abbrechen"
-#: src/icqface.cc:2975
+#: src/icqface.cc:2968
#, c-format
msgid "%s from %s, received on %s"
msgstr "%s von%s, erhalten am %s"
-#: src/icqface.cc:2976
+#: src/icqface.cc:2969
#, c-format
msgid "%s to %s, sent on %s"
msgstr "%s zu %s, gesendet am %s"
-#: src/icqface.cc:2985
+#: src/icqface.cc:2978
msgid "full-screen view"
msgstr "Vollbildansicht"
-#: src/icqface.cc:2991
+#: src/icqface.cc:2984
#, c-format
msgid "%s or %s to close, Up/Down and PgUp/PgDn to scroll"
msgstr ""
"%s oder %s zum abbrechen, Hoch/Runter und Bildhoch/Bildrunter zum srollen"
-#: src/icqface.cc:3077
+#: src/icqface.cc:3070
#, c-format
msgid "History for %s, %d events total"
msgstr "Geschichte von %s, %d Aktionen insgesammt"
-#: src/icqface.cc:3083
+#: src/icqface.cc:3076
#, c-format
msgid "%s search, %s again, %s cancel"
msgstr "%s suchen, %s nochmal, %s abbrechen"
-#: src/icqface.cc:3092
+#: src/icqface.cc:3085
msgid "search for: "
msgstr "suche nach: "
Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- centerim.spec 23 Oct 2007 10:48:58 -0000 1.3
+++ centerim.spec 23 Oct 2007 10:54:15 -0000 1.4
@@ -3,29 +3,19 @@
%define snapshot_ver 20071003
Name: centerim
-Version: %{snapshot_ver}
-Release: 3%{?dist}
+Version: %{stable_ver}.%{snapshot_ver}
+Release: 4%{?dist}
+Epoch: 1
Summary: Text mode menu- and window-driven IM
Group: Applications/Internet
License: GPLv2+
URL: http://www.centerim.org/
-Source0: http://www.centerim.org/download/%{name}-%{version}.tar.gz
+Source0: http://www.centerim.org/download/%{name}-%{snapshot_ver}.tar.gz
-Patch0: centerim-4.22.1-libyahoo.patch
-Patch7: centerim-4.22.1-overflows.patch
-
-## feature fixes
-# Fix ljhook
-Patch101: centerim-4.22.1-ljtags.patch
-Patch102: centerim-4.22.1-ljtypo.patch
-# Fix MSN
-Patch103: centerim-4.22.1-msn-NOT.patch
-
-## feature enh
-# provided by Andy Shevchenko... will ask before quit
-Patch201: centerim-4.22.1-quitask.patch
+# GIT
+Patch300: centerim-20071003-git20071022.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,12 +33,7 @@
%prep
%setup -q -n %{name}-%{stable_ver}
-%patch0 -p1 -b .libyahoo
-%patch7 -p1 -b .overflows
-%patch101 -p1 -b .ljtags
-%patch102 -p1 -b .ljtypo
-%patch103 -p1 -b .msn-NOT
-%patch201 -p1 -b .quitask
+%patch300 -p1 -b .git20071022
%build
%configure \
@@ -80,8 +65,12 @@
%{_mandir}/man1/*
%changelog
-* Tue Oct 23 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-3
-- Thanks to Stéphane Bisinger, MSN works
+* Tue Oct 23 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.1.20071003-4
+- lkundrak's dumb, dumb, dumb and he .... up the versioning, bumping epoch
+- Merging the upstream git snapshot:
+- Our fixes upstreamed
+- Fix for MSN NOT messages handling
+- Fixed french translation
* Mon Oct 08 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-2
- Fixed BuildRoot
--- centerim-4.22.1-libyahoo.patch DELETED ---
--- centerim-4.22.1-ljtags.patch DELETED ---
--- centerim-4.22.1-ljtypo.patch DELETED ---
--- centerim-4.22.1-msn-NOT.patch DELETED ---
--- centerim-4.22.1-overflows.patch DELETED ---
--- centerim-4.22.1-quitask.patch DELETED ---
More information about the fedora-extras-commits
mailing list