From 39ba387d4abe07df9cb22f089469226109e09a45 Mon Sep 17 00:00:00 2001 From: michuz Date: Tue, 22 May 2001 09:23:42 +0000 Subject: [PATCH] 86fde160bb54f868a6a9ba2bc2925ec2 desire-3.1.tar.gz desire-DESTDIR.patch - add $DESTDIR var. desire-QnD.patch - quick and dirty patch, resolves (?) problem: - db3 compilation - gd compilation - config directories - and more ... Changed files: desire-DESTDIR.patch -> 1.1 desire-QnD.patch -> 1.1 --- desire-DESTDIR.patch | 135 +++++++++++++++++++++++++ desire-QnD.patch | 227 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 362 insertions(+) create mode 100644 desire-DESTDIR.patch create mode 100644 desire-QnD.patch diff --git a/desire-DESTDIR.patch b/desire-DESTDIR.patch new file mode 100644 index 0000000..643022a --- /dev/null +++ b/desire-DESTDIR.patch @@ -0,0 +1,135 @@ +diff -Nur desire-3.1/depend/cistat/Makefile.in desire-3.1.new/depend/cistat/Makefile.in +--- desire-3.1/depend/cistat/Makefile.in Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/cistat/Makefile.in Mon May 21 14:45:30 2001 +@@ -6,6 +6,7 @@ + libdir=@libdir@ + includedir=@includedir@ + sysconfdir=@sysconfdir@ ++weblocation=/home/httpd/cgi-bin/cistat + + LIBS+= -L../../libdesire/.libs + LIBS+= -L../../libddraw/.libs +@@ -46,13 +47,11 @@ + rm -f *.o *.core ${TARGETS} 1 + + install: all +- ${INSTALL} -m 555 cistat ${bindir} +- ${INSTALL} -m 555 cidraw.cgi /www/admin/traffic +- ${INSTALL} -m 555 ./html/index.html ./html/form.cgi /www/admin/traffic +- @echo +- @echo Now you might want to make install-conf from ./depend/cistat +- @echo +- +-install-conf: +- ${INSTALL} -m 444 -g 0 -o 0 cistat.conf ${sysconfdir} ++ install -d $(DESTDIR)${bindir} ++ install -d $(DESTDIR)${weblocation} ++ install -d $(DESTDIR)${sysconfdir} ++ ${INSTALL} -m 555 cistat $(DESTDIR)${bindir} ++ ${INSTALL} -m 555 cidraw.cgi $(DESTDIR)${weblocation} ++ ${INSTALL} -m 555 ./html/* ./html/form.cgi $(DESTDIR)${weblocation} ++ ${INSTALL} -m 444 cistat.conf $(DESTDIR)${sysconfdir} + +diff -Nur desire-3.1/depend/ctbdump/Makefile.in desire-3.1.new/depend/ctbdump/Makefile.in +--- desire-3.1/depend/ctbdump/Makefile.in Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/ctbdump/Makefile.in Mon May 21 14:43:36 2001 +@@ -21,7 +21,8 @@ + ${CC} ${CFLAGS} -o ctbdump ctbdump.c ${LIBS} + + install: all +- ${INSTALL} -m 555 -g 0 -o 0 ctbdump ${bindir} ++ install -d $(DESTDIR)${bindir} ++ ${INSTALL} -m 555 ctbdump $(DESTDIR)${bindir} + + clean: + rm -f *.o *.core ctbdump 1 +diff -Nur desire-3.1/depend/ctbmap/Makefile.in desire-3.1.new/depend/ctbmap/Makefile.in +--- desire-3.1/depend/ctbmap/Makefile.in Mon Apr 9 10:35:55 2001 ++++ desire-3.1.new/depend/ctbmap/Makefile.in Mon May 21 14:43:36 2001 +@@ -21,7 +21,8 @@ + ${CC} ${CFLAGS} -o ctbmap ctbmap.c ${LIBS} + + install: all +- ${INSTALL} -m 555 -g 0 -o 0 ctbmap ${bindir} ++ install -d $(DESTDIR)${bindir} ++ ${INSTALL} -m 555 ctbmap $(DESTDIR)${bindir} + + clean: + rm -f *.o *.core ctbmap 1 +diff -Nur desire-3.1/depend/proxy_stats/Makefile.in desire-3.1.new/depend/proxy_stats/Makefile.in +--- desire-3.1/depend/proxy_stats/Makefile.in Mon Apr 9 10:35:55 2001 ++++ desire-3.1.new/depend/proxy_stats/Makefile.in Mon May 21 14:44:39 2001 +@@ -6,7 +6,7 @@ + includedir=@includedir@ + sysconfdir=@sysconfdir@ + +-WEBLOCATION=/www/admin/proxy ++WEBLOCATION=/home/httpd/cgi-bin/proxy_stats + + CC=@CC@ + +@@ -45,16 +45,12 @@ + ${CC} ${CFLAGS} -o $@ -c $< + + install: all +- ${INSTALL} -m 555 proxy_getstat ${bindir} +- @if [ ! -d ${WEBLOCATION} ]; then \ +- echo; \ +- echo "ERROR: proxy_draw cannot be installed due to directory absence: ${WEBLOCATION}"; \ +- echo; \ +- else \ +- ${INSTALL} -m 555 -g 0 -o 0 proxy_draw.cgi ${WEBLOCATION}; \ +- ${INSTALL} -m 555 -g 0 -o 0 proxy_top.cgi ${WEBLOCATION}; \ +- ${INSTALL} -m 555 -g 0 -o 0 ./html/form.cgi ${WEBLOCATION}; \ +- fi ++ install -d $(DESTDIR)${bindir} ++ ${INSTALL} -m 555 proxy_getstat $(DESTDIR)${bindir} ++ install -d $(DESTDIR)${WEBLOCATION} ++ ${INSTALL} -m 555 proxy_draw.cgi $(DESTDIR)${WEBLOCATION} ++ ${INSTALL} -m 555 proxy_top.cgi $(DESTDIR)${WEBLOCATION} ++ ${INSTALL} -m 555 ./html/* $(DESTDIR)${WEBLOCATION} + + clean: + rm -f *.o *.core ${TARGETS} 1 +diff -Nur desire-3.1/libddraw/Makefile.in desire-3.1.new/libddraw/Makefile.in +--- desire-3.1/libddraw/Makefile.in Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/libddraw/Makefile.in Mon May 21 14:43:36 2001 +@@ -42,11 +42,12 @@ + $(LIBTOOL) ${CC} ${CFLAGS} -c $< + + install: all +- $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a ${libdir} +- rm -f ${libdir}/${SHLIB_NAME} ${libdir}/${SHLIB_LINK} +- $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} ${libdir} +- ${LN_SF} ${SHLIB_NAME} ${libdir}/${SHLIB_LINK} +- ${INSTALL} -m 444 -o 0 -g 0 ../include/ddraw.h ${includedir} ++ install -d $(DESTDIR)${libdir} ++ install -d $(DESTDIR)${includedir} ++ $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a $(DESTDIR)${libdir} ++ $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} $(DESTDIR)${libdir} ++ ${LN_SF} ${SHLIB_NAME} $(DESTDIR)${libdir}/${SHLIB_LINK} ++ ${INSTALL} -m 444 ../include/ddraw.h $(DESTDIR)${includedir} + + clean: + rm -f *.o *.a *.lo *.la ${SHLIB_NAME} ${SHLIB_LINK} *.core +diff -Nur desire-3.1/libdesire/Makefile.in desire-3.1.new/libdesire/Makefile.in +--- desire-3.1/libdesire/Makefile.in Mon Apr 9 10:35:53 2001 ++++ desire-3.1.new/libdesire/Makefile.in Mon May 21 14:43:36 2001 +@@ -54,11 +54,12 @@ + + + install: all +- $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a ${libdir} +- rm -f ${libdir}/${SHLIB_NAME} ${libdir}/${SHLIB_LINK} +- $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} ${libdir} +- ${LN_SF} ${SHLIB_NAME} ${libdir}/${SHLIB_LINK} +- ${INSTALL} -m 444 ../include/desire.h ${includedir} ++ install -d $(DESTDIR)/${libdir} ++ install -d $(DESTDIR)/${includedir} ++ $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a $(DESTDIR)${libdir} ++ $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} $(DESTDIR)${libdir} ++ ${LN_SF} ${SHLIB_NAME} $(DESTDIR)${libdir}/${SHLIB_LINK} ++ ${INSTALL} -m 444 ../include/desire.h $(DESTDIR)${includedir} + + clean: + rm -f *.o *.lo *.la *.a ${SHLIB_NAME} ${SHLIB_LINK} *.core diff --git a/desire-QnD.patch b/desire-QnD.patch new file mode 100644 index 0000000..ab253f1 --- /dev/null +++ b/desire-QnD.patch @@ -0,0 +1,227 @@ +diff -Nur desire-3.1/conf/desire.conf desire-3.1.new/conf/desire.conf +--- desire-3.1/conf/desire.conf Mon Apr 9 10:35:53 2001 ++++ desire-3.1.new/conf/desire.conf Tue May 22 11:05:46 2001 +@@ -1,10 +1,10 @@ + + +-folder="/adm/stat"; ++folder="/var/log/desire"; + + service "dialup" { + folder = "dialup"; +- map U2 = "/adm/stat/dialup/Users"; ++ map U2 = "dialup/Users"; + }; + + service "traffic" { +@@ -16,13 +16,13 @@ + service "proxy" { + folder = "proxy"; + description = "Proxy statistics"; +- map Dst = "/adm/stat/proxy/Domains"; ++ map Dst = "proxy/Domains"; + }; + + service "email" { + folder = "email"; + description = "Mail accounting"; +- map Src = "/adm/etc/DOMAINS" ++ map Src = "/etc/DOMAINS" + }; + + service "calls" { +diff -Nur desire-3.1/configure.in desire-3.1.new/configure.in +--- desire-3.1/configure.in Mon Apr 9 10:35:55 2001 ++++ desire-3.1.new/configure.in Tue May 22 11:01:05 2001 +@@ -65,6 +65,6 @@ + AC_FUNC_MMAP + AC_CHECK_FUNCS(mkdir mktime strdup strerror strspn strstr getrusage flock fcntl dbopen dbm_open logf expf gdImagePng gdImageGif) + +-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) ++AC_OUTPUT(libdesire/Makefile libddraw/Makefile depend/proxy_stats/Makefile depend/ctbdump/Makefile depend/ctbmap/Makefile depend/cistat/Makefile depend/Makefile Makefile) + + +diff -Nur desire-3.1/depend/cistat/Makefile.in desire-3.1.new/depend/cistat/Makefile.in +--- desire-3.1/depend/cistat/Makefile.in Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/cistat/Makefile.in Tue May 22 11:01:05 2001 +@@ -9,7 +9,7 @@ + + LIBS+= -L../../libdesire/.libs + LIBS+= -L../../libddraw/.libs +-LIBS+= -L${libdir} ++LIBS+= -L${libdir} -L/usr/lib + LIBS+= -ldesire + LIBS+= -lstrfunc + +@@ -19,7 +19,7 @@ + + CC=@CC@ + CFLAGS+= -Wall @CFLAGS@ @DEFS@ +-CFLAGS+= -I../../include -I${includedir} ++CFLAGS+= -I../../include -I${includedir} -I/usr/include + + INSTALL=@INSTALL@ + +diff -Nur desire-3.1/depend/cistat/cidraw.c desire-3.1.new/depend/cistat/cidraw.c +--- desire-3.1/depend/cistat/cidraw.c Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/cistat/cidraw.c Tue May 22 11:01:05 2001 +@@ -131,11 +131,7 @@ + if(isatty(1)) + fprintf(stderr, "[Image will be displayed here]\n"); + else { +-#ifdef HAVE_GDIMAGEPNG + gdImagePng(im, stdout); +-#else +- gdImageGif(im, stdout); +-#endif + } + + return 0; +diff -Nur desire-3.1/depend/cistat/cistat.c desire-3.1.new/depend/cistat/cistat.c +--- desire-3.1/depend/cistat/cistat.c Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/cistat/cistat.c Tue May 22 11:01:05 2001 +@@ -211,7 +211,7 @@ + nets *nh; + int sscnt; + +- if(!(cf=fopen("/usr/local/etc/cistat.conf", "r"))) ++ if(!(cf=fopen("/etc/cistat.conf", "r"))) + sux("Can't read config."); + + while(fgets(buf, sizeof(buf), cf)) { +diff -Nur desire-3.1/depend/cistat/html/form.cgi desire-3.1.new/depend/cistat/html/form.cgi +--- desire-3.1/depend/cistat/html/form.cgi Mon Apr 9 10:35:54 2001 ++++ desire-3.1.new/depend/cistat/html/form.cgi Tue May 22 11:07:15 2001 +@@ -18,7 +18,7 @@ +