[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17932 - in gnunet: . src/nat src/transport src/vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17932 - in gnunet: . src/nat src/transport src/vpn |
Date: |
Wed, 2 Nov 2011 16:37:42 +0100 |
Author: grothoff
Date: 2011-11-02 16:37:42 +0100 (Wed, 02 Nov 2011)
New Revision: 17932
Modified:
gnunet/README
gnunet/configure.ac
gnunet/src/nat/Makefile.am
gnunet/src/transport/Makefile.am
gnunet/src/vpn/Makefile.am
Log:
fixing #1820
Modified: gnunet/README
===================================================================
--- gnunet/README 2011-11-02 15:11:43 UTC (rev 17931)
+++ gnunet/README 2011-11-02 15:37:42 UTC (rev 17932)
@@ -84,6 +84,13 @@
"/var/lib/gnunet"; you may also want to use "/etc/gnunet.conf" for the
location of the configuration file in this case.
+You can avoid running 'make install' as root if you run configure
+with the "--with-sudo=yes" option and have extensive sudo rights
+(can run chmod +s and chown via sudo). If you run 'make install'
+as a normal user without sudo rights (or the configure option),
+certain binaries that require additional priviledges will not be
+installed properly (and NAT traversal, WLAN and VPN will not work).
+
Note that additional, per-user configuration files
(~/.gnunet/gnunet.conf) need to be created by each user (for example,
by running gnunet-setup). Note that gnunet-setup is a separate
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-11-02 15:11:43 UTC (rev 17931)
+++ gnunet/configure.ac 2011-11-02 15:37:42 UTC (rev 17932)
@@ -676,6 +676,27 @@
AC_SUBST(EXT_LIB_PATH)
+# test for sudo
+AC_MSG_CHECKING(for sudo)
+AC_ARG_WITH(sudo,
+ [ --with-sudo=PATH path to sudo binary (or just yes)],
+ [AC_MSG_RESULT("$with_sudo")
+ case $with_sudo in
+ no)
+ SUDO_BINARY=
+ ;;
+ yes)
+ SUDO_BINARY=sudo
+ ;;
+ *)
+ SUDO_BINARY=$with_sudo
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([no])])
+AC_SUBST(SUDO_BINARY)
+
+
# should 'make check' run tests?
AC_MSG_CHECKING(whether to run tests)
AC_ARG_ENABLE([testruns],
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2011-11-02 15:11:43 UTC (rev 17931)
+++ gnunet/src/nat/Makefile.am 2011-11-02 15:37:42 UTC (rev 17932)
@@ -18,8 +18,8 @@
NATSERVER = gnunet-helper-nat-server.c
NATCLIENT = gnunet-helper-nat-client.c
install-exec-hook:
- chown root:root $(bindir)/gnunet-helper-nat-server
$(bindir)/gnunet-helper-nat-client $(nattest) || true
- chmod u+s $(bindir)/gnunet-helper-nat-server
$(bindir)/gnunet-helper-nat-client $(nattest) || true
+ $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-nat-server
$(bindir)/gnunet-helper-nat-client $(nattest) || true
+ $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-nat-server
$(bindir)/gnunet-helper-nat-client $(nattest) || true
else
install-exec-hook:
endif
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2011-11-02 15:11:43 UTC (rev 17931)
+++ gnunet/src/transport/Makefile.am 2011-11-02 15:37:42 UTC (rev 17932)
@@ -40,8 +40,8 @@
if LINUX
install-exec-hook:
- chown root:root $(bindir)/gnunet-transport-wlan-helper || true
- chmod u+s $(bindir)/gnunet-transport-wlan-helper || true
+ $(SUDO_BINARY) chown root:root $(bindir)/gnunet-transport-wlan-helper
|| true
+ $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-transport-wlan-helper || true
else
install-exec-hook:
endif
Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am 2011-11-02 15:11:43 UTC (rev 17931)
+++ gnunet/src/vpn/Makefile.am 2011-11-02 15:37:42 UTC (rev 17932)
@@ -12,10 +12,10 @@
VPNBIN = gnunet-helper-vpn
HIJACKBIN = gnunet-helper-hijack-dns
install-exec-hook:
- chown root:root $(bindir)/gnunet-helper-vpn || true
- chmod u+s $(bindir)/gnunet-helper-vpn || true
- chown root:root $(bindir)/gnunet-helper-hijack-dns || true
- chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
+ $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
+ $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
+ $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-hijack-dns ||
true
+ $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
else
install-exec-hook:
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17932 - in gnunet: . src/nat src/transport src/vpn,
gnunet <=