desire-QnD.patch

   1 diff -Nur desire-3.1/conf/desire.conf desire-3.1.new/conf/desire.conf
   2 --- desire-3.1/conf/desire.conf Mon Apr  9 10:35:53 2001
   3 +++ desire-3.1.new/conf/desire.conf     Tue May 22 11:05:46 2001
   4 @@ -1,10 +1,10 @@
   5
   6
   7 -folder="/adm/stat";
   8 +folder="/var/log/desire";
   9
  10  service "dialup" {
  11         folder = "dialup";
  12 -       map U2 = "/adm/stat/dialup/Users";
  13 +       map U2 = "dialup/Users";
  14  };
  15
  16  service "traffic" {
  17 @@ -16,13 +16,13 @@
  18  service "proxy" {
  19         folder = "proxy";
  20         description = "Proxy statistics";
  21 -       map Dst = "/adm/stat/proxy/Domains";
  22 +       map Dst = "proxy/Domains";
  23  };
  24
  25  service "email" {
  26         folder = "email";
  27         description = "Mail accounting";
  28 -       map Src = "/adm/etc/DOMAINS"
  29 +       map Src = "/etc/DOMAINS"
  30  };
  31
  32  service "calls" {
  33 diff -Nur desire-3.1/configure.in desire-3.1.new/configure.in
  34 --- desire-3.1/configure.in     Mon Apr  9 10:35:55 2001
  35 +++ desire-3.1.new/configure.in Tue May 22 11:01:05 2001
  36 @@ -65,6 +65,6 @@
  37  AC_FUNC_MMAP
  38  AC_CHECK_FUNCS(mkdir mktime strdup strerror strspn strstr getrusage flock fcntl dbopen dbm_open logf expf gdImagePng gdImageGif)
  39
  40 -AC_OUTPUT(libdesire/Makefile libddraw/Makefile depend/proxy_stats/Makefile depend/ctbdump/Makefile depend/ctbmap/Makefile depend/cistat/Makefile depend/Makefile Makefile depend/mail_stats/Makefile)
  41 +AC_OUTPUT(libdesire/Makefile libddraw/Makefile depend/proxy_stats/Makefile depend/ctbdump/Makefile depend/ctbmap/Makefile depend/cistat/Makefile depend/Makefile Makefile)
  42
  43
  44 diff -Nur desire-3.1/depend/cistat/Makefile.in desire-3.1.new/depend/cistat/Makefile.in
  45 --- desire-3.1/depend/cistat/Makefile.in        Mon Apr  9 10:35:54 2001
  46 +++ desire-3.1.new/depend/cistat/Makefile.in    Tue May 22 11:01:05 2001
  47 @@ -9,7 +9,7 @@
  48
  49  LIBS+= -L../../libdesire/.libs
  50  LIBS+= -L../../libddraw/.libs
  51 -LIBS+= -L${libdir}
  52 +LIBS+= -L${libdir} -L/usr/lib
  53  LIBS+= -ldesire
  54  LIBS+= -lstrfunc
  55
  56 @@ -19,7 +19,7 @@
  57
  58  CC=@CC@
  59  CFLAGS+= -Wall @CFLAGS@ @DEFS@
  60 -CFLAGS+= -I../../include -I${includedir}
  61 +CFLAGS+= -I../../include -I${includedir} -I/usr/include
  62
  63  INSTALL=@INSTALL@
  64
  65 diff -Nur desire-3.1/depend/cistat/cidraw.c desire-3.1.new/depend/cistat/cidraw.c
  66 --- desire-3.1/depend/cistat/cidraw.c   Mon Apr  9 10:35:54 2001
  67 +++ desire-3.1.new/depend/cistat/cidraw.c       Tue May 22 11:01:05 2001
  68 @@ -131,11 +131,7 @@
  69         if(isatty(1))
  70                 fprintf(stderr, "[Image will be displayed here]\n");
  71         else {
  72 -#ifdef HAVE_GDIMAGEPNG
  73                 gdImagePng(im, stdout);
  74 -#else
  75 -               gdImageGif(im, stdout);
  76 -#endif
  77         }
  78
  79         return 0;
  80 diff -Nur desire-3.1/depend/cistat/cistat.c desire-3.1.new/depend/cistat/cistat.c
  81 --- desire-3.1/depend/cistat/cistat.c   Mon Apr  9 10:35:54 2001
  82 +++ desire-3.1.new/depend/cistat/cistat.c       Tue May 22 11:01:05 2001
  83 @@ -211,7 +211,7 @@
  84         nets *nh;
  85         int sscnt;
  86
  87 -       if(!(cf=fopen("/usr/local/etc/cistat.conf", "r")))
  88 +       if(!(cf=fopen("/etc/cistat.conf", "r")))
  89                 sux("Can't read config.");
  90
  91         while(fgets(buf, sizeof(buf), cf)) {
  92 diff -Nur desire-3.1/depend/cistat/html/form.cgi desire-3.1.new/depend/cistat/html/form.cgi
  93 --- desire-3.1/depend/cistat/html/form.cgi      Mon Apr  9 10:35:54 2001
  94 +++ desire-3.1.new/depend/cistat/html/form.cgi  Tue May 22 11:07:15 2001
  95 @@ -18,7 +18,7 @@
  96  <SELECT NAME=file>
  97  ";
  98
  99 -opendir(D, "/adm/stat/traffic");
 100 +opendir(D, "/var/log/desire/traffic");
 101  readdir(D); readdir(D);
 102
 103  for (sort(readdir(D))) {
 104 diff -Nur desire-3.1/depend/proxy_stats/Makefile.in desire-3.1.new/depend/proxy_stats/Makefile.in
 105 --- desire-3.1/depend/proxy_stats/Makefile.in   Mon Apr  9 10:35:55 2001
 106 +++ desire-3.1.new/depend/proxy_stats/Makefile.in       Tue May 22 11:01:05 2001
 107 @@ -11,12 +11,12 @@
 108  CC=@CC@
 109
 110  CFLAGS+= @CFLAGS@ @DEFS@ -Wall
 111 -CFLAGS+= -I../../include -I${includedir}
 112 +CFLAGS+= -I../../include -I${includedir} -I/usr/include -I/usr/X11R6/include
 113
 114  LDAPLIBS= @LDAPLIBS@
 115  NETLIBS= @NETLIBS@
 116
 117 -LDFLAGS= -L../../libdesire/.libs -L../../libddraw/.libs @LDFLAGS@
 118 +LDFLAGS= -L../../libdesire/.libs -L../../libddraw/.libs @LDFLAGS@ -L/usr/lib -L/usr/X11R6/lib
 119  LIBS= -lddraw -ldesire @LIBS@
 120
 121  INSTALL=@INSTALL@
 122 diff -Nur desire-3.1/depend/proxy_stats/proxy_draw.c desire-3.1.new/depend/proxy_stats/proxy_draw.c
 123 --- desire-3.1/depend/proxy_stats/proxy_draw.c  Mon Apr  9 10:35:55 2001
 124 +++ desire-3.1.new/depend/proxy_stats/proxy_draw.c      Tue May 22 11:01:05 2001
 125 @@ -309,11 +309,7 @@
 126         if(isatty(1))
 127                 fprintf(stderr, "[Image will be displayed here]\n");
 128         else {
 129 -#ifdef HAVE_GDIMAGEPNG
 130                 gdImagePng(im, stdout);
 131 -#else
 132 -               gdImageGif(im, stdout);
 133 -#endif
 134         }
 135
 136         gdImageDestroy(im);
 137 diff -Nur desire-3.1/include/desire.h desire-3.1.new/include/desire.h
 138 --- desire-3.1/include/desire.h Mon Apr  9 10:35:54 2001
 139 +++ desire-3.1.new/include/desire.h     Tue May 22 11:01:05 2001
 140 @@ -86,7 +86,7 @@
 141
 142  ctb_session *
 143  ctb_open(
 144 -       const char *optConfigName,      /* /usr/local/etc/desire.conf */
 145 +       const char *optConfigName,      /* /etc/desire.conf */
 146         const char *Service,    /* Service name */
 147         const char *optName     /* Optional subdestination name */
 148  );
 149 diff -Nur desire-3.1/libddraw/Makefile.in desire-3.1.new/libddraw/Makefile.in
 150 --- desire-3.1/libddraw/Makefile.in     Mon Apr  9 10:35:54 2001
 151 +++ desire-3.1.new/libddraw/Makefile.in Tue May 22 11:01:05 2001
 152 @@ -10,7 +10,7 @@
 153  LIBTOOL= PATH=@PATH@ @LIBTOOL@
 154
 155  CFLAGS= -Wall @CFLAGS@ @DEFS@
 156 -CFLAGS+= -I../include -I${includedir}
 157 +CFLAGS+= -I../include -I${includedir} -I/usr/X11R6/include
 158  OBJS= param.o ddraw.o
 159  LOBJS+= ${OBJS}
 160
 161 diff -Nur desire-3.1/libddraw/param.c desire-3.1.new/libddraw/param.c
 162 --- desire-3.1/libddraw/param.c Mon Apr  9 10:35:54 2001
 163 +++ desire-3.1.new/libddraw/param.c     Tue May 22 11:01:05 2001
 164 @@ -1,7 +1,7 @@
 165  #include <stdlib.h>
 166  #include <stdio.h>
 167  #include <string.h>
 168 -#include <sys/time.h>
 169 +#include <time.h>
 170
 171  #include <strfunc.h>
 172
 173 diff -Nur desire-3.1/libdesire/ctbget.c desire-3.1.new/libdesire/ctbget.c
 174 --- desire-3.1/libdesire/ctbget.c       Mon Apr  9 10:35:54 2001
 175 +++ desire-3.1.new/libdesire/ctbget.c   Tue May 22 11:01:05 2001
 176 @@ -4,6 +4,7 @@
 177  #include <sys/stat.h>
 178  #include <unistd.h>
 179  #include <fcntl.h>
 180 +#include <time.h>
 181
 182  #include "desire.h"
 183  #include "ctbint.h"
 184 diff -Nur desire-3.1/libdesire/session.h desire-3.1.new/libdesire/session.h
 185 --- desire-3.1/libdesire/session.h      Mon Apr  9 10:35:54 2001
 186 +++ desire-3.1.new/libdesire/session.h  Tue May 22 11:01:05 2001
 187 @@ -11,34 +11,17 @@
 188  #include "config.h"
 189  #endif
 190
 191 -#ifdef HAVE_DBOPEN
 192 -
 193 -#ifdef HAVE_DB_H
 194  #include <db.h>
 195 -#endif
 196
 197  typedef        DB      DBMAP;
 198  typedef DBT    DBCHUNK;
 199  #define        map_data data
 200  #define        map_size size
 201
 202 -#else  /* HAVE_DBOPEN */
 203 -#ifdef HAVE_DBM_OPEN
 204 -
 205 -#ifdef HAVE_NDBM_H
 206 -#include <ndbm.h>
 207 -#endif
 208 -
 209 -typedef        DBM     DBMAP;
 210 -typedef datum DBCHUNK;
 211 -#define        map_data dptr
 212 -#define        map_size dsize
 213 -
 214 -#endif
 215  #endif
 216
 217  #ifndef CONFIG
 218 -#define CONFIG "/usr/local/etc/desire.conf"
 219 +#define CONFIG "/etc/desire.conf"
 220  #endif
 221
 222  #include "desire.h"
 223 @@ -83,4 +66,3 @@
 224         char *tmp_format_string;
 225  } ctb_sess;
 226
 227 -#endif