[GNUnet-SVN] r22969 - in gnunet/src: dns exit gns/nss nat transport vpn

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22969 - in gnunet/src: dns exit gns/nss nat transport vpn

From:	gnunet
Subject:	[GNUnet-SVN] r22969 - in gnunet/src: dns exit gns/nss nat transport vpn
Date:	Mon, 30 Jul 2012 12:59:26 +0200
Author: LRN
Date: 2012-07-30 12:59:26 +0200 (Mon, 30 Jul 2012)
New Revision: 22969

Added:
   gnunet/src/dns/install-dns-helper.sh
   gnunet/src/exit/install-exit-helper.sh
   gnunet/src/gns/nss/install-nss-plugin.sh
   gnunet/src/nat/install-nat-helper.sh
   gnunet/src/transport/install-wlan-helper.sh
   gnunet/src/vpn/install-vpn-helper.sh
Modified:
   gnunet/src/dns/Makefile.am
   gnunet/src/exit/Makefile.am
   gnunet/src/gns/nss/Makefile.am
   gnunet/src/nat/Makefile.am
   gnunet/src/transport/Makefile.am
   gnunet/src/vpn/Makefile.am
Log:
Do not run install commands from makefiles directly

Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am  2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/dns/Makefile.am  2012-07-30 10:59:26 UTC (rev 22969)
@@ -18,11 +18,7 @@
 if LINUX
 HIJACKBIN = gnunet-helper-dns
 install-exec-hook:
-       $(SUDO_BINARY) chown root $(bindir)/gnunet-helper-dns || true
-       $(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-helper-dns || 
true
-       $(SUDO_BINARY) chmod 4750 $(bindir)/gnunet-helper-dns || true
-       $(SUDO_BINARY) chown gnunet:$(GNUNETDNS_GROUP) 
$(bindir)/gnunet-service-dns || true
-       $(SUDO_BINARY) chmod 2750 $(bindir)/gnunet-service-dns || true
+       $(top_srcdir)/src/dns/install-dns-helper.sh $(SUDO_BINARY) $(bindir) 
$(GNUNETDNS_GROUP) || true
 else
 install-exec-hook:
 endif

Added: gnunet/src/dns/install-dns-helper.sh
===================================================================
--- gnunet/src/dns/install-dns-helper.sh                                (rev 0)
+++ gnunet/src/dns/install-dns-helper.sh        2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,9 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - bindir
+# $3 - gnunetdns group
+$1 chown root $2/gnunet-helper-dns || true
+$1 chgrp $3 $2/gnunet-helper-dns || true
+$1 chmod 4750 $2/gnunet-helper-dns || true
+$1 chown gnunet:$3 $2/gnunet-service-dns || true
+$1 chmod 2750 $2/gnunet-service-dns || true

Modified: gnunet/src/exit/Makefile.am
===================================================================
--- gnunet/src/exit/Makefile.am 2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/exit/Makefile.am 2012-07-30 10:59:26 UTC (rev 22969)
@@ -18,8 +18,7 @@
 if LINUX
 EXITBIN = gnunet-helper-exit
 install-exec-hook:
-       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-exit || true
-       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-exit || true
+       $(top_srcdir)/src/exit/install-exit-helper.sh $(SUDO_BINARY) $(bindir) 
|| true
 else
 install-exec-hook:
 endif

Added: gnunet/src/exit/install-exit-helper.sh
===================================================================
--- gnunet/src/exit/install-exit-helper.sh                              (rev 0)
+++ gnunet/src/exit/install-exit-helper.sh      2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,5 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - bindir
+$1 chown root:root $2/gnunet-helper-exit || true
+$1 chmod u+s $2/gnunet-helper-exit || true

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/gns/nss/Makefile.am      2012-07-30 10:59:26 UTC (rev 22969)
@@ -51,9 +51,15 @@
 libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1
 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 
+if !MINGW
 install-data-hook:
-       $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(nssdir)
-       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.la $(nssdir)/libnss_gns4.la 
$(nssdir)/libnss_gns6.la 
+       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SUDO_BINARY) $(SHELL) 
$(top_builddir) $(nssdir)
 
 uninstall-hook:
-       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.so.2 
$(nssdir)/libnss_gns4.so.2 $(nssdir)/libnss_gns6.so.2 
+       $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SUDO_BINARY) 
$(nssdir)
+else
+install-data-hook:
+
+uninstall-hook:
+
+endif

Added: gnunet/src/gns/nss/install-nss-plugin.sh
===================================================================
--- gnunet/src/gns/nss/install-nss-plugin.sh                            (rev 0)
+++ gnunet/src/gns/nss/install-nss-plugin.sh    2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,7 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - shell
+# $3 - top_builddir
+# $4 - nssdir
+$1 $2 $3/libtool --finish $4
+$1 rm -f $4/libnss_gns.la $4/libnss_gns4.la $4/libnss_gns6.la 

Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am  2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/nat/Makefile.am  2012-07-30 10:59:26 UTC (rev 22969)
@@ -23,8 +23,7 @@
 NATSERVER = gnunet-helper-nat-server.c
 NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-       $(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
+       $(top_srcdir)/src/nat/install-nat-helper.sh $(SUDO_BINARY) $(bindir) 
$(nattest) || true
 else
 install-exec-hook:
 endif

Added: gnunet/src/nat/install-nat-helper.sh
===================================================================
--- gnunet/src/nat/install-nat-helper.sh                                (rev 0)
+++ gnunet/src/nat/install-nat-helper.sh        2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,6 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - bindir
+# $3 - nattest
+$1 chown root:root $2/gnunet-helper-nat-server $2/gnunet-helper-nat-client $3 
|| true
+$1 chmod u+s $2/gnunet-helper-nat-server $2/gnunet-helper-nat-client $3 || true

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/transport/Makefile.am    2012-07-30 10:59:26 UTC (rev 22969)
@@ -47,8 +47,7 @@
 
 if LINUX
 install-exec-hook:
-       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wlan 
|| true
-       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || true
+       $(top_srcdir)/src/transport/install-wlan-helper.sh $(SUDO_BINARY) 
$(bindir) || true
 else
 install-exec-hook:
 endif

Added: gnunet/src/transport/install-wlan-helper.sh
===================================================================
--- gnunet/src/transport/install-wlan-helper.sh                         (rev 0)
+++ gnunet/src/transport/install-wlan-helper.sh 2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,5 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - bindir
+$1 chown root:root $2/gnunet-helper-transport-wlan || true
+$1 chmod u+s $2/gnunet-helper-transport-wlan || true

Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am  2012-07-30 10:53:04 UTC (rev 22968)
+++ gnunet/src/vpn/Makefile.am  2012-07-30 10:59:26 UTC (rev 22969)
@@ -18,8 +18,7 @@
 if LINUX
 VPNBIN = gnunet-helper-vpn
 install-exec-hook:
-       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
-       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
+       $(top_srcdir)/src/nat/install-vpn-helper.sh $(SUDO_BINARY) $(bindir) || 
true
 else
 install-exec-hook:
 endif

Added: gnunet/src/vpn/install-vpn-helper.sh
===================================================================
--- gnunet/src/vpn/install-vpn-helper.sh                                (rev 0)
+++ gnunet/src/vpn/install-vpn-helper.sh        2012-07-30 10:59:26 UTC (rev 
22969)
@@ -0,0 +1,5 @@
+#!/bin/bash
+# $1 - sudo binary
+# $2 - bindir
+$1 chown root:root $2/gnunet-helper-vpn || true
+$1 chmod u+s $2/gnunet-helper-vpn || true
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r22969 - in gnunet/src: dns exit gns/nss nat transport vpn, gnunet <=
Prev by Date: [GNUnet-SVN] r22968 - Extractor/src/main
Next by Date: [GNUnet-SVN] r22970 - monkey/branches/MonkeyBacktracking/monkey/src/pathologist
Previous by thread: [GNUnet-SVN] r22968 - Extractor/src/main
Next by thread: [GNUnet-SVN] r22970 - monkey/branches/MonkeyBacktracking/monkey/src/pathologist
Index(es):
- Date
- Thread