Merge pull request #7 from RetroShare/master

update master

build_scripts/AppImage_OBS/retroshare-service-git/appimage.yml

@@ -1,30 +0,0 @@
-app: retroshare-service
-
-build:
-  packages:
-    - gcc7
-    - gcc7-c++
-    - libxapian-devel
-    - doxygen
-    - linuxdeployqt
-    - desktop-file-utils
-    - glib2-devel
-    - sqlcipher-devel
-    - libqt5-qtbase-devel
-    - libqt5-qttools-devel
-    - openssl-devel
-    - update-desktop-files
-    - libbz2-devel
-    - libupnp-devel
-
-script:
-  - cd $BUILD_SOURCE_DIR
-  - tar -xf RetroShare-git.tar.gz
-  - cd RetroShare-git
-  - ls $(which gcc)*
-  - ls $(which g++)*
-  - qmake-qt5 QMAKE_CC=gcc-7 QMAKE_CXX=g++-7 PREFIX=/usr CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_qml_app CONFIG+=no_retroshare_android_notify_service CONFIG+=no_retroshare_plugins CONFIG+=ipv6 CONFIG+=no_retroshare_nogui CONFIG+=no_tests CONFIG+=rs_jsonapi CONFIG+=no_retroshare_android_service CONFIG+=rs_deep_search CONFIG+=no_libresapilocalserver CONFIG+=no_retroshare_gui CONFIG+=no_libresapihttpserver CONFIG+=retroshare_service CONFIG+=no_libresapi CONFIG+=c++11 CONFIG+=appimage
-  - make -j$(nproc) || make -j$(nproc) || make
-  - make INSTALL_ROOT=$BUILD_APPDIR install
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=3 -no-strip

build_scripts/DebianAndDerivatives_OBS/retroshare-service-git/debian.changelog

@@ -1,5 +0,0 @@
-retroshare-service-git (0.6.9999) stable; urgency=low
-
-    Add retroshare-service-git package
-
- -- Gioacchino Mazzurco <gio@eigenlab.org>  Tue, 08 Oct 2018 15:40:00 +0100

build_scripts/OBS/.gitignore

