rpm/gnunet
SHA256
1
0
Fork 0
forked from pool/gnunet
Code Pull Requests Activity

Accepting request 703531 from home:awissu

Browse Source 
- Update to 0.11.4:
  * see /usr/share/package/gnunet/ChangeLog
- Drop pathes: 
  * gnunet-fix_postgresql_include.patch 
  * gnunet-0.10.1_libexec_conversation.patch
- Create system user and groups with systemd-sysusers 
- Build gnurl only with protocols: HTTP HTTPS
- Remove obsolete macros
- Systemd files cleanup
- Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/703531
OBS-URL: https://build.opensuse.org/package/show/filesharing/gnunet?expand=0&rev=4
This commit is contained in:
Alexei Podvalsky 2019-05-16 19:35:25 +00:00 committed by Git OBS Bridge
parent 1a231b48d4
commit 29cad19f0c
14 changed files with 228 additions and 1548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnunet-0.10.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f65cbbf9678d5b009b0a9ab2f2a29f8c956a3a23594fb404b10bbfc947fd9d13
size 5022047

1125
gnunet-0.10.1_gnurl.patch
View File

File diff suppressed because it is too large Load Diff

12
gnunet-0.10.1_libexec_conversation.patch
View File

@ -1,12 +0,0 @@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/conversation/Makefile.am gnunet-0.10.1/src/conversation/Makefile.am
--- gnunet-0.10.1.orig/src/conversation/Makefile.am 2014-04-08 13:45:35.000000000 +0300
+++ gnunet-0.10.1/src/conversation/Makefile.am 2015-05-30 08:58:19.517389961 +0300
@@ -18,7 +18,7 @@
pkgcfgdir= $(prefix)/share/gnunet/config.d/
-libexecdir= $(prefix)/lib/gnunet/libexec/
+libexecdir= $(pkglibdir)/libexec/
plugin_LTLIBRARIES = \
libgnunet_plugin_gnsrecord_conversation.la

3
gnunet-0.11.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7afeb638bd8b5a33c6b8dab24b90c5d7467439adc79794ff33218e9180f8b01b
size 7597015

88
gnunet-fix_postgresql_include.patch
View File

