Changeset 2e815e5

Timestamp:

2014-02-28T23:14:11Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

35987a1

Parents:

6ae1056 (diff), cb90dc9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging a bunch of patches from Trac, collected by dx.

Files:

• Makefile (modified) (6 diffs)
• configure (modified) (2 diffs)
• init/bitlbee.socket (modified) (1 diff)
• irc_im.c (modified) (2 diffs)
• nick.c (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• tests/check_nick.c (modified) (4 diffs)

Makefile

@@ -91 +91 @@
 install-bin:
         mkdir -p $(DESTDIR)$(SBINDIR)
-        install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+        $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 uninstall-bin:
@@ -98 +98 @@
 install-dev:
         mkdir -p $(DESTDIR)$(INCLUDEDIR)
-        install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
-        for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
+        $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+        for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
         mkdir -p $(DESTDIR)$(PCDIR)
-        install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
+        $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
 
 uninstall-dev:
@@ -110 +110 @@
 install-etc:
         mkdir -p $(DESTDIR)$(ETCDIR)
-        install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-        install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+        $(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
@@ -123 +123 @@
 ifdef OTR_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
-        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+        $(INSTALL) -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
 endif
 
@@ -129 +129 @@
 ifdef SKYPE_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
-        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+        $(INSTALL) -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
         mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
-        install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
-        install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
-        install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
-        make -C protocols/skype install-doc
+        $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+        $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+        $(INSTALL) -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+        $(MAKE) -C protocols/skype install-doc
 endif
 
@@ -147 +147 @@
 ifeq ($(shell id -u),0)
         mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-        install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+        $(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 else
         @echo Not root, so not installing systemd files.

configure

@@ -480 +480 @@
 
 if [ "$plugins" = 0 ]; then
+        plugindir=""
         echo '#undef WITH_PLUGINS' >> config.h
 else
@@ -571 +572 @@
 prefix=$prefix
 includedir=$includedir
+plugindir=$plugindir
 
 Name: bitlbee

init/bitlbee.socket

@@ -3 +3 @@
 
 [Socket]
-ListenStream=127.0.0.1:6667
+ListenStream=6667
+BindToDevice=lo
 Accept=yes
 

irc_im.c

@@ -626 +626 @@
         irc_user_t *iu = bu->ui_data;
         irc_channel_t *ic = c->ui_data;
-        char *ts = NULL;
+        char *wrapped, *ts = NULL;
         
         if( ic == NULL )
@@ -634 +634 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
-        irc_send_msg( iu, "PRIVMSG", ic->name, msg, ts );
+        wrapped = word_wrap( msg, 425 );
+        irc_send_msg( iu, "PRIVMSG", ic->name, wrapped, ts );
         g_free( ts );
         

nick.c

@@ -210 +210 @@
                                                               "UTF-8", "", NULL, NULL, NULL );
                 
-                if( chop && ( s = strchr( part, chop ) ) )
+                if( part && chop && ( s = strchr( part, chop ) ) )
                         len = MIN( len, s - part );
                 

protocols/jabber/jabber_util.c

@@ -289 +289 @@
         struct jabber_buddy_ask_data *bla = data;
         
-        presence_send_request( bla->ic, bla->handle, "subscribed" );
+        presence_send_request( bla->ic, bla->handle, "unsubscribed" );
         
         g_free( bla->handle );

tests/check_nick.c

@@ -7 +7 @@
 #include "set.h"
 #include "misc.h"
+#include "bitlbee.h"
 
 START_TEST(test_nick_strip)
@@ -31 +32 @@
                 char copy[60];
                 strcpy(copy, get[i]);
-                nick_strip(copy);
+                nick_strip(NULL, copy);
                 fail_unless (strcmp(copy, expected[i]) == 0, 
                                          "(%d) nick_strip broken: %s -> %s (expected: %s)", 
@@ -46 +47 @@
 
         for (i = 0; nicks[i]; i++) {
-                fail_unless (nick_ok(nicks[i]) == 1,
+                fail_unless (nick_ok(NULL, nicks[i]) == 1,
                                          "nick_ok() failed: %s", nicks[i]);
         }
@@ -59 +60 @@
 
         for (i = 0; nicks[i]; i++) {
-                fail_unless (nick_ok(nicks[i]) == 0,
+                fail_unless (nick_ok(NULL, nicks[i]) == 0,
                                          "nick_ok() succeeded for invalid: %s", nicks[i]);
         }