@@ -0,0 +1,2 @@
+network\:retroshare/*/*.tar.*
+network\:retroshare/*/.osc/*

build_scripts/OBS/get_source_version.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SOURCE_VERSION_FILE="$( dirname "${BASH_SOURCE[0]}" )/../../Source_Version"
+
+VERSION_MAJOR="$(cat "${SOURCE_VERSION_FILE}" | awk -F. '{print $1}')"
+VERSION_MAJOR="${VERSION_MAJOR:1}"
+
+VERSION_MINOR="$(cat "${SOURCE_VERSION_FILE}" | awk -F. '{print $2}')"
+
+VERSION_MINI="$(cat "${SOURCE_VERSION_FILE}" | awk -F. '{print $3}' | awk -F- '{print $1}')"
+
+VERSION_EXTRA="$(cat "${SOURCE_VERSION_FILE}" | awk -F- '{print "-"$2"-"$3"-OBS"}')"
+
+echo RS_MAJOR_VERSION=${VERSION_MAJOR} RS_MINOR_VERSION=${VERSION_MINOR} RS_MINI_VERSION=${VERSION_MINI} RS_EXTRA_VERSION=\"${VERSION_EXTRA}\"

build_scripts/OBS/network:retroshare/.osc/_apiurl

@@ -0,0 +1 @@
+https://api.opensuse.org

build_scripts/OBS/network:retroshare/.osc/_packages

@@ -0,0 +1,11 @@
+<project name="network:retroshare">
+  <package name="libupnp_centos" state=" " />
+  <package name="retroshare-gui-0.6.4" state=" " />
+  <package name="retroshare-gui-0.6.5" state=" " />
+  <package name="retroshare-gui-unstable" state=" " />
+  <package name="retroshare-service-0.6.5" state=" " />
+  <package name="retroshare-service-unstable" state=" " />
+  <package name="sqlcipher_centos" state=" " />
+  <package name="sqlcipher_debian" state=" " />
+  <package name="sqlcipher_debian9" state=" " />
+</project>

build_scripts/OBS/network:retroshare/.osc/_project

@@ -0,0 +1 @@
+network:retroshare

build_scripts/OBS/network:retroshare/libupnp_centos/_service

@@ -0,0 +1,7 @@
+<services>
+  <service name="download_url">
+    <param name="host">downloads.sourceforge.net</param>
+    <param name="protocol">http</param>
+    <param name="path">/project/pupnp/pupnp/libUPnP%201.6.19/libupnp-1.6.19.tar.bz2</param>
+  </service>
+</services>

build_scripts/OBS/network:retroshare/libupnp_centos/libupnp.spec

@@ -0,0 +1,185 @@
+Version: 1.6.19
+Summary: Universal Plug and Play (UPnP) SDK
+Name: libupnp
+Release: 2%{?dist}
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.libupnp.org/
+Source: http://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
+
+%define docdeveldir %{_docdir}/%{name}-devel-%{version}
+%define docdir %{_docdir}/%{name}-%{version}
+
+%description
+The Universal Plug and Play (UPnP) SDK for Linux provides 
+support for building UPnP-compliant control points, devices, 
+and bridges on Linux.
+
+%package devel
+Group: Development/Libraries
+Summary: Include files needed for development with libupnp
+Requires: libupnp = %{version}-%{release}
+
+%description devel
+The libupnp-devel package contains the files necessary for development with
+the UPnP SDK libraries.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-static=no --enable-ipv6
+make %{?_smp_mflags}
+
+%install
+test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE THANKS
+%{_libdir}/libixml.so.2*
+%{_libdir}/libthreadutil.so.6*
+%{_libdir}/libupnp.so.6*
+
+%files devel
+%defattr(0644,root,root,0755)
+#doc _devel_docs/*
+%{_includedir}/upnp/
+%{_libdir}/libixml.so
+%{_libdir}/libthreadutil.so
+%{_libdir}/libupnp.so
+%{_libdir}/pkgconfig/libupnp.pc
+
+%clean
+rm -rf %{buildroot}
+
+%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Dec 09 2013 Adam Jackson <ajax@redhat.com> 1.6.19-1
+- libupnp 1.6.19
+- Build with --enable-ipv6 (#917210)
+
+* Sun Oct 27 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.6.18-4
+- Adapt to possibly unversioned doc dirs.
+- Include LICENSE and THANKS in main package.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jan 29 2013 Adam Jackson <ajax@redhat.com> 1.6.18-1
+- libupnp 1.6.18 (#905577)
+
+* Tue Oct 16 2012 Adam Jackson <ajax@redhat.com> 1.6.17-1
+- libupnp 1.6.17
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Jul 30 2011 Matěj Cepl <mcepl@redhat.com> - 1.6.13-2
+- Rebuilt against new libraries.
+
+* Tue May 31 2011 Adam Jackson <ajax@redhat.com> 1.6.13-1
+- libupnp 1.6.13
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu May 01 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.6-1
+- Update to version 1.6.6
+
+* Sun Feb 03 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.5-1
+- Update to version 1.6.5
+
+* Sun Jan 27 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.4-1
+- Update to version 1.6.4
+
+* Fri Jan 04 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.3-3
+- No more building static library
+
+* Sun Dec 30 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.3-2
+- Spec file cleanup
+
+* Sun Dec 30 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.3-1
+- Update to version 1.6.3
+
+* Thu Dec 13 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.2-1
+- Update to version 1.6.2
+
+* Sun Nov 18 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.1-1
+- Update to version 1.6.1
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.6.0-2
+- Rebuild for selinux ppc32 issue.
+
+* Wed Jun 13 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.6.0-1
+- Update to version 1.6.0
+
+* Tue May 01 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.6-1
+- Update to version 1.4.6
+
+* Sat Apr 21 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.4-1
+- Update to version 1.4.4
+
+* Tue Mar 06 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.3-1
+- Update to version 1.4.3
+
+* Fri Feb 02 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.2-1
+- Update to version 1.4.2
+
+* Wed Jul 05 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.1-1
+- Update to version 1.4.1
+
+* Fri Jun 23 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.0-3
+- modified patch for x86_64 arch
+
+* Fri Jun 23 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.0-2
+- Add a patch for x86_64 arch
+
+* Sun Jun 11 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.0-1
+- Update to 1.4.0
+
+* Sun Mar 05 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.3.1-1
+- Update to 1.3.1
+
+* Tue Feb 14 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.2.1a-6
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.2.1a-5
+- Rebuild for FC5
+
+* Mon Jan  9 2006 Eric Tanguy 1.2.1a-4
+- Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1
+
+* Sun Jan  8 2006 Paul Howarth 1.2.1a-3
+- Disable stripping of object code for sane debuginfo generation
+- Edit makefiles to hnnor RPM optflags
+- Install libraries in %%{_libdir} rather than hardcoded /usr/lib
+- Fix libupnp.so symlink
+- Own directory %%{_includedir}/upnp
+- Fix permissions in -devel package
+
+* Fri Jan 06 2006 Eric Tanguy 1.2.1a-2
+- Use 'install -p' to preserve timestamps
+- Devel now require full version-release of main package
+
+* Thu Dec 22 2005 Eric Tanguy 1.2.1a-1
+- Modify spec file from 
+http://rpm.pbone.net/index.php3/stat/4/idpl/2378737/com/libupnp-1.2.1a_DSM320-3.i386.rpm.html

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/PKGBUILD

@@ -0,0 +1,39 @@
+# Maintainer: Gioacchino Mazzurco <gio@eigenlab.org>
+# Contributor: AsamK
+# Contributor: sehraf
+# Contributor: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+pkgname=retroshare
+pkgver=0.6.4
+pkgrel=0
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://retroshare.net/"
+license=('AGPL' 'GPL' 'LGPL')
+depends=('gtk-update-icon-cache' 'desktop-file-utils' 'qt5-x11extras' 'qt5-multimedia' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlcipher' 'curl' 'libxslt')
+makedepends=('qt5-tools')
+provides=('retroshare')
+conflicts=('retroshare-git')
+
+source=(RetroShare-${pkgver}.tar.gz)
+
+md5sums=('392c36bb3171fa26b8702e0a984d5bd6')
+
+prepare() {
+	cd "${srcdir}/RetroShare-${pkgver}"
+	sed -i '/VOIP \\/d' plugins/plugins.pro
+}
+
+build() {
+	cd "${srcdir}/RetroShare-${pkgver}"
+	qmake-qt5 PREFIX=/usr DATA_DIR=/usr/share/retroshare "CONFIG-=debug" "CONFIG*=release" "CONFIG+=no_retroshare_plugins"
+	make
+}
+
+package() {
+	cd "${srcdir}/RetroShare-${pkgver}"
+	make INSTALL_ROOT="${pkgdir}" install
+}

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/_service

@@ -0,0 +1,4 @@
+<services>
+  <service name="appimage"/>
+</services>
+

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/appimage.yml

@@ -0,0 +1,32 @@
+app: retroshare-gui-0.6.4
+
+build:
+  packages:
+    - linuxdeployqt
+    - desktop-file-utils
+    - glib2-devel
+    - sqlcipher-devel
+    - libmicrohttpd-devel
+    - libqt5-qtbase-devel
+    - libqt5-qtx11extras-devel
+    - libqt5-qtmultimedia-devel
+    - libqt5-qttools-devel
+    - openssl-devel
+    - libXScrnSaver-devel
+    - update-desktop-files
+    - libbz2-devel
+    - libupnp-devel
+
+script:
+  - cd $BUILD_SOURCE_DIR
+  - tar -xf RetroShare-0.6.4.tar.gz
+  - cd RetroShare-0.6.4
+  - sed -i 's/retroshare.xpm/retroshare/' data/retroshare.desktop
+  - sed -i 's|/usr/bin/retroshare|retroshare|' data/retroshare.desktop
+  - qmake-qt5 PREFIX=/usr CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins
+  - make
+  - make INSTALL_ROOT=$BUILD_APPDIR install
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -no-strip -bundle-non-qt-libs -verbose=3
+
+# Adding -no-strip to linuxdeployqt may fix "no version information available" bug on raspbian see https://github.com/probonopd/linuxdeployqt/issues/313

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/debian.control

@@ -0,0 +1,29 @@
+Source: retroshare
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libbz2-dev, libsqlcipher-dev, libmicrohttpd-dev
+Standards-Version: 3.9.3
+Homepage: http://retroshare.net
+
+Package: retroshare-nogui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Secure communication with friends
+ RetroShare is a Free and Open Source, private and secure decentralized 
+ communication 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.
+ This package provide a headless RetroShare node that can be controlled using
+ the web interface or the JSON API.
+
+Package: retroshare
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Secure communication with friends
+ RetroShare is a Open Source cross-platform, private and secure decentralised 
+ communication 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/OBS/network:retroshare/retroshare-gui-0.6.4/debian.retroshare-nogui.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/retroshare-nogui
+debian/tmp/usr/share/retroshare/bdboot.txt
+debian/tmp/usr/share/retroshare/webui/*

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/debian.retroshare.install

@@ -0,0 +1,6 @@
+debian/tmp/usr/bin/retroshare
+debian/tmp/usr/bin/retroshare-nogui
+debian/tmp/usr/share/applications/retroshare.desktop
+debian/tmp/usr/share/icons/hicolor/*
+debian/tmp/usr/share/pixmaps/retroshare.xpm
+debian/tmp/usr/share/retroshare/*

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/debian.rules

@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	qmake-qt4 CONFIG-=debug CONFIG+=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	#dh_installdirs
+	$(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/OBS/network:retroshare/retroshare-gui-0.6.4/retroshare.dsc

@@ -0,0 +1,13 @@
+Format: 1.0
+Source: retroshare
+Binary: retroshare
+Architecture: any
+Version: 0.6.4
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Homepage: https://retroshare.net
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libsqlcipher-dev, libmicrohttpd-dev, libjpeg-dev
+Files:
+ 24d01e1ff2eff2e1a7477e175f14efd5 20021632 RetroShare-0.6.4.tar.gz
+
+# libavcodec-dev, libavutil-dev

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.4/retroshare.spec

@@ -0,0 +1,124 @@
+Name:          retroshare
+Version:       0.6.4
+Release:       0
+License:       GNU AFFERO GENERAL PUBLIC LICENSE version 3
+Summary:       Secure chat and file sharing
+Group:         Productivity/Networking/Other
+Url:           http://retroshare.net
+Source0:       https://github.com/RetroShare/RetroShare/archive/v%{version}.tar.gz#/RetroShare-%{version}.tar.gz
+#Patch0:       various.patch
+BuildRoot:     %{_tmppath}/%{name}
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: glib2-devel sqlcipher-devel libmicrohttpd-devel
+BuildRequires: openssl-devel
+
+%if 0%{?centos_version} == 600
+BuildRequires: gnome-keyring-devel
+%else
+BuildRequires: libgnome-keyring-devel
+%endif
+%if 0%{?centos_version} >= 800 || 0%{?suse_version} || 0%{?fedora_version}
+BuildRequires: fdupes
+%if 0%{?suse_version}
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtx11extras-devel
+BuildRequires: libqt5-qtmultimedia-devel
+BuildRequires: libqt5-qttools-devel
+%else
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtx11extras-devel
+BuildRequires: qt5-qtmultimedia-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qttools-static
+%endif
+%else
+BuildRequires: libqt4-devel
+%endif
+
+%if %{defined mageia}
+BuildRequires: libxscrnsaver-devel
+%else
+BuildRequires: libXScrnSaver-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files libbz2-devel
+%endif
+
+BuildRequires: libupnp-devel
+Requires:      openssl %name-nogui = %{version}
+Conflicts:     retroshare-git
+
+%if 0%{?fedora_version} >= 27
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+%endif
+
+%description
+RetroShare is a cross-platform F2F communication platform.
+It lets you share securely with your friends, using PGP
+to authenticate peers and OpenSSL to encrypt all communication.
+RetroShare provides filesharing, chat, messages and channels.
+
+Authors:
+see http://retroshare.net/
+--------
+
+%package nogui
+Summary:  RetroShare without gui
+Group:    Productivity/Network/Other
+Requires: openssl
+
+%description nogui
+retroshare-nogui comes without a user interface. It can be controlled via a webui.
+
+%prep
+%setup -n RetroShare-%{version}
+#%patch0 -p0
+
+%build
+%if 0%{?centos_version} >= 800 || 0%{?suse_version} || 0%{?fedora_version}
+QMAKE="qmake-qt5"
+%else
+QMAKE="qmake-qt4"
+%endif
+
+$QMAKE CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_plugins QMAKE_STRIP=echo PREFIX="%{_prefix}" BIN_DIR="%{_bindir}" LIB_DIR="%{_libdir}" DATA_DIR="%{_datadir}/retroshare" RetroShare.pro
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+
+%if 0%{?centos_version} < 800
+%else
+%fdupes %{buildroot}/%{_prefix}
+%endif
+
+#menu
+%if 0%{?suse_version}
+%suse_update_desktop_file -n -i retroshare Network P2P
+%endif
+%if 0%{?fedora_version}
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/retroshare.desktop
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%{_bindir}/retroshare
+%defattr(644, root, root)
+%{_datadir}/pixmaps/retroshare.xpm
+%{_datadir}/icons/hicolor/
+%{_datadir}/applications/retroshare.desktop
+
+%files nogui
+%defattr(-, root, root)
+%{_bindir}/retroshare-nogui
+%defattr(644, root, root)
+%{_datadir}/retroshare
+
+%changelog

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/PKGBUILD

@@ -0,0 +1,48 @@
+# Maintainer: Gioacchino Mazzurco <gio@altermundi.net>
+# Contributor: AsamK
+# Contributor: sehraf
+# Contributor: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+pkgname=retroshare
+pkgver=stable
+pkgrel=0
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail. System service version."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://retroshare.cc/"
+license=('AGPL' 'GPL' 'LGPL')
+depends=('bzip2' 'libupnp' 'libxss' 'libzip' 'openssl' 'qt5-multimedia' 'qt5-x11extras' 'rapidjson' 'sqlcipher' 'xapian-core')
+makedepends=('cmake' 'doxygen' 'pkgconf' 'qt5-tools')
+provides=('retroshare')
+conflicts=('retroshare-gui-unstable')
+
+source=(RetroShare.tar.gz)
+
+md5sums=('45a438fb9a862542cc651c6f5ff28fac')
+
+prepare() {
+	cd "${srcdir}/RetroShare"
+}
+
+build() {
+	cd "${srcdir}/RetroShare"
+	qmake-qt5 PREFIX=/usr DATA_DIR=/usr/share/retroshare \
+    	RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+        RS_EXTRA_VERSION="-retroshare-gui-OBS-Arch" \
+        CONFIG-=debug \
+    	CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+        CONFIG+=no_retroshare_android_notify_service \
+        CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+        CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+        CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+		CONFIG+=no_retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search \
+        CONFIG+=release
+	make -j$(nproc) || make -j$(nproc) || make
+}
+
+package() {
+	cd "${srcdir}/RetroShare"
+	make INSTALL_ROOT="${pkgdir}" install
+}

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/appimage.yml

@@ -0,0 +1,41 @@
+app: retroshare-gui
+
+build:
+  packages:
+    - desktop-file-utils
+    - doxygen
+    - gcc5
+    - gcc5-c++
+    - glib2-devel
+    - libbz2-devel
+    - libqt5-qtbase-devel
+    - libqt5-qtmultimedia-devel
+    - libqt5-qttools-devel
+    - libqt5-qtsvg-devel
+    - libqt5-qtx11extras-devel
+    - libupnp-devel
+    - libxapian-devel
+    - libXScrnSaver-devel
+    - linuxdeployqt
+    - openssl-devel
+    - sqlcipher-devel
+    - update-desktop-files
+
+ingredients:
+  packages:
+    - tor
+
+script:
+  - cd $BUILD_SOURCE_DIR
+  - tar -xf RetroShare.tar.gz
+  - cd RetroShare
+  - gcc --version
+  - ls $(which gcc)*
+  - ls $(which g++)*
+  - sed -i 's/retroshare.xpm/retroshare/' data/retroshare.desktop
+  - sed -i 's|/usr/bin/retroshare|retroshare|' data/retroshare.desktop
+  - qmake-qt5 QMAKE_CC=gcc-5 QMAKE_CXX=g++-5 PREFIX=/usr RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 RS_EXTRA_VERSION="-retroshare-gui-OBS-AppImage" CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_qml_app CONFIG+=no_retroshare_android_notify_service CONFIG+=no_retroshare_plugins CONFIG+=ipv6 CONFIG+=no_tests CONFIG+=rs_jsonapi CONFIG+=no_retroshare_android_service CONFIG+=rs_deep_search CONFIG+=no_libresapilocalserver CONFIG+=retroshare_gui CONFIG+=no_libresapihttpserver CONFIG+=no_retroshare_service CONFIG+=no_libresapi CONFIG+=c++11 CONFIG+=appimage
+  - make -j$(nproc) || make -j$(nproc) || make
+  - make INSTALL_ROOT=$BUILD_APPDIR install
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=3 -no-strip -extra-plugins=iconengines/libqsvgicon.so

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/debian.changelog

@@ -0,0 +1,5 @@
+retroshare (0.6.5) stable; urgency=low
+
+    Add retroshare 0.6.5 package
+
+ -- Gioacchino Mazzurco <gio@altermundi.net>  Mon, 09 Feb 2019 16:56:00 +0100

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/debian.compat

@@ -0,0 +1 @@
+7

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/debian.control

@@ -0,0 +1,17 @@
+Source: retroshare
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Standards-Version: 3.9.3
+Homepage: https://retroshare.cc
+
+Package: retroshare
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Secure communication with friends
+ RetroShare is a Free and Open Source, private and secure decentralized 
+ communication 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/OBS/network:retroshare/retroshare-gui-0.6.5/debian.retroshare.install

@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/retroshare
+debian/tmp/usr/share/applications/retroshare.desktop
+debian/tmp/usr/share/icons/hicolor/*
+debian/tmp/usr/share/pixmaps/retroshare.xpm
+debian/tmp/usr/share/retroshare/*

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/debian.rules

@@ -0,0 +1,69 @@
+#!/usr/bin/make -f
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	cat /etc/os-release
+	qmake --version
+	echo '. /etc/os-release'             >  /tmp/configJsonApi.sh
+	echo '[ "$$VERSION_ID" != "8" ] &&'  >> /tmp/configJsonApi.sh
+	echo '  echo "CONFIG+=rs_jsonapi"'   >> /tmp/configJsonApi.sh
+	echo 'true'                          >> /tmp/configJsonApi.sh
+	chmod +x /tmp/configJsonApi.sh
+	qmake \
+	RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+    RS_EXTRA_VERSION="-retroshare-gui-OBS-deb" \
+	CONFIG-=debug CONFIG+=release PREFIX=/usr LIB_DIR=/usr/lib \
+	CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+	CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+	CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+	CONFIG+=no_retroshare_service CONFIG+=rs_deep_search CONFIG+=c++11 \
+	$$(/tmp/configJsonApi.sh) \
+	RetroShare.pro
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -j$(shell nproc) || $(MAKE) -j$(shell nproc) || $(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	#dh_installdirs
+	$(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/OBS/network:retroshare/retroshare-gui-0.6.5/retroshare.dsc

@@ -0,0 +1,11 @@
+Format: 1.0
+Source: retroshare
+Binary: retroshare
+Architecture: any
+Version: 0.6.5
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Homepage: https://retroshare.cc
+Standards-Version: 3.8.1
+Build-Depends: cmake, debhelper (>= 7), doxygen, libglib2.0-dev, libssl-dev, libbz2-dev, libqt5x11extras5-dev, libsqlcipher-dev, libupnp-dev, libxapian-dev, libxss-dev, qt5-default, qtbase5-dev, qtmultimedia5-dev, qttools5-dev
+Files:
+  45a438fb9a862542cc651c6f5ff28fac 29377995 RetroShare.tar.gz

build_scripts/OBS/network:retroshare/retroshare-gui-0.6.5/retroshare.spec

@@ -0,0 +1,151 @@
+Name:          retroshare
+Version:       0.6.5
+Release:       0
+License:       AGPL-3.0-or-later
+Summary:       Secure distributed chat, mail, forums, file sharing etc
+Group:         Productivity/Networking/Other
+Url:           https://retroshare.cc
+Source0:       RetroShare.tar.gz
+#Patch0:       various.patch
+BuildRoot:     %{_tmppath}/%{name}
+Conflicts:     retroshare-gui-unstable
+BuildRequires: cmake doxygen openssl-devel sqlcipher-devel
+
+%if %{defined centos_version}
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+BuildRequires: qt5-qtmultimedia-devel qt5-qtx11extras-devel libXScrnSaver-devel
+BuildRequires: libupnp-devel
+%endif
+
+%if 0%{?fedora_version}
+BuildRequires: gcc-c++
+BuildRequires: fdupes xapian-core-devel libXScrnSaver-devel
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+BuildRequires: qt5-qtx11extras-devel qt5-qtmultimedia-devel
+%endif
+
+%if 0%{?fedora_version} >= 29
+BuildRequires: miniupnpc-devel
+%else
+BuildRequires: libupnp-devel
+%endif
+
+%if %{defined mageia}
+BuildRequires: gcc-c++
+BuildRequires: libzlib-devel libbzip2-devel
+BuildRequires: libqt5core-devel libqt5xml-devel libxapian-devel
+BuildRequires: libqt5x11extras-devel libxscrnsaver-devel libqt5multimedia-devel
+BuildRequires: libqt5designer-devel
+BuildRequires: libqt5gui-devel libqt5printsupport-devel
+BuildRequires: libupnp-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: gcc7 gcc7-c++
+BuildRequires: fdupes libbz2-devel 
+BuildRequires: libqt5-qtbase-devel libqt5-qttools-devel
+BuildRequires: libxapian-devel update-desktop-files
+BuildRequires: libqt5-qtx11extras-devel
+BuildRequires: libqt5-qtmultimedia-devel libXScrnSaver-devel
+BuildRequires: libminiupnpc-devel
+%endif
+
+%if 0%{?fedora_version} >= 27
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+%endif
+
+%description
+RetroShare is a cross-platform F2F communication platform.
+It lets you share securely with your friends, using PGP
+to authenticate peers and OpenSSL to encrypt all communication.
+RetroShare provides filesharing, chat, messages and channels.
+
+Authors:
+see https://retroshare.cc/
+--------
+
+%prep
+%setup -n RetroShare
+#%patch0 -p0
+
+%build
+
+nproc
+qmake --version || qmake-qt5 --version
+ls $(which gcc)*
+ls $(which g++)*
+
+BUILD_CC=""
+BUILD_CXX=""
+BUILD_DEEPSEARCH="CONFIG+=rs_deep_search"
+BUILD_JSONAPI="CONFIG+=rs_jsonapi"
+QMAKE="qmake-qt5"
+
+%if %{defined centos_version}
+# Xapian is not availabe on Centos 7
+BUILD_DEEPSEARCH="CONFIG+=no_rs_deep_search"
+BUILD_JSONAPI="CONFIG+=no_rs_jsonapi"
+%endif
+
+%if %{defined mageia}
+QMAKE="qmake"
+%endif
+
+%if 0%{?suse_version}
+BUILD_CC="QMAKE_CC=gcc-7"
+BUILD_CXX="QMAKE_CXX=g++-7"
+RS_UPNP_LIB="RS_UPNP_LIB=miniupnpc"
+%endif
+
+# On OpenSuse Tumbleweed and Factory ARM 64 bits seems cmake/restbed and
+# qmake/retroshare have PIE/PIC mismatch attempt to coherce restbed to be PIC
+# https://en.opensuse.org/Archive:How_to_detect_Tumbleweed
+%if 0%{?suse_version} == 1550 && ( (%{_arch} == "x86_64") || (%{_arch} == "aarch64") )
+RESTBED_CMAKE_FILE="supportlibs/restbed/CMakeLists.txt"
+echo 'set(CMAKE_POSITION_INDEPENDENT_CODE ON)' | \
+	cat - $RESTBED_CMAKE_FILE > tmp_cmake && mv tmp_cmake $RESTBED_CMAKE_FILE
+cat $RESTBED_CMAKE_FILE
+%endif
+
+%if 0%{?fedora_version} >= 29
+RS_UPNP_LIB="RS_UPNP_LIB=miniupnpc"
+%endif
+
+$QMAKE $BUILD_CC $BUILD_CXX QMAKE_STRIP=echo PREFIX="%{_prefix}" \
+	BIN_DIR="%{_bindir}" LIB_DIR="%{_libdir}" ${QMAKE_NO_PIE} \
+    DATA_DIR="%{_datadir}/retroshare" ${RS_UPNP_LIB} \
+    RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+    RS_EXTRA_VERSION="-retroshare-gui-OBS-rpm" \
+    CONFIG-=debug \
+    CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+    CONFIG+=no_retroshare_android_notify_service \
+    CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+    CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+    CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+    CONFIG+=no_retroshare_service ${BUILD_JSONAPI} ${BUILD_DEEPSEARCH} \
+    CONFIG+=release RetroShare.pro
+make -j$(nproc) || make -j$(nproc) || make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+
+%if 0%{?centos_version} < 800
+%else
+%fdupes %{buildroot}/%{_prefix}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%{_bindir}/retroshare
+%defattr(644, root, root)
+%{_datadir}/retroshare
+%{_datadir}/pixmaps/retroshare.xpm
+%{_datadir}/icons/hicolor/
+%{_datadir}/applications/retroshare.desktop
+
+%changelog

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/PKGBUILD

@@ -0,0 +1,47 @@
+# Maintainer: Gioacchino Mazzurco <gio@altermundi.net>
+# Contributor: AsamK
+# Contributor: sehraf
+# Contributor: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+pkgname=retroshare-gui-unstable
+pkgver=unstable
+pkgrel=0
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail. System service version."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://retroshare.cc/"
+license=('AGPL' 'GPL' 'LGPL')
+depends=('bzip2' 'libupnp' 'libxss' 'libzip' 'openssl' 'qt5-multimedia' 'qt5-x11extras' 'rapidjson' 'sqlcipher' 'xapian-core')
+makedepends=('cmake' 'doxygen' 'pkgconf' 'qt5-tools')
+provides=('retroshare')
+conflicts=('retroshare')
+
+source=(RetroShare.tar.gz)
+
+md5sums=('84ab98da5a5a005f4991846b89c481be')
+
+prepare() {
+	cd "${srcdir}/RetroShare"
+}
+
+build() {
+	cd "${srcdir}/RetroShare"
+	qmake-qt5 PREFIX=/usr DATA_DIR=/usr/share/retroshare \
+    	$(build_scripts/OBS/get_source_version.sh) RS_MINI_VERSION=9999 \
+        CONFIG-=debug \
+    	CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+        CONFIG+=no_retroshare_android_notify_service \
+        CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+        CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+        CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+		CONFIG+=no_retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search \
+        CONFIG+=release
+	make -j$(nproc) || make -j$(nproc) || make
+}
+
+package() {
+	cd "${srcdir}/RetroShare"
+	make INSTALL_ROOT="${pkgdir}" install
+}

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/appimage.yml

@@ -0,0 +1,41 @@
+app: retroshare-gui-unstable
+
+build:
+  packages:
+    - desktop-file-utils
+    - doxygen
+    - gcc5
+    - gcc5-c++
+    - glib2-devel
+    - libbz2-devel
+    - libqt5-qtbase-devel
+    - libqt5-qtmultimedia-devel
+    - libqt5-qttools-devel
+    - libqt5-qtsvg-devel
+    - libqt5-qtx11extras-devel
+    - libupnp-devel
+    - libxapian-devel
+    - libXScrnSaver-devel
+    - linuxdeployqt
+    - openssl-devel
+    - sqlcipher-devel
+    - update-desktop-files
+
+ingredients:
+  packages:
+    - tor
+
+script:
+  - cd $BUILD_SOURCE_DIR
+  - tar -xf RetroShare.tar.gz
+  - cd RetroShare
+  - gcc --version
+  - ls $(which gcc)*
+  - ls $(which g++)*
+  - sed -i 's/retroshare.xpm/retroshare/' data/retroshare.desktop
+  - sed -i 's|/usr/bin/retroshare|retroshare|' data/retroshare.desktop
+  - qmake-qt5 QMAKE_CC=gcc-5 QMAKE_CXX=g++-5 PREFIX=/usr $(build_scripts/OBS/get_source_version.sh) RS_MINI_VERSION=9999 CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_qml_app CONFIG+=no_retroshare_android_notify_service CONFIG+=no_retroshare_plugins CONFIG+=ipv6 CONFIG+=no_tests CONFIG+=rs_jsonapi CONFIG+=no_retroshare_android_service CONFIG+=rs_deep_search CONFIG+=no_libresapilocalserver CONFIG+=retroshare_gui CONFIG+=no_libresapihttpserver CONFIG+=no_retroshare_service CONFIG+=no_libresapi CONFIG+=c++11 CONFIG+=appimage
+  - make -j$(nproc) || make -j$(nproc) || make
+  - make INSTALL_ROOT=$BUILD_APPDIR install
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=3 -no-strip -extra-plugins=iconengines/libqsvgicon.so

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/debian.changelog

@@ -0,0 +1,5 @@
+retroshare-gui-unstable (0.6.9999) stable; urgency=low
+
+    Add retroshare-gui-unstable package
+
+ -- Gioacchino Mazzurco <gio@altermundi.net>  Mon, 04 Feb 2019 16:56:00 +0100

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/debian.compat

@@ -0,0 +1 @@
+7

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/debian.control

@@ -0,0 +1,17 @@
+Source: retroshare-gui-unstable
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Standards-Version: 3.9.3
+Homepage: https://retroshare.cc
+
+Package: retroshare-gui-unstable
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Secure communication with friends
+ RetroShare is a Free and Open Source, private and secure decentralized 
+ communication 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/OBS/network:retroshare/retroshare-gui-unstable/debian.retroshare-gui-unstable.install

@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/retroshare
+debian/tmp/usr/share/applications/retroshare.desktop
+debian/tmp/usr/share/icons/hicolor/*
+debian/tmp/usr/share/pixmaps/retroshare.xpm
+debian/tmp/usr/share/retroshare/*

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/debian.rules

@@ -0,0 +1,68 @@
+#!/usr/bin/make -f
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	cat /etc/os-release
+	qmake --version
+	echo '. /etc/os-release'             >  /tmp/configJsonApi.sh
+	echo '[ "$$VERSION_ID" != "8" ] &&'  >> /tmp/configJsonApi.sh
+	echo '  echo "CONFIG+=rs_jsonapi"'   >> /tmp/configJsonApi.sh
+	echo 'true'                          >> /tmp/configJsonApi.sh
+	chmod +x /tmp/configJsonApi.sh
+	qmake \
+	$$(build_scripts/OBS/get_source_version.sh) RS_MINI_VERSION=9999 \
+	CONFIG-=debug CONFIG+=release PREFIX=/usr LIB_DIR=/usr/lib \
+	CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+	CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+	CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+	CONFIG+=no_retroshare_service CONFIG+=rs_deep_search CONFIG+=c++11 \
+	$$(/tmp/configJsonApi.sh) \
+	RetroShare.pro
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -j$(shell nproc) || $(MAKE) -j$(shell nproc) || $(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	#dh_installdirs
+	$(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/OBS/network:retroshare/retroshare-gui-unstable/retroshare-gui-unstable.dsc

@@ -0,0 +1,11 @@
+Format: 1.0
+Source: retroshare-gui-unstable
+Binary: retroshare-gui-unstable
+Architecture: any
+Version: 0.6.9999
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Homepage: https://retroshare.cc
+Standards-Version: 3.8.1
+Build-Depends: cmake, debhelper (>= 7), doxygen, libglib2.0-dev, libssl-dev, libbz2-dev, libqt5x11extras5-dev, libsqlcipher-dev, libupnp-dev, libxapian-dev, libxss-dev, qt5-default, qtbase5-dev, qtmultimedia5-dev, qttools5-dev
+Files:
+ 84ab98da5a5a005f4991846b89c481be 29377395 RetroShare.tar.gz

build_scripts/OBS/network:retroshare/retroshare-gui-unstable/retroshare-gui-unstable.spec

@@ -0,0 +1,126 @@
+Name:          retroshare-gui-unstable
+Version:       0.6.9999
+Release:       0
+License:       AGPL-3.0-or-later
+Summary:       Secure distributed chat, mail, forums, file sharing etc
+Group:         Productivity/Networking/Other
+Url:           https://retroshare.cc
+Source0:       RetroShare.tar.gz
+#Patch0:       various.patch
+BuildRoot:     %{_tmppath}/%{name}
+Conflicts:     retroshare
+BuildRequires: cmake doxygen libupnp-devel openssl-devel sqlcipher-devel
+
+%if %{defined centos_version}
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+BuildRequires: qt5-qtmultimedia-devel qt5-qtx11extras-devel libXScrnSaver-devel
+%endif
+
+%if 0%{?fedora_version}
+BuildRequires: gcc-c++
+BuildRequires: fdupes xapian-core-devel libXScrnSaver-devel
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+BuildRequires: qt5-qtx11extras-devel qt5-qtmultimedia-devel
+%endif
+
+%if %{defined mageia}
+BuildRequires: gcc-c++
+BuildRequires: libzlib-devel libbzip2-devel
+BuildRequires: libqt5core-devel libqt5xml-devel libxapian-devel
+BuildRequires: libqt5x11extras-devel libxscrnsaver-devel libqt5multimedia-devel
+BuildRequires: libqt5designer-devel
+BuildRequires: libqt5gui-devel libqt5printsupport-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: gcc7 gcc7-c++
+BuildRequires: fdupes libbz2-devel 
+BuildRequires: libqt5-qtbase-devel libqt5-qttools-devel
+BuildRequires: libxapian-devel update-desktop-files
+BuildRequires: libqt5-qtx11extras-devel
+BuildRequires: libqt5-qtmultimedia-devel libXScrnSaver-devel
+%endif
+
+%if 0%{?fedora_version} >= 27
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+%endif
+
+%description
+RetroShare is a cross-platform F2F communication platform.
+It lets you share securely with your friends, using PGP
+to authenticate peers and OpenSSL to encrypt all communication.
+RetroShare provides filesharing, chat, messages and channels.
+
+Authors:
+see https://retroshare.cc/
+--------
+
+%prep
+%setup -n RetroShare
+#%patch0 -p0
+
+%build
+
+nproc
+qmake --version || qmake-qt5 --version
+ls $(which gcc)*
+ls $(which g++)*
+
+BUILD_CC=""
+BUILD_CXX=""
+BUILD_DEEPSEARCH="CONFIG+=rs_deep_search"
+BUILD_JSONAPI="CONFIG+=rs_jsonapi"
+QMAKE="qmake-qt5"
+
+%if %{defined centos_version}
+# Xapian is not availabe on Centos 7
+BUILD_DEEPSEARCH="CONFIG+=no_rs_deep_search"
+BUILD_JSONAPI="CONFIG+=no_rs_jsonapi"
+%endif
+
+%if %{defined mageia}
+QMAKE="qmake"
+%endif
+
+%if 0%{?suse_version}
+BUILD_CC="QMAKE_CC=gcc-7"
+BUILD_CXX="QMAKE_CXX=g++-7"
+%endif
+
+$QMAKE $BUILD_CC $BUILD_CXX QMAKE_STRIP=echo PREFIX="%{_prefix}" \
+	BIN_DIR="%{_bindir}" LIB_DIR="%{_libdir}" \
+    DATA_DIR="%{_datadir}/retroshare" \
+    $(build_scripts/OBS/get_source_version.sh) RS_MINI_VERSION=9999 \
+    CONFIG-=debug \
+    CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+    CONFIG+=no_retroshare_android_notify_service \
+    CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+    CONFIG+=retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+    CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+    CONFIG+=no_retroshare_service ${BUILD_JSONAPI} ${BUILD_DEEPSEARCH} \
+    CONFIG+=release RetroShare.pro
+make -j$(nproc) || make -j$(nproc) || make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+
+%if 0%{?centos_version} < 800
+%else
+%fdupes %{buildroot}/%{_prefix}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%{_bindir}/retroshare
+%defattr(644, root, root)
+%{_datadir}/retroshare
+%{_datadir}/pixmaps/retroshare.xpm
+%{_datadir}/icons/hicolor/
+%{_datadir}/applications/retroshare.desktop
+
+%changelog

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/PKGBUILD

@@ -1,4 +1,4 @@
-# Maintainer: Gioacchino Mazzurco <gio@eigenlab.org>
+# Maintainer: Gioacchino Mazzurco <gio@altermundi.net>
 # Contributor: AsamK
 # Contributor: sehraf
 # Contributor: stqn
@@ -6,28 +6,28 @@
 # Contributor: Tristero <tristero at online dot de>
 # Contributor: funkyou
 
-pkgname=retroshare-service-git
+pkgname=retroshare-service
-pkgver=git
+pkgver=stable
 pkgrel=0
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail. System service version."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-url="https://retroshare.net/"
+url="https://retroshare.cc/"
 license=('AGPL' 'GPL' 'LGPL')
 depends=('bzip2' 'libupnp' 'libzip' 'openssl' 'rapidjson' 'sqlcipher' 'xapian-core')
 makedepends=('cmake' 'doxygen' 'git' 'pkgconf' 'qt5-tools')
 provides=('retroshare-service')
 conflicts=('retroshare-service')
 
-source=(RetroShare-${pkgver}.tar.gz)
+source=(RetroShare.tar.gz)
 
-md5sums=('3c66108223b427d617b962aff0755378')
+md5sums=('45a438fb9a862542cc651c6f5ff28fac')
 
 prepare() {
-	cd "${srcdir}/RetroShare-${pkgver}"
+	cd "${srcdir}/RetroShare"
 }
 
 build() {
-	cd "${srcdir}/RetroShare-${pkgver}"
+	cd "${srcdir}/RetroShare"
 	qmake-qt5 PREFIX=/usr DATA_DIR=/usr/share/retroshare CONFIG-=debug \
     	CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
         CONFIG+=no_retroshare_android_notify_service \
@@ -35,11 +35,13 @@ build() {
         CONFIG+=no_retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
         CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
 		CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search \
-        CONFIG+=release
+        CONFIG+=release \
+        RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+        RS_EXTRA_VERSION="-retroshare-service-OBS-Arch"
 	make -j$(nproc) || make -j$(nproc) || make
 }
 
 package() {
-	cd "${srcdir}/RetroShare-${pkgver}"
+	cd "${srcdir}/RetroShare"
 	make INSTALL_ROOT="${pkgdir}" install
 }

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/appimage.yml

@@ -0,0 +1,35 @@
+app: retroshare-service
+
+build:
+  packages:
+    - desktop-file-utils
+    - doxygen
+    - gcc5
+    - gcc5-c++
+    - glib2-devel
+    - libbz2-devel
+    - libqt5-qtbase-devel
+    - libqt5-qttools-devel
+    - libupnp-devel
+    - libxapian-devel
+    - linuxdeployqt
+    - openssl-devel
+    - sqlcipher-devel
+    - update-desktop-files
+
+ingredients:
+  packages:
+    - tor
+
+script:
+  - cd $BUILD_SOURCE_DIR
+  - tar -xf RetroShare.tar.gz
+  - cd RetroShare
+  - gcc --version
+  - ls $(which gcc)*
+  - ls $(which g++)*
+  - qmake-qt5 QMAKE_CC=gcc-5 QMAKE_CXX=g++-5 PREFIX=/usr RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 RS_EXTRA_VERSION="-retroshare-service-OBS-AppImage" CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_qml_app CONFIG+=no_retroshare_android_notify_service CONFIG+=no_retroshare_plugins CONFIG+=ipv6 CONFIG+=no_tests CONFIG+=rs_jsonapi CONFIG+=no_retroshare_android_service CONFIG+=rs_deep_search CONFIG+=no_libresapilocalserver CONFIG+=no_retroshare_gui CONFIG+=no_libresapihttpserver CONFIG+=retroshare_service CONFIG+=no_libresapi CONFIG+=c++11 CONFIG+=appimage
+  - make -j$(nproc) || make -j$(nproc) || make
+  - make INSTALL_ROOT=$BUILD_APPDIR install
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=3 -no-strip

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/debian.changelog

@@ -0,0 +1,5 @@
+retroshare-service (0.6.5) stable; urgency=low
+
+    Add retroshare-service package
+
+ -- Gioacchino Mazzurco <gio@altermundi.net>  Mon, 04 Feb 2019 14:59:00 +0100

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/debian.compat

@@ -0,0 +1 @@
+7

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/debian.control

@@ -1,11 +1,11 @@
-Source: retroshare-service-git
+Source: retroshare-service
 Section: devel
 Priority: standard
 Maintainer: Cyril Soler <csoler@users.sourceforge.net>
 Standards-Version: 3.9.3
-Homepage: http://retroshare.net
+Homepage: https://retroshare.cc
 
-Package: retroshare-service-git
+Package: retroshare-service
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Secure communication with friends

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/debian.rules

@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	qmake --version
+	qmake CONFIG-=debug CONFIG+=release PREFIX=/usr LIB_DIR=/usr/lib \
+	CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+	CONFIG+=no_retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+	CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+	CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search \
+	CONFIG+=c++11 RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+    RS_EXTRA_VERSION="-retroshare-service-OBS-deb" \
+    RetroShare.pro
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -j$(shell nproc) || $(MAKE) -j$(shell nproc) || $(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	#dh_installdirs
+	$(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/OBS/network:retroshare/retroshare-service-0.6.5/retroshare-service.dsc

@@ -0,0 +1,11 @@
+Format: 1.0
+Source: retroshare-service
+Binary: retroshare-service
+Architecture: any
+Version: 0.6.5
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Homepage: https://retroshare.cc
+Standards-Version: 3.8.1
+Build-Depends: cmake, debhelper (>= 7), doxygen, git, libglib2.0-dev, libupnp-dev, qtbase5-dev, qt5-default, libssl-dev, libbz2-dev, libsqlcipher-dev, libxapian-dev
+Files:
+  45a438fb9a862542cc651c6f5ff28fac 29377995 RetroShare.tar.gz

build_scripts/OBS/network:retroshare/retroshare-service-0.6.5/retroshare-service.spec

@@ -0,0 +1,144 @@
+Name:          retroshare-service
+Version:       0.6.5
+Release:       0
+License:       AGPL-3.0-or-later
+Summary:       Secure distributed chat, mail, forums, file sharing etc
+Group:         Productivity/Networking/Other
+Url:           https://retroshare.cc
+Source0:       RetroShare.tar.gz
+#Patch0:       various.patch
+BuildRoot:     %{_tmppath}/%{name}
+Conflicts:     retroshare-service-unstable
+BuildRequires: cmake doxygen git openssl-devel sqlcipher-devel
+
+%if %{defined centos_version}
+BuildRequires: devtoolset-7-toolchain devtoolset-7-libstdc++-devel
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+BuildRequires: libupnp-devel
+%endif
+
+%if 0%{?fedora_version}
+BuildRequires: gcc-c++
+BuildRequires: fdupes xapian-core-devel
+BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
+%endif
+
+%if 0%{?fedora_version} >= 27
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+%endif
+
+%if 0%{?fedora_version} >= 29
+BuildRequires: miniupnpc-devel
+%else
+BuildRequires: libupnp-devel
+%endif
+
+%if %{defined mageia}
+BuildRequires: gcc-c++
+BuildRequires: libzlib-devel libbzip2-devel
+BuildRequires: libqt5core-devel libqt5xml-devel libxapian-devel
+BuildRequires: libupnp-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: gcc7 gcc7-c++
+BuildRequires: fdupes libbz2-devel 
+BuildRequires: libqt5-qtbase-devel libqt5-qttools-devel
+BuildRequires: libxapian-devel update-desktop-files
+BuildRequires: libminiupnpc-devel
+%endif
+
+%description
+RetroShare is a cross-platform F2F communication platform.
+It lets you share securely with your friends, using PGP
+to authenticate peers and OpenSSL to encrypt all communication.
+RetroShare provides filesharing, chat, messages and channels.
+This package provides RetroShare system service that can be
+controlled only via JSON API.
+
+Authors:
+see https://retroshare.cc/
+--------
+
+%prep
+%setup -n RetroShare
+#%patch0 -p0
+
+%build
+
+nproc
+qmake --version || qmake-qt5 --version
+ls $(which gcc)*
+ls $(which g++)*
+
+BUILD_CC=""
+BUILD_CXX=""
+BUILD_DEEPSEARCH="CONFIG+=rs_deep_search"
+QMAKE="qmake-qt5"
+
+%if %{defined centos_version}
+# Xapian is not availabe on Centos 7
+BUILD_DEEPSEARCH="CONFIG+=no_rs_deep_search"
+source /opt/rh/devtoolset-7/enable
+%endif
+
+%if %{defined mageia}
+QMAKE="qmake"
+%endif
+
+%if 0%{?suse_version}
+BUILD_CC="QMAKE_CC=gcc-7"
+BUILD_CXX="QMAKE_CXX=g++-7"
+RS_UPNP_LIB="RS_UPNP_LIB=miniupnpc"
+echo suse_version: %{?suse_version}
+%endif
+
+# On OpenSuse Tumbleweed and Factory ARM 64 bits seems cmake/restbed and
+# qmake/retroshare have PIE/PIC mismatch attempt to coherce restbed to be PIC
+# https://en.opensuse.org/Archive:How_to_detect_Tumbleweed
+%if 0%{?suse_version} == 1550 && ( (%{_arch} == "x86_64") || (%{_arch} == "aarch64") )
+RESTBED_CMAKE_FILE="supportlibs/restbed/CMakeLists.txt"
+echo 'set(CMAKE_POSITION_INDEPENDENT_CODE ON)' | \
+	cat - $RESTBED_CMAKE_FILE > tmp_cmake && mv tmp_cmake $RESTBED_CMAKE_FILE
+cat $RESTBED_CMAKE_FILE
+%endif
+
+%if 0%{?fedora_version} >= 29
+RS_UPNP_LIB="RS_UPNP_LIB=miniupnpc"
+%endif
+
+$QMAKE $BUILD_CC $BUILD_CXX QMAKE_STRIP=echo PREFIX="%{_prefix}" \
+	BIN_DIR="%{_bindir}" ${RS_UPNP_LIB} \
+	LIB_DIR="%{_libdir}" DATA_DIR="%{_datadir}/retroshare" CONFIG-=debug \
+    CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+    CONFIG+=no_retroshare_android_notify_service \
+    CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+    CONFIG+=no_retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+    CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+    CONFIG+=retroshare_service CONFIG+=rs_jsonapi ${BUILD_DEEPSEARCH} \
+    CONFIG+=release \
+    RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=5 \
+    RS_EXTRA_VERSION="-retroshare-service-OBS-RPM" \
+    RetroShare.pro
+make -j$(nproc) || make -j$(nproc) || make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+
+%if 0%{?centos_version} < 800
+%else
+%fdupes %{buildroot}/%{_prefix}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%{_bindir}/retroshare-service
+%defattr(644, root, root)
+%{_datadir}/retroshare
+
+%changelog

build_scripts/OBS/network:retroshare/retroshare-service-unstable/PKGBUILD

@@ -0,0 +1,47 @@
+# Maintainer: Gioacchino Mazzurco <gio@altermundi.net>
+# Contributor: AsamK
+# Contributor: sehraf
+# Contributor: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+pkgname=retroshare-service-unstable
+pkgver=stable
+pkgrel=0
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail. System service version."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://retroshare.cc/"
+license=('AGPL' 'GPL' 'LGPL')
+depends=('bzip2' 'libupnp' 'libzip' 'openssl' 'rapidjson' 'sqlcipher' 'xapian-core')
+makedepends=('cmake' 'doxygen' 'git' 'pkgconf' 'qt5-tools')
+provides=('retroshare-service')
+conflicts=('retroshare-service')
+
+source=(RetroShare.tar.gz)
+
+md5sums=('ce46d636891e28acdac95091941582d3')
+
+prepare() {
+	cd "${srcdir}/RetroShare"
+}
+
+build() {
+	cd "${srcdir}/RetroShare"
+	qmake-qt5 PREFIX=/usr DATA_DIR=/usr/share/retroshare \
+    	$(build_scripts/OBS/get_source_version.sh) RS_MINI_VERSION=9999 \
+    	CONFIG-=debug \
+    	CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
+        CONFIG+=no_retroshare_android_notify_service \
+        CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
+        CONFIG+=no_retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
+        CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \
+		CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search \
+        CONFIG+=release
+	make -j$(nproc) || make -j$(nproc) || make
+}
+
+package() {
+	cd "${srcdir}/RetroShare"
+	make INSTALL_ROOT="${pkgdir}" install
+}

build_scripts/OBS/network:retroshare/retroshare-service-unstable/appimage.yml

@@ -0,0 +1,35 @@
+app: retroshare-service-unstable
+
+build:
+  packages:
+    - desktop-file-utils
+    - doxygen
+    - gcc5
+    - gcc5-c++
+    - glib2-devel
+    - libbz2-devel
+    - libqt5-qtbase-devel
+    - libqt5-qttools-devel
+    - libupnp-devel
+    - libxapian-devel
+    - linuxdeployqt
+    - openssl-devel
+    - sqlcipher-devel
+    - update-desktop-files
+
+ingredients:
+  packages:
+    - tor
+
+script:
+  - cd $BUILD_SOURCE_DIR
+  - tar -xf RetroShare.tar.gz
+  - cd RetroShare
+  - gcc --version
+  - ls $(which gcc)*
+  - ls $(which g++)*
+  - qmake-qt5 QMAKE_CC=gcc-5 QMAKE_CXX=g++-5 PREFIX=/usr RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=9999 RS_EXTRA_VERSION="-retroshare-service-OBS-AppImage" CONFIG-=debug CONFIG+=release CONFIG+=no_retroshare_nogui CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_qml_app CONFIG+=no_retroshare_android_notify_service CONFIG+=no_retroshare_plugins CONFIG+=ipv6 CONFIG+=no_tests CONFIG+=rs_jsonapi CONFIG+=no_retroshare_android_service CONFIG+=rs_deep_search CONFIG+=no_libresapilocalserver CONFIG+=no_retroshare_gui CONFIG+=no_libresapihttpserver CONFIG+=retroshare_service CONFIG+=no_libresapi CONFIG+=c++11 CONFIG+=appimage
+  - make -j$(nproc) || make -j$(nproc) || make
+  - make INSTALL_ROOT=$BUILD_APPDIR install
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=3 -no-strip

build_scripts/OBS/network:retroshare/retroshare-service-unstable/debian.changelog

@@ -0,0 +1,5 @@
+retroshare-service-unstable (0.6.9999) stable; urgency=low
+
+    Add retroshare-service-unstable package
+
+ -- Gioacchino Mazzurco <gio@altermundi.net>  Mon, 04 Feb 2019 13:43:00 +0100

build_scripts/OBS/network:retroshare/retroshare-service-unstable/debian.compat

@@ -0,0 +1 @@
+7

build_scripts/OBS/network:retroshare/retroshare-service-unstable/debian.control

@@ -0,0 +1,18 @@
+Source: retroshare-service-unstable
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Standards-Version: 3.9.3
+Homepage: https://retroshare.cc
+
+Package: retroshare-service-unstable
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Secure communication with friends
+ RetroShare is a Free and Open Source, private and secure decentralized 
+ communication 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.
+ This package provide a headless RetroShare node that can be controlled only
+ using the JSON API.

build_scripts/OBS/network:retroshare/retroshare-service-unstable/debian.retroshare-service-unstable.install

@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/retroshare-service
+debian/tmp/usr/share/retroshare/bdboot.txt

build_scripts/OBS/network:retroshare/retroshare-service-unstable/debian.rules

@@ -5,6 +5,8 @@ configure-stamp:
 	dh_testdir
 	qmake --version
 	qmake CONFIG-=debug CONFIG+=release PREFIX=/usr LIB_DIR=/usr/lib \
+    RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=9999 \
+    RS_EXTRA_VERSION="-retroshare-service-OBS-deb" \
 	CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \
 	CONFIG+=no_retroshare_gui CONFIG+=no_tests CONFIG+=no_libresapi \
 	CONFIG+=no_libresapihttpserver CONFIG+=no_libresapilocalserver \

build_scripts/OBS/network:retroshare/retroshare-service-unstable/retroshare-service-unstable.dsc

@@ -1,11 +1,11 @@
 Format: 1.0
-Source: retroshare-service-git
+Source: retroshare-service-unstable
-Binary: retroshare-service-git
+Binary: retroshare-service-unstable
 Architecture: any
 Version: 0.6.9999
 Maintainer: Cyril Soler <csoler@users.sourceforge.net>
-Homepage: https://retroshare.net
+Homepage: https://retroshare.cc
 Standards-Version: 3.8.1
 Build-Depends: cmake, debhelper (>= 7), doxygen, git, libglib2.0-dev, libupnp-dev, qtbase5-dev, qt5-default, libssl-dev, libbz2-dev, libsqlcipher-dev, libxapian-dev
 Files:
- f562e399ef7d44ebc01362f365b4f30b 23617604 RetroShare-git.tar.gz
+ ce46d636891e28acdac95091941582d3 29378514 RetroShare.tar.gz

build_scripts/OBS/network:retroshare/retroshare-service-unstable/retroshare-service-unstable.spec

@@ -1,35 +1,31 @@
-Name:          retroshare-service-git
+Name:          retroshare-service-unstable
 Version:       0.6.9999
 Release:       0
-License:       GNU AFFERO GENERAL PUBLIC LICENSE version 3
+License:       AGPL-3.0-or-later
-Summary:       Secure chat and file sharing
+Summary:       Secure distributed chat, mail, forums, file sharing etc
 Group:         Productivity/Networking/Other
-Url:           http://retroshare.net
+Url:           https://retroshare.cc
-#Source0:       https://github.com/RetroShare/RetroShare/archive/v%{version}.tar.gz#/RetroShare-%{version}.tar.gz
+Source0:       RetroShare.tar.gz
-Source0:       RetroShare-git.tar.gz
 #Patch0:       various.patch
 BuildRoot:     %{_tmppath}/%{name}
 Conflicts:     retroshare-service
-Requires:      libupnp openssl sqlcipher
 BuildRequires: cmake doxygen git libupnp-devel openssl-devel sqlcipher-devel
 
 %if %{defined centos_version}
 BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
-Requires:      qt5-qtbase
+BuildRequires: devtoolset-7-toolchain devtoolset-7-libstdc++-devel
 %endif
 
 %if 0%{?fedora_version}
 BuildRequires: gcc-c++
 BuildRequires: fdupes xapian-core-devel
 BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static
-Requires:      qt5-qtbase xapian-core
 %endif
 
 %if %{defined mageia}
 BuildRequires: gcc-c++
 BuildRequires: libzlib-devel libbzip2-devel
 BuildRequires: libqt5core-devel libqt5xml-devel libxapian-devel
-Requires:      libqt5core libqt5xml5 libxapian
 %endif
 
 %if 0%{?suse_version}
@@ -37,7 +33,6 @@ BuildRequires: gcc7 gcc7-c++
 BuildRequires: fdupes libbz2-devel 
 BuildRequires: libqt5-qtbase-devel libqt5-qttools-devel
 BuildRequires: libxapian-devel update-desktop-files
-Requires:      libbz2 libxapian
 %endif
 
 %if 0%{?fedora_version} >= 27
@@ -54,11 +49,11 @@ This package provides RetroShare system service that can be
 controlled only via JSON API.
 
 Authors:
-see http://retroshare.net/
+see https://retroshare.cc/
 --------
 
 %prep
-%setup -n RetroShare-git
+%setup -n RetroShare
 #%patch0 -p0
 
 %build
@@ -76,6 +71,7 @@ QMAKE="qmake-qt5"
 %if %{defined centos_version}
 # Xapian is not availabe on Centos 7
 BUILD_DEEPSEARCH="CONFIG+=no_rs_deep_search"
+source /opt/rh/devtoolset-7/enable
 %endif
 
 %if %{defined mageia}
@@ -89,7 +85,10 @@ BUILD_CXX="QMAKE_CXX=g++-7"
 
 $QMAKE $BUILD_CC $BUILD_CXX QMAKE_STRIP=echo PREFIX="%{_prefix}" \
 	BIN_DIR="%{_bindir}" \
-	LIB_DIR="%{_libdir}" DATA_DIR="%{_datadir}/retroshare" CONFIG-=debug \
+	LIB_DIR="%{_libdir}" DATA_DIR="%{_datadir}/retroshare" \
+    RS_MAJOR_VERSION=0 RS_MINOR_VERSION=6 RS_MINI_VERSION=9999 \
+    RS_EXTRA_VERSION="-retroshare-service-OBS-RPM" \
+    CONFIG-=debug \
     CONFIG+=ipv6 CONFIG+=no_retroshare_android_service \
     CONFIG+=no_retroshare_android_notify_service \
     CONFIG+=no_retroshare_plugins CONFIG+=no_retroshare_nogui \

build_scripts/OBS/network:retroshare/sqlcipher_centos/get-from-git.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=sqlcipher
+# this is a huge hunk of stuff, so reuse the local repo if possible
+if [ -d ${NAME}/.git ]; then
+	cd ${NAME}
+	git pull
+	cd ..
+else
+	set -e
+	git clone https://github.com/sqlcipher/sqlcipher.git
+	set +e
+fi
+
+TOPDIR=$(pwd)
+cd ${NAME}
+TAG=$(git tag -l | tail -n 1)
+LINE=$(git show --format=format:"%h %ai"|head -n 1)
+set -- $LINE
+REV=$1
+DATE=$2
+VER=${DATE//-/.}
+set -e
+git archive --prefix=${NAME}-${TAG#v}/ -o $TOPDIR/${NAME}-${TAG#v}.tar ${TAG}
+cd $TOPDIR
+bzip2 -9 ${NAME}-${TAG#v}.tar
+sed -i "s/^Version:.*/Version:        ${TAG#v}/" ${NAME}.spec
+osc vc -m "Update to $REV ($DATE)"

build_scripts/OBS/network:retroshare/sqlcipher_centos/sqlcipher.changes

@@ -0,0 +1,30 @@
+-------------------------------------------------------------------
+Sat Jul 18 08:36:19 UTC 2015 - goedhart.martijn@gmail.com
+
+- Update to c01b94f (2015-07-13)
+
+-------------------------------------------------------------------
+Mon Oct 27 15:48:36 UTC 2014 - goedhart.martijn@gmail.com
+
+- Update to e7b8d1f (2014-09-30)
+
+-------------------------------------------------------------------
+Tue Jun 24 10:56:35 UTC 2014 - goedhart.martijn@gmail.com
+
+- Update to 9096584 (2014-04-23)
+
+-------------------------------------------------------------------
+Wed Dec 18 15:53:46 UTC 2013 - goedhart.martijn@gmail.com
+
+- Update to 8d0acdb (2013-12-06)
+
+-------------------------------------------------------------------
+Wed Dec 18 15:40:13 UTC 2013 - goedhart.martijn@gmail.com
+
+- Update to 8d0acdb (2013-12-06)
+
+-------------------------------------------------------------------
+Wed Dec 18 15:31:39 UTC 2013 - goedhart.martijn@gmail.com
+
+- Update to 8d0acdb (2013-12-06)
+

build_scripts/OBS/network:retroshare/sqlcipher_centos/sqlcipher.spec

@@ -0,0 +1,95 @@
+#
+# spec file for package 
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+Name:           sqlcipher
+Version:        3.3.1
+Release:	0
+License:	BSD-3-Clause
+Summary:	SQLite database encryption
+Url:		http://sqlcipher.net
+Group:		Productivity/Databases/Clients
+Source:		%name-%{version}.tar.bz2
+BuildRequires:	pkgconfig
+BuildRequires:	tcl-devel
+BuildRequires:	pkgconfig(openssl)
+BuildRequires:	readline-devel
+BuildRequires:	pkgconfig(sqlite3)
+#Requires:	libncurses5
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of database files. Pages are encrypted before being written to disk and are decrypted when read back. Due to the small footprint and great performance it’s ideal for protecting embedded application databases and is well suited for mobile development.
+
+%package -n lib%{name}-3_8_10_2-0
+Group:		System/Libraries
+Summary:	Shared library for SQLCipher
+
+%description -n lib%{name}-3_8_10_2-0
+SQLCipher library.
+
+SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of database files. Pages are encrypted before being written to disk and are decrypted when read back. Due to the small footprint and great performance it’s ideal for protecting embedded application databases and is well suited for mobile development.
+
+%package devel
+Group:		Development/Libraries/C and C++
+Summary:	Development files for SQLCipher
+#Requires:	sqlite3-devel
+#Requires:	libopenssl-devel
+
+%description devel
+Development files for SQLCipher.
+
+SQLCipher is an SQLite extension that provides transparent 256-bit AES encryption of database files. Pages are encrypted before being written to disk and are decrypted when read back. Due to the small footprint and great performance it’s ideal for protecting embedded application databases and is well suited for mobile development.
+
+
+%prep
+%setup -q
+
+%build
+%configure --enable-threadsafe --enable-cross-thread-connections --enable-releasemode --with-crypto-lib --disable-tcl --enable-tempstore=yes CFLAGS="-fPIC -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto"
+make %{?_smp_mflags}
+
+%install
+%make_install
+
+%post -n lib%{name}-3_8_10_2-0
+/sbin/ldconfig
+
+%postun -n lib%{name}-3_8_10_2-0
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc README.md LICENSE
+%_bindir/sqlcipher
+
+%files -n lib%{name}-3_8_10_2-0
+%defattr(-,root,root)
+%doc README.md LICENSE
+%_libdir/libsqlcipher-3.8.10.2.so.*
+
+%files devel
+%defattr(-,root,root)
+%doc README.md LICENSE
+%_libdir/libsqlcipher.a
+%_libdir/libsqlcipher.la
+%_libdir/libsqlcipher.so
+%_libdir/pkgconfig/sqlcipher.pc
+#%_libdir/tcl/tcl*/sqlite3
+%_includedir/sqlcipher
+
+%changelog
+

build_scripts/OBS/network:retroshare/sqlcipher_debian/sqlcipher_3.2.0-1.dsc

@@ -0,0 +1,48 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Format: 3.0 (quilt)
+Source: sqlcipher
+Binary: sqlcipher, libsqlcipher0-dbg, libsqlcipher0, libsqlcipher-dev
+Architecture: any
+Version: 3.2.0-1
+Maintainer: Hans-Christoph Steiner <hans@eds.org>
+Homepage: http://sqlcipher.net/
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/sqlcipher.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/sqlcipher.git
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.6-dev, dh-autoreconf, libssl-dev
+Build-Conflicts: tcl8.4, tcl8.4-dev, tcl8.5, tcl8.5-dev
+Package-List:
+ libsqlcipher-dev deb libdevel optional arch=any
+ libsqlcipher0 deb libs optional arch=any
+ libsqlcipher0-dbg deb debug extra arch=any
+ sqlcipher deb database optional arch=any
+Checksums-Sha1:
+ 44af36d34f05154a7527a55389d9bc0ef0913595 10100087 sqlcipher_3.2.0.orig.tar.gz
+ c96a75780719dcf6ea80e98668fdc8204e4f1222 14292 sqlcipher_3.2.0-1.debian.tar.xz
+Checksums-Sha256:
+ 25fa4f4cb38dcf9e52e4d1f46be8fee9c7aaef35b6df96912a216b289e22c2af 10100087 sqlcipher_3.2.0.orig.tar.gz
+ fe50ee231d190f69675d8f9ded9b79259465dc797e8875b4693f37cef1b26609 14292 sqlcipher_3.2.0-1.debian.tar.xz
+Files:
+ cfe11ec970851bedd21aba61d412f7f2 10100087 sqlcipher_3.2.0.orig.tar.gz
+ 73336465e3c4cbbaad3408a19a2caecc 14292 sqlcipher_3.2.0-1.debian.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: GPG for Android - https://guardianproject.info/code/gnupg/
+
+iQIcBAEBCAAGBQJUQagvAAoJEJ8P5Yc3S76BZaYQAJaXDZY2Tf/bHONRviHUBo1E
+ozifgFEUnO+fJLO/+GJwT7skMrHjZLsUUrUDQGV1q409sVRhLUWfWdXoMro3uNUy
+Nw3AQqH8eoWZb1w/7vllAGc25SqGJZsa9PMxusRuiCTv6wEHjt75s6C1yDD2OINl
+U/YO+eH5F5Nqop05DTEutRklJdJolJdAp96DDc1qdNx2c2kCuApdzOeeyjPuBdCH
+p3i9689IZnbVDhPO4g6wTVJvvW/4EGZkIMA61iEMLIczT5CbY2j33H1yyZtAhS4V
+oxkpkEiFoX15u5zdaNgK/I9yCy2f0iWw7rhTQPha5igBlvegEd13yDFe3qO1iwhb
+TikkmQvPJUVSSIqZyHi8NUn4Ea6J4zy2msaFB8Q6eVZbr8yavrIudwhswZ9lUr4i
+yzFAw2zA5sTai4aFsEoKn5WYt2wLj9o2H0gcLFUzHQsH4Jd93f+W6RatNWjN8TLg
+Mo+fdlyMjIWpnbdutH4Xo18NnThzmYLPihMD1doX03rruJwWHLyrXHANnqXEoyHt
+K91PWRFZtMZ5tq92+6KOm806PLwboBcblaTiPu3PIHkrAlA+24tWsLTgALO/oK4L
+5KJ+KpU6GHd5z3sjBTlIrzkxJlGj7/AD01fBJHjWk9Wau1kSn5CD04/KXugcbPG2
+SMt8Fa6OA8FvK80/PIe2
+=eFqY
+-----END PGP SIGNATURE-----

build_scripts/OBS/network:retroshare/sqlcipher_debian9/sqlcipher_3.4.1-1.dsc

@@ -0,0 +1,48 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Format: 3.0 (quilt)
+Source: sqlcipher
+Binary: sqlcipher, libsqlcipher0, libsqlcipher-dev
+Architecture: any
+Version: 3.4.1-1
+Maintainer: Hans-Christoph Steiner <hans@eds.org>
+Uploaders: Micah Anderson <micah@debian.org>
+Homepage: http://sqlcipher.net/
+Standards-Version: 4.0.1
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sqlcipher.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/sqlcipher.git
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 10), autoconf (>= 2.59), libtool (>= 1.5.2), automake, libreadline-dev, tcl8.6-dev, libssl-dev
+Build-Conflicts: tcl8.4, tcl8.4-dev, tcl8.5, tcl8.5-dev
+Package-List:
+ libsqlcipher-dev deb libdevel optional arch=any
+ libsqlcipher0 deb libs optional arch=any
+ sqlcipher deb database optional arch=any
+Checksums-Sha1:
+ 969b996b3c7249778c353d02362bb08ebe5a993e 13873645 sqlcipher_3.4.1.orig.tar.gz
+ a170473ee9c5782c9aff9e4f9ffaa0f9adf64d81 14408 sqlcipher_3.4.1-1.debian.tar.xz
+Checksums-Sha256:
+ 4172cc6e5a79d36e178d36bd5cc467a938e08368952659bcd95eccbaf0fa4ad4 13873645 sqlcipher_3.4.1.orig.tar.gz
+ 4e931aeade93d8211217fa2ca9d69fcf217103307a3b70f8a8ad152419b75f98 14408 sqlcipher_3.4.1-1.debian.tar.xz
+Files:
+ edd1c57129c21a22ab2c2fd7f47d4ccd 13873645 sqlcipher_3.4.1.orig.tar.gz
+ fad3b12e4c647d60f437e11156e7258c 14408 sqlcipher_3.4.1-1.debian.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+
+iQKTBAEBCgB9FiEER3dTX+VHFWJiYHe1jL+aMihhp5AFAlmPj8NfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDQ3
+Nzc1MzVGRTU0NzE1NjI2MjYwNzdCNThDQkY5QTMyMjg2MUE3OTAACgkQjL+aMihh
+p5Czmw/8DWuCNHwWfkMndecYuJnWoHXpZHg/9EnjY42comS89WLd5BOSm2LhfrhV
+3iH2Owd26osA3gZ/4UKCLp8PZtUcgMtwXf+kgy07hgn2iKwa9T6cagyTx0h5EqOY
+prBkO09/G3ZI9UAQIUk/73UdRcLxoSD3SuZIPDK1rXn2bunpQYDIMZ4edNzyahU9
+yBa0zM8JUW8KriQtjgCgJL1gUF3or4wFXc1eI4X7nKl5dtuLY8bRR0aMGNEu965v
+I0s4SOS5GOEdJCIEAtyvLJp3TGnfcrwHSlBa2vmc41j1SQcQmz1pxUiCnet/CVjm
+O8nKqgq7WhcrJ9JborZPGkX+jb02xiy62+n5kWIzqdlQZFNicWZ6+SogF+D/vA/G
+HkSuz4BPPPE1egSBbPhv0nEzG8fY5cTjGBsNIxQZfVhl1eawUbKrWHdVefkLtOjJ
+vqrr7dOiaG2vNWqwLzynJ4aHxCbqcj2KqoEsnEEgXfSfFD/2POv+lC/OPmw6J/Me
+GPa5gYVexKxA6EtP/yJXyMjyMJVRnhB/chqzep0HTisORU+WAAas7jNoDj8d/8ys
+iPDcVtd0h+moU40fFpahZvS4wWP02u0E+ZtSCguIRCsVeh+6vSBziSXJkCkjZ9zk
+Xt+f7DIVRObhrxNLcS+KNtBV5EeOnS4byul3lP0pDRmHFNrE0kc=
+=AVab
+-----END PGP SIGNATURE-----

