diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dns/Makefile.am | 17 | ||||
-rwxr-xr-x | src/dns/install-dns-helper.sh | 12 | ||||
-rw-r--r-- | src/exit/Makefile.am | 13 | ||||
-rwxr-xr-x | src/exit/install-exit-helper.sh | 5 | ||||
-rw-r--r-- | src/nat/Makefile.am | 18 | ||||
-rwxr-xr-x | src/nat/install-nat-helper.sh | 5 | ||||
-rw-r--r-- | src/transport/Makefile.am | 20 | ||||
-rwxr-xr-x | src/transport/install-bluetooth-helper.sh | 5 | ||||
-rwxr-xr-x | src/transport/install-wlan-helper.sh | 5 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 13 | ||||
-rwxr-xr-x | src/vpn/install-vpn-helper.sh | 5 |
11 files changed, 0 insertions, 118 deletions
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 1aea7f09a..d2598bd8a 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -14,25 +14,8 @@ plugindir = $(libdir)/gnunet | |||
14 | pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | dns.conf | 15 | dns.conf |
16 | 16 | ||
17 | if HAVE_SUDO | ||
18 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
19 | else | ||
20 | if HAVE_DOAS_BINARY | ||
21 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
22 | endif | ||
23 | endif | ||
24 | |||
25 | if LINUX | 17 | if LINUX |
26 | HIJACKBIN = gnunet-helper-dns | 18 | HIJACKBIN = gnunet-helper-dns |
27 | install-exec-hook: | ||
28 | chown root $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
29 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
30 | chmod 4750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
31 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
32 | chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
33 | chmod 2750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
34 | else | ||
35 | install-exec-hook: | ||
36 | endif | 19 | endif |
37 | 20 | ||
38 | lib_LTLIBRARIES = \ | 21 | lib_LTLIBRARIES = \ |
diff --git a/src/dns/install-dns-helper.sh b/src/dns/install-dns-helper.sh deleted file mode 100755 index 14d5caa70..000000000 --- a/src/dns/install-dns-helper.sh +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - gnunetdns group | ||
4 | # $3 - sudo binary (optional) | ||
5 | $3 chown root $1/gnunet-helper-dns | ||
6 | $3 chgrp $2 $1/gnunet-helper-dns | ||
7 | $3 chmod 4750 $1/gnunet-helper-dns | ||
8 | # In case user 'gnunet' does not exist, at least set the group | ||
9 | $3 chgrp $2 $1/gnunet-service-dns | ||
10 | # Usually we want both... | ||
11 | $3 chown gnunet:$2 $1/gnunet-service-dns | ||
12 | $3 chmod 2750 $1/gnunet-service-dns | ||
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index c45354256..c0323d0d6 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am | |||
@@ -14,21 +14,8 @@ plugindir = $(libdir)/gnunet | |||
14 | dist_pkgcfg_DATA = \ | 14 | dist_pkgcfg_DATA = \ |
15 | exit.conf | 15 | exit.conf |
16 | 16 | ||
17 | if HAVE_SUDO | ||
18 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
19 | else | ||
20 | if HAVE_DOAS_BINARY | ||
21 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
22 | endif | ||
23 | endif | ||
24 | |||
25 | if LINUX | 17 | if LINUX |
26 | EXITBIN = gnunet-helper-exit | 18 | EXITBIN = gnunet-helper-exit |
27 | install-exec-hook: | ||
28 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-exit | ||
29 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-exit | ||
30 | else | ||
31 | install-exec-hook: | ||
32 | endif | 19 | endif |
33 | 20 | ||
34 | 21 | ||
diff --git a/src/exit/install-exit-helper.sh b/src/exit/install-exit-helper.sh deleted file mode 100755 index d9ae14106..000000000 --- a/src/exit/install-exit-helper.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - sudo binary (optional) | ||
4 | $2 chown root:root $1/gnunet-helper-exit || true | ||
5 | $2 chmod u+s $1/gnunet-helper-exit || true | ||
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 2c04741da..67f5e4dbc 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -8,33 +8,15 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
8 | pkgcfg_DATA = \ | 8 | pkgcfg_DATA = \ |
9 | nat.conf | 9 | nat.conf |
10 | 10 | ||
11 | if HAVE_SUDO | ||
12 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
13 | else | ||
14 | if HAVE_DOAS_BINARY | ||
15 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
16 | endif | ||
17 | endif | ||
18 | |||
19 | if LINUX | 11 | if LINUX |
20 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client | 12 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
21 | NATSERVER = gnunet-helper-nat-server.c | 13 | NATSERVER = gnunet-helper-nat-server.c |
22 | NATCLIENT = gnunet-helper-nat-client.c | 14 | NATCLIENT = gnunet-helper-nat-client.c |
23 | install-exec-hook: | ||
24 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
25 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
26 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
27 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
28 | else | 15 | else |
29 | if XFREEBSD | 16 | if XFREEBSD |
30 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client | 17 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
31 | NATSERVER = gnunet-helper-nat-server.c | 18 | NATSERVER = gnunet-helper-nat-server.c |
32 | NATCLIENT = gnunet-helper-nat-client.c | 19 | NATCLIENT = gnunet-helper-nat-client.c |
33 | install-exec-hook: | ||
34 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
35 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
36 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server | ||
37 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client | ||
38 | endif | 20 | endif |
39 | else | 21 | else |
40 | install-exec-hook: | 22 | install-exec-hook: |
diff --git a/src/nat/install-nat-helper.sh b/src/nat/install-nat-helper.sh deleted file mode 100755 index d5ee91fa3..000000000 --- a/src/nat/install-nat-helper.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - sudo binary (optional) | ||
4 | $2 chown root:root $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true | ||
5 | $2 chmod u+s $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true | ||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index b690fa345..8221b7847 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -93,26 +93,6 @@ if LINUX | |||
93 | test_quota_compliance_wlan_asymmetric | 93 | test_quota_compliance_wlan_asymmetric |
94 | endif | 94 | endif |
95 | 95 | ||
96 | if HAVE_SUDO | ||
97 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
98 | else | ||
99 | if HAVE_DOAS_BINARY | ||
100 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
101 | endif | ||
102 | endif | ||
103 | |||
104 | if LINUX | ||
105 | install-exec-hook: | ||
106 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan | ||
107 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-wlan | ||
108 | if HAVE_LIBBLUETOOTH | ||
109 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth | ||
110 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-transport-bluetooth | ||
111 | endif | ||
112 | else | ||
113 | install-exec-hook: | ||
114 | endif | ||
115 | |||
116 | if LINUX | 96 | if LINUX |
117 | if HAVE_LIBBLUETOOTH | 97 | if HAVE_LIBBLUETOOTH |
118 | BT_BIN = gnunet-helper-transport-bluetooth | 98 | BT_BIN = gnunet-helper-transport-bluetooth |
diff --git a/src/transport/install-bluetooth-helper.sh b/src/transport/install-bluetooth-helper.sh deleted file mode 100755 index 5c40250fa..000000000 --- a/src/transport/install-bluetooth-helper.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - sudo binary (optional) | ||
4 | $2 chown root:root $1/gnunet-helper-transport-bluetooth || true | ||
5 | $2 chmod u+s $1/gnunet-helper-transport-bluetooth || true | ||
diff --git a/src/transport/install-wlan-helper.sh b/src/transport/install-wlan-helper.sh deleted file mode 100755 index 0fa9c9806..000000000 --- a/src/transport/install-wlan-helper.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - sudo binary (optional) | ||
4 | $2 chown root:root $1/gnunet-helper-transport-wlan || true | ||
5 | $2 chmod u+s $1/gnunet-helper-transport-wlan || true | ||
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 9992fa5ed..407d8ba92 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -14,21 +14,8 @@ plugindir = $(libdir)/gnunet | |||
14 | pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | vpn.conf | 15 | vpn.conf |
16 | 16 | ||
17 | if HAVE_SUDO | ||
18 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
19 | else | ||
20 | if HAVE_DOAS_BINARY | ||
21 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
22 | endif | ||
23 | endif | ||
24 | |||
25 | if LINUX | 17 | if LINUX |
26 | VPNBIN = gnunet-helper-vpn | 18 | VPNBIN = gnunet-helper-vpn |
27 | install-exec-hook: | ||
28 | chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-vpn | ||
29 | chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-vpn | ||
30 | else | ||
31 | install-exec-hook: | ||
32 | endif | 19 | endif |
33 | 20 | ||
34 | 21 | ||
diff --git a/src/vpn/install-vpn-helper.sh b/src/vpn/install-vpn-helper.sh deleted file mode 100755 index 086dabb67..000000000 --- a/src/vpn/install-vpn-helper.sh +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - sudo binary (optional) | ||
4 | $2 chown root:root $1/gnunet-helper-vpn || true | ||
5 | $2 chmod u+s $1/gnunet-helper-vpn || true | ||