[hipl-commit] [trunk] Rev 4435: Properly resolve hipdnsproxy installation.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 28 Apr 2010 20:50:47 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 28/04/2010 at 20:50:47
Revision: 4435
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Properly resolve hipdnsproxy installation.
  
  Drop the wrapper that invokes the daemon and just install the daemon into
  a system path directly. Dependent Python modules are also installed into
  system directories, where they belong.
  
  This includes renaming the daemon to the name of the wrapper, thus
  removing one layer of indirection.

Modified:
  D  tools/hipdnsproxy.in
  R  tools/dnsproxy/ => tools/hipdnsproxy/
  R  tools/dnsproxy/dnsproxy.py => tools/hipdnsproxy/hipdnsproxy
  M  Makefile.am
  M  configure.ac
  M  doc/HOWTO.xml
  M  test/packaging/create-deb.sh
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec
  M  test/packaging/rh-init.d-dnsproxy
  M  tools/hipdnsproxy/hipdnsproxy

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-28 17:09:59 +0000
+++ Makefile.am 2010-04-28 17:49:19 +0000
@@ -407,31 +407,30 @@
 # These two scripts are generated in the end to get the python paths correct.
 # Currently, I don't know a better way to deal with the python code. -miika
 dist_sbin_SCRIPTS = tools/hipdnskeyparse/hipdnskeyparse \
-                    tools/hipdnsproxy    \
+                    tools/hipdnsproxy/hipdnsproxy       \
                     tools/nsupdate.pl
 
-dns_PYTHON = tools/dnsproxy/DNS/__init__.py      \
-             tools/dnsproxy/DNS/Base.py          \
-             tools/dnsproxy/DNS/Class.py         \
-             tools/dnsproxy/DNS/lazy.py          \
-             tools/dnsproxy/DNS/Lib.py           \
-             tools/dnsproxy/DNS/Opcode.py        \
-             tools/dnsproxy/DNS/Serialization.py \
-             tools/dnsproxy/DNS/Status.py        \
-             tools/dnsproxy/DNS/Type.py          \
-             tools/dnsproxy/DNS/win32dns.py
+dns_PYTHON = tools/hipdnsproxy/DNS/__init__.py      \
+             tools/hipdnsproxy/DNS/Base.py          \
+             tools/hipdnsproxy/DNS/Class.py         \
+             tools/hipdnsproxy/DNS/lazy.py          \
+             tools/hipdnsproxy/DNS/Lib.py           \
+             tools/hipdnsproxy/DNS/Opcode.py        \
+             tools/hipdnsproxy/DNS/Serialization.py \
+             tools/hipdnsproxy/DNS/Status.py        \
+             tools/hipdnsproxy/DNS/Type.py          \
+             tools/hipdnsproxy/DNS/win32dns.py
 
-dnsdir = $(pyexecdir)/dnsproxy/DNS
+dnsdir = $(pyexecdir)/hipdnsproxy/DNS
 
 tools_hipdnskeyparse_PYTHON = tools/hipdnskeyparse/myasn.py
 
-tools_hipdnsproxy_PYTHON = tools/dnsproxy/dnsproxy.py          \
-                           tools/dnsproxy/hosts.py             \
-                           tools/dnsproxy/pyip6.py             \
-                           tools/dnsproxy/util.py
+tools_hipdnsproxy_PYTHON = tools/hipdnsproxy/hosts.py       \
+                           tools/hipdnsproxy/pyip6.py       \
+                           tools/hipdnsproxy/util.py
 
 tools_hipdnskeyparsedir = $(pyexecdir)
-tools_hipdnsproxydir    = $(pyexecdir)/dnsproxy
+tools_hipdnsproxydir    = $(pyexecdir)
 endif # HAVE_PYTHON
 
 

=== modified file 'configure.ac'
--- configure.ac        2010-04-28 17:09:59 +0000
+++ configure.ac        2010-04-28 17:49:19 +0000
@@ -327,6 +327,6 @@
 fi
 
 
-AC_CONFIG_FILES([ Makefile doc/Doxyfile tools/hipdnsproxy ])
+AC_CONFIG_FILES([ Makefile doc/Doxyfile ])
 
 AC_OUTPUT

=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml       2010-04-28 17:09:59 +0000
+++ doc/HOWTO.xml       2010-04-28 17:49:19 +0000
@@ -2577,7 +2577,7 @@
 
     <para>
       The DNS proxy is located in
-      the tools directory (dnsproxy.py) and has to be started with
+      the tools directory (hipdnsproxy) and has to be started with
       root priviledges. After you start the script, it will rewrite
       /etc/resolv.conf to redirect all DNS look ups to itself so that
       it can return HITs to applications when applicable.

=== modified file 'test/packaging/create-deb.sh'
--- test/packaging/create-deb.sh        2010-04-28 17:09:59 +0000
+++ test/packaging/create-deb.sh        2010-04-28 17:49:19 +0000
@@ -364,18 +364,18 @@
     inst -d $PKGDIR/$PYEXECDIR/hipdnskeyparse
     inst -d $PKGDIR/$PYEXECDIR/DNS
 
-    inst tools/dnsproxy.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
-    inst tools/pyip6.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
-    inst tools/hosts.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
-    inst tools/util.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
+    inst tools/hipdnsproxy/pyip6.py* $PKGDIR/$PYEXECDIR
+    inst tools/hipdnsproxy/hosts.py* $PKGDIR/$PYEXECDIR
+    inst tools/hipdnsproxy/util.py*  $PKGDIR/$PYEXECDIR
 
     inst tools/hipdnskeyparse/myasn.py* $PKGDIR/$PYEXECDIR
-    inst tools/DNS/*py* $PKGDIR/$PYEXECDIR/DNS
+    inst tools/hipdnsproxy/DNS/*py* $PKGDIR/$PYEXECDIR/DNS
 
     inst tools/hipdnsproxy $PKGDIR/usr/sbin/hipdnsproxy
     inst tools/hipdnskeyparse $PKGDIR/usr/sbin/hipdnskeyparse
 
     inst tools/hipdnskeyparse/hipdnskeyparse $PKGDIR/usr/sbin
+    inst tools/hipdnsproxy/hipdnsproxy $PKGDIR/usr/sbin
     inst tools/nsupdate.pl $PKGDIR/usr/sbin
 
     echo "** Copying init.d script to $PKGDIR"

=== modified file 'test/packaging/hipl-deb.spec'
--- test/packaging/hipl-deb.spec        2010-04-28 17:09:59 +0000
+++ test/packaging/hipl-deb.spec        2010-04-28 17:49:19 +0000
@@ -142,15 +142,14 @@
 install -m 755 test/packaging/debian-init.d-dnsproxy 
%{buildroot}/etc/init.d/hipdnsproxy
 install -m 644 doc/HOWTO.txt %{buildroot}/doc
 install -d %{buildroot}/usr/lib/python2.6/dist-packages/DNS
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/DNS tools/DNS/*py*
-install -d %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/dnsproxy.py*
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/pyip6.py*
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/hosts.py*
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/util.py*
+install -t %{buildroot}/usr/lib/python2.6/dist-packages/DNS 
tools/hipdnsproxy/DNS/*py*
+install -t %{buildroot}/usr/lib/python2.6/dist-packages 
tools/hipdnsproxy/pyip6.py*
+install -t %{buildroot}/usr/lib/python2.6/dist-packages 
tools/hipdnsproxy/hosts.py*
+install -t %{buildroot}/usr/lib/python2.6/dist-packages 
tools/hipdnsproxy/util.py*
 install -t %{buildroot}/usr/lib/python2.6/dist-packages 
tools/hipdnskeyparse/myasn.py*
+install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/hipdnsproxy/hipdnsproxy
 install -m 755 tools/hipdnskeyparse/hipdnskeyparse 
%{buildroot}/usr/sbin/hipdnskeyparse
-install -m 755 tools/hipdnsproxy %{buildroot}/usr/sbin/hipdnsproxy
+install -m 755 tools/hipdnsproxy/hipdnsproxy %{buildroot}/usr/sbin/hipdnsproxy
 install -m 755 agent/hipagent %{buildroot}/usr/sbin/hipagent
 
 %post lib

=== modified file 'test/packaging/hipl-rpm.spec'
--- test/packaging/hipl-rpm.spec        2010-04-28 17:09:59 +0000
+++ test/packaging/hipl-rpm.spec        2010-04-28 17:49:19 +0000
@@ -130,16 +130,15 @@
 install -m 755 test/packaging/rh-init.d-dnsproxy 
%{buildroot}/etc/rc.d/init.d/hipdnsproxy
 install -m 644 doc/HOWTO.txt %{buildroot}/doc
 install -d %{buildroot}%{python_sitelib}/DNS
-install -t %{buildroot}%{python_sitelib}/DNS tools/DNS/*py*
-install -d %{buildroot}%{python_sitelib}/hipdnsproxy
-install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/dnsproxy.py*
-install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/pyip6.py*
-install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/hosts.py*
-install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/util.py*
+install -t %{buildroot}%{python_sitelib}/DNS tools/hipdnsproxy/DNS/*py*
+install -d %{buildroot}%{python_sitelib}
+install -t %{buildroot}%{python_sitelib} tools/hipdnsproxy/pyip6.py*
+install -t %{buildroot}%{python_sitelib} tools/hipdnsproxy/hosts.py*
+install -t %{buildroot}%{python_sitelib} tools/hipdnsproxy/util.py*
 install -t %{buildroot}%{python_sitelib} tools/hipdnskeyparse/myasn.py*
 # required in CentOS release 5.2
 install -m 755 tools/hipdnskeyparse/hipdnskeyparse 
%{buildroot}%{prefix}/sbin/hipdnskeyparse
-install -m 755 tools/hipdnsproxy %{buildroot}%{prefix}/sbin/hipdnsproxy
+install -m 755 tools/hipdnsproxy/hipdnsproxy 
%{buildroot}%{prefix}/sbin/hipdnsproxy
 
 %post lib
 /sbin/ldconfig

=== modified file 'test/packaging/rh-init.d-dnsproxy'
--- test/packaging/rh-init.d-dnsproxy   2010-03-05 02:21:54 +0000
+++ test/packaging/rh-init.d-dnsproxy   2010-04-28 17:49:19 +0000
@@ -4,8 +4,8 @@
 #
 # description: HIP DNS proxy
 #
-# processname: dnsproxy.py
-# pidfile: /var/run/dnsproxy.pid
+# processname: hipdnsproxy
+# pidfile: /var/run/hipdnsproxy.pid
 # chkconfig: 2345 22 78
 
 # source function library

=== renamed directory 'tools/dnsproxy' => 'tools/hipdnsproxy'

Other related posts:

  • » [hipl-commit] [trunk] Rev 4435: Properly resolve hipdnsproxy installation. - Diego Biurrun