Merge branch 'master' into patched-masterHEADpatched-master

7 files changed, 44 insertions, 43 deletions

diff --git a/README.md b/README.md
index 54057077..476bafec 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
 # BitlBee
 
-![](http://bitlbee.org/style/logo.png)
+![](https://www.bitlbee.org/style/logo.png)
 
 [![Build Status](https://travis-ci.org/bitlbee/bitlbee.svg)](https://travis-ci.org/bitlbee/bitlbee)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/4028/badge.svg)](https://scan.coverity.com/projects/4028)
 
 An IRC to other chat networks gateway
 
-Main website: http://www.bitlbee.org/
+Main website: https://www.bitlbee.org/
 
-Bug tracker: http://bugs.bitlbee.org/
+Bug tracker: https://bugs.bitlbee.org/
 
-Wiki: http://wiki.bitlbee.org/
+Wiki: https://wiki.bitlbee.org/
 
 License: GPLv2
 
@@ -19,9 +19,9 @@ License: GPLv2
 
 BitlBee is available in the package managers of most distros.
 
-For debian/ubuntu/etc you may use the nightly APT repository: http://code.bitlbee.org/debian/
+For debian/ubuntu/etc you may use the nightly APT repository: https://code.bitlbee.org/debian/
 
-You can also use a public server (such as `im.bitlbee.org`) instead of installing it: http://bitlbee.org/main.php/servers.html
+You can also use a public server (such as `im.bitlbee.org`) instead of installing it: https://www.bitlbee.org/main.php/servers.html
 
 ## Compiling
 
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst
index 93ef5010..84c5543e 100644
--- a/debian/bitlbee-common.postinst
+++ b/debian/bitlbee-common.postinst
@@ -34,7 +34,9 @@ else
 	adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee
 fi
 
-chmod 700 /var/lib/bitlbee/
+if [ -d /var/lib/bitlbee ]; then
+    chmod 700 /var/lib/bitlbee/
+fi
 
 ## Can't do this in packaging phase: Don't know the UID yet. Access to
 ## the file should be limited, now that it stores passwords. Added
diff --git a/debian/changelog b/debian/changelog
index ff6ec7e1..6831eefa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 bitlbee (3.5.1-1.1) UNRELEASED; urgency=medium
 
+  [ dequis ]
   * Remove bitlbee-plugin-skype and skyped (obsolete)
   * Enable only bitlbee.service, not bitlbee.socket too
 
+  [ Sean Whitton ]
+  * Add existence check to chmod call in bitlbee-common.postinst
+    (Closes: #816200).
+
+  [ dequis ]
+  * Fix lintian pkg-config-unavailable-for-cross-compilation 
+
  -- dequis <dx@dxzone.com.ar>  Mon, 19 Mar 2018 22:18:43 -0300
 
 bitlbee (3.5.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9f7db6db..5a4b39ca 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: https://github.com/bitlbee/bitlbee
 
 Package: bitlbee
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
 Description: IRC to other chat networks gateway (default version)
@@ -21,7 +21,7 @@ Description: IRC to other chat networks gateway (default version)
 
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
 Description: IRC to other chat networks gateway (using libpurple)
@@ -37,7 +37,7 @@ Description: IRC to other chat networks gateway (using libpurple)
  If you don't need the extra features, it's better to use the built-in code.
 
 Package: bitlbee-common
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}, adduser
 Replaces: bitlbee
 Description: IRC to other chat networks gateway (common files/docs)
@@ -49,8 +49,8 @@ Description: IRC to other chat networks gateway (common files/docs)
  bitlbee-libpurple.
 
 Package: bitlbee-dev
-Architecture: all
-Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
+Architecture: any
+Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
 Description: IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google
@@ -60,7 +60,7 @@ Description: IRC to other chat networks gateway (dev files)
 
 Package: bitlbee-plugin-otr
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
 Description: IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google
diff --git a/debian/rules b/debian/rules
index 8cdb9628..4fabddfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,22 +34,19 @@ CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAG
 
 HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
 
-# No difference at the build stage so just call main build target.
-# (Well indep could be docs-only but we prebuild them plus it's really
-# not that much work.)
-build-arch build-indep: build
+build-arch: build
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
 	mkdir -p debian/build-native
-	ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --systemdsystemunitdir=/lib/systemd/system $(BITLBEE_CONFIGURE_FLAGS)
+	ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig $(BITLBEE_CONFIGURE_FLAGS)
 	$(MAKE) -C debian/build-native
 
 ifeq ($(BITLBEE_LIBPURPLE),1)
 	mkdir -p debian/build-libpurple
-	ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
+	ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
 	$(MAKE) -C debian/build-libpurple
 endif
 
@@ -97,10 +94,7 @@ binary-common:
 
 	dh_installchangelogs doc/CHANGES
 	dh_installexamples
-	dh_installdocs #--link-doc=bitlbee-common
-	# TODO: Restore --link-doc up here and remove the hack below once
-	# Hardy and Lenny are deprecated.
-	for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
+	dh_installdocs --link-doc=bitlbee-common
 	dh_installdebconf
 ifeq ($(HAS_DH_SYSTEMD),1)
 	dh_systemd_enable -p bitlbee-common --no-enable bitlbee.socket
@@ -122,14 +116,11 @@ endif
 	dh_md5sums
 	dh_builddeb
 
-binary-indep: build install
-	DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
-
 binary-arch: build install
 	DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
 
 binary-%: build install
 	DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary-common binary install
+binary: binary-arch
+.PHONY: build clean binary-arch binary-common binary install
diff --git a/lib/ssl_openssl.c b/lib/ssl_openssl.c
index 2f668da2..16e05a94 100644
--- a/lib/ssl_openssl.c
+++ b/lib/ssl_openssl.c
@@ -64,11 +64,17 @@ void ssl_init(void)
 {
 	const SSL_METHOD *meth;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_library_init();
 
 	meth = SSLv23_client_method();
 	ssl_ctx = SSL_CTX_new(meth);
 	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+#else
+	meth = TLS_client_method();
+	ssl_ctx = SSL_CTX_new(meth);
+	SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
+#endif
 
 	initialized = TRUE;
 }
@@ -300,20 +306,20 @@ size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len, const unsigned
                         const unsigned char *iv, unsigned char **res)
 {
 	int output_length = 0;
-	EVP_CIPHER_CTX ctx;
+	EVP_CIPHER_CTX *ctx;
 
 	*res = g_new0(unsigned char, 72);
 
 	/* Don't set key or IV because we will modify the parameters */
-	EVP_CIPHER_CTX_init(&ctx);
-	EVP_CipherInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
-	EVP_CIPHER_CTX_set_key_length(&ctx, key_len);
-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+	ctx = EVP_CIPHER_CTX_new();
+	EVP_CipherInit_ex(ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
+	EVP_CIPHER_CTX_set_key_length(ctx, key_len);
+	EVP_CIPHER_CTX_set_padding(ctx, 0);
 	/* We finished modifying parameters so now we can set key and IV */
-	EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, 1);
-	EVP_CipherUpdate(&ctx, *res, &output_length, input, input_len);
-	EVP_CipherFinal_ex(&ctx, *res, &output_length);
-	EVP_CIPHER_CTX_cleanup(&ctx);
+	EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, 1);
+	EVP_CipherUpdate(ctx, *res, &output_length, input, input_len);
+	EVP_CipherFinal_ex(ctx, *res, &output_length);
+	EVP_CIPHER_CTX_free(ctx);
 	//EVP_cleanup();
 
 	return output_length;
diff --git a/root_commands.c b/root_commands.c
index 8e410340..d04476cf 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -1604,11 +1604,6 @@ static void cmd_transfer(irc_t *irc, char **cmd)
 	}
 }
 
-static void cmd_nick(irc_t *irc, char **cmd)
-{
-	irc_rootmsg(irc, "This command is deprecated. Try: account %s set display_name", cmd[1]);
-}
-
 #ifdef WITH_GNUTLS
 static void cmd_certfp(irc_t *irc, char **cmd)
 {
@@ -1656,7 +1651,6 @@ command_t root_commands[] = {
 	{ "help",           0, cmd_help,           0 },
 	{ "identify",       0, cmd_identify,       0 },
 	{ "info",           1, cmd_info,           0 },
-	{ "nick",           1, cmd_nick,           0 },
 	{ "no",             0, cmd_yesno,          0 },
 	{ "plugins",        0, cmd_plugins,        0 },
 	{ "qlist",          0, cmd_qlist,          0 },