From 288a41e4587893565354f5f7a00825be38917dacac0335ed18baaacecc4ed087 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Thu, 23 Apr 2015 06:21:30 +0000 Subject: [PATCH 1/3] Accepting request 298676 from home:lmuelle - update to 3.4: See the package change log for more details. - Remove obsoleted COPYING.patch - Enhance the service file to start in daemon mode and as user bitlbee and create a user group too while calling useradd on install; (boo#928228). OBS-URL: https://build.opensuse.org/request/show/298676 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=31 --- COPYING.patch | 29 ------------------------- bitlbee-3.2.2.tar.gz | 3 --- bitlbee-3.4.tar.gz | 3 +++ bitlbee.changes | 47 +++++++++++++++++++++++++++++++++++++++++ bitlbee.service-suse.in | 2 +- bitlbee.spec | 6 ++---- 6 files changed, 53 insertions(+), 37 deletions(-) delete mode 100644 COPYING.patch delete mode 100644 bitlbee-3.2.2.tar.gz create mode 100644 bitlbee-3.4.tar.gz diff --git a/COPYING.patch b/COPYING.patch deleted file mode 100644 index e7ff65a..0000000 --- a/COPYING.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- bitlbee.orig/COPYING 2014-11-10 14:20:57.734766000 +0200 -+++ bitlbee/COPYING 2014-11-10 14:32:15.551355643 +0200 -@@ -2,7 +2,7 @@ - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -305,7 +305,7 @@ - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - - Also add information on how to contact you by electronic and paper mail. -@@ -313,7 +313,7 @@ - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. diff --git a/bitlbee-3.2.2.tar.gz b/bitlbee-3.2.2.tar.gz deleted file mode 100644 index 7687464..0000000 --- a/bitlbee-3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e -size 661757 diff --git a/bitlbee-3.4.tar.gz b/bitlbee-3.4.tar.gz new file mode 100644 index 0000000..571351c --- /dev/null +++ b/bitlbee-3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cebad646bbfd17c80923743244039fd970e3ca27e8c1b7cf872622e773239d5e +size 761027 diff --git a/bitlbee.changes b/bitlbee.changes index 25b6cd7..539ba6b 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Apr 22 19:41:55 UTC 2015 - lmuelle@suse.com + +- update to 3.4: + Some API/ABI changes. Recompiling third party plugins is required! + Important bugfixes: + * Fix memory leak when calling word_wrap() on groupchat messages (dx) + * Fix segfault after a file transfer is complete (dx) + * Fix bug where NSS would refuse to work in forkdaemon mode (dx) + * Fix several bugs with UTF8 nicks (dx) + * Fix some nasty deadlocks that appared mostly with libpurple (dx) + General changes: + * Add a 'pattern' parameter to the blist command, to filter it (tribut) + * Implemented /kick support, only supported by purple for now (jgeboski) + * Add a "special" state to show_users (mapped to the % prefix) (jgeboski) + * Improved support for cygwin, openbsd and darwin (jcopenha) + * Create temporary users instead of showing "Message from unknown + participant" (jgeboski) + purple: + * Local contact lists for gadugadu and whatsapp (dx) + * Add topic and name_hint to groupchats (seirl) + * Support for 'input' requests (such as telegram auth codes) (seirl) + Note that telegram-purple itself is rather unstable ATM, it may crash. + jabber: + * Handle compressed DNS responses in SRV lookup (jcopenha) + * Fix case sensitivity issues with JIDs (GRMrGecko, dx) + * Implement XEP-0203 style message timestamps (dx) + * Fix "Server claims your JID is X instead of Y" warnings (dx) + * Account-wide display_name setting, mostly for hipchat (dx) + twitter: + * Filter channels. Search by keyword/hashtag or a list of users (jgeboski) + * Fix bug in "reply" command which removed the first quote character (dx) + * Add "rawreply" command, like reply but bitlbee won't add @mention (WillP) + * Add support for The United States of America (favorite/fav aliases) (dx) + * Default show_old_mentions to 0 (dx) + * Start stream from last tweet on connect/reconnect (roger) + msn: + * Disabled module by default. The protocol we used (MSNP18) stopped working + last week. This is being worked on, but it's far from ready for release. +- Remove obsoleted COPYING.patch + +------------------------------------------------------------------- +Wed Apr 22 19:25:08 UTC 2015 - lmuelle@suse.com + +- Enhance the service file to start in daemon mode and as user bitlbee and + create a user group too while calling useradd on install; (boo#928228). + ------------------------------------------------------------------- Fri Dec 5 11:37:57 UTC 2014 - tampakrap@opensuse.org diff --git a/bitlbee.service-suse.in b/bitlbee.service-suse.in index 8e29e46..05196b7 100644 --- a/bitlbee.service-suse.in +++ b/bitlbee.service-suse.in @@ -17,7 +17,7 @@ After=network.target Type=forking ExecStartPre=/usr/bin/mkdir -p /run/bitlbee ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee -ExecStart=/usr/sbin/bitlbee +ExecStart=/usr/sbin/bitlbee -D -u bitlbee PIDFile=/run/bitlbee/bitlbee.pid ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/bitlbee.spec b/bitlbee.spec index 732f264..bcfad8e 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -37,7 +37,7 @@ %define daemon_piddir %{_localstatedir}/run/%{name} %endif Name: bitlbee -Version: 3.2.2 +Version: 3.4 Release: 0 Summary: IRC to other Chat Networks Gateway License: GPL-2.0 @@ -47,7 +47,6 @@ Source: http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz Source1: %{name}.xinetd-suse.in Source2: %{name}.service-suse.in Source3: %{name}.init.d-suse.in -Patch0: COPYING.patch BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: glibc-devel @@ -124,7 +123,6 @@ This package contains the user guide: %prep %setup -q -%patch0 -p1 # make it verbose! find . -name Makefile -exec sed -i.orig 's|@$(CC)|$(CC)|;s|@$(LD)|$(LD)|' {} \; @@ -214,7 +212,7 @@ if id bitlbee > /dev/null 2>&1;then : OK user %{name} already present %{nnmmsg} "info: The user %{name} for package %{name} is already present" else - useradd -r -g bitlbee -s /bin/false -c "bitlbee User" -d %{_localstatedir}/lib/%{name} bitlbee 2> /dev/null || : + useradd -r -U -s /bin/false -c "bitlbee User" -d %{_localstatedir}/lib/%{name} bitlbee 2> /dev/null || : %{nnmmsg} "Added user bitlbee for package %{name}" fi From f82a398a6509e5f010dfd7d96be19cc3789ad44a8328c229c1d7860ca4f827b2 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Thu, 23 Apr 2015 14:11:50 +0000 Subject: [PATCH 2/3] Accepting request 298806 from home:lmuelle Require util-linux-systemd at build time on post-13.1 systems. ... as else the SLE 12 build fails. Please consider to forward the 3.4 version update to openSUSE Factory. OBS-URL: https://build.opensuse.org/request/show/298806 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=32 --- bitlbee.changes | 5 +++++ bitlbee.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bitlbee.changes b/bitlbee.changes index 539ba6b..3320c7f 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 23 13:40:28 UTC 2015 - lmuelle@suse.com + +- Require util-linux-systemd at build time on post-13.1 systems. + ------------------------------------------------------------------- Wed Apr 22 19:41:55 UTC 2015 - lmuelle@suse.com diff --git a/bitlbee.spec b/bitlbee.spec index bcfad8e..824e3e6 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -75,7 +75,7 @@ BuildRequires: libpurple-devel %endif %if %{with_systemd} BuildRequires: systemd -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} > 1310 BuildRequires: util-linux-systemd %endif %endif From 293bada27e1a6fe3051cd2dac65328f08b95910ab1aed51a4caeb421e3acfd35 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Fri, 24 Apr 2015 07:51:19 +0000 Subject: [PATCH 3/3] Accepting request 299044 from home:lmuelle - Let systemd start bitlbee in fork daemon mode by default. - Cleanup of the spec file, the init script, and the systemd configuration. OBS-URL: https://build.opensuse.org/request/show/299044 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=33 --- bitlbee.changes | 6 ++++++ bitlbee.init.d-suse.in | 2 +- bitlbee.service-suse.in | 4 ++-- bitlbee.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bitlbee.changes b/bitlbee.changes index 3320c7f..87bdc80 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 23 18:45:03 UTC 2015 - lmuelle@suse.com + +- Let systemd start bitlbee in fork daemon mode by default. +- Cleanup of the spec file, the init script, and the systemd configuration. + ------------------------------------------------------------------- Thu Apr 23 13:40:28 UTC 2015 - lmuelle@suse.com diff --git a/bitlbee.init.d-suse.in b/bitlbee.init.d-suse.in index 4aed976..4c0aa55 100644 --- a/bitlbee.init.d-suse.in +++ b/bitlbee.init.d-suse.in @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 1995-2014 SUSE Linux AG, Nuernberg, Germany. +# Copyright (c) 1995-2015 SUSE Linux GmbH, Nuernberg, Germany. # All rights reserved. # # Author: Martin Caj diff --git a/bitlbee.service-suse.in b/bitlbee.service-suse.in index 05196b7..f718062 100644 --- a/bitlbee.service-suse.in +++ b/bitlbee.service-suse.in @@ -1,4 +1,4 @@ -# Copyright (c) 1995-2014 SUSE Linux AG, Nuernberg, Germany. +# Copyright (c) 1995-2015 SUSE Linux GmbH, Nuernberg, Germany. # All rights reserved. # # Author: Martin Caj @@ -17,7 +17,7 @@ After=network.target Type=forking ExecStartPre=/usr/bin/mkdir -p /run/bitlbee ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee -ExecStart=/usr/sbin/bitlbee -D -u bitlbee +ExecStart=/usr/sbin/bitlbee -F -u bitlbee PIDFile=/run/bitlbee/bitlbee.pid ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/bitlbee.spec b/bitlbee.spec index 824e3e6..afc5186 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -1,7 +1,7 @@ # # spec file for package bitlbee # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014-2015 SUSE Linux GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -24,7 +24,7 @@ %define with_libotr 1 %endif -#define systemd for the new OpenSUSE only: +#define systemd macro on post-12.3 systems only: %if 0%{?suse_version} >= 1310 %define with_systemd 1 %else