From: Kacper Kornet Date: Sat, 12 Nov 2011 20:29:09 +0000 (+0000) Subject: - move some patches to distfiles X-Git-Url: https://git.pld-linux.org/?p=packages%2Fdjbdns.git;a=commitdiff_plain;h=bd9ee8fdf6d3ffdb761446de33b66adcfddca172 - move some patches to distfiles - update md5sum for tinydns-log Changed files: djbdns-1.05-multi_tinydns_data.patch -> 1.2 djbdns.spec -> 1.90 --- diff --git a/djbdns-1.05-multi_tinydns_data.patch b/djbdns-1.05-multi_tinydns_data.patch deleted file mode 100644 index c0d5413..0000000 --- a/djbdns-1.05-multi_tinydns_data.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ruN djbdns-1.05.orig/tinydns-data.c djbdns-1.05/tinydns-data.c ---- djbdns-1.05.orig/tinydns-data.c Mon Jan 22 03:51:44 2001 -+++ djbdns-1.05/tinydns-data.c Mon Jan 29 18:12:47 2001 -@@ -159,11 +159,7 @@ - die_datatmp(); - } - --buffer b; --char bspace[1024]; -- - static stralloc line; --int match = 1; - unsigned long linenum = 0; - - #define NUMFIELDS 15 -@@ -181,7 +177,7 @@ - strerr_die4x(111,FATAL,"unable to parse data line ",strnum,why); - } - --int main() -+int load(const char *fname) - { - int fddata; - int i; -@@ -196,20 +192,18 @@ - char type[2]; - char soa[20]; - char buf[4]; -+ int match; -+ buffer b; -+ char bspace[1024]; - -- umask(022); -- -- fddata = open_read("data"); -+ fddata = open_read(fname); - if (fddata == -1) -- strerr_die2sys(111,FATAL,"unable to open data: "); -+ strerr_die4sys(111,FATAL,"unable to open ",fname,": "); - defaultsoa_init(fddata); - - buffer_init(&b,buffer_unixread,fddata,bspace,sizeof bspace); - -- fdcdb = open_trunc("data.tmp"); -- if (fdcdb == -1) die_datatmp(); -- if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); -- -+ match = 1; - while (match) { - ++linenum; - if (getln(&b,&line,&match,'\n') == -1) -@@ -444,6 +438,21 @@ - default: - syntaxerror(": unrecognized leading character"); - } -+ } -+ close(fddata); -+} -+ -+main(int argc, char **argv) -+{ -+ umask(022); -+ fdcdb = open_trunc("data.tmp"); -+ if (fdcdb == -1) die_datatmp(); -+ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); -+ -+ if (argc == 1) -+ load("data"); -+ while(--argc) { -+ load(argv[argc]); - } - - if (cdb_make_finish(&cdb) == -1) die_datatmp(); diff --git a/djbdns.spec b/djbdns.spec index 03d6748..7f3d8c0 100644 --- a/djbdns.spec +++ b/djbdns.spec @@ -19,11 +19,13 @@ Source2: ftp://ftp.innominate.org/gpa/djb/%{name}-%{version}-man.tar.gz Source3: http://www.sericyb.com.au/tinydns-notify # NoSource3-md5: 2213bdc8c58c10cb8770b7e5b0d67aea Source4: http://www.sericyb.com.au/tinydns-log -# NoSource4-md5: a9af7707a7cb7c41e855f441e242e422 +# NoSource4-md5: 2cc75dc47a66d38e03ce2d33443930b6 Patch0: dnscache-1.05-multiple-ip.patch # adds IPv6 support Patch1: http://www.fefe.de/dns/%{name}-1.05-test22.diff.bz2 +# Patch1-md5: afab02b7e3afe58b93d15ddf4e5f90b4 Patch3: http://iksz.hu/package/djbdns-conf/%{name}-1.05-multi_tinydns_data.patch +# Patch3-md5: 3b59e08b6e9d2c5538762ee60c286867 Patch4: %{name}-srv.patch Patch5: %{name}-glibc.patch # http://www.iecc.com/rbldns-patch.txt