Release 0.5.1

evs38 · Jan 27, 2007 · cfad42c · cfad42c
1 parent bbc8f56
commit cfad42c
Show file tree

Hide file tree

Showing 17 changed files with 196 additions and 79 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,7 @@
 QFE version SVN ==============================================================
+...
+
+QFE version 0.5.1 === Released 27.01.2007 ======================================
 - Fix update squish base UID when write new message.
 - Fix write new message & delete message in Jam-areas.
 - Fix UU & Base64 decoder for work with badly-encoded parts.

diff --git a/README b/README
@@ -27,7 +27,7 @@ and apply patch to husky for compile headers under C++ (located in qfe/misc/husk
 For more information about GPL, see http://www.gnu.org/licenses/gpl.html
 
 [ *** Quick-Compile & Install Guide *** ]
- tar -xf qfe-0.5.tar.bz2
+ tar -xf qfe-0.5.1.tar.bz2
  cd qfe
  ./configure
  make

diff --git a/config.h b/config.h
@@ -2,7 +2,7 @@
 #define _CONFIG_H_
 
 /* QFE Version */
-#define	QFE_VERSION	"0.5-svn"
+#define	QFE_VERSION	"0.5.1"
 
 /* QFE SVN Revision */
 #define QFE_REVISION	"$LastChangedRevision$"

diff --git a/misc/husky/patch/areafix.diff b/misc/husky/patch/areafix.diff
@@ -1,6 +1,27 @@
+diff -urN areafix.orig/Makefile areafix/Makefile
+--- areafix.orig/Makefile	2003-12-15 12:44:13.000000000 +0300
++++ areafix/Makefile	2007-01-27 16:19:16.000000000 +0300
+@@ -24,7 +24,7 @@
+ endif
+
+ SRC_DIR = src/
+-H_DIR   = areafix/
++H_DIR   = areafix
+ TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(_LIB)
+ TARGETDLL = $(LIBPREFIX)$(LIBNAME)$(_DLL)
+
+@@ -53,7 +53,7 @@
+   else
+ $(TARGETDLL).$(VER): $(OBJS)
+ 	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
+-          -o $(TARGETDLL).$(VER) $(OBJS)
++          -L$(LIBDIR) -lhusky -lfidoconfig -lsmapi -o $(TARGETDLL).$(VER) $(OBJS)
+   endif
+
+ instdyn: $(TARGETLIB) $(TARGETDLL).$(VER)
 diff -urN areafix.orig/src/areafix.c areafix/src/areafix.c
---- areafix.orig/src/areafix.c	2006-12-21 10:13:45.000000000 +0300
-+++ areafix/src/areafix.c	2006-12-21 10:50:48.000000000 +0300
+--- areafix.orig/src/areafix.c	2007-01-27 11:41:12.000000000 +0300
++++ areafix/src/areafix.c	2007-01-27 11:42:30.000000000 +0300
 @@ -131,7 +131,7 @@
  }
 
@@ -40,7 +61,7 @@ diff -urN areafix.orig/src/areafix.c areafix/src/areafix.c
                  if (rc==0) active++; avail++;
              }
  	} /* end add line */
-@@ -2721,14 +2721,14 @@
+@@ -2722,14 +2722,14 @@
                          if(af_config->readOnly[k].areaMask[0] != '!') {
                              if (patimat(areas[i].areaName, af_config->readOnly[k].areaMask) &&
                                  patmat(toAka, af_config->readOnly[k].addrMask)) {
@@ -57,7 +78,7 @@ diff -urN areafix.orig/src/areafix.c areafix/src/areafix.c
                              }
                          }
                      }