@ -1,88 +0,0 @@
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/configure.ac gnunet-0.10.1/configure.ac
--- gnunet-0.10.1.orig/configure.ac 2014-04-08 10:55:04.000000000 +0300
+++ gnunet-0.10.1/configure.ac 2015-05-26 02:40:20.535635974 +0300
@@ -661,13 +661,13 @@
no)
;;
yes)
- AC_CHECK_HEADERS(postgresql/libpq-fe.h,
+ AC_CHECK_HEADERS(pgsql/libpq-fe.h,
postgres=true)
;;
*)
LDFLAGS="-L$with_postgres/lib $LDFLAGS"
CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
- AC_CHECK_HEADERS(postgresql/libpq-fe.h,
+ AC_CHECK_HEADERS(pgsql/libpq-fe.h,
EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
POSTGRES_LDFLAGS="-L$with_postgres/lib"
POSTGRES_CPPFLAGS="-I$with_postgres/include"
@@ -678,7 +678,7 @@
esac
],
[AC_MSG_RESULT([--with-postgres not specified])
- AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)])
+ AC_CHECK_HEADERS(pgsql/libpq-fe.h, postgres=true)])
AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
AC_SUBST(POSTGRES_CPPFLAGS)
AC_SUBST(POSTGRES_LDFLAGS)
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h gnunet-0.10.1/gnunet_config.h
--- gnunet-0.10.1.orig/gnunet_config.h 2014-04-08 13:49:39.000000000 +0300
+++ gnunet-0.10.1/gnunet_config.h 2015-05-26 02:40:21.175626284 +0300
@@ -315,7 +315,7 @@
/* Have libopus library */
#define HAVE_OPUS 1
-/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+/* Define to 1 if you have the <pgsql/libpq-fe.h> header file. */
#define HAVE_POSTGRESQL_LIBPQ_FE_H 1
/* Have libpulse(audio) library */
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h.in gnunet-0.10.1/gnunet_config.h.in
--- gnunet-0.10.1.orig/gnunet_config.h.in 2014-04-08 13:49:18.000000000 +0300
+++ gnunet-0.10.1/gnunet_config.h.in 2015-05-26 02:40:20.586635202 +0300
@@ -314,7 +314,7 @@
/* Have libopus library */
#undef HAVE_OPUS
-/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+/* Define to 1 if you have the <pgsql/libpq-fe.h> header file. */
#undef HAVE_POSTGRESQL_LIBPQ_FE_H
/* Have libpulse(audio) library */
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c
--- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c 2013-12-20 12:43:38.000000000 +0300
+++ gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c 2015-05-26 02:40:20.570635444 +0300
@@ -27,7 +27,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_postgres_lib.h"
#include "gnunet_datacache_plugin.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
#define LOG(kind,...) GNUNET_log_from (kind, "datacache-postgres", __VA_ARGS__)
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c
--- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c 2013-12-20 12:43:38.000000000 +0300
+++ gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c 2015-05-26 02:40:20.560635596 +0300
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_datastore_plugin.h"
#include "gnunet_postgres_lib.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
/**
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h gnunet-0.10.1/src/include/gnunet_postgres_lib.h
--- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h 2013-10-11 16:38:11.000000000 +0300
+++ gnunet-0.10.1/src/include/gnunet_postgres_lib.h 2015-05-26 02:40:20.539635914 +0300
@@ -26,7 +26,7 @@
#define GNUNET_POSTGRES_LIB_H
#include "gnunet_util_lib.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
#ifdef __cplusplus
extern "C"

1
gnunet-tmpfile.conf
View File

@ -1 +0,0 @@
d /var/run/gnunet/ 0750 gnunet gnunet -

14
gnunet.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed May 15 16:48:43 UTC 2019 - Alexei Podvalsky <avvissu@yandex.by>
- Update to 0.11.4:
* see /usr/share/package/gnunet/ChangeLog
- Drop pathes:
* gnunet-fix_postgresql_include.patch
* gnunet-0.10.1_libexec_conversation.patch
- Create system user and groups with systemd-sysusers
- Build gnurl only with protocols: HTTP HTTPS
- Remove obsolete macros
- Systemd files cleanup
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 24 21:07:06 UTC 2018 - avvissu@yandex.by Fri Aug 24 21:07:06 UTC 2018 - avvissu@yandex.by

100
gnunet.init
View File

@ -1,100 +0,0 @@
#!/bin/sh
#
# openSUSE system startup script for GNUnet
# Copyright (C) 2010 Pascal Bleser <pascal.bleser@opensuse.org>
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
#
# This library is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
# USA.
#
### BEGIN INIT INFO
# Provides: gnunetd
# Required-Start: $syslog $remote_fs $network
# Should-Start: $time ypbind smtp
# Required-Stop: $syslog $remote_fs $network
# Should-Stop: ypbind smtp
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: GNUnet daemon
# Description: Start GNUnet daemon
### END INIT INFO
SN="gnunet"
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
GNUNET_BIN=/usr/bin/gnunet-arm
test -x "$GNUNET_BIN" || { echo "$GNUNET_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
GNUNET_SERVICE_BIN=/usr/bin/gnunet-service-arm
test -x "$GNUNET_BIN" || { echo "$GNUNET_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
GNUNET_LOG_LEVEL="INFO"
. /etc/rc.status
rc_reset
case "$1" in
start)
echo -n "Starting $SN "
/bin/su - gnunet "$GNUNET_BIN" --loglevel="$GNUNET_LOG_LEVEL" --start
rc_status -v
;;
stop)
echo -n "Shutting down $SN "
/bin/su - gnunet "$GNUNET_BIN" --loglevel="$GNUNET_LOG_LEVEL" --end
rc_status -v
;;
try-restart|condrestart)
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
rc_status
;;
restart)
$0 stop
$0 start
rc_status
;;
force-reload)
echo -n "Reload service $SN "
/sbin/killproc -HUP "$GNUNET_SERVICE_BIN"
rc_status -v
;;
reload)
echo -n "Reload service $SN "
/sbin/killproc -HUP "$GNUNET_SERVICE_BIN"
rc_status -v
;;
status)
echo -n "Checking for service $SN "
/sbin/checkproc "$GNUNET_SERVICE_BIN"
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
rc_exit

15
gnunet.service → gnunet.service.in
View File

@ -1,7 +1,8 @@
[Unit] [Unit]
Description=GNUnet Description=GNUnet
Description=Security focused Peer-to-Peer Framework Description=Security focused Peer-to-Peer Framework
Description=Configuration files: /etc/gnunet.conf /usr/share/gnunet/config.d /var/log/gnunet/gnunet.log Description=Configuration files: /etc/gnunet.conf /usr/share/gnunet/config.d
Description=Log files: /var/log/gnunet/gnunet.log
After=syslog.target remote-fs.target network.target After=syslog.target remote-fs.target network.target
Wants=time-sync.target ypbind.service sendmail.service Wants=time-sync.target ypbind.service sendmail.service
Before=time-sync.target ypbind.service sendmail.service Before=time-sync.target ypbind.service sendmail.service
@ -11,17 +12,7 @@ Type=forking
ExecStart=@LIBDIR@/gnunet/libexec/gnunet-service-arm -l /var/log/gnunet/gnunet.log -d ExecStart=@LIBDIR@/gnunet/libexec/gnunet-service-arm -l /var/log/gnunet/gnunet.log -d
TimeoutStartSec=5s TimeoutStartSec=5s
WorkingDirectory=/var/run/gnunet WorkingDirectory=/var/run/gnunet
User=gnunet User=@USER@
#[Service]
#Type=forking
#PermissionsStartOnly=true
#ExecStart=/usr/bin/gnunet-arm -c /etc/gnunet.conf -s
#ExecStop=/usr/bin/gnunet-arm -c /etc/gnunet.conf -e
#TimeoutStartSec=5s
#WorkingDirectory=/var/run/gnunet
#User=gnunet
#Group=gnunet
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

404
gnunet.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gnunet # spec file for package gnunet
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org> # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -13,76 +13,60 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.links2linux.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define gnurl gnurl-7.54.0 %define gnurl gnurl-7.64.1
%define user gnunet %define _USER_ gnunet
%define grpnet gnunet %define _GROUP_ gnunet
%define grpdns gnunetdns %define _OTHERGROUP_ gnunetdns
Name: gnunet Name: gnunet
Version: 0.10.1 Version: 0.11.4
Release: 0 Release: 0
Summary: Security focused Peer-to-Peer Framework Summary: Security focused Peer-to-Peer Framework
License: GPL-3.0 License: GPL-3.0-only
Group: Productivity/Networking/File-Sharing Group: Productivity/Networking/File-Sharing
Url: http://gnunet.org URL: http://gnunet.org
Source0: ftp://ftp.gnu.org/gnu/gnunet/%{name}-%{version}.tar.gz Source0: ftp://ftp.gnu.org/gnu/gnunet/%{name}-%{version}.tar.gz
Source1: https://gnunet.org/sites/default/files/%{gnurl}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/gnunet/%{gnurl}.tar.gz
Source2: gnunet.init Source2: gnunet.service.in
Source3: gnunet.service Source3: gnunet.sysusers.in
Source4: gnunet-tmpfile.conf Source4: gnunet.tmpfile.in
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: gnunet-0.10.1_gnurl.patch
Patch1: gnunet-fix_postgresql_include.patch
# PATCH-FIX-OPENSUSE gnurl.patch avvissu@yandex.ru -- Do not check build dependence (build here)
Patch2: gnunet-0.10.1_gnurl.patch
# PATCH-FIX-UPSTREAM libexec_conversation.patch avvissu@yandex.ru -- Change path to libexecdir
Patch3: gnunet-0.10.1_libexec_conversation.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: glpk-devel >= 4.45 BuildRequires: glpk-devel >= 4.45
BuildRequires: guile-devel >= 2.0
BuildRequires: libadns-devel BuildRequires: libadns-devel
BuildRequires: libesmtp-devel BuildRequires: libesmtp-devel
BuildRequires: libgcrypt-devel >= 1.6 BuildRequires: libgcrypt-devel >= 1.6
BuildRequires: libmysqlclient-devel >= 5.1 BuildRequires: libmysqlclient-devel >= 5.1
BuildRequires: libtool
BuildRequires: libunistring-devel BuildRequires: libunistring-devel
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: postgresql-devel >= 8.3 BuildRequires: postgresql-devel >= 8.3
BuildRequires: pkgconfig(gnutls) >= 3.2.12 BuildRequires: pkgconfig(gnutls) >= 3.2.12
BuildRequires: pkgconfig(guile-2.0)
BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcares)
# Use gnurl instead of curl [bugs.archlinux.org#38820]
#BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libextractor) >= 0.6.1 BuildRequires: pkgconfig(libextractor) >= 0.6.1
BuildRequires: pkgconfig(libidn) >= 1.0 BuildRequires: pkgconfig(libidn2)
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(sqlite3) >= 3.8 BuildRequires: pkgconfig(sqlite3) >= 3.8
# This fork of libcurl, which is only for GNUnet Recommends: gnunet-plugins
# Conflict with curl
#BuildRequires: pkgconfig(libgnurl)
###########Recommends###########
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(openssl) >= 1.0
BuildRequires: pkgconfig(opus) >= 1.0.1
BuildRequires: pkgconfig(ogg) >= 1.3.0
#BuildRequires: gettext
%if 0%{?suse_version} > 1140
%{!?_tmpfilesdir:%global _tmpfilesdir %{_libexecdir}/tmpfiles.d}
BuildRequires: systemd
%{?systemd_requires}
%endif
Provides: gnunetd = %{version} Provides: gnunetd = %{version}
Provides: GNUnet = %{version} Provides: GNUnet = %{version}
Provides: GNUnetd = %{version} Provides: GNUnetd = %{version}
Recommends: gnunet-plugins %{?systemd_requires}
BuildRoot: %{_tmppath}/%{name}-%{version}-build # SECTION
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(ogg) >= 1.3.0
BuildRequires: pkgconfig(openssl) >= 1.0
BuildRequires: pkgconfig(opus) >= 1.0.1
# /SECTION
%description %description
GNUnet is peer-to-peer framework focusing on security. The first and primary GNUnet is peer-to-peer framework focusing on security. The first and primary
@ -96,10 +80,7 @@ Summary: Security focused Peer-to-Peer Framework
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: lib%{name} = %{version} Requires: lib%{name} = %{version}
Requires: libgcrypt-devel >= 1.6 Requires: libgcrypt-devel >= 1.6
Requires: pkgconfig(libpulse) >= 2.0 Requires: pkgconfig(gnutls) >= 3.2.12
Requires: pkgconfig(ogg) >= 1.3.0
Requires: pkgconfig(openssl) >= 1.0
Requires: pkgconfig(opus) >= 1.0.1
%description devel %description devel
GNUnet is peer-to-peer framework focusing on security. The first and primary GNUnet is peer-to-peer framework focusing on security. The first and primary
@ -166,16 +147,46 @@ by a worldwide group of independent free software developers.
%prep %prep
%setup -q -b1 %setup -q -b1
%patch1 -p1 %patch0 -p1
%patch2 -p1
%patch3 -p1 for _file in %{SOURCE2} %{SOURCE3} %{SOURCE4}; do
sed -e 's/@USER@/%{_USER_}/' \
-e 's/@GROUP@/%{_GROUP_}/' \
-e 's/@OTHERGROUP@/%{_OTHERGROUP_}/' \
-e 's|@LIBDIR@|%{_libdir}|' \
< $_file > ${_file##*/}
done
%build %build
# Build gnurl # Build gnurl
pushd %{_builddir}/%{gnurl} pushd %{_builddir}/%{gnurl}
autoreconf -fiv autoreconf -fiv
%configure \ %configure \
--enable-shared=no --without-ssl \
--without-libpsl \
--without-librtmp \
--without-libmetalink \
--disable-ftp \
--disable-file \
--disable-ldap \
--disable-rtsp \
--disable-dict \
--disable-telnet \
--disable-dict \
--disable-telnet \
--disable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smb \
--disable-smtp \
--disable-gopher \
--disable-ntlm-wb \
--enable-hidden-symbols \
--enable-threaded-resolver \
--enable-shared=no \
--with-random=/dev/urandom \
--with-ca-bundle=%{_sysconfdir}/ssl/certs/ca-certificates.crt
make %{?_smp_mflags} make %{?_smp_mflags}
popd popd
# Build gnunet # Build gnunet
@ -183,7 +194,6 @@ export CPPFLAGS="-I%{_builddir}/%{gnurl}/include"
export LIBS="-L%{_builddir}/%{gnurl}/lib/.libs/ -lgnurl" export LIBS="-L%{_builddir}/%{gnurl}/lib/.libs/ -lgnurl"
autoreconf -fiv autoreconf -fiv
%configure \ %configure \
--with-nssdir=%{_libdir} \
--with-gnunetdns=%{grpdns} --with-gnunetdns=%{grpdns}
make %{?_smp_mflags} V=1 \ make %{?_smp_mflags} V=1 \
@ -193,22 +203,19 @@ make %{?_smp_mflags} V=1 \
make DESTDIR=%{buildroot} install \ make DESTDIR=%{buildroot} install \
pkgcfgdir="%{_sysconfdir}/gnunet" pkgcfgdir="%{_sysconfdir}/gnunet"
# install service file # install systemd files
%if 0%{?suse_version} > 1140 install -d %{buildroot}%{_sbindir}
install -d %{buildroot}/%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
install -Dm 644 "%{SOURCE3}" %{buildroot}%{_unitdir}/%{name}.service install -Dm 0644 %{name}.service.in %{buildroot}%{_unitdir}/%{name}.service
sed -i 's|@LIBDIR@|%{_libdir}|' %{buildroot}%{_unitdir}/%{name}.service install -Dm 0644 %{name}.tmpfile.in %{buildroot}%{_tmpfilesdir}/%{name}.conf
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} install -Dm 0644 %{name}.sysusers.in %{buildroot}%{_sysusersdir}/%{name}.conf
install -Dm 644 "%{SOURCE4}" %{buildroot}%{_tmpfilesdir}/%{name}.conf
%else
install -D -m0755 "%{SOURCE2}" "%{buildroot}%{_initddir}/%{name}"
install -d "%{buildroot}%{_sbindir}"
ln -s "../..%{_initddir}/%{name}" "%{buildroot}%{_sbindir}/rc%{name}"
%endif
# use a symbolic link instead of patch # use a symbolic link instead of patch
ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config.d ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config.d
# set a default configuration file
sed -ri '/DEFAULTCONFIG/s/^ +?# +?//' $(grep -rl 'DEFAULTCONFIG\ \?=')
# create a default configuration # create a default configuration
cat<<EOF > "%{buildroot}%{_sysconfdir}/%{name}.conf" cat<<EOF > "%{buildroot}%{_sysconfdir}/%{name}.conf"
[path] [path]
@ -221,11 +228,6 @@ SYSTEM_ONLY = YES
USER_ONLY = NO USER_ONLY = NO
EOF EOF
# link libraries
for f in $(find %{buildroot} -name \*nss_gns*.so.[0-9]); do
s="${f%s*}"; l="$(echo $f|sed 's|%{buildroot}||')"
ln -s $l ${s}so; done
# get rid of static libraries # get rid of static libraries
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
@ -234,210 +236,192 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%find_lang %{name} %find_lang %{name}
%pre %pre
if ! %{_bindir}/id %{user} &>/dev/null; then
%{_sbindir}/groupadd -r %{grpnet}
%{_sbindir}/useradd -r -g %{user} -c "GNUnet daemon" -d \
%{_localstatedir}/lib/%{name} %{grpnet}; fi
if test ! -d %{_localstatedir}/log/%{name}; then
install -d -m0750 -o%{user} -g%{grpnet} "%{_localstatedir}/lib/%{name}"
install -d -m0750 -o%{user} -g%{grpnet} "%{_localstatedir}/log/%{name}"; fi
if ! %{_bindir}/getent group %{grpdns} &>/dev/null; then
echo -n "Create a special secured group %{grpdns}:"
%{_sbindir}/groupadd -r %{grpdns}
echo " done"; fi
%if 0%{?suse_version} > 1140
%service_add_pre %{name}.service %service_add_pre %{name}.service
%endif
%post %post
%if 0%{?suse_version} > 1140
%service_add_post %{name}.service %service_add_post %{name}.service
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%else %sysusers_create %{_sysusersdir}/%{name}.conf
%fillup_and_insserv -f %{name} %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%endif
%preun %preun
%if 0%{?suse_version} > 1140
%service_del_preun %{name}.service %service_del_preun %{name}.service
%else
%stop_on_removal %{name}
%endif
%postun %postun
%if 0%{?suse_version} > 1140
%service_del_postun %{name}.service %service_del_postun %{name}.service
%else %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%restart_on_update %{name}
%insserv_cleanup
%endif
if [ $1 -eq 0 ]; then
userdel %{user} || logger "User \"%{user}\" could not be deleted."
rm -rf %{_localstatedir}/lib/%{name}
rm -rf %{_localstatedir}/log/%{name}; fi
%post -n lib%{name} -p /sbin/ldconfig %post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %license COPYING
%doc AUTHORS ChangeLog COPYING README %doc AUTHORS ChangeLog README
%{_bindir}/%{name}-arm %{_bindir}/gnunet-arm
%{_bindir}/%{name}-ats %{_bindir}/gnunet-ats
%{_bindir}/%{name}-auto-share %{_bindir}/gnunet-auto-share
%{_bindir}/%{name}-bcd %{_bindir}/gnunet-bcd
%{_bindir}/%{name}-config %{_bindir}/gnunet-bugreport
%{_bindir}/%{name}-conversation %{_bindir}/gnunet-cadet
%{_bindir}/%{name}-conversation-test %{_bindir}/gnunet-config
%{_bindir}/%{name}-core %{_bindir}/gnunet-consensus-profiler
%{_bindir}/%{name}-datastore %{_bindir}/gnunet-conversation
%{_bindir}/%{name}-directory %{_bindir}/gnunet-conversation-test
%{_bindir}/%{name}-download %{_bindir}/gnunet-core
%{_bindir}/%{name}-download-manager.scm %{_bindir}/gnunet-datastore
%{_bindir}/%{name}-ecc %{_bindir}/gnunet-dht-get
%{_bindir}/%{name}-fs %{_bindir}/gnunet-dht-monitor
%{_bindir}/%{name}-gns %{_bindir}/gnunet-dht-put
%{_bindir}/%{name}-gns-import.sh %{_bindir}/gnunet-directory
%{_bindir}/%{name}-gns-proxy-setup-ca %{_bindir}/gnunet-download
%{_bindir}/%{name}-identity %{_bindir}/gnunet-ecc
%{_bindir}/%{name}-mesh %{_bindir}/gnunet-fs
%{_bindir}/%{name}-namecache %{_bindir}/gnunet-gns
%{_bindir}/%{name}-namestore %{_bindir}/gnunet-gns-proxy-setup-ca
%{_bindir}/%{name}-nat-server %{_bindir}/gnunet-identity
%{_bindir}/%{name}-nse %{_bindir}/gnunet-namecache
%{_bindir}/%{name}-peerinfo %{_bindir}/gnunet-namestore
%{_bindir}/%{name}-publish %{_bindir}/gnunet-nat
%{_bindir}/%{name}-qr %{_bindir}/gnunet-nat-auto
%{_bindir}/%{name}-resolver %{_bindir}/gnunet-nat-server
%{_bindir}/%{name}-revocation %{_bindir}/gnunet-nse
%{_bindir}/%{name}-scrypt %{_bindir}/gnunet-peerinfo
%{_bindir}/%{name}-search %{_bindir}/gnunet-peerstore
%{_bindir}/%{name}-set-ibf-profiler %{_bindir}/gnunet-publish
%{_bindir}/%{name}-set-profiler %{_bindir}/gnunet-resolver
%{_bindir}/%{name}-statistics %{_bindir}/gnunet-revocation
%{_bindir}/%{name}-template %{_bindir}/gnunet-scalarproduct
%{_bindir}/%{name}-testbed-profiler %{_bindir}/gnunet-scrypt
%{_bindir}/%{name}-testing %{_bindir}/gnunet-search
%{_bindir}/%{name}-transport %{_bindir}/gnunet-secretsharing-profiler
%{_bindir}/%{name}-transport-certificate-creation %{_bindir}/gnunet-set-profiler
%{_bindir}/%{name}-unindex %{_bindir}/gnunet-statistics
%{_bindir}/%{name}-uri %{_bindir}/gnunet-testbed-profiler
%{_bindir}/%{name}-vpn %{_bindir}/gnunet-testing
%{_bindir}/gnunet-transport
%{_bindir}/gnunet-transport-certificate-creation
%{_bindir}/gnunet-unindex
%{_bindir}/gnunet-uri
%{_bindir}/gnunet-vpn
%{_bindir}/gnunet-zoneimport
%{_datadir}/%{name} %{_datadir}/%{name}
# libexec dir # libexec dir
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/libexec %dir %{_libdir}/%{name}/libexec
%{_libdir}/%{name}/libexec/%{name}-daemon-exit %{_libdir}/gnunet/libexec/gnunet-communicator-unix
%{_libdir}/%{name}/libexec/%{name}-daemon-hostlist %{_libdir}/gnunet/libexec/gnunet-daemon-exit
%{_libdir}/%{name}/libexec/%{name}-daemon-latency-logger %{_libdir}/gnunet/libexec/gnunet-daemon-latency-logger
%{_libdir}/%{name}/libexec/%{name}-daemon-pt %{_libdir}/gnunet/libexec/gnunet-daemon-pt
%{_libdir}/%{name}/libexec/%{name}-daemon-regexprofiler %{_libdir}/gnunet/libexec/gnunet-daemon-regexprofiler
%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-blacklist %{_libdir}/gnunet/libexec/gnunet-daemon-testbed-blacklist
%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-underlay %{_libdir}/gnunet/libexec/gnunet-daemon-testbed-underlay
%{_libdir}/%{name}/libexec/%{name}-daemon-topology %{_libdir}/gnunet/libexec/gnunet-daemon-topology
%{_libdir}/%{name}/libexec/%{name}-dns2gns %{_libdir}/gnunet/libexec/gnunet-dns2gns
%{_libdir}/%{name}/libexec/%{name}-gns-proxy %{_libdir}/gnunet/libexec/gnunet-helper-audio-playback
%{_libdir}/%{name}/libexec/%{name}-helper-audio-playback %{_libdir}/gnunet/libexec/gnunet-helper-audio-record
%{_libdir}/%{name}/libexec/%{name}-helper-audio-record %{_libdir}/gnunet/libexec/gnunet-helper-dns
%{_libdir}/%{name}/libexec/%{name}-helper-dns %{_libdir}/gnunet/libexec/gnunet-helper-exit
%{_libdir}/%{name}/libexec/%{name}-helper-exit %{_libdir}/gnunet/libexec/gnunet-helper-fs-publish
%{_libdir}/%{name}/libexec/%{name}-helper-fs-publish %{_libdir}/gnunet/libexec/gnunet-helper-nat-client
%{_libdir}/%{name}/libexec/%{name}-helper-nat-client %{_libdir}/gnunet/libexec/gnunet-helper-nat-server
%{_libdir}/%{name}/libexec/%{name}-helper-nat-server %{_libdir}/gnunet/libexec/gnunet-helper-testbed
%{_libdir}/%{name}/libexec/%{name}-helper-testbed %{_libdir}/gnunet/libexec/gnunet-helper-vpn
%{_libdir}/%{name}/libexec/%{name}-helper-transport-wlan %{_libdir}/gnunet/libexec/gnunet-namestore-fcfsd
%{_libdir}/%{name}/libexec/%{name}-helper-transport-wlan-dummy %{_libdir}/gnunet/libexec/gnunet-service-arm
%{_libdir}/%{name}/libexec/%{name}-helper-vpn %{_libdir}/gnunet/libexec/gnunet-service-ats
%{_libdir}/%{name}/libexec/%{name}-namestore-fcfsd %{_libdir}/gnunet/libexec/gnunet-service-ats-new
%{_libdir}/%{name}/libexec/%{name}-service-arm %{_libdir}/gnunet/libexec/gnunet-service-cadet
%{_libdir}/%{name}/libexec/%{name}-service-ats %{_libdir}/gnunet/libexec/gnunet-service-consensus
%{_libdir}/%{name}/libexec/%{name}-service-core %{_libdir}/gnunet/libexec/gnunet-service-conversation
%{_libdir}/%{name}/libexec/%{name}-service-conversation %{_libdir}/gnunet/libexec/gnunet-service-core
%{_libdir}/%{name}/libexec/%{name}-service-datastore %{_libdir}/gnunet/libexec/gnunet-service-datastore
%{_libdir}/%{name}/libexec/%{name}-service-dht %{_libdir}/gnunet/libexec/gnunet-service-dht
%{_libdir}/%{name}/libexec/%{name}-service-dht-xvine %{_libdir}/gnunet/libexec/gnunet-service-dns
%{_libdir}/%{name}/libexec/%{name}-service-dns %{_libdir}/gnunet/libexec/gnunet-service-evil-consensus
%{_libdir}/%{name}/libexec/%{name}-service-fs %{_libdir}/gnunet/libexec/gnunet-service-fs
%{_libdir}/%{name}/libexec/%{name}-service-gns %{_libdir}/gnunet/libexec/gnunet-service-gns
%{_libdir}/%{name}/libexec/%{name}-service-identity %{_libdir}/gnunet/libexec/gnunet-service-identity
%{_libdir}/%{name}/libexec/%{name}-service-mesh %{_libdir}/gnunet/libexec/gnunet-service-namecache
%{_libdir}/%{name}/libexec/%{name}-service-namecache %{_libdir}/gnunet/libexec/gnunet-service-namestore
%{_libdir}/%{name}/libexec/%{name}-service-namestore %{_libdir}/gnunet/libexec/gnunet-service-nat
%{_libdir}/%{name}/libexec/%{name}-service-nse %{_libdir}/gnunet/libexec/gnunet-service-nat-auto
%{_libdir}/%{name}/libexec/%{name}-service-peerinfo %{_libdir}/gnunet/libexec/gnunet-service-nse
%{_libdir}/%{name}/libexec/%{name}-service-regex %{_libdir}/gnunet/libexec/gnunet-service-peerinfo
%{_libdir}/%{name}/libexec/%{name}-service-resolver %{_libdir}/gnunet/libexec/gnunet-service-peerstore
%{_libdir}/%{name}/libexec/%{name}-service-revocation %{_libdir}/gnunet/libexec/gnunet-service-regex
%{_libdir}/%{name}/libexec/%{name}-service-set %{_libdir}/gnunet/libexec/gnunet-service-resolver
%{_libdir}/%{name}/libexec/%{name}-service-statistics %{_libdir}/gnunet/libexec/gnunet-service-revocation
%{_libdir}/%{name}/libexec/%{name}-service-template %{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-alice
%{_libdir}/%{name}/libexec/%{name}-service-testbed %{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-bob
%{_libdir}/%{name}/libexec/%{name}-service-testbed-logger %{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-ecc-alice
%{_libdir}/%{name}/libexec/%{name}-service-transport %{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-ecc-bob
%{_libdir}/%{name}/libexec/%{name}-service-vpn %{_libdir}/gnunet/libexec/gnunet-service-secretsharing
%{_libdir}/gnunet/libexec/gnunet-service-set
%{_libdir}/gnunet/libexec/gnunet-service-statistics
%{_libdir}/gnunet/libexec/gnunet-service-testbed
%{_libdir}/gnunet/libexec/gnunet-service-testbed-logger
%{_libdir}/gnunet/libexec/gnunet-service-transport
%{_libdir}/gnunet/libexec/gnunet-service-vpn
%{_libdir}/gnunet/libexec/gnunet-service-zonemaster
%{_libdir}/gnunet/libexec/gnunet-service-zonemaster-monitor
%{_libdir}/gnunet/libexec/gnunet-timeout
%{_libdir}/gnunet/libgnunet_plugin_namestore_heap.so
%{_libdir}/gnunet/libgnunet_plugin_peerstore_sqlite.so
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config %{_sysconfdir}/%{name}/*.conf %config %{_sysconfdir}/%{name}/*.conf
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_mandir}/man1/%{name}*.1* %{_mandir}/man?/%{name}*.?%{ext_info}
%{_mandir}/man5/%{name}*.5*
%{_infodir}/gnunet*%{ext_info}
%{_infodir}/images/
%if 0%{?suse_version} > 1140
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sysusersdir}/%{name}.conf
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%else %if 0%{?suse_version} < 1500
%{_sysconfdir}/init.d/%{name} %dir %{_sysusersdir}
%{_sbindir}/rc%{name}
%endif %endif
%files -n lib%{name} %files -n lib%{name}
%defattr(-,root,root)
%{_libdir}/lib%{name}*.so.* %{_libdir}/lib%{name}*.so.*
%{_libdir}/libnss_gns*.so.*
%files plugins %files plugins
%defattr(-,root,root) %dir %{_libdir}/%{name}/nss
%{_libdir}/%{name}/nss/libnss_gns.so??
%{_libdir}/%{name}/nss/libnss_gns?.so??
%{_libdir}/%{name}/lib%{name}_plugin_ats*.so %{_libdir}/%{name}/lib%{name}_plugin_ats*.so
%{_libdir}/%{name}/lib%{name}_plugin_block*.so %{_libdir}/%{name}/lib%{name}_plugin_block*.so
%{_libdir}/%{name}/lib%{name}_plugin_datacache_heap.so %{_libdir}/%{name}/lib%{name}_plugin_datacache_heap.so
%{_libdir}/%{name}/lib%{name}_plugin_datacache_template.so
%{_libdir}/%{name}/lib%{name}_plugin_datastore_heap.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_heap.so
%{_libdir}/%{name}/lib%{name}_plugin_datastore_template.so
%{_libdir}/%{name}/lib%{name}_plugin_gnsrecord*.so %{_libdir}/%{name}/lib%{name}_plugin_gnsrecord*.so
%{_libdir}/%{name}/lib%{name}_plugin_test.so %{_libdir}/%{name}/lib%{name}_plugin_test.so
%{_libdir}/%{name}/lib%{name}_plugin_transport*.so %{_libdir}/%{name}/lib%{name}_plugin_transport*.so
%files mysql %files mysql
%defattr(-,root,root)
%{_libdir}/%{name}/lib%{name}_plugin_datastore_mysql.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_mysql.so
%files postgresql %files postgresql
%defattr(-,root,root)
%{_libdir}/%{name}/lib%{name}_plugin_datacache_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_datacache_postgres.so
%{_libdir}/%{name}/lib%{name}_plugin_datastore_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_postgres.so
%{_libdir}/%{name}/lib%{name}_plugin_namecache_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_namecache_postgres.so
%{_libdir}/%{name}/lib%{name}_plugin_namestore_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_namestore_postgres.so
%files sqlite %files sqlite
%defattr(-,root,root)
%{_libdir}/%{name}/lib%{name}_plugin_datacache_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_datacache_sqlite.so
%{_libdir}/%{name}/lib%{name}_plugin_datastore_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_sqlite.so
%{_libdir}/%{name}/lib%{name}_plugin_namecache_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_namecache_sqlite.so
%{_libdir}/%{name}/lib%{name}_plugin_namestore_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_namestore_sqlite.so
%files devel %files devel
%defattr(-,root,root)
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}*.pc %{_libdir}/pkgconfig/%{name}*.pc
%{_libdir}/lib%{name}*.so %{_libdir}/lib%{name}*.so
%{_libdir}/libnss_gns*.so
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root)
%changelog %changelog

2
gnunet.sysusers.in Normal file
View File

@ -0,0 +1,2 @@
u @USER@ - - /var/run/gnunet
m @USER@ @OTHERGROUP@

3
gnunet.tmpfile.in Normal file
View File

@ -0,0 +1,3 @@
d /var/lib/gnunet 0750 @USER@ @GROUP@ -
d /var/log/gnunet 0750 @USER@ @GROUP@ -
d /var/run/gnunet 0750 @USER@ @GROUP@ -

3
gnurl-7.54.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:407d2844a72f386cdf404cb4ab79792cd68546e544a11270349676dd982183f3
size 1887426

3
gnurl-7.64.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ea67d505e2576f00d8a09485e6c04396af75388c17d77087a140f05e0ca2a96
size 3643690