Subject: Debian's development branch
Origin: http://anonscm.debian.org/cgit/collab-maint/eb.git/log/?h=devel

diff --git a/ChangeLog b/ChangeLog
index a201280..a9396cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2016-10-09  paulownia  <paulownia@Safe-mail.net>
+
+	* eb/zio.c: Fix return value assigned to variable of wrong type.
+	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833085#5
+
+2015-02-01  paulownia  <paulownia@Safe-mail.net>
+
+	* ebinfo/ebinfo.c: Fix too many arguments for format string.
+	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776602#5
+
+	* libebutils/makedir.h:
+	Correct parameter declarations of make_missing_directory().
+	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748030#12
+
+	* eb/urlparts.c:
+	Fix that url_parts_parse() performs a NULL-pointer dereference.
+	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715855#20
+
 2010-03-08  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
 	* Version 4.4.3.
diff --git a/eb/urlparts.c b/eb/urlparts.c
index 4ab1071..e3d67d9 100644
--- a/eb/urlparts.c
+++ b/eb/urlparts.c
@@ -355,20 +355,22 @@ url_parts_parse(URL_Parts *parts, const char *url)
 	 * Get host and port.
 	 * IPv6 address is enclosed in `[' and `]'.
 	 */
-	if (*hostport == '[') {
-	    right_bracket = strchr(hostport + 1, ']');
-	    if (right_bracket == NULL)
-		separator = NULL;
-	    else {
-		if (*(right_bracket + 1) == ':'
-		    || *(right_bracket + 1) == '\0') {
-		    hostport++;
-		    *right_bracket = '\0';
+	if (hostport != NULL) {
+		if (*hostport == '[') {
+		    right_bracket = strchr(hostport + 1, ']');
+		    if (right_bracket == NULL)
+			separator = NULL;
+		    else {
+			if (*(right_bracket + 1) == ':'
+			    || *(right_bracket + 1) == '\0') {
+			    hostport++;
+			    *right_bracket = '\0';
+			}
+			separator = strchr(right_bracket + 1, ':');
+		    }
+		} else {
+		    separator = strchr(hostport, ':');
 		}
-		separator = strchr(right_bracket + 1, ':');
-	    }
-	} else {
-	    separator = strchr(hostport, ':');
 	}
 
 	if (separator != NULL) {
diff --git a/eb/zio.c b/eb/zio.c
index 160337f..208b169 100644
--- a/eb/zio.c
+++ b/eb/zio.c
@@ -1827,7 +1827,7 @@ zio_unzip_slice_sebxa(Zio *zio, char *out_buffer)
 {
     char in_buffer[ZIO_SEBXA_SLICE_LENGTH];
     unsigned char *in_buffer_p;
-    size_t in_read_rest;
+    ssize_t in_read_rest;
     unsigned char *out_buffer_p;
     size_t out_length;
     int compression_flags[8];
diff --git a/ebinfo/ebinfo.c b/ebinfo/ebinfo.c
index 1e407fa..edf4dbb 100644
--- a/ebinfo/ebinfo.c
+++ b/ebinfo/ebinfo.c
@@ -371,7 +371,7 @@ output_information(const char *book_path, int multi_flag)
 	    return_code = error_code;
 	    continue;
 	}
-	printf(_("  title: "), title);
+	fputs(_("  title: "), stdout);
 	fputs_eucjp_to_locale(title, stdout);
 	fputc('\n', stdout);
 
@@ -567,7 +567,7 @@ output_multi_information(EB_Book *book)
 	    return_code = error_code;
 	    continue;
 	}
-	printf(_("    title: "), search_title);
+	fputs(_("    title: "), stdout);
 	fputs_eucjp_to_locale(search_title, stdout);
 	fputc('\n', stdout);
 
diff --git a/libebutils/makedir.h b/libebutils/makedir.h
index f4188c2..8eb3a15 100644
--- a/libebutils/makedir.h
+++ b/libebutils/makedir.h
@@ -33,10 +33,11 @@
 #include "config.h"
 #endif
 
+#include <sys/types.h>
 
 /*
  * Function declarations.
  */
-int make_missing_directory(const char *, int);
+int make_missing_directory(const char *, mode_t);
 
 #endif /* not MAKEDIR_H */