build_scripts/OBS/prepare_source_tarball.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Make sure you have built RetroShare at list once from the same source tree,
+# so the support libs get ingluded in the source tarball
+
+## Define default value for variable, take two arguments, $1 variable name,
+## $2 default variable value, if the variable is not already define define it
+## with default value.
+function define_default_value()
+{
+	VAR_NAME="${1}"
+	DEFAULT_VALUE="${2}"
+
+	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
+}
+
+define_default_value GIT_DIR "${HOME}/Development/rs-develop/.git"
+define_default_value WORK_DIR "$(mktemp --directory)/"
+
+ORIG_DIR="$(pwd)"
+
+[ "$(ls "${GIT_DIR}/../supportlibs/restbed/" | wc -l)" -lt "5" ] &&
+{
+	cat << EOF
+WARNING: supportlibs/restbed/ seems have not been checked out!
+The produced tarball may not be suitable to build RetroShare JSON API
+EOF
+}
+
+cd "${WORK_DIR}"
+rsync -a --delete \
+	--exclude='.git' \
+	--filter=':- build_scripts/OBS/.gitignore' \
+	"${GIT_DIR}/../" RetroShare/
+git describe > RetroShare/Source_Version
+tar -zcf RetroShare.tar.gz RetroShare/
+
+cat RetroShare/Source_Version
+md5sum RetroShare.tar.gz
+wc -c RetroShare.tar.gz
+mv RetroShare.tar.gz "${ORIG_DIR}/RetroShare.tar.gz"
+rm -rf "${WORK_DIR}" 
+