-@@ -2739,22 +2739,22 @@
+@@ -2740,22 +2740,22 @@
                          if(af_config->writeOnly[k].areaMask[0] != '!') {
                              if (patimat(areas[i].areaName, af_config->writeOnly[k].areaMask) &&
                                  patmat(toAka, af_config->writeOnly[k].addrMask)) {
@@ -85,8 +106,8 @@ diff -urN areafix.orig/src/areafix.c areafix/src/areafix.c
                  }
 
 diff -urN areafix.orig/src/query.c areafix/src/query.c
---- areafix.orig/src/query.c	2006-12-21 10:13:45.000000000 +0300
-+++ areafix/src/query.c	2006-12-21 10:51:12.000000000 +0300
+--- areafix.orig/src/query.c	2007-01-27 11:41:12.000000000 +0300
++++ areafix/src/query.c	2007-01-27 11:42:30.000000000 +0300
 @@ -1263,9 +1263,9 @@
      arealink = getAreaLink(area, aka);
      if (arealink) {

diff --git a/misc/husky/patch/fidoconf.diff b/misc/husky/patch/fidoconf.diff
@@ -1,6 +1,6 @@
 diff -urN fidoconf.orig/fidoconf/fidoconf.h fidoconf/fidoconf/fidoconf.h
 --- fidoconf.orig/fidoconf/fidoconf.h	2006-12-21 10:14:08.000000000 +0300
-+++ fidoconf/fidoconf/fidoconf.h	2006-12-21 10:40:25.000000000 +0300
++++ fidoconf/fidoconf/fidoconf.h	2007-01-27 11:44:14.000000000 +0300
 @@ -113,7 +113,7 @@
     char    *command;
  } s_execonfile, *ps_execonfile;
@@ -39,9 +39,45 @@ diff -urN fidoconf.orig/fidoconf/fidoconf.h fidoconf/fidoconf/fidoconf.h
     int          netMail;  /*  do this in netmail, not echomail */
     int          move;	  /*  move (not copy) original msg */
     int          extspawn; /*  areaName is name of external program to exec */
+diff -urN fidoconf.orig/Makefile fidoconf/Makefile
+--- fidoconf.orig/Makefile	2006-02-04 12:44:14.000000000 +0300
++++ fidoconf/Makefile	2007-01-27 16:24:40.000000000 +0300
+@@ -80,7 +80,7 @@
+ else
+ $(TARGETDLL).$(VER): $(LOBJS)
+ 	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
+-	-o $(TARGETDLL).$(VER) $(LOBJS)
++        -L$(LIBDIR) -lhusky -o $(TARGETDLL).$(VER) $(LOBJS)
+ endif
+ 	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
+ 	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
+diff -urN fidoconf.orig/makefile.in2 fidoconf/makefile.in2
+--- fidoconf.orig/makefile.in2	2006-02-04 12:44:21.000000000 +0300
++++ fidoconf/makefile.in2	2007-01-27 16:21:41.000000000 +0300
+@@ -8,7 +8,7 @@
+ AR_R = rs
+ RM   = rm
+
+-CDEFS  += -c -fPIC -Wall -ggdb -DUNIX -I.. -Wno-char-subscripts $(CINCL)
++CDEFS  += -c -fPIC -Wall -ggdb -I.. -Wno-char-subscripts $(CINCL)
+ COPT   += -O3
+ LFLAGS += -L.
+
+diff -urN fidoconf.orig/makefile.inc fidoconf/makefile.inc
+--- fidoconf.orig/makefile.inc	2007-01-27 11:41:15.000000000 +0300
++++ fidoconf/makefile.inc	2007-01-27 16:22:42.000000000 +0300
+@@ -10,6 +10,8 @@
+
+ include makefile.in1
+
++LIBS = -lfidoconfig -lsmapi -lhusky
++
+ commonlibs: $(LIBFIDOCONFIG)$(_LIB) $(SYMBOLIC)
+ 	$(NULL)
+
 diff -urN fidoconf.orig/src/afixcmd.c fidoconf/src/afixcmd.c
 --- fidoconf.orig/src/afixcmd.c	2005-03-13 22:03:43.000000000 +0300
-+++ fidoconf/src/afixcmd.c	2006-12-21 10:46:42.000000000 +0300
++++ fidoconf/src/afixcmd.c	2007-01-27 11:44:14.000000000 +0300
 @@ -458,14 +458,14 @@
                  if(config->readOnly[i].areaMask[0] != '!') {
                      if (patimat(area->areaName, config->readOnly[i].areaMask) &&
@@ -77,9 +113,9 @@ diff -urN fidoconf.orig/src/afixcmd.c fidoconf/src/afixcmd.c
                  }
              }
 diff -urN fidoconf.orig/src/common.c fidoconf/src/common.c
---- fidoconf.orig/src/common.c	2006-12-21 10:14:09.000000000 +0300
-+++ fidoconf/src/common.c	2006-12-21 10:41:41.000000000 +0300
-@@ -316,7 +316,7 @@
+--- fidoconf.orig/src/common.c	2007-01-10 12:33:13.000000000 +0300
++++ fidoconf/src/common.c	2007-01-27 11:44:14.000000000 +0300
+@@ -317,7 +317,7 @@
  		   break;
  	   case immediate : xstrcat(&name, "i");
  		   break;
@@ -90,7 +126,7 @@ diff -urN fidoconf.orig/src/common.c fidoconf/src/common.c
  		   break;
 diff -urN fidoconf.orig/src/fidoconf.c fidoconf/src/fidoconf.c
 --- fidoconf.orig/src/fidoconf.c	2006-12-21 10:14:09.000000000 +0300
-+++ fidoconf/src/fidoconf.c	2006-12-21 10:42:57.000000000 +0300
++++ fidoconf/src/fidoconf.c	2007-01-27 11:44:14.000000000 +0300
 @@ -293,7 +293,7 @@
  		   if (stricmp(cbaName, aptr->areaName)==0) {
  		       found++;
@@ -175,8 +211,8 @@ diff -urN fidoconf.orig/src/fidoconf.c fidoconf/src/fidoconf.c
                 memcpy ( &(clink->hisAka), &(config->addr[i]), sizeof(hs_addr));
                 clink->ourAka = &(config->addr[i]);
 diff -urN fidoconf.orig/src/line.c fidoconf/src/line.c
---- fidoconf.orig/src/line.c	2006-12-21 10:14:09.000000000 +0300
-+++ fidoconf/src/line.c	2006-12-21 10:46:06.000000000 +0300
+--- fidoconf.orig/src/line.c	2007-01-10 12:33:13.000000000 +0300
++++ fidoconf/src/line.c	2007-01-27 11:44:14.000000000 +0300
 @@ -626,21 +626,21 @@
 
      if (link->numOptGrp > 0) {
@@ -279,7 +315,7 @@ diff -urN fidoconf.orig/src/line.c fidoconf/src/line.c
    else if (strcmp(iLine, "direct")==0) *flavour = direct;
    else if (strcmp(iLine, "crash")==0) *flavour = crash;
    else if (strcmp(iLine, "immediate")==0) *flavour = immediate;
-@@ -3149,8 +3149,8 @@
+@@ -3150,8 +3150,8 @@
        config->linkDefaults->filefix.on = 1;
 
        /*  set defaults to export, import, mandatory (0), manual (0) */
@@ -290,7 +326,7 @@ diff -urN fidoconf.orig/src/line.c fidoconf/src/line.c
        config->linkDefaults->ourAka = &(config->addr[0]);
 
        /*  set defaults maxUnpackedNetmail */
-@@ -4058,14 +4058,14 @@
+@@ -4064,14 +4064,14 @@
              break;
          case ID_EXPORT:
              if( (clink = getDescrLink(config)) != NULL ) {
@@ -309,7 +345,7 @@ diff -urN fidoconf.orig/src/line.c fidoconf/src/line.c
              }
 diff -urN fidoconf.orig/src/tparser.c fidoconf/src/tparser.c
 --- fidoconf.orig/src/tparser.c	2006-12-21 10:14:09.000000000 +0300
-+++ fidoconf/src/tparser.c	2006-12-21 10:48:46.000000000 +0300
++++ fidoconf/src/tparser.c	2007-01-27 11:44:14.000000000 +0300
 @@ -412,19 +412,19 @@
         printf("\t");
         printAddr(&(area.downlinks[i]->link->hisAka));

diff --git a/misc/husky/patch/hpt.diff b/misc/husky/patch/hpt.diff
@@ -1,6 +1,18 @@
+diff -urN hpt.orig/Makefile hpt/Makefile
+--- hpt.orig/Makefile	2003-12-15 13:08:05.000000000 +0300
++++ hpt/Makefile	2007-01-27 16:23:06.000000000 +0300
+@@ -6,7 +6,7 @@
+ include ../huskymak.cfg
+ endif
+
+-SRC_DIR = src$(DIRSEP)
++SRC_DIR = src/
+
+ ifeq ($(DEBUG), 1)
+   CFLAGS = -Ih -I$(INCDIR) $(DEBCFLAGS) $(WARNFLAGS)
 diff -urN hpt.orig/src/carbon.c hpt/src/carbon.c
 --- hpt.orig/src/carbon.c	2006-12-21 10:14:35.000000000 +0300
-+++ hpt/src/carbon.c	2006-12-21 10:54:50.000000000 +0300
++++ hpt/src/carbon.c	2007-01-27 11:45:30.000000000 +0300
 @@ -156,7 +156,7 @@
  int processCarbonCopy (s_area *area, s_area *echo, s_message *msg, s_carbon carbon)
  {
@@ -33,9 +45,9 @@ diff -urN hpt.orig/src/carbon.c hpt/src/carbon.c
  	else rc = putMsgInArea(area,msg,0,0);
  	area->imported++;  /*  area has got new messages */
 diff -urN hpt.orig/src/hptafix.c hpt/src/hptafix.c
---- hpt.orig/src/hptafix.c	2005-12-23 10:40:58.000000000 +0300
-+++ hpt/src/hptafix.c	2006-12-21 10:54:15.000000000 +0300
-@@ -113,7 +113,7 @@
+--- hpt.orig/src/hptafix.c	2007-01-10 12:33:47.000000000 +0300
++++ hpt/src/hptafix.c	2007-01-27 11:45:30.000000000 +0300
+@@ -117,7 +117,7 @@
                    if (rescanCount < 0 || rescanCount > link->rescanLimit)
                      rescanCount = link->rescanLimit;
                  }
@@ -45,9 +57,9 @@ diff -urN hpt.orig/src/hptafix.c hpt/src/hptafix.c
                      tossTempOutbound(config->tempOutbound);
                  } else {
 diff -urN hpt.orig/src/perl.c hpt/src/perl.c
---- hpt.orig/src/perl.c	2005-04-01 15:48:11.000000000 +0400
-+++ hpt/src/perl.c	2006-12-21 10:52:43.000000000 +0300
-@@ -162,7 +162,7 @@
+--- hpt.orig/src/perl.c	2007-01-10 12:33:47.000000000 +0300
++++ hpt/src/perl.c	2007-01-27 11:45:30.000000000 +0300
+@@ -165,7 +165,7 @@
    else if ((attr & 0x20000) || (attr & 0x202) == 0x202) return direct;
    else if (attr & 0x200) return hold;
    else if (attr & 2) return crash;
@@ -56,7 +68,7 @@ diff -urN hpt.orig/src/perl.c hpt/src/perl.c
  }
  /* flavour to flag */
  static unsigned long flv2flag(e_flavour flv) {
-@@ -187,7 +187,7 @@
+@@ -190,7 +190,7 @@
  /* smart string flavour parsing */
  static e_flavour str2flv(char *flv) {
  struct flv_data_s { e_flavour f; char c; char *s1; char *s2; };
@@ -65,7 +77,7 @@ diff -urN hpt.orig/src/perl.c hpt/src/perl.c
                                         { hold, 'h', "hld", "hold" },
                                         { crash, 'c', "cra", "crash" },
                                         { direct, 'd', "dir", "direct" },
-@@ -1168,8 +1168,8 @@
+@@ -1232,8 +1232,8 @@
                              1 | config->echoAreas[i].downlinks[j]->defLink << 1
                              | config->echoAreas[i].downlinks[j]->manual << 2
                              | config->echoAreas[i].downlinks[j]->mandatory << 3
@@ -76,7 +88,7 @@ diff -urN hpt.orig/src/perl.c hpt/src/perl.c
                             );
            }
            /* val r/o: SvREADONLY_on(hv3); */
-@@ -1566,7 +1566,7 @@
+@@ -1630,7 +1630,7 @@
                  sv_setpv(svroute, aka2str(defroute->target->hisAka));
          else /* noroute */
                  sv_setpv(svroute, aka2str(msg->destAddr));
@@ -85,7 +97,7 @@ diff -urN hpt.orig/src/perl.c hpt/src/perl.c
              sv_setpv(svflv, "normal");
          else if (defroute->flavour==hold)
              sv_setpv(svflv, "hold");
-@@ -1674,7 +1674,7 @@
+@@ -1738,7 +1738,7 @@
                 else if ( (route.flavour = str2flv(flv)) != -1 ) ;
      #else
                 else if (stricmp(flv, "normal") == 0)
@@ -95,8 +107,8 @@ diff -urN hpt.orig/src/perl.c hpt/src/perl.c
                   route.flavour = hold;
                 else if (stricmp(flv, "crash") == 0)
 diff -urN hpt.orig/src/scan.c hpt/src/scan.c
---- hpt.orig/src/scan.c	2006-12-21 10:14:35.000000000 +0300
-+++ hpt/src/scan.c	2006-12-21 10:53:33.000000000 +0300
+--- hpt.orig/src/scan.c	2007-01-10 12:33:47.000000000 +0300
++++ hpt/src/scan.c	2007-01-27 11:45:30.000000000 +0300
 @@ -480,7 +480,7 @@
  int packMsg(HMSG SQmsg, XMSG *xmsg, s_area *area)
  {
@@ -143,9 +155,9 @@ diff -urN hpt.orig/src/scan.c hpt/src/scan.c
  		         remove(virtualLink->bsyFile);
  		         nfree(virtualLink->bsyFile);
 diff -urN hpt.orig/src/seenby.c hpt/src/seenby.c
---- hpt.orig/src/seenby.c	2004-12-08 07:53:02.000000000 +0300
-+++ hpt/src/seenby.c	2006-12-21 10:53:55.000000000 +0300
-@@ -333,7 +333,7 @@
+--- hpt.orig/src/seenby.c	2007-01-10 12:33:47.000000000 +0300
++++ hpt/src/seenby.c	2007-01-27 11:45:30.000000000 +0300
+@@ -335,7 +335,7 @@
          if ( checkLink(seenBys, seenByCount, echo->downlinks[i]->link,
              pktOrigAddr, echo)!=0) continue;
          /*  link with "export off" */

diff --git a/misc/husky/patch/htick.diff b/misc/husky/patch/htick.diff
@@ -1,6 +1,6 @@
 diff -urN htick.orig/src/clean.c htick/src/clean.c
 --- htick.orig/src/clean.c	2004-03-28 00:30:04.000000000 +0300
-+++ htick/src/clean.c	2006-12-21 10:56:02.000000000 +0300
++++ htick/src/clean.c	2007-01-27 11:46:11.000000000 +0300
 @@ -115,7 +115,7 @@
              aka = &(config->links[i]->hisAka);
              do
@@ -11,8 +11,8 @@ diff -urN htick.orig/src/clean.c htick/src/clean.c
                    sprintf(strrchr(tmpdir, '.'), ".sep");
                    if (direxist(tmpdir)) {
 diff -urN htick.orig/src/htickafix.c htick/src/htickafix.c
---- htick.orig/src/htickafix.c	2005-06-09 11:53:36.000000000 +0400
-+++ htick/src/htickafix.c	2006-12-21 10:55:44.000000000 +0300
+--- htick.orig/src/htickafix.c	2007-01-10 12:34:26.000000000 +0300
++++ htick/src/htickafix.c	2007-01-27 11:46:11.000000000 +0300
 @@ -109,14 +109,14 @@
 
  		if (link->numOptGrp) {

diff --git a/misc/husky/patch/huskylib.diff b/misc/husky/patch/huskylib.diff
@@ -0,0 +1,37 @@
+diff -urN huskylib.orig/Makefile huskylib/Makefile
+--- huskylib.orig/Makefile	2006-02-04 12:23:29.000000000 +0300
++++ huskylib/Makefile	2007-01-27 16:23:39.000000000 +0300
+@@ -34,7 +34,7 @@
+ endif
+
+ _SRC_DIR = src/
+-_H_DIR   = huskylib/
++_H_DIR   = huskylib
+
+ %$(_OBJ): $(_SRC_DIR)%.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(_SRC_DIR)$*.c
+diff -urN huskylib.orig/src/fexist.c huskylib/src/fexist.c
+--- huskylib.orig/src/fexist.c	2005-01-13 23:08:03.000000000 +0300
++++ huskylib/src/fexist.c	2007-01-27 11:56:40.000000000 +0300
+@@ -58,6 +58,8 @@
+    the old "ffind" method. */
+ #  include <sys/types.h>
+ #  include <sys/stat.h>
++#else
++#  include <ffind.h>
+ #endif
+
+ /* huskylib headers */
+diff -urN huskylib.orig/src/genverst.c huskylib/src/genverst.c
+--- huskylib.orig/src/genverst.c	2004-06-06 20:16:47.000000000 +0400
++++ huskylib/src/genverst.c	2007-01-27 11:58:14.000000000 +0300
+@@ -53,6 +53,9 @@
+ #ifdef UNAME                          /* Use '-DUNAME' compiler parameter */
+    platform = "/" UNAME;
+
++#elif defined(__x86_64__)
++   platform = "/lnx64";
++
+ #elif defined(__linux__)              /*  gcc on Linux                    */
+    platform = "/lnx";
+
diff --git a/misc/husky/patch/smapi.diff b/misc/husky/patch/smapi.diff
@@ -0,0 +1,21 @@
+diff -urN smapi.orig/Makefile smapi/Makefile
+--- smapi.orig/Makefile	2003-03-11 17:07:07.000000000 +0300
++++ smapi/Makefile	2007-01-27 16:24:13.000000000 +0300
+@@ -24,7 +24,7 @@
+ endif
+
+ SRC_DIR = src/
+-H_DIR   = smapi/
++H_DIR   = smapi
+
+ CDEFS=-D$(OSTYPE) $(ADDCDEFS) -I$(H_DIR) -I$(INCDIR)
+
+@@ -51,7 +51,7 @@
+   else
+ $(TARGETDLL).$(VER): $(OBJS)
+ 	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
+-          -o $(TARGETDLL).$(VER) $(OBJS)
++          -L$(LIBDIR) -lhusky -o $(TARGETDLL).$(VER) $(OBJS)
+   endif
+
+ instdyn: $(TARGETLIB) $(TARGETDLL).$(VER)