--- rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch 2014/05/18 15:10:52 1.1 +++ rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch 2014/06/17 23:11:11 1.2 @@ -1,6 +1,6 @@ diff -Nur e-smith-tinydns-2.4.0.old/createlinks e-smith-tinydns-2.4.0/createlinks ---- e-smith-tinydns-2.4.0.old/createlinks 2014-05-18 01:58:17.822368168 +0200 -+++ e-smith-tinydns-2.4.0/createlinks 2014-05-18 02:04:52.426622645 +0200 +--- e-smith-tinydns-2.4.0.old/createlinks 2014-06-17 23:46:27.046462016 +0200 ++++ e-smith-tinydns-2.4.0/createlinks 2014-06-17 23:47:00.027649759 +0200 @@ -26,3 +26,27 @@ service_link_enhanced("tinydns", "K65", "6"); service_link_enhanced("tinydns", "K65", "0"); @@ -31,24 +31,24 @@ diff -Nur e-smith-tinydns-2.4.0.old/crea + safe_symlink("/var/service/dhcp-dns/", "root/service/dhcp-dns"); diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status --- e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status 2014-05-18 02:05:57.345788401 +0200 ++++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status 2014-06-17 23:47:00.028649886 +0200 @@ -0,0 +1 @@ +enabled diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type --- e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type 2014-05-18 02:05:57.304783191 +0200 ++++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type 2014-06-17 23:47:00.029650013 +0200 @@ -0,0 +1 @@ +service diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/events/actions/dnscache-change e-smith-tinydns-2.4.0/root/etc/e-smith/events/actions/dnscache-change --- e-smith-tinydns-2.4.0.old/root/etc/e-smith/events/actions/dnscache-change 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/etc/e-smith/events/actions/dnscache-change 2014-05-18 02:05:58.604948433 +0200 ++++ e-smith-tinydns-2.4.0/root/etc/e-smith/events/actions/dnscache-change 2014-06-17 23:47:00.030650140 +0200 @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/sv 1 /service/tinydns diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords --- e-smith-tinydns-2.4.0.old/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords 2014-05-18 02:06:05.227790167 +0200 ++++ e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords 2014-06-17 23:52:49.434051111 +0200 @@ -0,0 +1,48 @@ +{ + # we need perl-Text-DHCPparse rpm from Dag's repo @@ -62,8 +62,9 @@ diff -Nur e-smith-tinydns-2.4.0.old/root + + # copy of dhcpd.leases file to /tmp because working directly on the original + # is not a good idea -+ system "cat /var/lib/dhcpd/dhcpd.leases > /tmp/dhcpd.leases"; -+ ++ use File::Copy; ++ copy('/var/lib/dhcpd/dhcpd.leases', '/tmp/dhcpd.leases'); ++ + # now we parse the leases + $return = leaseparse('/tmp/dhcpd.leases'); + @@ -75,8 +76,8 @@ diff -Nur e-smith-tinydns-2.4.0.old/root + foreach (keys %$return) { + ($ip, $time, $mac, $name) = unpack("A17 A21 A19 A30", $return->{$_}); + -+ # sometimes $name is empty.. we want only non empty one -+ if ( (defined $name) && (defined $ip)) { ++ # when the dhcp lease is over $name is empty .. we want only non empty one ++ if ( $name ne "" ) { + # we skip also ips already allocated + unless (exists $allocated_ips{$ip}) + { @@ -89,7 +90,6 @@ diff -Nur e-smith-tinydns-2.4.0.old/root + # Determine TTL + my $ttl = ''; + $ttl = 0 unless ($ts <= time); -+ + $OUT .= "=$name.$localdomain:$ip:$ttl:$endtai\n"; + } + $allocated_ips{$ip} = 1; @@ -100,7 +100,7 @@ diff -Nur e-smith-tinydns-2.4.0.old/root +} diff -Nur e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/dhcp-dns e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns --- e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/dhcp-dns 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns 2014-05-18 02:06:08.370189551 +0200 ++++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns 2014-06-17 23:47:00.031650267 +0200 @@ -0,0 +1,33 @@ +#!/usr/bin/perl + @@ -137,7 +137,7 @@ diff -Nur e-smith-tinydns-2.4.0.old/root + diff -Nur e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/run e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run --- e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/run 1970-01-01 01:00:00.000000000 +0100 -+++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run 2014-05-18 02:06:08.429197051 +0200 ++++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run 2014-06-17 23:47:00.032650394 +0200 @@ -0,0 +1,4 @@ +#!/bin/sh +