data/retroshare.desktop

@@ -2,10 +2,10 @@
 Encoding=UTF-8
 Version=1.0
 Name=RetroShare
-Comment=Securely share files with your friends
+Comment=Securely communicate with your friends
 Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Application;Network;P2P;Feed;Chat;InstantMessaging
 MimeType=x-scheme-handler/retroshare;

libresapi/src/api/ChatHandler.h

@@ -29,7 +29,7 @@
 #include "util/rstime.h"
 
 class RsPeers;
-class RsIdentity;
+struct RsIdentity;
 
 namespace resource_api
 {

libresapi/src/api/IdentityHandler.h

@@ -28,7 +28,7 @@
 #include "ResourceRouter.h"
 #include "StateTokenServer.h"
 
-class RsIdentity;
+struct RsIdentity;
 
 namespace resource_api
 {

libretroshare/src/chat/distantchat.cc

@@ -135,13 +135,13 @@ void DistantChatService::handleRecvChatStatusItem(RsChatStatusItem *cs)
         std::cerr << "DistantChatService::handleRecvChatStatusItem(): received keep alive packet for inactive chat! peerId=" << cs->PeerId() << std::endl;
 }
 
-bool DistantChatService::acceptDataFromPeer(const RsGxsId& gxs_id,const RsGxsTunnelId& tunnel_id,bool is_client_side)
+bool DistantChatService::acceptDataFromPeer(const RsGxsId& gxs_id,const RsGxsTunnelId& tunnel_id,bool am_I_client_side)
 {
-    bool res = true ;
+    if(am_I_client_side)	// always accept distant chat when we're the client side.
-    
-    if(is_client_side)	// always accept distant chat when we're the client side.
         return true ;
     
+    bool res = true ;
+
     if(mDistantChatPermissions & RS_DISTANT_CHAT_CONTACT_PERMISSION_FLAG_FILTER_NON_CONTACTS)
         res = (rsIdentity!=NULL) && rsIdentity->isARegularContact(gxs_id) ;
     

libretroshare/src/chat/distantchat.h

@@ -91,7 +91,7 @@ public:
     virtual void connectToGxsTunnelService(RsGxsTunnelService *tunnel_service) ;
     
 private:
-    virtual bool acceptDataFromPeer(const RsGxsId& gxs_id, const RsGxsTunnelService::RsGxsTunnelId& tunnel_id, bool is_client_side) ;
+    virtual bool acceptDataFromPeer(const RsGxsId& gxs_id, const RsGxsTunnelService::RsGxsTunnelId& tunnel_id, bool am_I_client_side) ;
     virtual void notifyTunnelStatus(const RsGxsTunnelService::RsGxsTunnelId& tunnel_id,uint32_t tunnel_status) ;
     virtual void receiveData(const RsGxsTunnelService::RsGxsTunnelId& id,unsigned char *data,uint32_t data_size) ;
 

libretroshare/src/ft/fttransfermodule.cc

@@ -44,34 +44,40 @@
  *
  */
 
-const double 	FT_TM_MAX_PEER_RATE 		       = 100 * 1024 * 1024; /* 100MB/s */
+const double   FT_TM_MAX_PEER_RATE 		       = 100 * 1024 * 1024; /* 100MB/s */
 const uint32_t FT_TM_MAX_RESETS  		       = 5;
-const uint32_t FT_TM_MINIMUM_CHUNK 		       = 1024; /* ie 1Kb / sec */
+const uint32_t FT_TM_MINIMUM_CHUNK 		       = 1024;              /* ie 1Kb / sec */
-const uint32_t FT_TM_RESTART_DOWNLOAD 	       = 20; /* 20 seconds */
+const uint32_t FT_TM_DEFAULT_TRANSFER_RATE     = 20*1024;           /* ie 20 Kb/sec */
-const uint32_t FT_TM_DOWNLOAD_TIMEOUT 	       = 10; /* 10 seconds */
+const uint32_t FT_TM_RESTART_DOWNLOAD 	       = 20;                /* 20 seconds */
-//const uint32_t FT_TM_CRC_MAP_MAX_WAIT_PER_GIG = 20; /* 20 seconds per gigabyte */
+const uint32_t FT_TM_DOWNLOAD_TIMEOUT 	       = 10;                /* 10 seconds */
-
-// const double FT_TM_MAX_INCREASE = 1.00;
-// const double FT_TM_MIN_INCREASE = -0.10;
 
 const double FT_TM_RATE_INCREASE_SLOWER  = 0.05 ;
 const double FT_TM_RATE_INCREASE_AVERAGE = 0.3 ;
 const double FT_TM_RATE_INCREASE_FASTER  = 1.0 ;
 
-//const int32_t FT_TM_FAST_RTT    = 1.0;
-//const int32_t FT_TM_STD_RTT     = 5.0;
-//const int32_t FT_TM_SLOW_RTT    = 20.0;
-
-//const uint32_t FT_TM_CRC_MAP_STATE_NOCHECK 	= 0 ;
-//const uint32_t FT_TM_CRC_MAP_STATE_DONT_HAVE = 1 ;
-//const uint32_t FT_TM_CRC_MAP_STATE_HAVE 		= 2 ;
-
 #define FT_TM_FLAG_DOWNLOADING 	0
 #define FT_TM_FLAG_CANCELED		1
 #define FT_TM_FLAG_COMPLETE 		2
 #define FT_TM_FLAG_CHECKING 		3
 #define FT_TM_FLAG_CHUNK_CRC 		4
 
+peerInfo::peerInfo(const RsPeerId& peerId_in)
+    :peerId(peerId_in),state(PQIPEER_NOT_ONLINE),desiredRate(FT_TM_DEFAULT_TRANSFER_RATE),actualRate(FT_TM_DEFAULT_TRANSFER_RATE),
+		lastTS(0),
+		recvTS(0), lastTransfers(0), nResets(0),
+		rtt(0), rttActive(false), rttStart(0), rttOffset(0),
+		mRateIncrease(1)
+	{
+	}
+//	peerInfo(const RsPeerId& peerId_in,uint32_t state_in,uint32_t maxRate_in):
+//		peerId(peerId_in),state(state_in),desiredRate(maxRate_in),actualRate(0),
+//		lastTS(0),
+//		recvTS(0), lastTransfers(0), nResets(0),
+//		rtt(0), rttActive(false), rttStart(0), rttOffset(0),
+//		mRateIncrease(1)
+//	{
+//		return;
+//	}
 ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm, ftController *c)
 	:mFileCreator(fc), mMultiplexor(dm), mFtController(c), tfMtx("ftTransferModule"), mFlag(FT_TM_FLAG_DOWNLOADING),mPriority(SPEED_NORMAL)
 {

libretroshare/src/ft/fttransfermodule.h

@@ -54,39 +54,32 @@ class HashThread ;
 class peerInfo
 {
 public:
-	explicit peerInfo(const RsPeerId& peerId_in):peerId(peerId_in),state(PQIPEER_NOT_ONLINE),desiredRate(0),actualRate(0),
+	explicit peerInfo(const RsPeerId& peerId_in);
-		lastTS(0),
+
-		recvTS(0), lastTransfers(0), nResets(0), 
+//	peerInfo(const RsPeerId& peerId_in,uint32_t state_in,uint32_t maxRate_in):
-		rtt(0), rttActive(false), rttStart(0), rttOffset(0),
+//		peerId(peerId_in),state(state_in),desiredRate(maxRate_in),actualRate(0),
-		mRateIncrease(1)
+//		lastTS(0),
-	{
+//		recvTS(0), lastTransfers(0), nResets(0),
-		return;
+//		rtt(0), rttActive(false), rttStart(0), rttOffset(0),
-	}
+//		mRateIncrease(1)
-	peerInfo(const RsPeerId& peerId_in,uint32_t state_in,uint32_t maxRate_in):
+//	{
-		peerId(peerId_in),state(state_in),desiredRate(maxRate_in),actualRate(0),
+//		return;
-		lastTS(0),
+//	}
-		recvTS(0), lastTransfers(0), nResets(0), 
-		rtt(0), rttActive(false), rttStart(0), rttOffset(0),
-		mRateIncrease(1)
-	{
-		return;
-	}
   	RsPeerId peerId;
   	uint32_t state;
-  	double desiredRate;
+  	double desiredRate;        /* speed at which the data should be requested */
-  	double actualRate;
+  	double actualRate;	       /* actual speed at which the data is received  */
 
-  	rstime_t lastTS; /* last Request */
+  	rstime_t lastTS;           /* last Request */
-	rstime_t recvTS; /* last Recv */
+	rstime_t recvTS;           /* last Recv */
-	uint32_t lastTransfers; /* data recvd in last second */
+	uint32_t lastTransfers;    /* data recvd in last second */
-	uint32_t nResets; /* count to disable non-existant files */
+	uint32_t nResets;          /* count to disable non-existant files */
 
-	/* rrt rate control */
+	uint32_t rtt;              /* last rtt */
-	uint32_t rtt;       /* last rtt */
+	bool     rttActive;        /* have we initialised an rtt measurement */
-	bool     rttActive; /* have we initialised an rtt measurement */
+	rstime_t	 rttStart;     /* ts of request */
-	rstime_t	 rttStart;  /* ts of request */
+	uint64_t rttOffset;        /* end of request */
-	uint64_t rttOffset; /* end of request */
+	float    mRateIncrease;    /* current rate increase factor */
-	float    mRateIncrease; /* current rate */
 };
 
 class ftFileStatus

libretroshare/src/gxs/rsgenexchange.h

@@ -710,7 +710,7 @@ public:
 	virtual bool     getGroupNetworkStats(const RsGxsGroupId& grpId,RsGroupNetworkStats& stats);
 
     uint16_t serviceType() const { return mServType ; }
-    uint32_t serviceFullType() const { return ((uint32_t)mServType << 8) + (((uint32_t) RS_PKT_VERSION_SERVICE) << 24); }
+    uint32_t serviceFullType() const { return RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(mServType); }
 
     virtual RsReputations::ReputationLevel minReputationForForwardingMessages(uint32_t group_sign_flags,uint32_t identity_flags);
 protected:

libretroshare/src/gxstrans/p3gxstrans.cc

@@ -753,8 +753,9 @@ bool p3GxsTrans::handleEncryptedMail(const RsGxsTransMailItem* mail)
 	// Hint match none of our own ids
 	if(decryptIds.empty())
 	{
-		std::cout << "p3GxsTrans::handleEcryptedMail(...) hint doesn't match"
+#ifdef DEBUG_GXSTRANS
-		          << std::endl;
+		std::cout << "p3GxsTrans::handleEcryptedMail(...) hint doesn't match" << std::endl;
+#endif
 		return true;
 	}
 

libretroshare/src/gxstunnel/p3gxstunnel.cc

@@ -370,11 +370,11 @@ void p3GxsTunnelService::handleRecvTunnelDataItem(const RsGxsTunnelId& tunnel_id
             std::map<RsGxsTunnelId,GxsTunnelPeerInfo>::iterator it2 = _gxs_tunnel_contacts.find(tunnel_id) ; 
             
             if(it2 != _gxs_tunnel_contacts.end())
-	    {
+			{
-		    it2->second.client_services.insert(item->service_id) ;
+				it2->second.client_services.insert(item->service_id) ;
-		    peer_from = it2->second.to_gxs_id ;
+				peer_from = it2->second.to_gxs_id ;
-		    is_client_side = (it2->second.direction == RsTurtleGenericDataItem::DIRECTION_CLIENT);
+				is_client_side = (it2->second.direction == RsTurtleGenericDataItem::DIRECTION_SERVER);
-	    }
+			}
             
             // Check if the item has already been received. This is necessary because we actually re-send items until an ACK is received. If the ACK gets lost (connection interrupted) the
             // item may be received twice. This is conservative and ensure that no item is lost nor received twice.

libretroshare/src/libretroshare.pro

@@ -193,12 +193,6 @@ linux-* {
 		}
 	}
 
-	#CONFIG += version_detail_bash_script
-
-	# linux/bsd can use either - libupnp is more complete and packaged.
-	#CONFIG += upnp_miniupnpc 
-    CONFIG += upnp_libupnp
-
 	# Check if the systems libupnp has been Debian-patched
 	system(grep -E 'char[[:space:]]+PublisherUrl' /usr/include/upnp/upnp.h >/dev/null 2>&1) {
 		# Normal libupnp
@@ -207,8 +201,9 @@ linux-* {
 		DEFINES *= PATCHED_LIBUPNP
 	}
 
-	PKGCONFIG *= libssl libupnp
+    PKGCONFIG *= libssl
-	PKGCONFIG *= libcrypto zlib
+    equals(RS_UPNP_LIB, "upnp ixml threadutil"):PKGCONFIG *= libupnp
+    PKGCONFIG *= libcrypto zlib
     no_sqlcipher:PKGCONFIG *= sqlite3
     LIBS *= -ldl
 
@@ -240,8 +235,6 @@ win32-x-g++ {
 	QMAKE_AR = i586-mingw32msvc-ar
 	DEFINES *= STATICLIB WIN32
 
-	CONFIG += upnp_miniupnpc
-
         SSL_DIR=../../../../openssl
 	UPNPC_DIR = ../../../../miniupnpc-1.3
 	GPG_ERROR_DIR = ../../../../libgpg-error-1.7
@@ -309,10 +302,6 @@ freebsd-* {
 	INCLUDEPATH *= /usr/local/include/glib-2.0
 
 	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
-
-	# linux/bsd can use either - libupnp is more complete and packaged.
-	#CONFIG += upnp_miniupnpc 
-    CONFIG += upnp_libupnp
 }
 
 ################################# OpenBSD ##########################################
@@ -322,8 +311,6 @@ openbsd-* {
 	INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
 
 	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
-
-	CONFIG += upnp_libupnp
 }
 
 ################################# Haiku ##########################################
@@ -335,7 +322,6 @@ haiku-* {
 	INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
 	DEFINES *= NO_SQLCIPHER
 	CONFIG += release
-	CONFIG += upnp_libupnp
 	DESTDIR = lib
 }
 
@@ -661,12 +647,6 @@ SOURCES +=	util/folderiterator.cc \
             util/rstime.cc \
             util/rsurl.cc
 
-## Added for retrocompatibility remove ASAP
-isEmpty(RS_UPNP_LIB) {
-    upnp_miniupnpc:RS_UPNP_LIB=miniupnpc
-    upnp_libupnp:RS_UPNP_LIB="upnp ixml threadutil"
-}
-
 equals(RS_UPNP_LIB, miniupnpc) {
 	HEADERS += upnp/upnputil.h upnp/upnphandler_miniupnp.h
 	SOURCES += upnp/upnputil.c upnp/upnphandler_miniupnp.cc
@@ -676,8 +656,6 @@ equals(RS_UPNP_LIB, miniupnpc) {
 	DEFINES *= RS_USE_LIBUPNP
 }
 
-
-
 zeroconf {
 
 HEADERS +=	zeroconf/p3zeroconf.h \

libretroshare/src/pqi/p3servicecontrol.cc

@@ -459,10 +459,7 @@ bool	p3ServiceControl::checkFilter(uint32_t serviceId, const RsPeerId &peerId)
 #endif
 
 	// must allow ServiceInfo through, or we have nothing!
-#define FULLID_SERVICEINFO ((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + ((RS_SERVICE_TYPE_SERVICEINFO) << 8))
+	if (serviceId == RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(RS_SERVICE_TYPE_SERVICEINFO))
-
-	//if (serviceId == RS_SERVICE_TYPE_SERVICEINFO)
-	if (serviceId == FULLID_SERVICEINFO)
 	{
 #ifdef SERVICECONTROL_DEBUG
 		std::cerr << "p3ServiceControl::checkFilter() Allowed SERVICEINFO";

libretroshare/src/retroshare/rsgxscommon.h

@@ -169,8 +169,8 @@ struct RsGxsCommentService
 	virtual bool getRelatedComments( uint32_t token,
 	                                 std::vector<RsGxsComment> &comments ) = 0;
 
-	virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0;
+	virtual bool createNewComment(uint32_t &token, RsGxsComment &comment) = 0;
-	virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
+	virtual bool createNewVote(uint32_t &token, RsGxsVote &vote) = 0;
 
 	virtual bool acknowledgeComment(
 	        uint32_t token,

libretroshare/src/retroshare/rsgxstunnel.h

@@ -62,7 +62,7 @@ public:
         
         // Gives feedback about type of data that is allowed in. For security reasons, this always needs to be re-derived (Clients can return true on default)
         
-        virtual bool acceptDataFromPeer(const RsGxsId& gxs_id,const RsGxsTunnelId& tunnel_id,bool is_client_side) = 0 ;
+        virtual bool acceptDataFromPeer(const RsGxsId& gxs_id,const RsGxsTunnelId& tunnel_id,bool am_I_client_side) = 0 ;
     };
     
     class GxsTunnelInfo

libretroshare/src/retroshare/rsposted.h

@@ -25,10 +25,12 @@
 #include <inttypes.h>
 #include <string>
 #include <list>
+#include <functional>
 
 #include "retroshare/rstokenservice.h"
 #include "retroshare/rsgxsifacehelper.h"
 #include "retroshare/rsgxscommon.h"
+#include "serialiser/rsserializable.h"
 
 /* The Main Interface Class - for information about your Posted */
 class RsPosted;
@@ -42,6 +44,7 @@ class RsPostedGroup
 
 	RsGroupMetaData mMeta;
 	std::string mDescription;
+
 };
 
 
@@ -52,7 +55,7 @@ class RsPostedGroup
 #define RSPOSTED_PERIOD_YEAR		1
 #define RSPOSTED_PERIOD_MONTH		2
 #define RSPOSTED_PERIOD_WEEK		3
-#define RSPOSTED_PERIOD_DAY		4
+#define RSPOSTED_PERIOD_DAY			4
 #define RSPOSTED_PERIOD_HOUR		5
 
 #define RSPOSTED_VIEWMODE_LATEST	1
@@ -87,8 +90,8 @@ virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts
 	    /* From RsGxsCommentService */
 //virtual bool getCommentData(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0;
 //virtual bool getRelatedComments(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0;
-//virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0;
+//virtual bool createNewComment(uint32_t &token, RsGxsComment &comment) = 0;
-//virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
+//virtual bool createNewVote(uint32_t &token, RsGxsVote &vote) = 0;
 
         //////////////////////////////////////////////////////////////////////////////
 virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) = 0;
@@ -102,7 +105,6 @@ virtual bool updateGroup(uint32_t &token, RsPostedGroup &group) = 0;
 };
 
 
-
 class RsPostedPost
 {
 	public:
@@ -137,6 +139,24 @@ class RsPostedPost
 	double  mHotScore;
 	double  mTopScore;
 	double  mNewScore;
+	
+	RsGxsImage mImage;
+
+	/// @see RsSerializable
+	/*virtual void serial_process( RsGenericSerializer::SerializeJob j,
+	                             RsGenericSerializer::SerializeContext& ctx )
+	{
+		RS_SERIAL_PROCESS(mImage);
+		RS_SERIAL_PROCESS(mMeta);
+		RS_SERIAL_PROCESS(mLink);
+		RS_SERIAL_PROCESS(mHaveVoted);
+		RS_SERIAL_PROCESS(mUpVotes);
+		RS_SERIAL_PROCESS(mDownVotes);
+		RS_SERIAL_PROCESS(mComments);
+		RS_SERIAL_PROCESS(mHotScore);
+		RS_SERIAL_PROCESS(mTopScore);
+		RS_SERIAL_PROCESS(mNewScore);
+	}*/
 };
 
 

libretroshare/src/rsitems/rsposteditems.cc

@@ -22,15 +22,29 @@
 #include "rsitems/rsposteditems.h"
 #include "serialiser/rstypeserializer.h"
 
+
+
 void RsGxsPostedPostItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
 {
     RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_LINK,mPost.mLink,"mPost.mLink") ;
     RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_MSG ,mPost.mNotes,"mPost.mNotes") ;
+
+	// Do not serialize mImage member if it is empty (keeps compatibility of new posts without image toward older RS)
+	// and do not expect to deserialize mImage member if the data block has been consummed entirely (keeps compatibility
+	// of new RS with older posts.
+
+    if(j == RsGenericSerializer::DESERIALIZE && ctx.mOffset == ctx.mSize)
+        return ;
+
+	if((j == RsGenericSerializer::SIZE_ESTIMATE || j == RsGenericSerializer::SERIALIZE) && mImage.empty())
+		return ;
+
+	RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,mImage,"mImage") ;
 }
 
 void RsGxsPostedGroupItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
 {
-    RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DESCR ,mGroup.mDescription,"mGroup.mDescription") ;
+	RsTypeSerializer::serial_process(j,ctx,TLV_TYPE_STR_DESCR ,mGroup.mDescription,"mGroup.mDescription") ;
 }
 
 RsItem *RsGxsPostedSerialiser::create_item(uint16_t service_id,uint8_t item_subtype) const
@@ -47,12 +61,54 @@ RsItem *RsGxsPostedSerialiser::create_item(uint16_t service_id,uint8_t item_subt
     }
 }
 
+bool RsGxsPostedPostItem::fromPostedPost(RsPostedPost &post, bool moveImage)
+{
+	clear();
+	
+	mPost = post;
+	meta = post.mMeta;
+
+	if (moveImage)
+	{
+		mImage.binData.bin_data = post.mImage.mData;
+		mImage.binData.bin_len = post.mImage.mSize;
+		post.mImage.shallowClear();
+	}
+	else
+	{
+		mImage.binData.setBinData(post.mImage.mData, post.mImage.mSize);
+	}
+
+	return true;
+}
+
+bool RsGxsPostedPostItem::toPostedPost(RsPostedPost &post, bool moveImage)
+{
+	post = mPost;
+	post.mMeta = meta;
+
+	if (moveImage)
+	{
+		post.mImage.take((uint8_t *) mImage.binData.bin_data, mImage.binData.bin_len);
+		// mImage doesn't have a ShallowClear at the moment!
+		mImage.binData.TlvShallowClear();
+	}
+	else
+	{
+		post.mImage.copy((uint8_t *) mImage.binData.bin_data, mImage.binData.bin_len);
+	}
+
+	return true;
+}
+
 void RsGxsPostedPostItem::clear()
 {
 	mPost.mLink.clear();
 	mPost.mNotes.clear();
+	mImage.TlvClear();
 }
 void RsGxsPostedGroupItem::clear()
 {
 	mGroup.mDescription.clear();
 }
