Merge branch 'master' into webui

build_scripts/Debian+Ubuntu/control.stretch

@@ -0,0 +1,44 @@
+Source: retroshare06
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default
+Standards-Version: 3.9.6
+Homepage: http://retroshare.sourceforge.net
+
+Package: retroshare06-voip-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5
+Description: RetroShare VOIP plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
+ friends chatting together need the plugin installed to be able to talk together.
+
+Package: retroshare06-feedreader-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06
+Description: RetroShare FeedReader plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds a RSS feed reader tab to retroshare.
+
+Package: retroshare06-nogui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06
+Description: Secure communication with friends
+ This is the command-line client for RetroShare network. This client
+ can be contacted and talked-to using SSL. Clients exist for portable
+ devices running e.g. Android. 
+
+Package: retroshare06
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06-nogui
+Description: Secure communication with friends
+ RetroShare is a Open Source cross-platform, private and secure decentralised 
+ commmunication platform. It lets you to securely chat and share files with your 
+ friends and family, using a web-of-trust to authenticate peers and OpenSSL to 
+ encrypt all communication. RetroShare provides filesharing, chat, messages, 
+ forums and channels.
+
+

build_scripts/Debian+Ubuntu/makeSourcePackage.sh

@@ -133,6 +133,9 @@ for i in ${dist}; do
         cp ../control.squeeze_bubba3 debian/control
     elif test "${i}" = "precise" ; then
         cp ../control.precise debian/control
+    elif test "${i}" = "stretch" ; then
+        cp ../control.${i} debian/control
+        cp ../rules.${i} debian/rules
     else
         cp ../debian/control debian/control
     fi

build_scripts/Debian+Ubuntu/rules.stretch

@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	cd src && qmake "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
+	touch $@
+
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	# Add here commands to compile the package.
+	# cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make 
+	# cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make
+	# mkdir lib
+	# cp -r libssh-0.6.4 lib/
+	#cp -r sqlcipher lib/
+	#cd src/rsctrl/src && make
+	cd src && $(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f src/Makefile ] || (cd src && $(MAKE) distclean)
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	#dh_installdirs
+	cd src && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --list-missing
+	#dh_installdocs
+	#dh_installexamples
+	#dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

build_scripts/RedHat+Fedora/retroshare06.spec

@@ -52,7 +52,7 @@ This package provides a plugin for RetroShare, a secured Friend-to-Friend commun
 
 %build
 cd lib/sqlcipher
-./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto"
+./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-fPIC -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto"
 make
 cd -
 cd src

libretroshare/src/pqi/p3netmgr.cc

@@ -1212,7 +1212,7 @@ bool    p3NetMgrIMPL::setExtAddress(const struct sockaddr_storage &addr)
 	bool changed = false;
 	{
 		RsStackMutex stack(mNetMtx); /****** STACK LOCK MUTEX *******/
-		if (sockaddr_storage_same(mExtAddr, addr))
+		if (!sockaddr_storage_same(mExtAddr, addr))
 		{
 			changed = true;
 		}