pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnunet: First steps towards fixing the uid+gid feedback.
Module Name: pkgsrc-wip
Committed By: ng0 <ng0%n0.is@localhost>
Pushed By: ng0
Date: Wed Mar 6 15:57:09 2019 +0000
Changeset: e97a33fd7934f8ccc7e8587306620f9784bffa81
Modified Files:
gnunet/Makefile
gnunet/PLIST
gnunet/files/gnunet.in
gnunet/options.mk
Log Message:
gnunet: First steps towards fixing the uid+gid feedback.
* Add check for Linux and include bluez when OPSYS is Linux
* Remove dependencies only needed for experimental, and ...
* ... add them to new option, experimental. Add the PLIST files.
* gnunet rc.d script: shot in the dark bugfixing.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e97a33fd7934f8ccc7e8587306620f9784bffa81
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnunet/Makefile | 16 +++++++--------
gnunet/PLIST | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
gnunet/files/gnunet.in | 12 +++++------
gnunet/options.mk | 15 +++++++++++++-
4 files changed, 83 insertions(+), 15 deletions(-)
diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index f668e61058..73c026ee7b 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -3,6 +3,7 @@
DISTNAME= gnunet-0.11.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=gnunet/}
+PKGREVISION= 1
MAINTAINER= ng0%n0.is@localhost
HOMEPAGE= https://gnunet.org/
@@ -26,7 +27,7 @@ INFO_FILES= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-extractor=${BUILDLINK_PREFIX.libextractor}
-CONFIGURE_ARGS+= --with-gnunetdns=${GNUNETDNS_GROUP}
+CONFIGURE_ARGS+= --with-gnunetdns=gnunetdns
GNUNET_USER= gnunet
GNUNET_GROUP= gnunet
@@ -54,8 +55,6 @@ CONF_FILES+= ${FILESDIR}/gnunet.conf \
${PKG_SYSCONFDIR}/gnunet.conf
FILES_SUBST+= PKG_HOME=${PKG_HOME.${GNUNET_USER}}
-FILES_SUBST+= GNUNET_USER=${GNUNET_USER} GNUNET_GROUP=${GNUNET_GROUP}
-FILES_SUBST+= GNUNETDNS_GROUP=${GNUNETDNS_GROUP}
SUBST_CLASSES+= sysconfdir
SUBST_STAGE.sysconfdir= post-build
@@ -82,13 +81,17 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn ${SETUID_ROOT_PER
post-install:
cd ${WRKSRC} && ${INSTALL_SCRIPT} ${WRKSRC}/src/util/gnunet-qr.py ${DESTDIR}${PREFIX}/bin
- # XXX: Will be fixed in 0.11.1 or rewritten in C.
+ # XXX: Will be fixed in 0.11.1, rewritten in C.
# Technically this is no executable script anymore, as we call
# call it with the shell script. The warning thrown is harmless.
# https://gnunet.org/en/#gsoc2019
${CHMOD} -x ${DESTDIR}${PREFIX}/bin/gnunet-qr.py
-.include "../../audio/libopus/buildlink3.mk"
+.if ${OPSYS} == "Linux"
+# Do we need more for bluez?
+.include "../../wip/bluez-libs/buildlink3.mk"
+.endif
+
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
@@ -97,9 +100,6 @@ post-install:
.include "../../devel/libextractor/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
-.include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/libunistring/buildlink3.mk"
diff --git a/gnunet/PLIST b/gnunet/PLIST
index 6a79b0b585..ac72ce1625 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -469,3 +469,58 @@ ${PLIST.doc}man/man1/gnunet-uri.1
${PLIST.doc}man/man1/gnunet-vpn.1
${PLIST.doc}man/man1/gnunet-zoneimport.1
${PLIST.doc}man/man5/gnunet.conf.5
+${PLIST.experimental}bin/gnunet-auction-create
+${PLIST.experimental}bin/gnunet-auction-info
+${PLIST.experimental}bin/gnunet-auction-join
+${PLIST.experimental}bin/gnunet-conversation
+${PLIST.experimental}bin/gnunet-conversation-test
+${PLIST.experimental}bin/gnunet-rps
+${PLIST.experimental}lib/gnunet/libexec/gnunet-helper-audio-playback
+${PLIST.experimental}lib/gnunet/libexec/gnunet-helper-audio-record
+${PLIST.experimental}lib/gnunet/libexec/gnunet-service-auction
+${PLIST.experimental}lib/gnunet/libexec/gnunet-service-conversation
+${PLIST.experimental}lib/gnunet/libexec/gnunet-service-rps
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.so
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.a
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.so
+${PLIST.experimental}lib/libgnunetconversation.a
+${PLIST.experimental}lib/libgnunetconversation.la
+${PLIST.experimental}lib/libgnunetconversation.so
+${PLIST.experimental}lib/libgnunetconversation.so.0
+${PLIST.experimental}lib/libgnunetconversation.so.0.0.0
+${PLIST.experimental}lib/libgnunetmicrophone.a
+${PLIST.experimental}lib/libgnunetmicrophone.la
+${PLIST.experimental}lib/libgnunetmicrophone.so
+${PLIST.experimental}lib/libgnunetmicrophone.so.0
+${PLIST.experimental}lib/libgnunetmicrophone.so.0.0.0
+${PLIST.experimental}lib/libgnunetrps.a
+${PLIST.experimental}lib/libgnunetrps.la
+${PLIST.experimental}lib/libgnunetrps.so
+${PLIST.experimental}lib/libgnunetrps.so.0
+${PLIST.experimental}lib/libgnunetrps.so.0.0.0
+${PLIST.experimental}lib/libgnunetspeaker.a
+${PLIST.experimental}lib/libgnunetspeaker.la
+${PLIST.experimental}lib/libgnunetspeaker.so
+${PLIST.experimental}lib/libgnunetspeaker.so.0
+${PLIST.experimental}lib/libgnunetspeaker.so.0.0.0
+${PLIST.experimental}share/gnunet/config.d/auction.conf
+${PLIST.experimental}share/gnunet/config.d/conversation.conf
+${PLIST.experimental}share/gnunet/config.d/rps.conf
diff --git a/gnunet/files/gnunet.in b/gnunet/files/gnunet.in
index 59fd11a26a..3668e6681b 100755
--- a/gnunet/files/gnunet.in
+++ b/gnunet/files/gnunet.in
@@ -19,10 +19,10 @@ command="@PREFIX@/bin/gnunet-arm"
command_args="-c @PKG_SYSCONFDIR@/gnunet.conf"
required_files="@PKG_SYSCONFDIR@/gnunet.conf"
pidfile="@PKG_HOME@/${name}.pid"
-: ${gnunet_user:=@GNUNET_USER@}
-: ${gnunet_group:=@GNUNET_GROUP@}
+: ${gnunet_user:=gnunet}
+: ${gnunet_group:=gnunet}
: ${gnunet_home:=@PKG_HOME@}
-: ${gnunetdns_group:=@GNUNETDNS_GROUP@}
+: ${gnunetdns_group:=gnunetdns}
start_cmd="gnunet_start"
start_precmd="gnunet_precmd"
@@ -30,17 +30,17 @@ stop_cmd="gnunet_stop"
restart_cmd="gnunet_stop ; gnunet_start"
restart_precmd="gnunet_precmd"
-gnunet_env="HOME=${gnunet_home} USER=${gnunet_user}"
+gnunet_env="HOME=${gnunet_home} USER=${gnunet_user} TMP=/tmp"
gnunet_precmd()
{
if [ -f ${gnunet_home}/.local/share/gnunet/gnunet.conf ]; then
@CHMOD@ 0600 @PKG_HOME@/.local/share/gnunet/gnunet.conf
- @CHOWN@ @GNUNET_USER@:@GNUNET_GROUP@ @PKG_HOME@/.local/share/gnunet/gnunet.conf
+ @CHOWN@ gnunet:gnunet @PKG_HOME@/.local/share/gnunet/gnunet.conf
fi
if [ ! -d ${gnunet_home}/.cache/gnunet ]; then
@MKDIR@ -p ${gnunet_home}/.cache/gnunet
- @CHOWN@ @GNUNET_USER@:@GNUNET_GROUP@ ${gnunet_home}/.cache/gnunet
+ @CHOWN@ gnunet:gnunet ${gnunet_home}/.cache/gnunet
fi
if [ ! -f ${required_files} ]; then
warn "${required_files} does not exist."
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 285a3dd966..564cd3f553 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -1,9 +1,10 @@
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.gnunet
-PKG_SUPPORTED_OPTIONS= doc mdoc idn mysql pgsql tests
+PKG_SUPPORTED_OPTIONS= doc mdoc idn mysql pgsql tests experimental
PKG_SUGGESTED_OPTIONS= doc
PLIST_VARS+= doc
+PLIST_VARS+= experimental
# openssl is currently required by:
# src/transport/gnunet-transport-certificate-creation
# src/gns/gnunet-gns-proxy-setup-ca
@@ -54,3 +55,15 @@ CONFIGURE_ARGS+= --with-libidn=${BUILDLINK_PREFIX.libidn}
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
.endif
+
+# Experimental
+.if !empty(PKG_OPTIONS:Mexperimental)
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../math/glpk/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-experimental
+PLIST.experimental= yes
+.endif
Home |
Main Index |
Thread Index |
Old Index