[csw-devel] SF.net SVN: gar:[4395] csw/mgar/pkg/bind2nsd/trunk

[idogan23 at users.sourceforge.net]

Revision: 4395
          http://gar.svn.sourceforge.net/gar/?rev=4395&view=rev
Author:   idogan23
Date:     2009-04-18 09:59:21 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
bind2nsd: added patches to fix file locations

Modified Paths:
--------------
    csw/mgar/pkg/bind2nsd/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/bind2nsd/trunk/files/Config.py.diff
    csw/mgar/pkg/bind2nsd/trunk/files/setup.py.diff

Modified: csw/mgar/pkg/bind2nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind2nsd/trunk/Makefile	2009-04-18 03:23:56 UTC (rev 4394)
+++ csw/mgar/pkg/bind2nsd/trunk/Makefile	2009-04-18 09:59:21 UTC (rev 4395)
@@ -12,7 +12,12 @@
 
 MASTER_SITES = http://bind2nsd.sourceforge.net/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES  += setup.py.diff
+DISTFILES  += Config.py.diff
 
+PATCHFILES = setup.py.diff
+PATCHFILES += Config.py.diff
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 

Added: csw/mgar/pkg/bind2nsd/trunk/files/Config.py.diff
===================================================================
--- csw/mgar/pkg/bind2nsd/trunk/files/Config.py.diff	                        (rev 0)
+++ csw/mgar/pkg/bind2nsd/trunk/files/Config.py.diff	2009-04-18 09:59:21 UTC (rev 4395)
@@ -0,0 +1,62 @@
+diff --speed-large-files --minimal -Nru bind2nsd-0.7.2.orig/bind2nsd/Config.py bind2nsd-0.7.2/bind2nsd/Config.py
+--- bind2nsd-0.7.2.orig/bind2nsd/Config.py	2008-06-27 02:22:28.000000000 +0200
++++ bind2nsd-0.7.2/bind2nsd/Config.py	2009-04-18 11:50:52.347203690 +0200
+@@ -53,7 +53,7 @@
+       self.fname = ''
+       self.config = \
+          { 'acl_list'            : 'acl_list',
+-	   'bind2nsd'            : '/usr/bin/bind2nsd',
++	   'bind2nsd'            : '/opt/csw/bin/bind2nsd',
+ 	   'database'            : '"nsd.db"',
+ 	   'DEBUG'               : False,
+ 	   'DEMO-MODE'           : False,
+@@ -70,28 +70,28 @@
+ 	   'masters_for_slaves'	 : '127.0.0.1',
+ 	   'named-checkconf'     : '/usr/sbin/named-checkconf',
+ 	   'named-checkzone'     : '/usr/sbin/named-checkzone',
+-	   'named_root'          : '/etc/bind9',
++	   'named_root'          : '/etc',
+            'named_conf'          : 'named.conf',
+ 	   'named_watchlist'     : '/etc/named.conf',
+-	   'nsd-checkconf'       : '/usr/sbin/nsd-checkconf',
++	   'nsd-checkconf'       : '/opt/csw/sbin/nsd-checkconf',
+ 	   'nsd_conf'            : 'nsd.conf',
+-           'nsd_conf_dir'        : '/etc/nsd/',
++           'nsd_conf_dir'        : '/etc/opt/csw/nsd/',
+ 	   'nsd_preamble'        : 'nsd.conf-preamble',
+-	   'password_file'       : '/etc/bind2nsd/passwd',
+-           'pidfile'             : '"nsd.pid"',
++	   'password_file'       : '/etc/opt/csw/bind2nsd/passwd',
++           'pidfile'             : '"/var/run/nsd.pid"',
+ 	   'port'                : '53',
+-	   'rebuild_cmd'         : '/etc/init.d/nsdc rebuild',
+-	   'restart_cmd'         : '/etc/init.d/nsdc restart',
++	   'rebuild_cmd'         : '/opt/csw/sbin/nsdc rebuild',
++	   'restart_cmd'         : '/opt/csw/sbin/nsdc restart',
+ 	   'sleep_time'          : '5',
+-	   'start_cmd'           : '/etc/init.d/nsdc start',
++	   'start_cmd'           : '/opt/csw/sbin/nsdc start',
+ 	   'statistics'          : '3600',
+-	   'stop_cmd'            : '/etc/init.d/nsdc stop',
++	   'stop_cmd'            : '/opt/csw/sbin/nsdc stop',
+ 	   'syspw'               : 'iforgot',
+ 	   'tmpdir'              : '/tmp/secure64/',   # must have trailing '/'
+ 	   'username'            : 'nsd',
+            'version'             : '0.7.2',
+ 	   'xfrd-reload-timeout' : '10',
+-	   'zonec_cmd'           : '/etc/init.d/zonec',
++	   'zonec_cmd'           : '/opt/csw/sbin/zonec',
+          }
+  
+       self.init()
+@@ -110,8 +110,8 @@
+ 	 if os.path.exists(fname):
+ 	    self.fname = fname
+ 	 else:
+-	    if os.path.exists('/etc/bind2nsd/bind2nsd.conf'):
+-	       self.fname = '/etc/bind2nsd/bind2nsd.conf'
++	    if os.path.exists('/etc/opt/csw/bind2nsd/bind2nsd.conf'):
++	       self.fname = '/etc/opt/csw/bind2nsd/bind2nsd.conf'
+ 	    else:
+ 	       print '? hrm.  no config file found -- did you _mean_ that?'
+ 

Added: csw/mgar/pkg/bind2nsd/trunk/files/setup.py.diff
===================================================================
--- csw/mgar/pkg/bind2nsd/trunk/files/setup.py.diff	                        (rev 0)
+++ csw/mgar/pkg/bind2nsd/trunk/files/setup.py.diff	2009-04-18 09:59:21 UTC (rev 4395)
@@ -0,0 +1,14 @@
+diff --speed-large-files --minimal -Nru bind2nsd-0.7.2.orig/setup.py bind2nsd-0.7.2/setup.py
+--- bind2nsd-0.7.2.orig/setup.py	2008-06-27 02:22:28.000000000 +0200
++++ bind2nsd-0.7.2/setup.py	2009-04-18 11:22:14.530664816 +0200
+@@ -37,8 +37,8 @@
+       packages = [ 'bind2nsd' ],
+       scripts = [ 'scripts/bind2nsd', 'scripts/s64-sync', 'scripts/nsd-sync',
+                   'scripts/s64-mkpw', 'scripts/bind2nsd-slave', ],
+-      data_files = [ ('/usr/share/doc/bind2nsd', ['./README', './TODO']),
+-                     ('/etc/bind2nsd', ['etc/bind2nsd.conf']),
++      data_files = [ ('/opt/csw/share/doc/bind2nsd', ['./README', './TODO']),
++                     ('/etc/opt/csw/bind2nsd', ['etc/bind2nsd.conf']),
+ 		   ]
+      )
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.