+

libretroshare/src/rsitems/rsposteditems.h

@@ -25,6 +25,7 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/rsgxscommentitems.h"
 #include "rsitems/rsgxsitems.h"
+#include "serialiser/rstlvimage.h"
 
 #include "retroshare/rsposted.h"
 
@@ -38,9 +39,12 @@ public:
 	virtual ~RsGxsPostedGroupItem() {}
 
 	void clear();
+	
 	virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
 	
 	RsPostedGroup mGroup;
+	
+
 };
 
 class RsGxsPostedPostItem : public RsGxsMsgItem
@@ -52,7 +56,13 @@ public:
 	void clear();
 	virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
 	
+	// Slightly unusual structure.
+	// use conversion functions to transform:
+	bool fromPostedPost(RsPostedPost &post, bool moveImage);
+	bool toPostedPost(RsPostedPost &post, bool moveImage);
+
 	RsPostedPost mPost;
+	RsTlvImage mImage;
 };
 
 class RsGxsPostedSerialiser : public RsGxsCommentSerialiser

libretroshare/src/serialiser/rsserializable.h

@@ -37,6 +37,8 @@ struct RsSerializable
 	 */
 	virtual void serial_process(RsGenericSerializer::SerializeJob j,
 	                            RsGenericSerializer::SerializeContext& ctx) = 0;
