djbdns-opendns/runit.patch

   1 diff --git a/djbdns-1.05/dnscache-conf.c b/djbdns-1.05/dnscache-conf.c
   2 index e8c12be..c7972e3 100644
   3 --- a/djbdns-1.05/dnscache-conf.c
   4 +++ b/djbdns-1.05/dnscache-conf.c
   5 @@ -121,13 +121,13 @@ int main(int argc,char **argv)
   6    seed_addtime(); start("env/DATALIMIT"); outs("3000000\n"); finish();
   7    seed_addtime(); perm(0644);
   8    seed_addtime(); start("run");
   9 -  outs("#!/bin/sh\nexec 2>&1\nexec <seed\nexec envdir ./env sh -c '\n  exec envuidgid "); outs(user);
  10 -  outs(" softlimit -o250 -d \"$DATALIMIT\" ");
  11 +  outs("#!/bin/sh\nexec 2>&1\nexec <seed\nexec chpst -e ./env sh -c '\n  exec chpst -U "); outs(user);
  12 +  outs(" -o250 -d \"$DATALIMIT\" ");
  13    outs(auto_home); outs("/bin/dnscache\n'\n"); finish();
  14    seed_addtime(); perm(0755);
  15    seed_addtime(); start("log/run");
  16 -  outs("#!/bin/sh\nexec setuidgid "); outs(loguser);
  17 -  outs(" multilog t ./main\n"); finish();
  18 +  outs("#!/bin/sh\nexec chpst -u "); outs(loguser);
  19 +  outs(" svlogd t ./main\n"); finish();
  20    seed_addtime(); perm(0755);
  21    seed_addtime(); makedir("root");
  22    seed_addtime(); perm(02755);
  23 diff --git a/djbdns-1.05/generic-conf.c b/djbdns-1.05/generic-conf.c
  24 index db4aa1d..6c864b4 100644
  25 --- a/djbdns-1.05/generic-conf.c
  26 +++ b/djbdns-1.05/generic-conf.c
  27 @@ -92,8 +92,8 @@ void makelog(const char *user,int uid,int gid)
  28
  29    start("log/run");
  30    outs("#!/bin/sh\nexec");
  31 -  outs(" setuidgid "); outs(user);
  32 -  outs(" multilog t ./main\n");
  33 +  outs(" chpst -u "); outs(user);
  34 +  outs(" svlogd t ./main\n");
  35    finish();
  36    perm(0755);
  37  }
  38 diff --git a/djbdns-1.05/tinydns-conf.c b/djbdns-1.05/tinydns-conf.c
  39 index db83f11..44702cf 100644
  40 --- a/djbdns-1.05/tinydns-conf.c
  41 +++ b/djbdns-1.05/tinydns-conf.c
  42 @@ -45,8 +45,8 @@ int main(int argc,char **argv)
  43    perm(0644);
  44
  45    start("run");
  46 -  outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
  47 -  outs(" envdir ./env softlimit -d300000 ");
  48 +  outs("#!/bin/sh\nexec 2>&1\nexec chpst -U "); outs(user);
  49 +  outs(" -e ./env -d300000 ");
  50    outs(auto_home); outs("/bin/tinydns\n");
  51    finish();
  52    perm(0755);
  53 diff --git a/djbdns-1.05/axfrdns-conf.c b/djbdns-1.05/axfrdns-conf.c
  54 index 4dc8657..56a7637 100644
  55 --- a/djbdns-1.05/axfrdns-conf.c
  56 +++ b/djbdns-1.05/axfrdns-conf.c
  57 @@ -49,8 +49,8 @@ int main(int argc,char **argv)
  58    perm(0644);
  59
  60    start("run");
  61 -  outs("#!/bin/sh\nexec 2>&1\nexec envdir ./env sh -c '\n  exec envuidgid "); outs(user);
  62 -  outs(" softlimit -d300000 tcpserver -vDRHl0 -x tcp.cdb -- \"$IP\" 53 ");
  63 +  outs("#!/bin/sh\nexec 2>&1\nexec chpst -e ./env sh -c '\n  exec chpst -U "); outs(user);
  64 +  outs(" -d300000 tcpsvd -v -l $IP -i ./peers \"$IP\" 53 ");
  65    outs(auto_home); outs("/bin/axfrdns\n'\n");
  66    finish();
  67    perm(0755);
  68 diff --git a/djbdns-1.05/pickdns-conf.c b/djbdns-1.05/pickdns-conf.c
  69 index 9edd184..6c00fa8 100644
  70 --- a/djbdns-1.05/pickdns-conf.c
  71 +++ b/djbdns-1.05/pickdns-conf.c
  72 @@ -45,8 +45,8 @@ int main(int argc,char **argv)
  73    perm(0644);
  74
  75    start("run");
  76 -  outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
  77 -  outs(" envdir ./env softlimit -d250000 ");
  78 +  outs("#!/bin/sh\nexec 2>&1\nexec chpst -U "); outs(user);
  79 +  outs(" -e ./env -d250000 ");
  80    outs(auto_home); outs("/bin/pickdns\n");
  81    finish();
  82    perm(0755);
  83 diff --git a/djbdns-1.05/rbldns-conf.c b/djbdns-1.05/rbldns-conf.c
  84 index 79d446f..4a2bd40 100644
  85 --- a/djbdns-1.05/rbldns-conf.c
  86 +++ b/djbdns-1.05/rbldns-conf.c
  87 @@ -50,8 +50,8 @@ int main(int argc,char **argv)
  88    perm(0644);
  89
  90    start("run");
  91 -  outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
  92 -  outs(" envdir ./env softlimit -d250000 ");
  93 +  outs("#!/bin/sh\nexec 2>&1\nexec chpst -U "); outs(user);
  94 +  outs(" -e ./env -d250000 ");
  95    outs(auto_home); outs("/bin/rbldns\n");
  96    finish();
  97    perm(0755);
  98 diff --git a/djbdns-1.05/walldns-conf.c b/djbdns-1.05/walldns-conf.c
  99 index b46f19a..e0ed3d0 100644
 100 --- a/djbdns-1.05/walldns-conf.c
 101 +++ b/djbdns-1.05/walldns-conf.c
 102 @@ -45,8 +45,8 @@ int main(int argc,char **argv)
 103    perm(0644);
 104
 105    start("run");
 106 -  outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
 107 -  outs(" envdir ./env softlimit -d250000 ");
 108 +  outs("#!/bin/sh\nexec 2>&1\nexec chpst -U "); outs(user);
 109 +  outs(" -e ./env -d250000 ");
 110    outs(auto_home); outs("/bin/walldns\n");
 111    finish();
 112    perm(0755);