system-config-bind: use /etc/bind/, not /etc/

3 files changed, 73 insertions, 4 deletions

diff --git a/app-admin/system-config-bind/Manifest b/app-admin/system-config-bind/Manifest
index 19b68fe..54599b8 100644
--- a/app-admin/system-config-bind/Manifest
+++ b/app-admin/system-config-bind/Manifest
@@ -1,8 +1,12 @@
+AUX 4.0.0-use-etc-bind-directory.patch 4701 RMD160 abdf8419d0f4d726000e8f96fe817bb377bf6a95 SHA1 62fb86d4de6cb31132c632e2a22a63cd6704013f SHA256 6ff920082ab61036bebb12067248e797179ca363ac863d264b0eff52138f51cd
+MD5 57db2ab8e20ac9c14ea8fc414fc99e0f files/4.0.0-use-etc-bind-directory.patch 4701
+RMD160 abdf8419d0f4d726000e8f96fe817bb377bf6a95 files/4.0.0-use-etc-bind-directory.patch 4701
+SHA256 6ff920082ab61036bebb12067248e797179ca363ac863d264b0eff52138f51cd files/4.0.0-use-etc-bind-directory.patch 4701
 DIST system-config-bind-4.0.0-44.fc6.src.rpm 9832659 RMD160 bd109d46674e2a7b41fdbfd6509677482a1da8b1 SHA1 e19997d710dc31b64c56e3fe4c4e8ad510c97ff3 SHA256 9641464e749c707b65e3c7a0dff6daa2d76fea2018c2e462a6ee31d08a8b9410
-EBUILD system-config-bind-4.0.0.ebuild 930 RMD160 98885addac081c6c8b068319884eaf5fe1096a42 SHA1 ae3c18a0a8d5ba4e0d07374caa9d0932e93cfe07 SHA256 e3821086662f4d42290cca691a093d425eb6174170559ade55f65abcc33f5709
-MD5 bb21355000b52fdda8d6099e9d2abee5 system-config-bind-4.0.0.ebuild 930
-RMD160 98885addac081c6c8b068319884eaf5fe1096a42 system-config-bind-4.0.0.ebuild 930
-SHA256 e3821086662f4d42290cca691a093d425eb6174170559ade55f65abcc33f5709 system-config-bind-4.0.0.ebuild 930
+EBUILD system-config-bind-4.0.0.ebuild 1271 RMD160 e885d52cd6df92b960f82d0e6f80cdf4957f8d5a SHA1 adf48163021292227d616937c187ee3c9a38af7a SHA256 6cb36023c463e94e4faea4682aa5bacdb5e3f6e54a6917cc8ddaab633f7ce367
+MD5 536253b78299e41f8f6e43af4836a201 system-config-bind-4.0.0.ebuild 1271
+RMD160 e885d52cd6df92b960f82d0e6f80cdf4957f8d5a system-config-bind-4.0.0.ebuild 1271
+SHA256 6cb36023c463e94e4faea4682aa5bacdb5e3f6e54a6917cc8ddaab633f7ce367 system-config-bind-4.0.0.ebuild 1271
 MD5 c9d0f20697102936b5830893ec4e1393 files/digest-system-config-bind-4.0.0 301
 RMD160 29eb75ad04e3c27b9986ea0c4ccb3e64fdce876d files/digest-system-config-bind-4.0.0 301
 SHA256 c4b6cfdeb418c25f0eb9140e6d195b35c2310cf0eab6efb5a75c7126aa06774c files/digest-system-config-bind-4.0.0 301