+
+	virtual ~RsSerializable() = default;
 };
 
 /** @def RS_SERIAL_PROCESS(I)

libretroshare/src/serialiser/rstlvimage.h

@@ -33,16 +33,17 @@
 
 class RsTlvImage: public RsTlvItem
 {
-	public:
+public:
-	 RsTlvImage(); 
+	RsTlvImage();
-	 RsTlvImage(const RsTlvImage& );
+	RsTlvImage(const RsTlvImage& );
-	 virtual ~RsTlvImage() { return; }
+	virtual ~RsTlvImage() { return; }
-virtual uint32_t TlvSize() const;
+	virtual uint32_t TlvSize() const;
-virtual void	 TlvClear();
+	virtual void	 TlvClear();
-virtual bool     SetTlv(void *data, uint32_t size, uint32_t *offset) const;
+	virtual bool     SetTlv(void *data, uint32_t size, uint32_t *offset) const;
-virtual bool     GetTlv(void *data, uint32_t size, uint32_t *offset);
+	virtual bool     GetTlv(void *data, uint32_t size, uint32_t *offset);
 
-virtual std::ostream &print(std::ostream &out, uint16_t indent) const;
+	bool empty() const { return binData.bin_len == 0 ; }
+	virtual std::ostream &print(std::ostream &out, uint16_t indent) const;
 
 	uint32_t        image_type;   // Mandatory:
 	RsTlvBinaryData binData;      // Mandatory: serialised file info

libretroshare/src/services/p3gxschannels.cc

@@ -1089,7 +1089,7 @@ bool p3GxsChannels::createChannel(RsGxsChannelGroup& channel)
 bool p3GxsChannels::createComment(RsGxsComment& comment)
 {
 	uint32_t token;
-	if(!createComment(token, comment))
+	if(!createNewComment(token, comment))
 	{
 		std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating comment."
 		          << std::endl;
@@ -1116,7 +1116,7 @@ bool p3GxsChannels::createComment(RsGxsComment& comment)
 bool p3GxsChannels::createVote(RsGxsVote& vote)
 {
 	uint32_t token;
-	if(!createVote(token, vote))
+	if(!createNewVote(token, vote))
 	{
 		std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating vote."
 		          << std::endl;
@@ -1795,7 +1795,7 @@ bool p3GxsChannels::generateComment(uint32_t &token, const RsGxsGroupId &grpId,
 	} 
 #endif
 
-	createComment(token, msg);
+	createNewComment(token, msg);
 
 	return true;
 }
@@ -1846,7 +1846,7 @@ bool p3GxsChannels::generateVote(uint32_t &token, const RsGxsGroupId &grpId, con
 		vote.mVoteType = GXS_VOTE_DOWN;
 	}
 
-	createVote(token, vote);
+	createNewVote(token, vote);
 
 	return true;
 }

libretroshare/src/services/p3gxschannels.h

@@ -132,30 +132,29 @@ virtual bool getChannelDownloadDirectory(const RsGxsGroupId &groupId, std::strin
 	                                  const RsGxsGroupId& grpId ) override;
 
 	/* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */
