diff --git a/bitlbee-3.0.1.tar.bz2 b/bitlbee-3.0.1.tar.bz2 deleted file mode 100644 index 1f9481d..0000000 --- a/bitlbee-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6e3ff21151c2bcf4bde6632cab817b3de91d55cfe7b0072f74cf0137ad8e1db -size 504533 diff --git a/bitlbee-3.0.2.tar.bz2 b/bitlbee-3.0.2.tar.bz2 new file mode 100644 index 0000000..6821854 --- /dev/null +++ b/bitlbee-3.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb411ea96db99303932c80934bb84ff1d90569ec1c799ab87fcf2e2bdda80b02 +size 505306 diff --git a/bitlbee-fix_oscar_buffer_overflow.patch b/bitlbee-fix_oscar_buffer_overflow.patch deleted file mode 100644 index a696ba8..0000000 --- a/bitlbee-fix_oscar_buffer_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- protocols/oscar/ssi.c.orig 2009-10-19 14:34:39.000000000 +0200 -+++ protocols/oscar/ssi.c 2009-10-19 14:35:25.000000000 +0200 -@@ -414,7 +414,7 @@ - for (parentgroup=sess->ssi.items; ((parentgroup) && (parentgroup->type!=AIM_SSI_TYPE_GROUP) && (parentgroup->gid==0x0000)); parentgroup=parentgroup->next); - if (!parentgroup) { - char *newgroup; -- newgroup = (char*)g_malloc(strlen("Unknown")*sizeof(char)); -+ newgroup = (char*)g_malloc((strlen("Unknown")*sizeof(char)) + 1); - strcpy(newgroup, "Unknown"); - aim_ssi_addgroups(sess, conn, &newgroup, 1); - } diff --git a/bitlbee.changes b/bitlbee.changes index ea5911e..58ae2fc 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 08 10:35:15 UTC 2011 - pascal.bleser@opensuse.org + +- split out userguide into -doc subpackage +- update to 3.0.2: + * fixed MSN login issues with @msn.com accounts + * /CTCP support: you can CTCP VERSION Jabber contacts, and CTCP NUDGE MSN contacts + * by default, leave Twitter turned on for libpurple builds + * allow using /OPER to identify/register as well (Password security hack) + * fixed proxy support with libpurple + * some minor changes/fixes + ------------------------------------------------------------------- Thu Nov 25 01:24:08 UTC 2010 - pascal.bleser@opensuse.org @@ -7,11 +19,14 @@ Thu Nov 25 01:24:08 UTC 2010 - pascal.bleser@opensuse.org + fixed MSN login issues + fixed big memory leak in the MSN SOAP code * better handling of multiple control channels and set private=false - * using login.icq.com for ICQ logins again since AOL sold ICQ so it doesn't live on the AIM servers anymore + * using login.icq.com for ICQ logins again since AOL sold ICQ so it doesn't + live on the AIM servers anymore * fixed ability to join password-protected Jabber rooms * time out if logging into an account takes too long - * support for server-side Gadu-Gadu contact lists (via libpurple, there's still no native gg support) - * allow omitting password when using "account add", the password can be entered using /OPER to prevent echoing to screen and logs + * support for server-side Gadu-Gadu contact lists (via libpurple, there's + still no native gg support) + * allow omitting password when using "account add", the password can be + entered using /OPER to prevent echoing to screen and logs ------------------------------------------------------------------- Fri Oct 22 13:50:48 UTC 2010 - pascal.bleser@opensuse.org @@ -25,8 +40,10 @@ Fri Oct 22 13:50:48 UTC 2010 - pascal.bleser@opensuse.org * many many more changes and fixes were done - changes from 1.3dev: - * complete rewrite of the IRC core, allowing the user to create multiple control channels, each with a different set of users - * the ability to use libpurple as the IM backend (which adds support for many more IM protocols) + * complete rewrite of the IRC core, allowing the user to create multiple + control channels, each with a different set of users + * the ability to use libpurple as the IM backend (which adds support for many + more IM protocols) * support for file transfers ------------------------------------------------------------------- diff --git a/bitlbee.spec b/bitlbee.spec index 5318bfb..0392eb7 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -5,7 +5,7 @@ %endif Name: bitlbee -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: IRC to other Chat Networks Gateway # http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz @@ -27,6 +27,7 @@ BuildRequires: fdupes %if 0%{?with_libotr:1} BuildRequires: libotr-devel %endif +BuildRequires: libpurple-devel PreReq: /usr/sbin/groupadd /usr/sbin/useradd %description @@ -47,6 +48,29 @@ almost immediately. And the result is BitlBee. This package comes with support for MSN, Jabber, Oscar and Yahoo, as well as enabled flood protection. +%package doc +Summary: IRC to other Chat Networks Gateway (User Guide) +Group: Productivity/Networking/IRC +Requires: %{name} = %{version} + +%description doc +We are both console lovers. But it is annoying to have a few tty's open with +chat things in them. IRC, ICQ, MSN, Jabber... For X there is Gaim, which +supports many chatprotocols. Why wasn't there such a thing for the console? + +The idea to port Gaim was easily thought of, of course. But we liked our IRC +clients. And we used it the most, so we used it best. Importing it into the +IRC client was a nice idea. But what if someone liked a different client. Then +(s)he had to duplicate our work. + +That's a shame, we thought. Doing work twice is pointless. So when Wilmer got +the ingenious thought in his mind while farming, to create an IRC to other +chatnetworks gateway, we were both so excited, that we started working on it +almost immediately. And the result is BitlBee. + +This package contains the user guide: + %{_docdir}/%{name}/user-guide + %prep %setup -q @@ -71,7 +95,7 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ --pidfile="%{_localstatedir}/run/%{name}.pid" \ --config="%{_localstatedir}/lib/%{name}" \ --ipcsocket="%{_localstatedir}/run/%{name}.sock" \ - --purple=0 \ + --purple=1 \ %if 0%{?with_libotr:1} --otr=1 \ %else @@ -110,6 +134,18 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ %fdupes -s %endif +%__install -d "%{buildroot}%{_docdir}/%{name}" +LM="$PWD/%{name}.lang" +echo -n > "$LM" +for f in COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/README; do + b="${f##*/}" + %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$b" + echo "%doc %{_docdir}/%{name}/$b" >>"$LM" +done + +%__install -d "%{buildroot}%{_docdir}/%{name}/user-guide" +%__cp -a doc/user-guide/*.{txt,html} "%{buildroot}%{_docdir}/%{name}/user-guide/" + %pre /usr/bin/getent group bitlbee &>/dev/null || /usr/sbin/groupadd -r bitlbee &>/dev/null || : /usr/bin/getent passwd bitlbee &>/dev/null || \ @@ -119,12 +155,9 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ %clean %{?buildroot:%__rm -rf "%{buildroot}"} -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/README -%if 0%{?suse_version} >= 1010 -%doc doc/user-guide/*.html doc/user-guide/*.txt -%endif +%doc %dir %{_docdir}/%{name} %config(noreplace) %{_sysconfdir}/xinetd.d/bitlbee %attr(0750,root,bitlbee) %dir %{_sysconfdir}/bitlbee %config(noreplace) %attr(0640,root,bitlbee) %{_sysconfdir}/bitlbee/bitlbee.conf @@ -135,3 +168,8 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ %doc %{_mandir}/man8/bitlbee.8%{ext_man} %attr(0750,bitlbee,bitlbee) %dir %{_localstatedir}/lib/bitlbee +%files doc +%defattr(-,root,root) +%doc %dir %{_docdir}/%{name} +%{_docdir}/%{name}/user-guide +