diff --git a/app-admin/system-config-bind/files/4.0.0-use-etc-bind-directory.patch b/app-admin/system-config-bind/files/4.0.0-use-etc-bind-directory.patch
new file mode 100644
index 0000000..1b56352
--- /dev/null
+++ b/app-admin/system-config-bind/files/4.0.0-use-etc-bind-directory.patch
@@ -0,0 +1,52 @@
+? patch
+Index: system-config-bind-4.0.0/BIND.py
+===================================================================
+RCS file: /usr/local/CVS/system-config-bind/devel/system-config-bind-4.0.0/BIND.py,v
+retrieving revision 1.4
+diff -u -b -B -r1.4 BIND.py
+--- system-config-bind-4.0.0/BIND.py	7 Jun 2006 18:26:02 -0000	1.4
++++ system-config-bind-4.0.0/BIND.py	3 Sep 2006 20:44:42 -0000
+@@ -51,12 +51,12 @@
+         r=commands.getstatusoutput('. /etc/sysconfig/named; echo "$ROOTDIR"')
+         if (r[0] == 0):
+             chroot=r[1]        
+-        if os.access(chroot + '/etc/named.conf',os.F_OK) != 1:
++        if os.access(chroot + '/etc/bind/named.conf',os.F_OK) != 1:
+             if os.access(SCB + '/profiles/default/named.conf',os.F_OK)==1:
+                 debug( 'INIT CONFIG')
+                 self.gui.warning(self.gui.gui,_('Initializing to Defaults:'),_('No BIND configuration was found.\nInstalling the initial default configuration.'))
+                 debug( 'INITIALIZING')
+-                r=commands.getstatusoutput('set -e; /bin/mkdir -p '+chroot+'/{etc,var/{named/{slave,data},tmp,run/named},dev}; if [ ! -e '+chroot+'/dev/random ]; then /bin/mknod '+chroot+'/dev/random c 1 8; fi; if [ ! -e '+chroot+'/dev/null ]; then /bin/mknod '+chroot+'/dev/null c 1 3; fi; if [ ! -e '+chroot+'/dev/zero ]; then /bin/mknod '+chroot+'/dev/zero c 1 5; fi; /bin/cp -fp $SCB/profiles/default/named.conf '+chroot+'/etc; /bin/cp -fp $SCB/profiles/default/named/* '+chroot+'/var/named; /bin/chown -R root:named '+chroot+'/var/named; /bin/chown named:named '+chroot+'/var/{named/{slave,data},run/named};  /bin/chown root:root '+chroot+'/etc/named.conf; echo -ne "key rndckey {\n\talgorithm hmac-md5;\n\tsecret \""`/usr/sbin/dns-keygen`"\";\n};\n">'+chroot+'/etc/rndc.key; /bin/chown root:named '+chroot+'/etc/rndc.key; /bin/chmod 640 '+chroot+'/etc/rndc.key; /bin/chmod 777 '+chroot+'/var/tmp; if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then /sbin/restorecon -R /var/{named,run,tmp}; fi')
++                r=commands.getstatusoutput('set -e; /bin/mkdir -p '+chroot+'/{etc,var/{named/{slave,data},tmp,run/named},dev}; if [ ! -e '+chroot+'/dev/random ]; then /bin/mknod '+chroot+'/dev/random c 1 8; fi; if [ ! -e '+chroot+'/dev/null ]; then /bin/mknod '+chroot+'/dev/null c 1 3; fi; if [ ! -e '+chroot+'/dev/zero ]; then /bin/mknod '+chroot+'/dev/zero c 1 5; fi; /bin/cp -fp $SCB/profiles/default/named.conf '+chroot+'/etc; /bin/cp -fp $SCB/profiles/default/named/* '+chroot+'/var/named; /bin/chown -R root:named '+chroot+'/var/named; /bin/chown named:named '+chroot+'/var/{named/{slave,data},run/named};  /bin/chown root:root '+chroot+'/etc/bind/named.conf; echo -ne "key rndckey {\n\talgorithm hmac-md5;\n\tsecret \""`/usr/sbin/dns-keygen`"\";\n};\n">'+chroot+'/etc/bind/rndc.key; /bin/chown root:named '+chroot+'/etc/bind/rndc.key; /bin/chmod 640 '+chroot+'/etc/bind/rndc.key; /bin/chmod 777 '+chroot+'/var/tmp; if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then /sbin/restorecon -R /var/{named,run,tmp}; fi')
+                 debug(r)
+                 if r[0] != 0 :
+                    self.gui.error(_('Initialization Error:'),_('Configuration could not be initialized from defaults:\n')+r[1],True)
+Index: system-config-bind-4.0.0/NamedConf.py
+===================================================================
+RCS file: /usr/local/CVS/system-config-bind/devel/system-config-bind-4.0.0/NamedConf.py,v
+retrieving revision 1.6
+diff -u -b -B -r1.6 NamedConf.py
+--- system-config-bind-4.0.0/NamedConf.py	20 Dec 2005 00:14:14 -0000	1.6
++++ system-config-bind-4.0.0/NamedConf.py	3 Sep 2006 20:44:43 -0000
+@@ -279,7 +279,7 @@
+            opts+=named_conf
+            self.files.append({'file':named_conf,'tokens':[],'contents':''})
+         else:
+-           self.files.append({'file':self.chroot + '/etc/named.conf','tokens':[],'contents':''})           
++           self.files.append({'file':self.chroot + '/etc/bind/named.conf','tokens':[],'contents':''})           
+         s=commands.getstatusoutput('/usr/sbin/named-checkconf '+opts)
+         if len(s[1]):
+             self.errors.append(s[1])
+Index: system-config-bind-4.0.0/profiles/default/named.conf
+===================================================================
+RCS file: /usr/local/CVS/system-config-bind/devel/system-config-bind-4.0.0/profiles/default/named.conf,v
+retrieving revision 1.1.1.1
+diff -u -b -B -r1.1.1.1 named.conf
+--- system-config-bind-4.0.0/profiles/default/named.conf	28 Apr 2005 17:56:14 -0000	1.1.1.1
++++ system-config-bind-4.0.0/profiles/default/named.conf	3 Sep 2006 20:44:43 -0000
+@@ -58,4 +58,4 @@
+ 	allow-update { none; };
+ };
+ 
+-include "/etc/rndc.key";
++include "/etc/bind/rndc.key";
diff --git a/app-admin/system-config-bind/system-config-bind-4.0.0.ebuild b/app-admin/system-config-bind/system-config-bind-4.0.0.ebuild
index f643326..e4986b2 100644
--- a/app-admin/system-config-bind/system-config-bind-4.0.0.ebuild
+++ b/app-admin/system-config-bind/system-config-bind-4.0.0.ebuild
@@ -28,6 +28,19 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/intltool"
 
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+
+	# by default it uses /etc/named.conf, not /etc/bind/named.conf
+	epatch "${FILESDIR}"/${PV}-use-etc-bind-directory.patch
+
+	# Reset the dates, otherwise gettext gets confused
+	touch -mt 200606070000 BIND.py
+	touch -mt 200512200000 NamedConf.py
+	touch -mt 200504280000 profiles/default/named.conf
+}
+
 src_install() {
 	emake ROOT="${D}" install || die "emake install failed"