-	virtual bool getCommentData(uint32_t token, std::vector<RsGxsComment> &msgs)
+	virtual bool getCommentData(uint32_t token, std::vector<RsGxsComment> &msgs) override
 	{ return mCommentService->getGxsCommentData(token, msgs); }
 
 	virtual bool getRelatedComments( uint32_t token,
-	                                 std::vector<RsGxsComment> &msgs )
+	                                 std::vector<RsGxsComment> &msgs ) override
 	{ return mCommentService->getGxsRelatedComments(token, msgs); }
 
-virtual bool createComment(uint32_t &token, RsGxsComment &msg)
+	virtual bool createNewComment(uint32_t &token, RsGxsComment &msg) override
 	{
 		return mCommentService->createGxsComment(token, msg);
 	}
 
-virtual bool createVote(uint32_t &token, RsGxsVote &msg)
+	virtual bool createNewVote(uint32_t &token, RsGxsVote &msg) override
 	{
 		return mCommentService->createGxsVote(token, msg);
 	}
 
-virtual bool acknowledgeComment(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId)
+	virtual bool acknowledgeComment(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override
 	{
 		return acknowledgeMsg(token, msgId);
 	}
 
-
+	virtual bool acknowledgeVote(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override
-virtual bool acknowledgeVote(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId)
 	{
 		if (mCommentService->acknowledgeVote(token, msgId))
 		{

libretroshare/src/services/p3photoservice.cc

@@ -187,8 +187,7 @@ void p3PhotoService::groupsChanged(std::list<RsGxsGroupId>& grpIds)
 }
 
 
-void p3PhotoService::msgsChanged(
+void p3PhotoService::msgsChanged(GxsMsgIdResult& msgs)
-		std::map<RsGxsGroupId, std::vector<RsGxsMessageId> >& msgs)
 {
     RsStackMutex stack(mPhotoMutex);
 

libretroshare/src/services/p3photoservice.h

@@ -56,8 +56,7 @@ public:
     void groupsChanged(std::list<RsGxsGroupId>& grpIds);
 
 
-    void msgsChanged(std::map<RsGxsGroupId,
+    void msgsChanged(GxsMsgIdResult& msgs);
-                             std::vector<RsGxsMessageId> >& msgs);
 
     RsTokenService* getTokenService();
 

libretroshare/src/services/p3posted.cc

@@ -123,6 +123,7 @@ bool p3Posted::getPostData(const uint32_t &token, std::vector<RsPostedPost> &msg
 				{
 					RsPostedPost msg = postItem->mPost;
 					msg.mMeta = postItem->meta;
+					postItem->toPostedPost(msg, true);
 					msg.calculateScores(now);
 
 					msgs.push_back(msg);
@@ -291,8 +292,10 @@ bool p3Posted::createPost(uint32_t &token, RsPostedPost &msg)
 	std::cerr << std::endl;
 
 	RsGxsPostedPostItem* msgItem = new RsGxsPostedPostItem();
-	msgItem->mPost = msg;
+	//msgItem->mPost = msg;
-	msgItem->meta = msg.mMeta;
+	//msgItem->meta = msg.mMeta;
+	msgItem->fromPostedPost(msg, true);
+		
 	
 	RsGenExchange::publishMsg(token, msgItem);
 	return true;

libretroshare/src/services/p3posted.h

@@ -89,12 +89,12 @@ virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgI
 	                                 std::vector<RsGxsComment> &msgs )
 	{ return mCommentService->getGxsRelatedComments(token, msgs); }
 
-virtual bool createComment(uint32_t &token, RsGxsComment &msg)
+	virtual bool createNewComment(uint32_t &token, RsGxsComment &msg)
 	{
 		return mCommentService->createGxsComment(token, msg);
 	}
 
-virtual bool createVote(uint32_t &token, RsGxsVote &msg)
+	virtual bool createNewVote(uint32_t &token, RsGxsVote &msg)
 	{
 		return mCommentService->createGxsVote(token, msg);
 	}

libretroshare/src/services/p3service.h

@@ -50,7 +50,7 @@ std::string generateRandomServiceId();
 
 
 //	p3FastService(uint16_t type)
-//	:pqiService((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) type) << 8)), 
+//	  :pqiService((RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(type)),
 
 
 class p3FastService: public pqiService

libretroshare/src/turtle/p3turtle.cc

@@ -1387,7 +1387,9 @@ bool p3turtle::getTunnelServiceInfo(TurtleTunnelId tunnel_id,RsPeerId& vpid,RsFi
 
 		if(it == _incoming_file_hashes.end())
 		{
+#ifdef P3TURTLE_DEBUG
 			std::cerr << "p3turtle::handleRecvGenericTunnelItem(): hash " << hash << " for client side tunnel endpoint " << std::hex << tunnel_id << std::dec << " has been removed (probably a late response)! Dropping the item. " << std::endl;
+#endif
 			return false;
 		}
 
@@ -1399,7 +1401,9 @@ bool p3turtle::getTunnelServiceInfo(TurtleTunnelId tunnel_id,RsPeerId& vpid,RsFi
 
         if(it == _outgoing_tunnel_client_services.end())
 		{
+#ifdef P3TURTLE_DEBUG
             std::cerr << "p3turtle::handleRecvGenericTunnelItem(): hash " << tunnel.hash << " for server side tunnel endpoint " << std::hex << tunnel_id << std::dec << " has been removed (probably a late response)! Dropping the item. " << std::endl;
+#endif
 			return false;
 		}
 
@@ -1899,8 +1903,10 @@ void p3turtle::handleTunnelResult(RsTurtleTunnelOkItem *item)
 						new_vpid = _local_tunnels[item->tunnel_id].vpid ; // save it for off-mutex usage.
 					}
 				}
+#ifdef P3TURTLE_DEBUG
 			if(!found)
 				std::cerr << "p3turtle: error. Could not find hash that emmitted tunnel request " << reinterpret_cast<void*>(item->tunnel_id) << std::endl ;
+#endif
 		}
 		else
 		{											// Nope, forward it back.

plugins/Common/retroshare_plugin.pri

@@ -16,9 +16,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
 ################################################################################
 
-TEMPLATE = subdirs
-
-SUBDIRS += \
 !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
 
 TEMPLATE = lib
@@ -28,9 +25,6 @@ DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
 INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
 
 linux-* {
-# Cyril: Someone can explain to me why I need to put that again here??? Normally this variable should be set by
-# the include of retroshare.pri, but for some reason it is not!
-	isEmpty(RS_PLUGIN_DIR): RS_PLUGIN_DIR = "$${PREFIX}/lib/retroshare/extensions6"
 	target.path = "$${RS_PLUGIN_DIR}"
 	INSTALLS += target
 }

plugins/FeedReader/services/p3FeedReader.h

@@ -32,7 +32,7 @@ class RsFeedReaderMsg;
 class p3FeedReaderThread;
 
 class RsGxsForums;
-class RsGxsForumGroup;
+struct RsGxsForumGroup;
 
 class p3FeedReader : public RsPQIService, public RsFeedReader
 {

retroshare-gui/src/TorControl/TorManager.cpp

@@ -472,6 +472,15 @@ QString TorManagerPrivate::torExecutablePath() const
         return path + filename;
 #endif
 
+#ifdef __APPLE__
+    // on MacOS, try traditional brew installation path
+
+    path = QStringLiteral("/usr/local/opt/tor/bin") ;
+
+    if (QFile::exists(path + filename))
+        return path + filename;
+#endif
+
     // Try $PATH
     return filename.mid(1);
 }

retroshare-gui/src/gui/Circles/CreateCircleDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>951</width>
+    <width>600</width>
-    <height>578</height>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">

retroshare-gui/src/gui/FileTransfer/DetailsDialog.h

@@ -25,7 +25,7 @@
 #include "ui_DetailsDialog.h"
 #include <retroshare/rstypes.h>
 
-class FileChunksInfo ;
+struct FileChunksInfo ;
 
 class DetailsDialog : public QDialog
 {

retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h

@@ -27,8 +27,8 @@
 #include "RsAutoUpdatePage.h"
 #include <retroshare/rstypes.h>
 
-class FileChunksInfo ;
+struct FileChunksInfo ;
-class FileInfo ;
+struct FileInfo ;
 
 class FileTransferInfoWidget : public RsAutoUpdatePage
 {