/[smeserver]/rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch
ViewVC logotype

Diff of /rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by stephdl, Sun May 18 15:10:52 2014 UTC Revision 1.2 by stephdl, Tue Jun 17 23:11:11 2014 UTC
# Line 1  Line 1 
1  diff -Nur e-smith-tinydns-2.4.0.old/createlinks e-smith-tinydns-2.4.0/createlinks  diff -Nur e-smith-tinydns-2.4.0.old/createlinks e-smith-tinydns-2.4.0/createlinks
2  --- e-smith-tinydns-2.4.0.old/createlinks       2014-05-18 01:58:17.822368168 +0200  --- e-smith-tinydns-2.4.0.old/createlinks       2014-06-17 23:46:27.046462016 +0200
3  +++ e-smith-tinydns-2.4.0/createlinks   2014-05-18 02:04:52.426622645 +0200  +++ e-smith-tinydns-2.4.0/createlinks   2014-06-17 23:47:00.027649759 +0200
4  @@ -26,3 +26,27 @@  @@ -26,3 +26,27 @@
5   service_link_enhanced("tinydns", "K65", "6");   service_link_enhanced("tinydns", "K65", "6");
6   service_link_enhanced("tinydns", "K65", "0");   service_link_enhanced("tinydns", "K65", "0");
# Line 31  diff -Nur e-smith-tinydns-2.4.0.old/crea Line 31  diff -Nur e-smith-tinydns-2.4.0.old/crea
31  +    safe_symlink("/var/service/dhcp-dns/", "root/service/dhcp-dns");  +    safe_symlink("/var/service/dhcp-dns/", "root/service/dhcp-dns");
32  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  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
33  --- 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.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status        1970-01-01 01:00:00.000000000 +0100
34  +++ 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
35  @@ -0,0 +1 @@  @@ -0,0 +1 @@
36  +enabled  +enabled
37  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  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
38  --- 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.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type  1970-01-01 01:00:00.000000000 +0100
39  +++ 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
40  @@ -0,0 +1 @@  @@ -0,0 +1 @@
41  +service  +service
42  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  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
43  --- 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.old/root/etc/e-smith/events/actions/dnscache-change   1970-01-01 01:00:00.000000000 +0100
44  +++ 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
45  @@ -0,0 +1,3 @@  @@ -0,0 +1,3 @@
46  +#!/bin/sh  +#!/bin/sh
47  +  +
48  +/usr/bin/sv 1 /service/tinydns  +/usr/bin/sv 1 /service/tinydns
49  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  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
50  --- 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.old/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords   1970-01-01 01:00:00.000000000 +0100
51  +++ 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
52  @@ -0,0 +1,48 @@  @@ -0,0 +1,48 @@
53  +{  +{
54  +    # we need perl-Text-DHCPparse rpm from Dag's repo  +    # we need perl-Text-DHCPparse rpm from Dag's repo
# Line 62  diff -Nur e-smith-tinydns-2.4.0.old/root Line 62  diff -Nur e-smith-tinydns-2.4.0.old/root
62  +  +
63  +    # copy of dhcpd.leases file to /tmp because working directly on the original  +    # copy of dhcpd.leases file to /tmp because working directly on the original
64  +    # is not a good idea  +    # is not a good idea
65  +    system "cat /var/lib/dhcpd/dhcpd.leases > /tmp/dhcpd.leases";  +    use File::Copy;
66  +        +    copy('/var/lib/dhcpd/dhcpd.leases', '/tmp/dhcpd.leases');      
67    +    
68  +    # now we parse the leases  +    # now we parse the leases
69  +    $return = leaseparse('/tmp/dhcpd.leases');  +    $return = leaseparse('/tmp/dhcpd.leases');
70  +    +  
# Line 75  diff -Nur e-smith-tinydns-2.4.0.old/root Line 76  diff -Nur e-smith-tinydns-2.4.0.old/root
76  +    foreach (keys %$return) {  +    foreach (keys %$return) {
77  +        ($ip, $time, $mac, $name) = unpack("A17 A21 A19 A30", $return->{$_});  +        ($ip, $time, $mac, $name) = unpack("A17 A21 A19 A30", $return->{$_});
78  +  +
79  +        # sometimes $name is empty.. we want only non empty one  +        # when the dhcp lease is over $name is empty .. we want only non empty one
80  +        if ( (defined $name) && (defined $ip)) {  +         if ( $name ne "" ) {
81  +            # we skip also ips already allocated  +            # we skip also ips already allocated
82  +            unless (exists $allocated_ips{$ip})  +            unless (exists $allocated_ips{$ip})
83  +            {  +            {
# Line 89  diff -Nur e-smith-tinydns-2.4.0.old/root Line 90  diff -Nur e-smith-tinydns-2.4.0.old/root
90  +                # Determine TTL  +                # Determine TTL
91  +                my $ttl = '';  +                my $ttl = '';
92  +                $ttl = 0 unless ($ts <= time);  +                $ttl = 0 unless ($ts <= time);
 +  
93  +                $OUT .= "=$name.$localdomain:$ip:$ttl:$endtai\n";  +                $OUT .= "=$name.$localdomain:$ip:$ttl:$endtai\n";
94  +            }  +            }
95  +            $allocated_ips{$ip} = 1;  +            $allocated_ips{$ip} = 1;
# Line 100  diff -Nur e-smith-tinydns-2.4.0.old/root Line 100  diff -Nur e-smith-tinydns-2.4.0.old/root
100  +}  +}
101  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  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
102  --- 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.old/root/var/service/dhcp-dns/dhcp-dns        1970-01-01 01:00:00.000000000 +0100
103  +++ 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
104  @@ -0,0 +1,33 @@  @@ -0,0 +1,33 @@
105  +#!/usr/bin/perl  +#!/usr/bin/perl
106  +  +
# Line 137  diff -Nur e-smith-tinydns-2.4.0.old/root Line 137  diff -Nur e-smith-tinydns-2.4.0.old/root
137  +  +
138  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  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
139  --- 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.old/root/var/service/dhcp-dns/run     1970-01-01 01:00:00.000000000 +0100
140  +++ 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
141  @@ -0,0 +1,4 @@  @@ -0,0 +1,4 @@
142  +#!/bin/sh  +#!/bin/sh
143  +  +

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed