Changeset e4f08bf

Timestamp:

2015-06-08T18:25:08Z (9 years ago)

Author:

dequis <dx@…>

Children:

29ff5c2

Parents:

c720890 (diff), 61e7e02 (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:

Merge branch 'develop' into feat/hip-cat

Conflicts:

configure

Files:

• .travis.yml (modified) (1 diff)
• configure (modified) (2 diffs)
• debian/control (modified) (1 diff)
• doc/Makefile (modified) (1 diff)
• doc/user-guide/Makefile (modified) (2 diffs)
• doc/user-guide/genhelp.py (modified) (3 diffs)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• nick.c (modified) (1 diff)
• protocols/skype/Makefile (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (3 diffs)
• sock.h (modified) (1 diff)

.travis.yml

@@ -4 +4 @@
  - ./configure
  - make check
- - dpkg-buildpackage -uc -us
+ - BITLBEE_SKYPE=plugin dpkg-buildpackage -uc -us
 
 before_install:

configure

@@ -79 +79 @@
                 branch=$(cd $srcdir; git rev-parse --abbrev-ref HEAD)
 
-                search="(.+)-([0-9]+)-(g[0-9a-f]+)"
+                search='\(.*\)-\([0-9]*\)-\(g[0-9a-f]*\)'
                 replace="\1+$timestamp+$branch+\2-\3-git"
 
-                BITLBEE_VERSION=$(cd $srcdir; git describe --long --tags | sed -r "s#$search#$replace#")
-
-                unset timestamp branch search replace
+                describe=$(cd $srcdir; git describe --long --tags 2>/dev/null)
+                if [ $? -ne 0 ]; then
+                        describe=${REAL_BITLBEE_VERSION}-0-g$(cd $srcdir; git rev-parse --short HEAD)
+                fi
+
+                BITLBEE_VERSION=$(echo $describe | sed "s#$search#$replace#")
+
+                unset timestamp branch search replace describe
         fi
 }
@@ -680 +685 @@
 fi
 
+if [ -z "$PYTHON" ]; then
+        PYTHON=python
+fi
+
 if [ "$doc" = "1" ]; then
         # check this here just in case someone tries to install it in python2.4...
-        if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
+        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
                 echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
+                echo "(Use the PYTHON environment variable if it's in a weird location)"
                 exit 1
         fi
         echo "DOC=1" >> Makefile.settings
+        echo "PYTHON=$PYTHON" >> Makefile.settings
 fi
 

debian/control

@@ -22 +22 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
-Provides: bitlbee (= ${source:Version})
 Conflicts: bitlbee
 Replaces: bitlbee

doc/Makefile

@@ -5 +5 @@
 
 all:
-        # Only build the docs if this is a git tree
-        test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide
+        $(MAKE) -C user-guide
 
 install:

doc/user-guide/Makefile

@@ -3 +3 @@
 _SRCDIR_ := $(_SRCDIR_)doc/user-guide/
 endif
+
+ifndef PYTHON
+PYTHON = python
+endif 
 
 all: help.txt
@@ -31 +35 @@
         xsltproc --xinclude --output $@ docbook.xsl $< 
 
-help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml
-        python genhelp.py $< $@
+help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
+        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
 
 clean: 

doc/user-guide/genhelp.py

@@ -3 +3 @@
 # Usage: python genhelp.py input.xml output.txt
 # (Both python2 (>=2.5) or python3 work)
+#
+# The shebang above isn't used, set the PYTHON environment variable
+# before running ./configure instead
 
 # This program is free software; you can redistribute it and/or
@@ -20 +23 @@
 
 
+import os
 import re
 import sys
@@ -222 +226 @@
         return
 
+    # ensure that we really are in the same directory as the input file
+    os.chdir(os.path.dirname(os.path.abspath(sys.argv[1])))
+
     txt = process_file(sys.argv[1])
     open(sys.argv[2], "w").write(txt)

lib/misc.c

@@ -751 +751 @@
         return end - string;
 }
+
+/* Parses a guint64 from string, returns TRUE on success */
+gboolean parse_int64(char *string, int base, guint64 *number)
+{
+        guint64 parsed;
+        char *endptr;
+
+        errno = 0;
+        parsed = g_ascii_strtoull(string, &endptr, base);
+        if (errno || endptr == string || *endptr != '\0') {
+                return FALSE;
+        }
+        *number = parsed;
+        return TRUE;
+}
+

lib/misc.h

@@ -149 +149 @@
 G_MODULE_EXPORT char *get_rfc822_header(const char *text, const char *header, int len);
 G_MODULE_EXPORT int truncate_utf8(char *string, int maxlen);
+G_MODULE_EXPORT gboolean parse_int64(char *string, int base, guint64 *number);
 
 #endif

nick.c

@@ -186 +186 @@
                    LC_CTYPE being set to something other than C/POSIX. */
                 if (!(irc && irc->status & IRC_UTF8_NICKS)) {
-                        part = asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT",
-                                                             "UTF-8", "", NULL, NULL, NULL);
+                        asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, NULL, NULL);
+
+                        if (!asc) {
+                                /* If above failed, try again without //TRANSLIT.
+                                   //TRANSLIT is a GNU iconv special and is not POSIX.
+                                   Other platforms may not support it. */
+                                asc = g_convert_with_fallback(part, -1, "ASCII", "UTF-8", "", NULL, NULL, NULL);
+                        }
+
+                        part = asc;
                 }
 

protocols/skype/Makefile

@@ -19 +19 @@
 install-doc:
         $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
-        $(INSTALL) -m644 skyped.1 $(DESTDIR)$(MANDIR)/man1
+        $(INSTALL) -m644 $(_SRCDIR_)skyped.1 $(DESTDIR)$(MANDIR)/man1
 
 uninstall-doc:

protocols/twitter/twitter.c

@@ -469 +469 @@
         g_regex_match(regex, msg, 0, &match_info);
         while (g_match_info_matches(match_info)) {
-                gchar *url = g_match_info_fetch(match_info, 2);
+                gchar *s, *url;
+
+                url = g_match_info_fetch(match_info, 2);
                 url_len_diff += target_len - g_utf8_strlen(url, -1);
+
                 /* Add another character for https://t.co/... URLs */
-                if (g_match_info_fetch(match_info, 3) != NULL) {
+                if ((s = g_match_info_fetch(match_info, 3))) {
                         url_len_diff += 1;
+                        g_free(s);
                 }
                 g_free(url);
@@ -859 +863 @@
 }
 
-/* Parses a decimal or hex tweet ID, returns TRUE on success */
-static gboolean twitter_parse_id(char *string, int base, guint64 *id)
-{
-        guint64 parsed;
-        char *endptr;
-
-        errno = 0;
-        parsed = g_ascii_strtoull(string, &endptr, base);
-        if (errno || endptr == string || *endptr != '\0') {
-                return FALSE;
-        }
-        *id = parsed;
-        return TRUE;
-}
-
 bee_user_t twitter_log_local_user;
 
@@ -903 +892 @@
                         arg++;
                 }
-                if (twitter_parse_id(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
+                if (parse_int64(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
-                } else if (twitter_parse_id(arg, 10, &id)) {
+                } else if (parse_int64(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore

sock.h

@@ -9 +9 @@
 #define sock_make_nonblocking(fd) fcntl(fd, F_SETFL, O_NONBLOCK)
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
-#define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
+#define sockerr_again() (errno == EINPROGRESS || errno == EINTR || errno == EAGAIN)
 void closesocket(int fd);