first test commit to make sudo + sh scripts obsolete.

install(1) is too unportable to handle this job so
we take the content of the scripts.

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index acf9660f7ff9d204403219780ab784ecc101bf9f..8082cbab5f77ba8a30153ef9e69e0597ec896525 100644 (file)
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -25,7 +25,12 @@ endif
 if LINUX
 HIJACKBIN = gnunet-helper-dns
 install-exec-hook:
-       $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_OR_DOAS_BINARY) || true
+       chown root $(DESTDIR)$(libexecdir)/gnunt-helper-dns
+       chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns
+       chmod 4750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns
+       chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns
+       chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunt-helper-dns
+       chmod 2750 $(DESTDIR)$(libexecdir)/gnunt-helper-dns
 else
 install-exec-hook:
 endif

diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index bca0f1d9fb875b8483d7f5a862c5573cb3db9216..c45354256abe7bcfcd2a1a7bc8ff3005d6546f5c 100644 (file)
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -25,7 +25,8 @@ endif
 if LINUX
 EXITBIN = gnunet-helper-exit
 install-exec-hook:
-       $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit
 else
 install-exec-hook:
 endif

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index d88dd6db40d4e9a88c26a0acceccbeddcf27c508..2c04741da1c00637d0ae35818966e1374e79ee22 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -21,14 +21,20 @@ if LINUX
   NATSERVER = gnunet-helper-nat-server.c
   NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-       $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
 else
 if XFREEBSD
   NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
   NATSERVER = gnunet-helper-nat-server.c
   NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-       $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
 endif
 else
 install-exec-hook:
@@ -61,7 +67,7 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libgnunetnatnew.la 
+  libgnunetnatnew.la
 
 libgnunetnatnew_la_SOURCES = \
   nat_api.c \

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 178ecc737970f804f24c3ce23b7a96a7f9b1fd91..b690fa3459086db2484276fefe30ef624714579f 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -103,9 +103,11 @@ endif
 
 if LINUX
 install-exec-hook:
-       $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan
 if HAVE_LIBBLUETOOTH
-       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth
 endif
 else
 install-exec-hook:

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 4d7ca087e02078f6df5df0d15285b16175553fe2..9992fa5ed8c2f90da8887f6e8a8aafdc42dc8e5c 100644 (file)
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -25,7 +25,8 @@ endif
 if LINUX
 VPNBIN = gnunet-helper-vpn
 install-exec-hook:
-       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_OR_DOAS_BINARY) || true
+       chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn
+       chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn
 else
 install-exec-hook:
 endif