diff options
Diffstat (limited to 'net-im/bitlbee/files')
-rw-r--r-- | net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch | 200 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch | 55 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch | 99 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee.confd-r1 | 8 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee.initd-r1 | 30 |
5 files changed, 154 insertions, 238 deletions
diff --git a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch deleted file mode 100644 index 7501963cb5de..000000000000 --- a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch +++ /dev/null @@ -1,200 +0,0 @@ -Add a --verbose configure flag to enable verbose build output. - ---- bitlbee-3.5/configure -+++ bitlbee-3.5/configure -@@ -38,6 +38,7 @@ - twitter=1 - purple=0 - -+verbose=0 - doc=1 - debug=0 - strip=0 -@@ -125,6 +126,8 @@ - --pidfile=... $pidfile - --config=... $config - -+--verbose=0/1 Disable/enable verbose build $verbose -+ - --msn=0/1 Disable/enable MSN part $msn - --jabber=0/1 Disable/enable Jabber part $jabber - --oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar -@@ -282,6 +285,12 @@ - debug=1 - fi - -+if [ "$verbose" = "0" ]; then -+ echo 'VERBOSE=@' >> Makefile.settings -+else -+ echo 'VERBOSE=' >> Makefile.settings -+fi -+ - if [ "$debug" = "1" ]; then - echo 'DEBUG=1' >> Makefile.settings - CFLAGS="$CFLAGS -g3 -DDEBUG -O0" ---- bitlbee-3.5/lib/Makefile -+++ bitlbee-3.5/lib/Makefile -@@ -35,12 +35,12 @@ - - lib.o: $(objects) $(subdirs) - @echo '*' Linking lib.o -- @$(LD) $(LFLAGS) $(objects) -o lib.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o - - $(objects): ../Makefile.settings Makefile - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - -include .depend/*.d ---- bitlbee-3.5/Makefile -+++ bitlbee-3.5/Makefile -@@ -162,28 +162,28 @@ - tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x - - $(subdirs): -- @$(MAKE) -C $@ $(MAKECMDGOALS) -+ $(MAKE) -C $@ $(MAKECMDGOALS) - - $(OTR_PI): %.so: $(_SRCDIR_)%.c - @echo '*' Building plugin $@ -- @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS) -+ $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS) - - $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c - @echo '*' Building plugin skype -- @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@ -+ $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - $(objects): Makefile Makefile.settings config.h - - $(OUTFILE): $(objects) $(subdirs) - @echo '*' Linking $(OUTFILE) -- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS) -+ $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS) - ifneq ($(firstword $(STRIP)), \#) - @echo '*' Stripping $(OUTFILE) -- @-$(STRIP) $(OUTFILE) -+ $(VERBOSE) -$(STRIP) $(OUTFILE) - endif - - ctags: ---- bitlbee-3.5/protocols/jabber/Makefile -+++ bitlbee-3.5/protocols/jabber/Makefile -@@ -37,10 +37,10 @@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - jabber_mod.o: $(objects) - @echo '*' Linking jabber_mod.o -- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o - - -include .depend/*.d ---- bitlbee-3.5/protocols/Makefile -+++ bitlbee-3.5/protocols/Makefile -@@ -42,18 +42,18 @@ - rm -rf .depend - - $(subdirs): -- @$(MAKE) -C $@ $(MAKECMDGOALS) -+ $(MAKE) -C $@ $(MAKECMDGOALS) - - ### MAIN PROGRAM - - protocols.o: $(objects) $(subdirs) - @echo '*' Linking protocols.o -- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o - - $(objects): ../Makefile.settings Makefile - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - -include .depend/*.d ---- bitlbee-3.5/protocols/msn/Makefile -+++ bitlbee-3.5/protocols/msn/Makefile -@@ -37,10 +37,10 @@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - msn_mod.o: $(objects) - @echo '*' Linking msn_mod.o -- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o - - -include .depend/*.d ---- bitlbee-3.5/protocols/oscar/Makefile -+++ bitlbee-3.5/protocols/oscar/Makefile -@@ -38,10 +38,10 @@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - oscar_mod.o: $(objects) - @echo '*' Linking oscar_mod.o -- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o - - -include .depend/*.d ---- bitlbee-3.5/protocols/purple/Makefile -+++ bitlbee-3.5/protocols/purple/Makefile -@@ -38,10 +38,10 @@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - purple_mod.o: $(objects) - @echo '*' Linking purple_mod.o -- @$(LD) $(LFLAGS) $(objects) -o purple_mod.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o - - -include .depend/*.d ---- bitlbee-3.5/protocols/twitter/Makefile -+++ bitlbee-3.5/protocols/twitter/Makefile -@@ -37,10 +37,10 @@ - - $(objects): %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ - - twitter_mod.o: $(objects) - @echo '*' Linking twitter_mod.o -- @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o -+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o - - -include .depend/*.d ---- bitlbee-3.5/tests/Makefile -+++ bitlbee-3.5/tests/Makefile -@@ -20,8 +20,8 @@ - - check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o - @echo '*' Linking $@ -- @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) -+ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) - - %.o: $(_SRCDIR_)%.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@ diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch new file mode 100644 index 000000000000..0973bd4bd5fa --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch @@ -0,0 +1,55 @@ +This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156 +where it was already merged. + +From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz> +Date: Tue, 23 Mar 2021 13:07:18 +0100 +Subject: [PATCH] root_commands: prevent linker error when plugins are disabled + +This commit fixes compilation issue with disabled plugin support +(./configure --plugins=0), where get_plugins function is unavailable. +The problem has been introduced with addition of new 'plugins info' +subcommand, where get_plugins is used in cmd_plugins_info function, +which should be conditionally available only if WITH_PLUGINS is defined. + +Bug: https://bugs.gentoo.org/739510 +Bug: https://bugs.gentoo.org/617604 +Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there") +Signed-off-by: Petr Vaněk <arkamar@atlas.cz> +--- + root_commands.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/root_commands.c b/root_commands.c +index 8358c030..a4e72f83 100644 +--- a/root_commands.c ++++ b/root_commands.c +@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr) + g_list_free(prpls); + } + ++#ifdef WITH_PLUGINS + static void cmd_plugins_info(irc_t *irc, char **cmd) + { + GList *l; +@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd) + irc_rootmsg(irc, " URL: %s", info->url); + } + } ++#endif + + static void cmd_plugins(irc_t *irc, char **cmd) + { +@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd) + GString *gstr; + + if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) { ++#ifdef WITH_PLUGINS + cmd_plugins_info(irc, cmd); ++#endif + return; + } + +-- +2.26.3 + diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch new file mode 100644 index 000000000000..0a9c197d763d --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch @@ -0,0 +1,99 @@ +This is adapted patch from upstream PR 151. Original PR defines +--external-json-parser which breaks configuration, see [1]. It was changed to +--externaljsonparser and $external_json_parser to $externaljsonparser. +Additionally, LDFLAGS_CHECK variable was introduced in order to make +tests working, see [2] and #865667. + +[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 +[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239 + +Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 + +diff --git a/configure b/configure +index fd8d363a..39495515 100755 +--- a/configure ++++ b/configure +@@ -47,6 +47,7 @@ plugins=1 + otr=0 + + events=glib ++externaljsonparser=auto + ssl=auto + + pam=0 +@@ -148,6 +149,7 @@ Option Description Default + --events=... Event handler (glib, libevent) $events + --ssl=... SSL library to use (gnutls, nss, openssl, auto) + $ssl ++--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser + + + --target=... Cross compilation target same as host +@@ -398,6 +400,21 @@ else + fi + echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings + ++if [ "$externaljsonparser" = "auto" ]; then ++ if pkg-config --exists json-parser; then ++ externaljsonparser=1 ++ else ++ externaljsonparser=0 ++ fi ++fi ++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings ++if [ "$externaljsonparser" = "1" ]; then ++ echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings ++ echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings ++ echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings ++fi ++ ++ + detect_gnutls() + { + if $PKG_CONFIG --exists gnutls; then +@@ -979,6 +996,12 @@ else + echo ' systemd disabled.' + fi + ++if [ "$externaljsonparser" = "1" ]; then ++ echo ' Using system JSON parser.' ++else ++ echo ' Using bundled JSON parser.' ++fi ++ + echo ' Using event handler: '$events + echo ' Using SSL library: '$ssl + #echo ' Building with these storage backends: '$STORAGES +diff --git a/lib/Makefile b/lib/Makefile +index fc46aedc..ad95d9cb 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/ + endif + + # [SH] Program variables +-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++ ++ifneq ($(EXTERNAL_JSON_PARSER),1) ++objects += json.o ++endif + + LFLAGS += -r + +diff --git a/tests/Makefile b/tests/Makefile +index 76122a2f..2235bf1d 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc. + + check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o + @echo '*' Linking $@ +- $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) ++ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LDFLAGS_CHECK) $(EFLAGS) + + %.o: $(_SRCDIR_)%.c + @echo '*' Compiling $< +-- +2.35.1 + diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1 deleted file mode 100644 index d581222f9fb9..000000000000 --- a/net-im/bitlbee/files/bitlbee.confd-r1 +++ /dev/null @@ -1,8 +0,0 @@ -# Bitlbee options (see /usr/sbin/bitlbee -h) -BITLBEE_OPTS="-F" - -# By default, the bitlbee init script will attempt to stop -# all bitlbee-owned processes, including per-client forks. -# Setting this to "no" tells the init script to only -# stop the main bitlbee process. -BITLBEE_STOP_ALL="yes" diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1 deleted file mode 100644 index 413bd45735ed..000000000000 --- a/net-im/bitlbee/files/bitlbee.initd-r1 +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or -# later - -DAEMON=/usr/sbin/bitlbee -PIDFILE=/var/run/bitlbee/bitlbee.pid - -depend() { - need logger net -} - -start () { - ebegin "Starting bitlbee" - checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE}) - start-stop-daemon --start --quiet \ - -u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \ - -- -P ${PIDFILE} ${BITLBEE_OPTS} - eend $? -} - -stop() { - ebegin "Stopping bitlbee" - local pidfile= - yesno ${BITLBEE_STOP_ALL:-YES} || - pidfile="--pidfile ${PIDFILE}" - start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee - eend $? -} - |