--- estic-1.61.orig/Makefile +++ estic-1.61/Makefile @@ -0,0 +1,16 @@ +# Simple Makefile +# $Id: Makefile,v 1.1 1999/12/26 15:51:20 debacle Exp $ + +all: areacode/actest areacode/acvers estic/estic spunk/spunk.a + +areacode/actest: + cd areacode; $(MAKE) depend; $(MAKE) actest + +areacode/acvers: + cd areacode; $(MAKE) depend; $(MAKE) acvers + +estic/estic: spunk/spunk.a areacode/areacode.o + cd estic; $(MAKE) depend; $(MAKE) estic + +spunk/spunk.a: + cd spunk; $(MAKE) depend; $(MAKE) spunk.a --- estic-1.61.orig/estic/icshort.cc +++ estic-1.61/estic/icshort.cc @@ -578,17 +578,17 @@ // Item numbers for the short number edit menu -const miNumber = 10; -const miUsage = 20; -const miSignaling = 30; -const miDevice1 = 110; -const miDevice2 = 120; -const miDevice3 = 130; -const miDevice4 = 140; -const miDevice5 = 150; -const miDevice6 = 160; -const miDevice7 = 170; -const miDevice8 = 180; +const int miNumber = 10; +const int miUsage = 20; +const int miSignaling = 30; +const int miDevice1 = 110; +const int miDevice2 = 120; +const int miDevice3 = 130; +const int miDevice4 = 140; +const int miDevice5 = 150; +const int miDevice6 = 160; +const int miDevice7 = 170; +const int miDevice8 = 180; --- estic-1.61.orig/estic/icdevs.cc +++ estic-1.61/estic/icdevs.cc @@ -157,8 +157,8 @@ String DevListBox::RerouteName (const String& Num) // Map the reroute capability to a string with fixed length { - const StringLength = 18; - const PadLength = 21; + const int StringLength = 18; + const int PadLength = 21; String Res (PadLength); if (Num.IsEmpty ()) { @@ -269,9 +269,9 @@ static void EditExtReroute (const Point& Pos, IstecDevConfig& Config) // Edit the extended reroute capabilities of FW 2.0 in a separate menu { - const miPhone = 10; - const miCondition = 20; - const miRingCount = 30; + const int miPhone = 10; + const int miCondition = 20; + const int miRingCount = 30; // Load the menu Menue* M = (Menue*) LoadResource ("@ICDEVS.RerouteMenue"); @@ -407,38 +407,38 @@ static const String StgPosName = "EditDevConfig.ConfigMenue.Position"; // Menue constants - const miDialCaps = 10; - const miService = 20; - const miReroute = 30; // Simple reroute, pre-2.00 - const miChargePulse = 40; - const miPIN = 50; - const miTerminalMode = 60; - const miKnockInt = 70; - const miKnockExt = 80; - const miKnockTFE = 90; - const miExtReroute = 100; // Extended reroute, 2.00 and up - const miKnockInt21 = 1000; - const miKnockInt22 = 1010; - const miKnockInt23 = 1020; - const miKnockInt24 = 1030; - const miKnockInt25 = 1040; - const miKnockInt26 = 1050; - const miKnockInt27 = 1060; - const miKnockInt28 = 1070; - const miKnockMSN0 = 1100; - const miKnockMSN1 = 1110; - const miKnockMSN2 = 1120; - const miKnockMSN3 = 1130; - const miKnockMSN4 = 1140; - const miKnockMSN5 = 1150; - const miKnockMSN6 = 1160; - const miKnockMSN7 = 1170; - const miKnockMSN8 = 1180; - const miKnockMSN9 = 1190; - const miKnockTFE1 = 1200; - const miKnockTFE2 = 1210; - const miKnockTFE3 = 1220; - const miKnockTFE4 = 1230; + const int miDialCaps = 10; + const int miService = 20; + const int miReroute = 30; // Simple reroute, pre-2.00 + const int miChargePulse = 40; + const int miPIN = 50; + const int miTerminalMode = 60; + const int miKnockInt = 70; + const int miKnockExt = 80; + const int miKnockTFE = 90; + const int miExtReroute = 100; // Extended reroute, 2.00 and up + const int miKnockInt21 = 1000; + const int miKnockInt22 = 1010; + const int miKnockInt23 = 1020; + const int miKnockInt24 = 1030; + const int miKnockInt25 = 1040; + const int miKnockInt26 = 1050; + const int miKnockInt27 = 1060; + const int miKnockInt28 = 1070; + const int miKnockMSN0 = 1100; + const int miKnockMSN1 = 1110; + const int miKnockMSN2 = 1120; + const int miKnockMSN3 = 1130; + const int miKnockMSN4 = 1140; + const int miKnockMSN5 = 1150; + const int miKnockMSN6 = 1160; + const int miKnockMSN7 = 1170; + const int miKnockMSN8 = 1180; + const int miKnockMSN9 = 1190; + const int miKnockTFE1 = 1200; + const int miKnockTFE2 = 1210; + const int miKnockTFE3 = 1220; + const int miKnockTFE4 = 1230; // Save the configuration into a memory stream, remember the CRC --- estic-1.61.orig/estic/estic.cc +++ estic-1.61/estic/estic.cc @@ -80,9 +80,9 @@ // Diag mode update -static const duOff = 0; -static const duOn = 1; -static const duAuto = 2; // Update if version <= 1.93 +static const int duOff = 0; +static const int duOn = 1; +static const int duAuto = 2; // Update if version <= 1.93 static const char VersionStr [] = "1.50"; static const char VersionID [] = "ESTIC-Version"; @@ -213,6 +213,11 @@ // Try to open the debug logfile InitDebugLog (DebugLog); + // Don't create estic.rc "somewhere", better is the $HOME + String HomeDir = GetEnvVar ("HOME"); + AddPathSep (HomeDir); + SettingsFile = HomeDir + SettingsFile; + // Open the program option file if (!SettingsFile.IsEmpty ()) { // If we cannot open the settings file, print an error message. @@ -618,11 +623,15 @@ if (F->GetStatus () != stOk) { // Ok, last resort: try the support path delete F; - F = new IniFile (GetSupportPath () + IniName); + F = new IniFile ("/etc/" + IniName); if (F->GetStatus () != stOk) { // No ini file delete F; - return; + F = new IniFile (GetSupportPath () + IniName); + if (F->GetStatus () != stOk) { + delete F; + return; + } } } } --- estic-1.61.orig/estic/icbaseed.cc +++ estic-1.61/estic/icbaseed.cc @@ -451,26 +451,26 @@ // otherwise, Changed is left untouched. { // ID's of menue items for EditBaseConfig - const miIstecType = 10; - const miProtocol = 20; - const miExtLevel = 30; - const miMusic = 40; - const miConnection = 50; - const miNumber1 = 60; - const miNumber2 = 70; - const miTFEAssignment = 80; - const miQueryLoc = 90; - const miMSN = 100; - const miMSNGroups = 110; - const miEAZGroups = 120; - const miExternalMusicPort = 130; - const miCountryCode = 140; - const miSignaling = 150; + const int miIstecType = 10; + const int miProtocol = 20; + const int miExtLevel = 30; + const int miMusic = 40; + const int miConnection = 50; + const int miNumber1 = 60; + const int miNumber2 = 70; + const int miTFEAssignment = 80; + const int miQueryLoc = 90; + const int miMSN = 100; + const int miMSNGroups = 110; + const int miEAZGroups = 120; + const int miExternalMusicPort = 130; + const int miCountryCode = 140; + const int miSignaling = 150; // Values for the miMusic toggle item - const musOff = 0; - const musInternal = 1; - const musExternal = 2; + const int musOff = 0; + const int musInternal = 1; + const int musExternal = 2; --- estic-1.61.orig/estic/Makefile +++ estic-1.61/estic/Makefile @@ -0,0 +1,145 @@ +# ***************************************************************************** +# * * +# * ESTIC Makefile for Linux * +# * * +# * (C) 1995-96 Ullrich von Bassewitz * +# * Wacholderweg 14 * +# * D-70597 Stuttgart * +# * EMail: uz@ibb.schwaben.com * +# * * +# ***************************************************************************** + + + +# $Id: Makefile,v 1.4 2002/02/19 11:54:17 debacle Exp $ +# +# $Log: Makefile,v $ +# Revision 1.4 2002/02/19 11:54:17 debacle +# *** empty log message *** +# +# Revision 1.3 2001/02/07 01:34:27 debacle +# gcc instead of g++ is better for linking. +# +# Revision 1.2 2000/01/01 16:10:07 debacle +# Nothing important. +# +# Revision 1.1 1999/12/26 15:51:28 debacle +# Debianisation. +# +# +# + + + +# ------------------------------------------------------------------------------ +# Definitions + +# Names of executables +AS = gas +AR = ar +LD = ld +ZIP = zip +CXX = g++-4.6 + +LIB = ../spunk/spunk.a +INCDIR = ../spunk + +# Flags for the GNU C compiler +override CFLAGS += -DLINUX -I$(INCDIR) -fno-implicit-templates -DEXPLICIT_TEMPLATES + +# ------------------------------------------------------------------------------ +# Implicit rules + +.c.o: + $(CC) $(CFLAGS) -c $< + +.cc.o: + $(CXX) $(CFLAGS) -c $< + +# ------------------------------------------------------------------------------ +# All OBJ files + +OBJS = callwin.o \ + chargwin.o \ + cliwin.o \ + devstate.o \ + estic.o \ + icac.o \ + icalias.o \ + icbaseed.o \ + iccli.o \ + icconfig.o \ + iccom.o \ + iccprint.o \ + iccron.o \ + iccti.o \ + icdevs.o \ + icdiag.o \ + icdlog.o \ + icei.o \ + icerror.o \ + icfile.o \ + icident.o \ + icintcon.o \ + iclog.o \ + icmsgwin.o \ + icshort.o \ + icver.o \ + imon.o \ + istecmsg.o + +ACOBJ = ../areacode/areacode.o + +# ------------------------------------------------------------------------------ +# + +ifeq (.depend,$(wildcard .depend)) +all: estic +include .depend +else +all: depend +endif + + +estic: $(LIB) $(OBJS) + $(CXX) -o $@ $(OBJS) $(ACOBJ) $(LIB) -lncurses + +# ------------------------------------------------------------------------------ +# Create a dependency file + +depend dep: + @echo "Creating dependency information" + $(CXX) -I$(INCDIR) -DLINUX -MM *.cc > .depend + +# ------------------------------------------------------------------------------ +# Create a ZIP file + +strip: + strip estic + + +zip: + -rm -f estic.zip + -rm -f *~ + cp Makefile linux.mak + $(ZIP) -9 estic.zip *.cc *.h estic.res estic.ini *.doc *.chg *.mak alias.dat + +bin-dist: estic icload strip + -rm -f estic.zip + $(ZIP) -9 estic.zip estic estic.res estic.doc estic.chg estic.ini alias.dat + +convert: + dos2iso -f *.cc *.h *.doc *.dat estic.ini estic.chg make/*.mak + + +# ------------------------------------------------------------------------------ +# clean up + +clean: + -rm *.bak *~ + +zap: clean + -rm *.o + -rm .depend + + --- estic-1.61.orig/spunk/sercom.h +++ estic-1.61/spunk/sercom.h @@ -43,29 +43,29 @@ // Constants for accessing the array of error counters -const ceRXOverflow = 0; // Receive buffer overflow -const ceTXOverflow = 1; // Transmit buffer overflow -const ceOverrun = 2; // UART overrun -const ceBreak = 3; // Break received -const ceFrame = 4; // Framing error -const ceParity = 5; // Parity error +const int ceRXOverflow = 0; // Receive buffer overflow +const int ceTXOverflow = 1; // Transmit buffer overflow +const int ceOverrun = 2; // UART overrun +const int ceBreak = 3; // Break received +const int ceFrame = 4; // Framing error +const int ceParity = 5; // Parity error // Bitmask constants for evaluating the result of ModemStatus -const csDeltaCTS = 0x01; // Delta CTS -const csDeltaDSR = 0x02; // Delta DSR -const csDeltaRI = 0x04; // Falling edge of RI -const csDeltaCarrierDetect = 0x08; // Delta CD -const csClearToSend = 0x10; // Clear To Send -const csDataSetReady = 0x20; // Data Set Ready -const csRingIndicator = 0x40; // Ring Indicator -const csCarrierDetect = 0x80; // Carrier Detect -const csCTS = csClearToSend; -const csDSR = csDataSetReady; -const csRI = csRingIndicator; -const csCD = csCarrierDetect; -const csDeltaCD = csDeltaCarrierDetect; +const int csDeltaCTS = 0x01; // Delta CTS +const int csDeltaDSR = 0x02; // Delta DSR +const int csDeltaRI = 0x04; // Falling edge of RI +const int csDeltaCarrierDetect = 0x08; // Delta CD +const int csClearToSend = 0x10; // Clear To Send +const int csDataSetReady = 0x20; // Data Set Ready +const int csRingIndicator = 0x40; // Ring Indicator +const int csCarrierDetect = 0x80; // Carrier Detect +const int csCTS = csClearToSend; +const int csDSR = csDataSetReady; +const int csRI = csRingIndicator; +const int csCD = csCarrierDetect; +const int csDeltaCD = csDeltaCarrierDetect; --- estic-1.61.orig/spunk/filepath.h +++ estic-1.61/spunk/filepath.h @@ -74,9 +74,6 @@ // If such an abreviation is not possible, S is returned - so check the length // of the result before using the returned string. -String TempName (); -// Return a name for a temporary file (this function uses tmpnam) - char GetCurrentDrive (); // Return the current drive as a letter @@ -88,7 +85,7 @@ // Return 1 if the given path contains one of the wildcard characters '*', '?' // or '[]', return zero otherwise. -int FMatch (const String& Source, const String& Pattern); +//int FMatch (const String& Source, const String& Pattern); // Match the string in Source against Pattern. Pattern may contain the // wildcards '*', '?', '[abcd]' '[ab-d]', '[!abcd]', '[!ab-d]' // The function returns a value of zero if Source does not match Pattern, --- estic-1.61.orig/spunk/filesys.h +++ estic-1.61/spunk/filesys.h @@ -44,10 +44,10 @@ extern const char FileSysPathSep; // Path separator extern const char FileSysListSep; // Path list separator -extern const FileSysMaxPath; // Maximum path length -extern const FileSysMaxDir; // Maximum directory length -extern const FileSysMaxName; // Maximum file name length -extern const FileSysMaxExt; // Maximum extension length (including the dot) +extern const int FileSysMaxPath; // Maximum path length +extern const int FileSysMaxDir; // Maximum directory length +extern const int FileSysMaxName; // Maximum file name length +extern const int FileSysMaxExt; // Maximum extension length (including the dot) --- estic-1.61.orig/spunk/menue.cc +++ estic-1.61/spunk/menue.cc @@ -495,8 +495,8 @@ i16 GenericMenue::GetChoice () { - const AltNextKeyCode = MaxUserID + 1; - const AltPrevKeyCode = MaxUserID + 2; + const int AltNextKeyCode = MaxUserID + 1; + const int AltPrevKeyCode = MaxUserID + 2; // Remember old window state --- estic-1.61.orig/spunk/program.cc +++ estic-1.61/spunk/program.cc @@ -125,6 +125,13 @@ } } +#ifdef USR_SHARE_PATH + String UsrSharePath = "/usr/share/"; + UsrSharePath += ProgBaseName; + UsrSharePath += FileSysListSep; // Add a file list separator + SearchPath = UsrSharePath + SearchPath; +#endif // USR_SHARE_PATH + // Get the current directory and remove the trailing separator String CurrentDir = GetCurrentDir (); DelPathSep (CurrentDir); --- estic-1.61.orig/spunk/textstrm.cc +++ estic-1.61/spunk/textstrm.cc @@ -66,8 +66,8 @@ // LineLen is the estimated length of a line in the file used for // estimating the size of the buffer. { - static const Delta = 100; - static const BufSize = 4096; + static const int Delta = 100; + static const int BufSize = 4096; // Estimate the count of lines if ((Limit = Size / LineLen) < 100) { --- estic-1.61.orig/spunk/palette.h +++ estic-1.61/spunk/palette.h @@ -40,19 +40,19 @@ // Indices into the palette arrays -static const atFrameInactive = 0; // passive frame -static const atFrameActive = 1; // active frame -static const atFrameResizing = 2; // resizing frame -static const atTextNormal = 3; // normal text -static const atTextInvers = 4; // inverted text -static const atTextSelected = 5; // selected static text -static const atTextHigh = 6; // selected text (i.e. hotkeys) -static const atTextHighInvers = 7; // inverted selected text -static const atTextGrayed = 8; // grey (inactive) text -static const atTextGrayedInvers = 9; // dito inverted -static const atEditNormal = 10; // normal text in an edit window -static const atEditHigh = 11; // i.e. left/right arrows -static const atEditBar = 12; // scroll bar (use atEditNormal for text) +static const int atFrameInactive = 0; // passive frame +static const int atFrameActive = 1; // active frame +static const int atFrameResizing = 2; // resizing frame +static const int atTextNormal = 3; // normal text +static const int atTextInvers = 4; // inverted text +static const int atTextSelected = 5; // selected static text +static const int atTextHigh = 6; // selected text (i.e. hotkeys) +static const int atTextHighInvers = 7; // inverted selected text +static const int atTextGrayed = 8; // grey (inactive) text +static const int atTextGrayedInvers = 9; // dito inverted +static const int atEditNormal = 10; // normal text in an edit window +static const int atEditHigh = 11; // i.e. left/right arrows +static const int atEditBar = 12; // scroll bar (use atEditNormal for text) // Palette numbers --- estic-1.61.orig/spunk/check.h +++ estic-1.61/spunk/check.h @@ -38,9 +38,6 @@ extern -#ifdef __GNUC__ -volatile -#endif void (*CheckFailed) (const char* Msg, const char* Cond, int Code, const char* File, int Line); // Function pointer that is called from Check if the condition code is true. --- estic-1.61.orig/spunk/itemwin.h +++ estic-1.61/spunk/itemwin.h @@ -54,7 +54,7 @@ /* class WindowItem */ /*****************************************************************************/ - +class ItemWindow; class WindowItem : public Streamable { --- estic-1.61.orig/spunk/window.cc +++ estic-1.61/spunk/window.cc @@ -1432,7 +1432,7 @@ // Write a string to the inner window. Note: Attr is an index, not a real // attribute ! { - const BufSize = 256; + const int BufSize = 256; u16 Buf [256]; // Check if the given string is empty @@ -1554,7 +1554,7 @@ // Write a string to the inner window. Note: Attr is an index, not a real // attribute ! { - const BufSize = 256; + const int BufSize = 256; u16 Buf [BufSize]; // If the Y coord is outside the inner window, there is nothing to do --- estic-1.61.orig/spunk/coll.cc +++ estic-1.61/spunk/coll.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include "machine.h" #include "check.h" --- estic-1.61.orig/spunk/resitem.cc +++ estic-1.61/spunk/resitem.cc @@ -1539,16 +1539,16 @@ // Data edit menue { // Menue IDs - const miID = 10; - const miText = 20; - const miState = 30; - const miAccelKey = 40; - const miHelpKey = 50; - const miCharset = 60; - const miLimits = 70; - const miSubMenue = 80; - const miToggleText = 90; - const miToggleCount = 100; + const int miID = 10; + const int miText = 20; + const int miState = 30; + const int miAccelKey = 40; + const int miHelpKey = 50; + const int miCharset = 60; + const int miLimits = 70; + const int miSubMenue = 80; + const int miToggleText = 90; + const int miToggleCount = 100; // Load the menue from the resource Menue* M = (Menue*) LoadResource ("@RESITEM.ItemDataMenue"); @@ -1785,13 +1785,13 @@ void ResEditApp::ChangeCharset (WindowItem* Item) { - const miReset = 1; - const miAddDigits = 2; - const miAddHex = 3; - const miAddAlpha = 4; - const miAddAll = 5; - const miCustom = 6; - const miAllowEmpty = 7; + const int miReset = 1; + const int miAddDigits = 2; + const int miAddHex = 3; + const int miAddAlpha = 4; + const int miAddAll = 5; + const int miCustom = 6; + const int miAllowEmpty = 7; // Only RStringItem and TextEdits are allowed to change the charset --- estic-1.61.orig/spunk/check.cc +++ estic-1.61/spunk/check.cc @@ -50,9 +50,6 @@ // The fail vector -#ifdef __GNUC__ -volatile -#endif void (*CheckFailed) (const char*, const char* Cond, int Code, const char* File, int Line) = _CheckFailed; --- estic-1.61.orig/spunk/Makefile +++ estic-1.61/spunk/Makefile @@ -0,0 +1,217 @@ +# ***************************************************************************** +# * * +# * SPUNK MAKEFILE for Linux using g++ * +# * * +# * (C) 1993-96 Ullrich von Bassewitz * +# * Wacholderweg 14 * +# * D-70597 Stuttgart * +# * EMail: uz@ibb.schwaben.com * +# * * +# ***************************************************************************** + + + +# $Id: Makefile,v 1.2 1999/12/28 08:39:07 debacle Exp $ +# +# $Log: Makefile,v $ +# Revision 1.2 1999/12/28 08:39:07 debacle +# Looking in /usr/share/estic/ for estic.res now. +# +# Revision 1.1 1999/12/26 15:51:32 debacle +# Debianisation. +# +# +# + + + +# ------------------------------------------------------------------------------ +# Definitions + +# Names of executables +AS = gas +AR = ar +LD = ld +ZIP = zip +CXX = g++-4.6 + +# Flags for the gnu compiler +override CFLAGS += -DLINUX -fno-implicit-templates -DEXPLICIT_TEMPLATES -DUSR_SHARE_PATH + +LIB = spunk.a +ZIPFILE = spunk.zip + +# ------------------------------------------------------------------------------ +# Implicit rules + +.c.o: + $(CC) $(CFLAGS) -c $< + +.cc.o: + $(CXX) $(CFLAGS) -c $< + +# ------------------------------------------------------------------------------ +# All SPUNK OBJ files + +OBJS = bitset.o \ + charset.o \ + charstrm.o \ + chartype.o \ + check.o \ + coll.o \ + cont.o \ + cpucvt.o \ + crc16.o \ + crc32.o \ + crcccitt.o \ + crcstrm.o \ + datetime.o \ + delay.o \ + environ.o \ + errlog.o \ + event.o \ + filecoll.o \ + filepath.o \ + filesel.o \ + filesys.o \ + frame.o \ + fviewer.o \ + inifile.o \ + itemlbl.o \ + itemwin.o \ + kbd.o \ + keydef.o \ + keymap.o \ + listnode.o \ + memcheck.o \ + memstrm.o \ + menue.o \ + menuedit.o \ + menuitem.o \ + msg.o \ + msgcoll.o \ + national.o \ + nlsinit.o \ + nullstrm.o \ + object.o \ + palette.o \ + password.o \ + program.o \ + progutil.o \ + rect.o \ + rescoll.o \ + resource.o \ + rng.o \ + screen.o \ + screen2.o \ + sercom.o \ + serstrm.o \ + settings.o \ + splitmsg.o \ + statline.o \ + stdmenue.o \ + stdmsg.o \ + str.o \ + strbox.o \ + strcoll.o \ + strcvt.o \ + stream.o \ + strmable.o \ + strparse.o \ + strpool.o \ + syserror.o \ + textitem.o \ + textstrm.o \ + thread.o \ + winattr.o \ + window.o \ + winmgr.o \ + winsize.o + +# ------------------------------------------------------------------------------ +# All resedit OBJ files + +RESEDITOBJS = resed.o \ + resedit.o \ + resfile.o \ + resitem.o \ + resprint.o \ + resutil.o \ + reswin.o + +# ------------------------------------------------------------------------------ +# Dummy targets + +ifeq (.depend,$(wildcard .depend)) +all: resed +include .depend +else +all: depend +endif + +resed: $(LIB) $(RESEDITOBJS) + $(CXX) -g -o resed $(RESEDITOBJS) $(LIB) -lncurses + +lib: $(LIB) + +# ------------------------------------------------------------------------------ +# Library + +$(LIB): $(OBJS) + $(AR) rs $(LIB) $? + +depend dep: + @echo "Creating dependency information" + $(CXX) -DLINUX -MM *.cc > .depend + +# ------------------------------------------------------------------------------ +# Target specific files + +delay.o: unixsrc/delay.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +filesys.o: linuxsrc/filesys.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +kbd.o: linuxsrc/kbd.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +nlsinit.o: unixsrc/nlsinit.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +screen.o: linuxsrc/screen.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +screen2.o: unixsrc/screen2.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +sercom.o: linuxsrc/sercom.cc $(HDRS) + $(CXX) $(CFLAGS) -c $< + +# ------------------------------------------------------------------------------ +# Create a ZIP file + +zip: + -rm -f spunk.zip + -rm -f *.bak *~ + $(ZIP) $(ZIPFILE) *.cc *.h bccdos.cfg bccos2.cfg baseres.res resed.res + -cp Makefile make/linux.mak + $(ZIP) $(ZIPFILE) copying.txt spunk.chg make/* + $(ZIP) $(ZIPFILE) dossrc/*.cc dossrc/*.asm + $(ZIP) $(ZIPFILE) dos32src/*.cc dos32src/*.asm djgppsrc\*.cc + $(ZIP) $(ZIPFILE) linuxsrc/*.cc os2src/*.cc bsdsrc/*.cc unixsrc/*.cc + $(ZIP) $(ZIPFILE) xsrc/*.cc samples/* + $(ZIP) $(ZIPFILE) doc/*.doc support/* data/* + +# ------------------------------------------------------------------------------ +# clean up + +clean: + -rm -f *~ linuxsrc/*~ bsdsrc/*~ unixsrc/*~ + +zap: clean + -rm -f *.o + -rm -f .depend + -rm $(LIB) + + --- estic-1.61.orig/spunk/stream.cc +++ estic-1.61/spunk/stream.cc @@ -347,7 +347,7 @@ void Stream::CopyFrom (Stream& S, size_t Count) { - static const BufSize = 4096; // Size of copy buffer + static const int BufSize = 4096; // Size of copy buffer // Check parameter --- estic-1.61.orig/spunk/coll.h +++ estic-1.61/spunk/coll.h @@ -24,7 +24,7 @@ #include -#include +#include #include "check.h" #include "object.h" @@ -33,8 +33,8 @@ -static const coIndexError = 1; // Index out of range -static const coOverflowError = 2; // Collection overflow +static const int coIndexError = 1; // Index out of range +static const int coOverflowError = 2; // Collection overflow @@ -479,15 +479,15 @@ // Duplicates allowed. Do a linear search. // (Hint: Search returns the first of all entrys with the same key) - Item2 = (T*) Items [Index]; + Item2 = (T*) this->Items [Index]; do { if (Item2 == Item) { // That's it ! return Index; } // Get next - Item2 = (T*) Items [++Index]; - } while (Index < Count && Compare (Key, KeyOf (Item2)) == 0); + Item2 = (T*) this->Items [++Index]; + } while (Index < this->Count && Compare (Key, KeyOf (Item2)) == 0); // Item not found return -1; @@ -522,7 +522,7 @@ { // do a binary search int First = 0; - int Last = Count - 1; + int Last = this->Count - 1; int Current; int Result; int S = 0; @@ -533,7 +533,7 @@ Current = (Last + First) / 2; // Do a compare - Result = Compare (KeyOf ((T*) Items [Current]), Key); + Result = Compare (KeyOf ((T*) this->Items [Current]), Key); if (Result < 0) { First = Current + 1; } else { @@ -577,7 +577,7 @@ int I; if (Search (Key, I) != 0) { // We found the key, I is the index - return At (I); + return this->At (I); } else { // We did not find the key return 0; --- estic-1.61.orig/spunk/stream.h +++ estic-1.61/spunk/stream.h @@ -50,19 +50,19 @@ -static const stOk = 0; // things are allright -static const stInitError = 1; // error initializing the stream -static const stReadError = 2; // error reading from the stream -static const stWriteError = 3; // error writing to the stream -static const stGetError = 4; // get found not registered class -static const stPutError = 5; // put found not registered class -static const stMemoryError = 6; // not enough memory -static const stStoreError = 7; // Keine Store-Methode angegeben -static const stLoadError = 8; // Keine Load-Methode oder Fehler bei Load -static const stCopyError = 9; // CopyFrom: error of source stream -static const stSeekError = 10; // error using Seek, GetPos etc. -static const stReadTimeout = 11; // Timeout on read (CharacterStream only) -static const stWriteTimeout = 12; // Timeout on write (CharcterStream only) +static const int stOk = 0; // things are allright +static const int stInitError = 1; // error initializing the stream +static const int stReadError = 2; // error reading from the stream +static const int stWriteError = 3; // error writing to the stream +static const int stGetError = 4; // get found not registered class +static const int stPutError = 5; // put found not registered class +static const int stMemoryError = 6; // not enough memory +static const int stStoreError = 7; // Keine Store-Methode angegeben +static const int stLoadError = 8; // Keine Load-Methode oder Fehler bei Load +static const int stCopyError = 9; // CopyFrom: error of source stream +static const int stSeekError = 10; // error using Seek, GetPos etc. +static const int stReadTimeout = 11; // Timeout on read (CharacterStream only) +static const int stWriteTimeout = 12; // Timeout on write (CharcterStream only) --- estic-1.61.orig/spunk/filepath.cc +++ estic-1.61/spunk/filepath.cc @@ -298,16 +298,6 @@ return S; } - - -String TempName () -// Return a name for a temporary file (this function uses tmpnam) -{ - return String (tmpnam (NULL)); -} - - - char GetCurrentDrive () // Return the current drive as a letter { --- estic-1.61.orig/spunk/keydef.cc +++ estic-1.61/spunk/keydef.cc @@ -31,7 +31,7 @@ -struct { +static struct { Key Orig; // Original key Key Meta; // Meta version } MetaTable [] = { --- estic-1.61.orig/spunk/machine.h +++ estic-1.61/spunk/machine.h @@ -206,13 +206,15 @@ // Endianess. The following code is not very clean as it accesses a reserved // implementation identifier, but there is no other way to determine byte // order under Linux (known to me). -#include +#include #if __BYTE_ORDER == 1234 # define CPU_LITTLE_ENDIAN -#elif __BYTE_ORDER = 4321 -# define CPU_BIG_ENDIAN -#elif -# error Byte order not defined! +#else +# if __BYTE_ORDER == 4321 +# define CPU_BIG_ENDIAN +# else +# error Byte order not defined! +# endif #endif // data types @@ -236,10 +238,12 @@ #include #if (BYTE_ORDER == LITTLE_ENDIAN) # define CPU_LITTLE_ENDIAN -#elif (BYTE_ORDER == BIG_ENDIAN) +#else +# if (BYTE_ORDER == BIG_ENDIAN) # define CPU_BIG_ENDIAN -#elif +# else # error Byte order not defined! +# endif #endif // data types @@ -288,10 +292,12 @@ #include #if (BYTE_ORDER == LITTLE_ENDIAN) # define CPU_LITTLE_ENDIAN -#elif (BYTE_ORDER == BIG_ENDIAN) +#else +# if (BYTE_ORDER == BIG_ENDIAN) # define CPU_BIG_ENDIAN -#elif +# else # error Byte order not defined! +# endif #endif // data types @@ -336,9 +342,11 @@ #if defined (DOS) || defined (DOS32) || defined (OS2) || defined(NT) -#define DOSLIKE_OS -#elif !defined(NETWARE) -#define UNIXLIKE_OS +# define DOSLIKE_OS +#else +# if !defined(NETWARE) +# define UNIXLIKE_OS +# endif #endif --- estic-1.61.orig/spunk/str.h +++ estic-1.61/spunk/str.h @@ -91,6 +91,46 @@ // Note: This string class may not work with strings greater than INT_MAX or // 0xFFFF, whichever is less +// Declare functions and operators which are later 'injected' as friends +// (gcc-4.1 doesn't allow friend injection any more) + + String ShowControls (const String& S, unsigned Style); + String HideControls (const String& S); + String& operator += (String&, const char); + String& operator += (String&, const char*); + inline String& operator += (String&, const String&); + String operator + (const String&, const char); + String operator + (const String&, const char*); + String operator + (const String&, const String&); + String operator + (const char, const String&); + String operator + (const char*, const String&); + inline int operator == (const String&, const String&); + inline int operator != (const String&, const String&); + inline int operator >= (const String&, const String&); + inline int operator <= (const String&, const String&); + inline int operator > (const String&, const String&); + inline int operator < (const String&, const String&); + inline int operator == (const char*, const String&); + inline int operator != (const char*, const String&); + inline int operator >= (const char*, const String&); + inline int operator <= (const char*, const String&); + inline int operator > (const char*, const String&); + inline int operator < (const char*, const String&); + inline int operator == (const String&, const char*); + inline int operator != (const String&, const char*); + inline int operator >= (const String&, const char*); + inline int operator <= (const String&, const char*); + inline int operator > (const String&, const char*); + inline int operator < (const String&, const char*); + + inline int Compare (const String& S1, const String& S2); + + int Match (const char* Source, const char* Pattern); + int Match (const String& Source, const String& Pattern); + int Match (const String& Source, const char* Pattern); + int Match (const char* Source, const String& Pattern); + + String FormatStr (const char* S, ...); class String : public Streamable { --- estic-1.61.orig/spunk/password.cc +++ estic-1.61/spunk/password.cc @@ -84,14 +84,15 @@ /* class PasswordEntry */ /*****************************************************************************/ - +static void EntryEditor (class PasswordEntry*, int&, int&); class PasswordEntry: public Streamable { friend class PasswordColl; friend class PasswordListBox; friend void Login (const String&, const String&); - friend inline void EntryEditor (class PasswordEntry*, int&, int&); + friend void EntryEditor (class PasswordEntry*, int&, int&); + // Comment by original author: // EntryEditor is not inline but static, but this way gcc don't displays // a warning @@ -529,10 +530,10 @@ // Allow editing of one password entry { // ID's of the menue items - const miUserID = 1; - const miUserName = 2; - const miPassword = 3; - const miLevel = 4; + const int miUserID = 1; + const int miUserName = 2; + const int miPassword = 3; + const int miLevel = 4; // Remember the crc of the entry u32 OldCRC = GetCRC (E); --- estic-1.61.orig/spunk/unixsrc/delay.cc +++ estic-1.61/spunk/unixsrc/delay.cc @@ -73,7 +73,7 @@ // // The function returns the real time passed or just ms. { - const ChunkSize = 256; + const int ChunkSize = 256; // Check the argument... if (ms <= ChunkSize) { --- estic-1.61.orig/spunk/unixsrc/filesys.cc +++ estic-1.61/spunk/unixsrc/filesys.cc @@ -42,10 +42,10 @@ extern const char FileSysPathSep = '/'; // Path separator extern const char FileSysListSep = ':'; // Path list separator -extern const FileSysMaxPath = 255; // Maximum path length -extern const FileSysMaxDir = 255; // Maximum directory length -extern const FileSysMaxName = 255; // Maximum file name length -extern const FileSysMaxExt = 255; // Maximum extension length (including the dot) +extern const int FileSysMaxPath = 255; // Maximum path length +extern const int FileSysMaxDir = 255; // Maximum directory length +extern const int FileSysMaxName = 255; // Maximum file name length +extern const int FileSysMaxExt = 255; // Maximum extension length (including the dot) --- estic-1.61.orig/spunk/linuxsrc/kbd.cc +++ estic-1.61/spunk/linuxsrc/kbd.cc @@ -62,8 +62,8 @@ // An array for mapping extended to virtual keys -const VirtualMapSize = 50; -struct { Key EK; Key VK; } VirtualMap [VirtualMapSize]; +const int VirtualMapSize = 50; +static struct { Key EK; Key VK; } VirtualMap [VirtualMapSize]; static unsigned VirtualMapCount = 0; @@ -202,7 +202,7 @@ { static char CapBuf [128]; char* CapPtr = CapBuf; - return tgetstr (Cap, &CapPtr); + return tgetstr ((char *) Cap, &CapPtr); } --- estic-1.61.orig/spunk/linuxsrc/screen.cc +++ estic-1.61/spunk/linuxsrc/screen.cc @@ -67,7 +67,7 @@ // only. { // We have a new string if we are on the console and are using CP437 - return (Console && CP437)? "\033(U\033>\033[4;20l" : IS; + return (Console && CP437)? ((char *) "\033(U\033>\033[4;20l") : IS; } @@ -77,7 +77,7 @@ // only. { // We have a new string if we are on the console and are using CP437 - return (Console && CP437)? "\033(B\033>\033[4;20l\033[?25h" : RS; + return (Console && CP437)? ((char *) "\033(B\033>\033[4;20l\033[?25h") : RS; } --- estic-1.61.orig/spunk/linuxsrc/filesys.cc +++ estic-1.61/spunk/linuxsrc/filesys.cc @@ -38,10 +38,10 @@ extern const char FileSysPathSep = '/'; // Path separator extern const char FileSysListSep = ':'; // Path list separator -extern const FileSysMaxPath = 255; // Maximum path length -extern const FileSysMaxDir = 255; // Maximum directory length -extern const FileSysMaxName = 255; // Maximum file name length -extern const FileSysMaxExt = 255; // Maximum extension length (including the dot) +extern const int FileSysMaxPath = 255; // Maximum path length +extern const int FileSysMaxDir = 255; // Maximum directory length +extern const int FileSysMaxName = 255; // Maximum file name length +extern const int FileSysMaxExt = 255; // Maximum extension length (including the dot) --- estic-1.61.orig/spunk/dossrc/kbd.cc +++ estic-1.61/spunk/dossrc/kbd.cc @@ -31,10 +31,12 @@ #if defined (__WATCOMC__) -#include -#include -#elif defined (__BORLANDC__) || defined (__GO32__) -#include +# include +# include +#else +# if defined (__BORLANDC__) || defined (__GO32__) +# include +# endif #endif #include "msgid.h" --- estic-1.61.orig/spunk/dossrc/nlsinit.cc +++ estic-1.61/spunk/dossrc/nlsinit.cc @@ -27,10 +27,12 @@ #if defined (__WATCOMC__) -#include -#include -#elif defined (__BORLANDC__) -#include +# include +# include +#else +# if defined (__BORLANDC__) +# include +# endif #endif #include "check.h" --- estic-1.61.orig/spunk/dossrc/screen.cc +++ estic-1.61/spunk/dossrc/screen.cc @@ -32,12 +32,14 @@ #include #if defined (__WATCOMC__) -#include -#include -#elif defined (__BORLANDC__) || defined (__GO32__) -#include +# include +# include #else -#error Unknown compiler! +# if defined (__BORLANDC__) || defined (__GO32__) +# include +# else +# error Unknown compiler! +# endif #endif #if defined (__GO32__) #include --- estic-1.61.orig/debian/copyright +++ estic-1.61/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by W. Borgert on +Sun, 26 Dec 1999 14:57:24 +0000. + +It was downloaded from ftp://ftp.franken.de/pub/isdn4linux/ +estic/estic-1.60-sources.zip and ftp://ftp.franken.de/pub/ +isdn4linux/estic/estic-1.61-patch-from-1.60.zip + +Upstream Author: Ullrich von Bassewitz + +Copyright for estic: + + COPYING CONDITIONS + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source + distribution. + +Copyright for spunk: + + SPUNK LIBRARY + + (C) Copyright 1992-1996 Ullrich von Bassewitz + + COPYING CONDITIONS + + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source + distribution + --- estic-1.61.orig/debian/changelog +++ estic-1.61/debian/changelog @@ -0,0 +1,156 @@ +estic (1.61-20.1) unstable; urgency=low + + * Non maintainer upload + * Work around build failure with GCC. Closes: #667157. + + -- Matthias Klose Mon, 28 May 2012 08:36:00 +0000 + +estic (1.61-20) unstable; urgency=low + + [ Fabian Guter ] + * Add myself to Uploaders. + * FTBFS with GCC 4.3: uses (removed) pre-iso c++ headers (Closes: + #461717) + * changed menu section to comply to new menu-policy + * upgraded to Debian policy 3.7.3 + + [ Torsten Werner ] + * Add Vcs-* headers to debian/control. + + -- Fabian Guter Sat, 02 Feb 2008 13:32:53 +0100 + +estic (1.61-19) unstable; urgency=low + + * upgraded to Debian policy 3.7.2 + * fix bashisms in debian/rules, closes: #379579 + + -- Fabian Guter Fri, 3 Nov 2006 00:20:19 +0100 + +estic (1.61-18) unstable; urgency=low + + * fix for gcc-4.1, closes: #356159 + * New maintainer, closes: #263048 + * fixed lintian warning about unquoted strings in menu + + -- Fabian Guter Wed, 3 May 2006 23:07:26 +0200 + +estic (1.61-17) unstable; urgency=low + + * orphaning the package because I do not own the hardware anymore + + -- Torsten Werner Sun, 16 Apr 2006 19:13:38 +0200 + +estic (1.61-16) unstable; urgency=low + + * small fix for gcc-4.0, thanks to Andreas Jochens, closes: #321747 + + -- Torsten Werner Sun, 7 Aug 2005 21:31:46 +0200 + +estic (1.61-15) unstable; urgency=low + + * applied patch from Andreas Jochens for gcc-4.0, closes: #284807 + + -- Torsten Werner Mon, 27 Dec 2004 23:09:16 +0100 + +estic (1.61-14) unstable; urgency=low + + * applied patch from Andreas Jochens for g++-3.4, closes: #258653 + + -- Torsten Werner Sun, 18 Jul 2004 01:37:40 +0200 + +estic (1.61-13) unstable; urgency=low + + * switched from cbs to cdbs + * do not install spunk docs and examples anymore + + -- Torsten Werner Thu, 14 Aug 2003 18:37:13 +0200 + +estic (1.61-12) unstable; urgency=low + + * recompiled with g++ 3.3.1 + * removed config.{guess,sub} files + + -- Torsten Werner Thu, 14 Aug 2003 08:05:02 +0200 + +estic (1.61-11) unstable; urgency=low + + * changed CC to CXX in {estic,spunk}/Makefile, closes: #173079 + * updated debian/rules + + -- Torsten Werner Sat, 4 Jan 2003 13:52:05 +0100 + +estic (1.61-10) unstable; urgency=low + + * converted to CBS + + -- Torsten Werner Wed, 4 Dec 2002 21:51:30 +0100 + +estic (1.61-9) unstable; urgency=low + + * adopted the package, changed Maintainer: field, closes: #154593 + * fixed the clean target in debian/rules + + -- Torsten Werner Fri, 2 Aug 2002 20:14:07 +0200 + +estic (1.61-8) unstable; urgency=low + + * Removed unused, dangerous function from spunk library. + * ??? (closes: #127139). + + -- W. Borgert Mon, 18 Feb 2002 10:20:02 +0000 + +estic (1.61-7) unstable; urgency=low + + * Yes, really closes: #105033. + * Fixed lintian warning. + + -- W. Borgert Fri, 26 Oct 2001 19:32:45 +0000 + +estic (1.61-6.1) unstable; urgency=low + + * NMU + * Applied patch to fix problem building with gcc-2.96/gcc-3.0. + Closes: 105033 + + -- Randolph Chung Sat, 25 Aug 2001 20:43:04 -0700 + +estic (1.61-6) unstable; urgency=low + + * Added description of options -c, -n, -p, thanks to + joey@debian.org. Closes: bug#75230. + + -- W. Borgert Wed, 7 Feb 2001 00:12:32 +0000 + +estic (1.61-5) frozen unstable; urgency=low + + * Added docbook-to-man to Build-Depends field in debian/control + Closes: bug#59810. + * Fixed also a lintian warning about extra-license-file. + + -- W. Borgert Wed, 8 Mar 2000 19:53:53 +0000 + +estic (1.61-4) frozen unstable; urgency=low + + * Fixed typo in spunk/machine.h for big endian. Closes: bug#58683. + + -- W. Borgert Fri, 25 Feb 2000 08:51:08 +0000 + +estic (1.61-3) frozen unstable; urgency=low + + * Fixed Build-Depends field in debian/control. Closes: bug#57722. + + -- W. Borgert Thu, 17 Feb 2000 09:45:32 +0000 + +estic (1.61-2) frozen unstable; urgency=low + + * Fixed xestic manpage link. + * Added Build-Depends. + * Eliminated all #elif's. Closes: bug#54447. + + -- W. Borgert Sun, 30 Jan 2000 12:14:20 +0000 + +estic (1.61-1) unstable; urgency=low + + * Initial Release. + + -- W. Borgert Sun, 26 Dec 1999 14:57:24 +0000 --- estic-1.61.orig/debian/estic.sgml +++ estic-1.61/debian/estic.sgml @@ -0,0 +1,215 @@ +Debian GNU/Linux"> + ISTEC"> + PABX"> +]> + + + + + +
+ debacle@debian.org +
+ + W. + Borgert + + + 1999 + W. Borgert + + 2000-01-01 + + + estic + + 1 + + + estic + + Administration program for &istec; + ISDN &pabx;. + + + + estic + + + + + + + + + + xestic + + + + + + + + Description + + This program allows you the administration of the ISDN + private automatic branch exchanges ISTEC + 1003 and ISTEC 1008 + (produced by the German company Emmerich). The documentation + under /usr/share/doc/estic/is mostly in the + German language. + + The main configuration file is + estic.ini. The program looks first in the + current directory, than in the home directory and than under + /etc for this file. + + While estic is for use from the console, xestic is a shell + script that runs estic inside of an x-terminal-emulation. + + This manual page was written for the Debian GNU/Linux + distribution because the original program does not have a manual + page. Permission is granted to copy, distribute and/or modify + this document under the terms of the GNU Free + Documentation License, Version 1.1 or any later version + published by the Free Software Foundation; with no Invariant + Sections, no Front-Cover Texts and no Back-Cover Texts. + + + Options + + + + + + cmd is a command that will be executed upon startup of + estic. This is useful for cronjobs, e.g. for swaping + configuration with estic -c loadconfig + tag.ic. + + + + + + + + This option specifies the preferred size and position + of the xestic window; see X(1) for the syntax. + + + + + + + No ISTEC is available, only edit parameters. + + + + + + + Use + ttyS1..ttyS63 to + specify the serial port on which the ISTEC is hooked + on. + + + + + + Author + + The program has been written by + Ullrich von + Bassewitz + <uz@ibb.schwaben.com>. The program is no + longer maintained by him. Patches by + W. + Borgert + <debacle@debian.org> have been applied. + Thanks also to Martin + Schulze + <joey@debian.org>, + Paul + Slootman + <paul@debian.org>, and + Roland + Rosenfeld + <roland@debian.org> for good suggestions. + Special thanks to Joey, who sent corrections to this manual + page, that I included after only 109 days. + + + Copyright + + This software is provided 'as-is', without any express or + implied warranty. In no event will the authors be held liable + for any damages arising from the use of this software. + + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following + restrictions: + + + + The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. If + you use this software in a product, an acknowledgment in the + product documentation would be appreciated but is not + required. + + + Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original + software. + + + This notice may not be removed or altered from any + source distribution. + + + + + Bugs + + It is possible, that there are a lot of problems with + different versions of the &istec; firmware. Unfortunately these + problem are very unlikely to be fixed. The &istec; &pabx; is + more or less outdated, the original author of estic does not + support the program anymore and the communication protocol + between the &istec; &pabx; and the PC is not + officially specified by the company Emmerich. + + The program is not very UNIXish. E.g. the keyboard + shortcuts are not like those in GNU + Emacs or as in + vi. Please send patches if you can + fix this. + + Please tell me about grammatical or spelling errors! + + + + --- estic-1.61.orig/debian/compat +++ estic-1.61/debian/compat @@ -0,0 +1 @@ +4 --- estic-1.61.orig/debian/README.Debian +++ estic-1.61/debian/README.Debian @@ -0,0 +1,8 @@ +estic for Debian +---------------------- + +The X11 version of estic is replaced by a script that runs estic in an +xterm or similar terminal window. Note also, that the programs actest +and acvers are not included in the Debian package. + + -- W. Borgert , Sun, 26 Dec 1999 14:57:24 +0000 --- estic-1.61.orig/debian/dirs +++ estic-1.61/debian/dirs @@ -0,0 +1,4 @@ +etc +usr/bin +usr/share/doc/estic +usr/share/estic --- estic-1.61.orig/debian/control +++ estic-1.61/debian/control @@ -0,0 +1,19 @@ +Source: estic +Section: utils +Priority: extra +Maintainer: Fabian Guter +Uploaders: Torsten Werner +Standards-Version: 3.7.3 +Build-Depends: cdbs, debhelper (>= 4.1.0), libncurses5-dev, docbook-to-man, g++-4.6 +Vcs-Svn: svn+ssh://svn.debian.org/svn/collab-maint/ext-maint/estic/trunk +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/estic/trunk/ + +Package: estic +Architecture: any +Depends: ${shlibs:Depends} +Suggests: isdnutils, x-terminal-emulator +Description: Administration program for ISDN PABX ISTEC 1003/1008 + This program allows you the administration of the ISDN private + automatic branch exchanges ISTEC 1003 and ISTEC 1008 (produced by the + German company Emmerich). Note that the program and its documentation + is mostly in German language. --- estic-1.61.orig/debian/menu +++ estic-1.61/debian/menu @@ -0,0 +1,6 @@ +?package(estic):\ + command="/usr/bin/estic"\ + icon="/usr/share/estic/estic.xpm"\ + needs="text"\ + section="Applications/System/Administration"\ + title="ESTIC" --- estic-1.61.orig/debian/examples +++ estic-1.61/debian/examples @@ -0,0 +1 @@ +estic/samples/* --- estic-1.61.orig/debian/estic.xpm +++ estic-1.61/debian/estic.xpm @@ -0,0 +1,42 @@ +/* XPM */ +static char * estic_xpm[] = { +"32 32 7 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #007F00", +"# c #FF00FF", +"$ c #7F7F7F", +"% c #FF0000", +" ", +" ", +" ................ ", +" .++++++++@+@+@+. ", +" . ................ ", +" .#. .++++++++++++++. ", +" . .#. .++.+++++$+$+$+. ", +" .#. .#. .++.+++++$+$+$+. ", +" .##. .#..++.+++++$+$+$+. ", +" .###. . .++.+++++$+$+$+. ", +" .####. .++.+++++$+$+$+. ", +" .###. .++.+++++$+$+$+. ", +" .##. .++.+++++$+$+$+. ", +" .##. .++.+++++$+$+$+. ", +" .###. .++.+++++$+$+$+. ", +" .###..++.+++++$+$+$+. ", +" .##..++.+++++$+$+$+. ", +" .##.++.+++++$+$+$+. ", +" .###.+.+++++$+$+$+. ", +" .###..+++++$+$+$+. ", +" .###..++++$+.+$+. ", +" .####.+++$.#.$+. ", +" ...###.++.+.#.+. ", +" .++.###..#.$.#.. ", +" .+++.######.+.#. ", +" .......#####.... ", +" .++++++.#####.+. ", +" .+++++++.....++. ", +" .+++++++++%+%+%. ", +" ................ ", +" ", +" "}; --- estic-1.61.orig/debian/docs +++ estic-1.61/debian/docs @@ -0,0 +1,2 @@ +areacode/areacode.doc +estic/estic.doc --- estic-1.61.orig/debian/estic.1 +++ estic-1.61/debian/estic.1 @@ -0,0 +1,154 @@ +.\" This -*- nroff -*- file has been generated from +.\" DocBook SGML with docbook-to-man on Debian GNU/Linux. +...\" +...\" transcript compatibility for postscript use. +...\" +...\" synopsis: .P! +...\" +.de P! +\\&. +.fl \" force out current output buffer +\\!%PB +\\!/showpage{}def +...\" the following is from Ken Flowers -- it prevents dictionary overflows +\\!/tempdict 200 dict def tempdict begin +.fl \" prolog +.sy cat \\$1\" bring in postscript file +...\" the following line matches the tempdict above +\\!end % tempdict % +\\!PE +\\!. +.sp \\$2u \" move below the image +.. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 +.. +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow +.. +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +'\" t +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +.TH "estic" "1" +.SH "NAME" +estic \(em Administration program for \fBISTEC\fP ISDN PABX. +.SH "SYNOPSIS" +.PP +\fBestic\fP [\fB-c \fIcmd\fP\fP] [\fB-n\fP] [\fB-p \fIport\fP\fP] +.PP +\fBxestic\fP [\fB-g \fIgeometry\fP\fP] [\fB-geometry \fIgeometry\fP\fP] +.SH "Description" +.PP +This program allows you the administration of the ISDN +private automatic branch exchanges \fBISTEC +1003\fP and \fBISTEC 1008\fP (produced by the German company Emmerich). The documentation +under \fB/usr/share/doc/estic/\fPis mostly in the +German language. +.PP +The main configuration file is +\fBestic.ini\fP. The program looks first in the +current directory, than in the home directory and than under +\fB/etc\fP for this file. +.PP +While estic is for use from the console, xestic is a shell +script that runs estic inside of an x-terminal-emulation. +.PP +This manual page was written for the Debian GNU/Linux +distribution because the original program does not have a manual +page. Permission is granted to copy, distribute and/or modify +this document under the terms of the GNU Free +Documentation License, Version 1.1 or any later version +published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts and no Back-Cover Texts. +.SH "Options" +.IP "\fB-c \fIcmd\fP\fP " 10 +cmd is a command that will be executed upon startup of +estic. This is useful for cronjobs, e.g. for swaping +configuration with estic -c \fIloadconfig +tag.ic\fP. +.IP "\fB-g \fIgeometry\fP\fP \fB--geometry \fIgeometry\fP \fP " 10 +This option specifies the preferred size and position +of the xestic window; see X(1) for the syntax. +.IP "\fB-n\fP " 10 +No ISTEC is available, only edit parameters. +.IP "\fB-p \fIport\fP\fP " 10 +Use +\fBttyS1\fP..\fBttyS63\fP to +specify the serial port on which the ISTEC is hooked +on. +.SH "Author" +.PP +The program has been written by +Ullrich von +Bassewitz . The program is no +longer maintained by him. Patches by +W. Borgert have been applied. +Thanks also to Martin Schulze , +Paul Slootman , and +Roland Rosenfeld for good suggestions. +Special thanks to Joey, who sent corrections to this manual +page, that I included after only 109 days. +.SH "Copyright" +.PP +This software is provided 'as-is', without any express or +implied warranty. In no event will the authors be held liable +for any damages arising from the use of this software. +.PP +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following +restrictions: +.IP " 1." 6 +The origin of this software must not be misrepresented; +you must not claim that you wrote the original software. If +you use this software in a product, an acknowledgment in the +product documentation would be appreciated but is not +required. +.IP " 2." 6 +Altered source versions must be plainly marked as such, +and must not be misrepresented as being the original +software. +.IP " 3." 6 +This notice may not be removed or altered from any +source distribution. +.SH "Bugs" +.PP +It is possible, that there are a lot of problems with +different versions of the \fBISTEC\fP firmware. Unfortunately these +problem are very unlikely to be fixed. The \fBISTEC\fP PABX is +more or less outdated, the original author of estic does not +support the program anymore and the communication protocol +between the \fBISTEC\fP PABX and the PC is not +officially specified by the company Emmerich. +.PP +The program is not very UNIXish. E.g. the keyboard +shortcuts are not like those in GNU \fBEmacs\fP or as in +\fBvi\fP. Please send patches if you can +fix this. +.PP +Please tell me about grammatical or spelling errors! +...\" created by instant / docbook-to-man, Wed 04 Dec 2002, 21:56 --- estic-1.61.orig/debian/manpages +++ estic-1.61/debian/manpages @@ -0,0 +1 @@ +debian/estic.1 --- estic-1.61.orig/debian/links +++ estic-1.61/debian/links @@ -0,0 +1 @@ +usr/share/man/man1/estic.1.gz usr/share/man/man1/xestic.1.gz --- estic-1.61.orig/debian/rules +++ estic-1.61/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk + +CFLAGS += -Wno-deprecated + +PREFIX := debian/estic/usr + +clean:: + -(cd estic; $(MAKE) zap; rm -f estic) + -(cd spunk; $(MAKE) zap) + -(cd areacode; $(MAKE) clean) + +install/estic:: + cp estic/estic debian/xestic $(PREFIX)/bin/ + chmod 755 $(PREFIX)/bin/estic + chmod 755 $(PREFIX)/bin/xestic + cp estic/estic.res debian/estic.xpm $(PREFIX)/share/estic/ + cp debian/estic.ini $(PREFIX)/../etc/ + --- estic-1.61.orig/debian/xestic +++ estic-1.61/debian/xestic @@ -0,0 +1,58 @@ +#!/bin/sh +# +# $Id: xestic,v 1.3 2000/01/02 15:19:14 debacle Exp $ +# +# Shell script as replacement for xestic binary written by W. Borgert +# for Debian GNU/Linux. + +# allow user to set -geometry +GEOMETRY=80x25 +if [ "$#" -eq 2 ]; then + if [ "$1" = "-geometry" -o "$1" = "-g" ]; then + GEOMETRY=$2 + else + echo "$0: Unknown option or argument \`$1'" 1>&2 + exit -1 + fi +else + if [ "$#" -ne 0 ]; then + echo "$0: Wrong number of arguments" 1>&2 + exit -1 + fi +fi + +unset SPUNK_CP437 +unset TERM +ISO=ISO-8859-1 + +if [ -x /usr/bin/gnome-terminal/xx -a -d "$HOME/.gnome" ]; then + # gnome-terminal is executable and user has .gnome directory. Good. + gnome-terminal --geometry=$GEOMETRY --title=ESTIC \ + --execute env LC_CTYPE=$ISO SPUNK_COLOR=yes \ + COLORTERM=gnome-terminal TERM=xterm-debian estic + exit $? +fi + +# rxvt, xterm, xtv, and Eterm do all understand the same +# options `-g', `-n', `-T' and `-e'. +ESTICTERM="" +if [ -x /usr/bin/Eterm ]; then ESTICTERM=/usr/bin/Eterm; fi +if [ -x /usr/bin/X11/xtv ]; then ESTICTERM=/usr/bin/X11/xtv; fi +if [ -x /usr/bin/X11/xterm ]; then ESTICTERM=/usr/bin/X11/xterm; fi +if [ -x /usr/bin/X11/rxvt ]; then ESTICTERM=/usr/bin/X11/rxvt; fi + +if [ "$ESTICTERM" ]; then + $ESTICTERM -g $GEOMETRY -n ESTIC -T ESTIC \ + -e env LC_CTYPE=$ISO SPUNK_COLOR=yes TERM=xterm-debian estic + exit $? +fi + +# Hopefully /usr/bin/x-terminal-emulator does at least understand -e! +if [ -x /usr/bin/x-terminal-emulator ]; then + /usr/bin/x-terminal-emulator \ + -e env LC_CTYPE=$ISO SPUNK_COLOR=yes estic + exit $? +fi + +echo "$0: Terminal emulator not found" 1>&2 +exit -1 --- estic-1.61.orig/debian/estic.ini +++ estic-1.61/debian/estic.ini @@ -0,0 +1,287 @@ +; +; Beispiel eines INI Files für ESTIC <-- das ist im übrigen ein Kommentar +; +; Diese Datei muss UNBEDINGT vor dem ersten Start von ESTIC angepasst werden! +; + + + +; ------------------------- ESTIC Grundeinstellungen ------------------------ +[ESTIC] + + +; Das File in dem ESTIC seine Einstellungen speichert. Dazu gehören +; sämtliche(!) Fenster, Positionen, Größen und ähnliches. Unter den *nix +; Derivaten kann der Namen die Tilde als Ersatz für das Home-Verzeichnis +; beinhalten (ein guter Name wäre z.B. "~/.esticrc"). +; Bei Problemen kann diese Datei ohne weiteres gelöscht werden, da sie +; keine für ESTIC "lebenswichtigen" Daten enthält. +; Die Defaulteinstellung ist "estic.rc", d.h. die Datei wird im aktuellen +; Verzeichnis angelegt. Ist der Name leer (""), dann wird nichts gespeichert. + +SettingsFile = "~/.esticrc" + + +; ----------------------------- Schnittstelle ------------------------------- +[Port] + +; Der Port- bzw. Device-Name +PortName = "/dev/ttyS1" + +; -------------------------------- Ausdruck --------------------------------- +[Printing] + +; String der als Kopfzeile verwendet wird +Headline = "" + +; Währung. Wird derzeit von ESTIC nicht verwendet, da bei einer Änderung nicht +; nur die Währung, sondern auch das Format umgestellt werden muss ($20 vs. 20DM) +; Falls der Ausdruck jemals Einheiten verwenden sollte, wird vermutlich die +; sowieso bekannte landesspezifische Einheit verwendet. +;Currency = "DM" + +; DM/Einheit, default ist 12 Pf +;PricePerUnit = 0.12 + + +; -------------------------------- Windows -------------------------------- +[Windows] + +; Soll in der rechten oberen Ecke Zeit/Datum permanent angezeigt werden? +; Mögliche Werte: +; None (keine Anzeige) +; Minutes (Stunden/Minuten) +; Seconds (auch Sekunden) +; Default ist Minutes + +;ShowDateTime = Minutes + + +; Soll direkt beim Start das Fenster mit den Informationen über die Istec +; (Software-Version usw.) angezeigt werden? +; Default ist yes +;ShowInfoOnStartup = yes + +; -------------------------------- AreaCode ------------------------------- +[AreaCode] + +; ESTIC verwendet die areacode Datenbank um Infos über Vorwahlen zu erhalten. +; Bisher sind in der Datenbank die Vorwahlen für Deutschland und die Schweiz +; enthalten. Neue Datenfiles gibt es von ftp://ftp.musoftware.com/pub/areacode/. +; Die Verwendung von areacode ermöglicht diverse Features, die sonst nicht +; möglich wären, z.B. die Prüfung auf gültige Nummern bei den Kurzwahlen oder +; Aliasen. +; Areacode ist im übrigen als (C++ kompatibler C-) Quelltext erhältlich und +; darf frei verwendet werden, auch für kommerzielle Anwendungen. + + +; Name und Pfad zum areacode Datenfile? Die Linux-Installationroutine kopiert +; es normalerweise als "areacodes" nach /usr/lib, wenn es dort nicht ist, ist +; der folgende Pfad zu setzen. Die Verwendung von /usr/lib/areacodes hat den +; Vorteil, dass die Zusammenarbeit mit anderen Programmen problemloser ist +; (isdnlog erwartet das File auch dort). Alle anderen (DOS usw.) erwarten +; die Datei im aktuellen Verzeichnis als "areacode.dat" +; Wenn der Pfad leer ist, dann wird der Default verwendet (areacode.dat im +; aktuellen Verzeichnis). +AreaCodeFile = "/usr/share/isdn/areacode.dat" + +; Internationale Vorwahl des eigenen Landes ohne "Verkehrsausscheidungsziffern". +; Der Default ist der in der Istec gespeicherte Landescode. Dieser wird dann +; verwendet, wenn die folgende Angabe leer ist. Der Landescode sollte immer +; gesetzt werden, auch wenn er - bei angeschlossener Istec - streng genommen +; nicht notwendig ist. Er hat dann Gültigkeit, wenn keine Istec gefunden wird, +; oder wenn die Istec Firmware (noch) keine Landescodes unterstützt (1.93 oder +; kleiner). +;CountryCode = "49" + +; Vorwahl ohne "Verkehrsausscheidungsziffer". Wird verwendet um lokale Nummern +; in der Datenbank suchen zu können. +;AreaCode = "711" + +; Die "Verkehrssuscheidungsziffer" an und für sich. Default ist "0" +;DialPrefix = "0" + + +; ------------------------------- Call-Logs ------------------------------- +[Call-Logs] + +; Namen der Logfiles in die ESTIC ausgehende und eingehende Gespräche loggt. +; Die angegebenen Namen sollten einen Pfad enthalten und können u.a. +; Steuercodes für strftime enthalten. Durch die Wahl des Namens kann z.B. +; ein Tages-, Wochen- oder Monatslog erzeugt werden: Wenn der Name z.B. so +; gewählt ist, dass er sich jeden Tag ändert, dann entsteht ein Tageslog. +; Die Namen sind nur Vorschläge - speziell unter Linux und OS/2 bietet es +; sich an, längere Namen zu verwenden. +; +; Verwendet werden können: +; +; %% für das Zeichen '%' +; %a Wochentag, kurz +; %A Wochentag, lang +; %b Monat, kurz +; %B Monat, lang +; %c Zeit+Datum (nicht zweckmässig) +; %d Tag des Monats (01-31) +; %E Apparat, von dem das Gespräch ausging (21-28) NUR AUSGEHEND!! +; %H Stunde (00-23) +; %I Stunde (00-12) +; %j Tag des Jahres (001-366) +; %m Monat (01-12) +; %M Minute (00-59) +; %p AM oder PM +; %S Sekunde (00-59) +; %U Kalenderwoche, Sonntag erster Wochentag (00-53) +; %w Nummer des Wochentags (Sonntag = 0) +; %W Kalenderwoche, Montag erster Wochentag (00-53) +; %x Datum +; %X Zeit +; %y Jahr, zweistellig (00-99) +; %Y Jahr, vierstellig +; +; Achtung: Alle Bezeichner (für Monat, Tag usw.) sind englisch! +; +; Default ist für OutgoingLog1 die Datei "outgoing.log" im aktuellen +; Verzeichnis, für die beiden anderen der Leerstring (d.h. kein Logging). +; Für den Eintrag in das Logfile ist die Startzeit maßgeblich, d.h. die +; Zeit zu der das Gespräch begonnen wurde. +; +; An ein Logfile wird prinzipiell immer angehängt wenn die Datei existiert, +; ansonsten wird sie erzeugt. Ergibt sich aus den angegebenen Pattern +; mehrfach derselbe Name, so wird in dieses File auch mehrfach geloggt. +; + +;OutgoingLog1 = "%d-%m-%y.log" ; Ergibt 01-08-95.log +;OutgoingLog1 = "%d-%m-%y.out" ; Ergibt 01-08-95.out +;OutgoingLog2 = "KW%W-%y.log" ; Ergibt KW43-95.log +;OutgoingLog2 = "%b-%y.%E" ; Ergibt Feb-95.21 +;OutgoingLog3 = "%m-%Y.log" ; Ergibt 12-1995.log +;OutgoingLog1 = "O-%b-%y.log" ; Ergibt O-Feb-95.log +;IncomingLog1 = "I-%m-%Y.log" ; Ergibt I-Feb-95.log +OutgoingLog1 = "O-%Y-%m.log" +IncomingLog1 = "I-%Y-%m.log" + + +; Angabe, ob Gespräche mit 0 Einheiten (z.B. wenn nicht abgehoben wurde) +; geloggt werden. + +LogZeroCostCalls = yes + +; Wie viele Stellen sollen am hinteren Ende der Nummer ausge-X-t werden? +; Default ist 0. +; ACHTUNG: Bei Werten > 0 können keine Aliase mehr aufgelöst werden, da +; die Nummer im Aliasfile nicht mehr gefunden wird! + +;XDigits = 3 + + +; --------------------------------- Aliase -------------------------------- +[Alias] + +; Hier können Aliase für die einzelnen Anschlüsse vergeben werden. Diese +; tauchen dann in den Logfiles neben den Nummern auf. +; +; Für das Eintragen der Aliase gibt es zwei verschiedene Möglichkeiten. +; +; * Direktes Eintragen hier im .ini File. Das ist nur für die eigenen Geräte +; möglich (d.h. die Nummern 21..XX), alle anderen Nummern werden ignoriert. +; * Ein separates Alias-File. Dort können sowohl Aliase für die eigenen +; Geräte als auch für ausgehende Nummern aufgenommen werden. +; +; Die Unterscheidung erfolgt anhand der Variable "AliasFile". Ist hier ein +; Name angegeben, dann werden nur die Aliase aus dieser Datei verwendet. +; Ist kein Name für die Alias-Datei angegeben, dann wird versucht, die +; Aliase für die eigenen Geräte aus der ini Datei zu lesen. + +; Die folgenden Einträge werden ignoriert, weil weiter unten eine Alias-Datei +; angegeben ist. Es soll nur die Syntax gezeigt werden. +;21 = "Büro" +;22 = "Martin" +;23 = "Fax, Büro" +;24 = "Philip" +;25 = "Wohnzimmer" +;28 = "Anrufb." + +; Ein Aliasfile, das Namen für bestimmte Rufnummern enthält. +;AliasFile = "alias.dat" + +; Wenn AutoReadAliases auf on gesetzt ist, dann wird nach jedem Gespräch die +; oben angegebene Alias-Datei neu eingelesen. Da das nur dann notwendig ist, +; wenn sich das Aliasfile öfters ändert, ist der Default off, d.h. einlesen +; nur auf explizite Anforderung in ESTIC. Der Schalter hat keine Wirkung, +; wenn kein Aliasfile definiert ist. + +AutoReadAliases = no ; on/off/yes/no/1/0 möglich + + +; ---------------------------------- Cron --------------------------------- +[Cron] + +; Wird eine Cron-Datei verwendet? Wenn ja, Namen hier angeben (Default ist +; der Leerstring). Eine Beispieldatei mit Erklärungen findet sich unter dem +; Namen cron.dat + +;CronFile = "cron.dat" + +; ------------------------------- Debugging ------------------------------- +[Debug] + +; Zeit in ms, die nach dem Gespräch gewartet wird, bevor die Gebühren +; abgefragt werden. Falls nach Gesprächen manchmal (oder immer) 0 Einheiten +; geloggt werden, obwohl eine Verbindung zustande kam, diesen Wert vorsichtig +; erhöhen. +WaitAfterCall = 700 + +; Festlegen ob nach dem Absenden eine kurze oder eine lange Pause gemacht +; werden soll. Default ist 'on'. +ShortWaitAfterMsg = on + +; Logfile für's Debugging, default ist der Leerstring +;DebugLog = "debug.log" + +; Soll ein existierendes Debug-Log beim Start von ESTIC überschrieben werden, +; oder sollen neue Daten angehängt werden? Default ist überschreiben (no) +;AppendDebugLog = no + +; Die folgenden Einstellungen sind Firmware spezifisch. Da sie eigentlich nicht +; geändert werden müssen (außer vielleicht zu Testzwecken) befinden sie sich +; im Abschnitt "Debug" und nicht im Abschnitt "Firmware". +;ConfigVersionHigh = 2 +;ConfigVersionLow = 0 + +; -------------------------------- Firmware ------------------------------- +[Firmware] + +; Die unterschiedlichen Versionen der Istec Firmware unterstützen +; unterschiedliche Features. Bei angeschlossener Istec erkennt ESTIC selber, +; welche Version der Firmware verwendet wird. Sollen Konfiguratonsdateien +; erstellt werden, ohne daß eine Istec angeschlossen ist, dann kann ESTIC +; nicht erkennen, welche Firmware-Version vorhanden ist und stellt u.U. +; bestimmte Einstellungen nicht zur Wahl. Mit der Variable FirmwareVersion +; kann angegeben werden, welche Version ESTIC bei nicht angeschlossener +; annehmen soll. Der Default ist Firmware Version 1.70. +; Nochmal: Das hat nur eine Bedeutung, wenn _keine_ Istec angeschlossen ist. + +;FirmwareVersion = 1.93 + +; Umschiffung eines Bugs in alten Istec Firmware-Versionen: Versionen bis hin +; zur Version 1.93 schalten selbsttätig irgendwann den Diagnose-Modus ab, den +; ESTIC zur Darstellung der Verbindungsmatrix und der Gesprächserfassung +; benötigt. Soll der Diagnose-Modus in regelmäßigen Abständen von ESTIC +; eingeschaltet werden? Mögliche Werte sind ON, OFF und AUTO, Default ist +; AUTO (d.h. ON, wenn Firmware <= 1.93). +DiagModeUpdate = auto + +; Ab der Firmware-Version 2.0 vom November 1996 kann die Istec eingehende +; Anrufe melden. Das geht aber nur dann, wenn der Diagnosemodus nicht +; eingeschaltet ist. Das bedeutet, dass es nicht gleichzeitig möglich ist, +; die Verbindungsmatrix/Logging ausgehender Rufe zu haben, und eine Anzeige/ +; Logging eingehender Rufe. Ich habe mit den Entwicklern gesprochen und mir +; wurde zugesagt, dass diese Beschraenkung entfernt wird - das ist aber +; offensichtlich nicht geschehen. Wenn Emmerich sich doch noch entschliessen +; sollte, beides gleichzeitig zu ermoeglichen, dann kann das Abschalten des +; Diagnose-Modus beim Öffnen des Fensters für eingehende Anrufe hier +; unterbunden werden. +; Default ist "yes", d.h. der Diagnosemodus wird beim Öffnen des Fensters +; ab- und beim Schliessen wieder angeschaltet. +;CLINoDiagMode = yes + --- estic-1.61.orig/areacode/Makefile +++ estic-1.61/areacode/Makefile @@ -0,0 +1,126 @@ +# ***************************************************************************** +# * * +# * AREACODE Makefile for Linux * +# * * +# * (C) 1995-97 Ullrich von Bassewitz * +# * Wacholderweg 14 * +# * D-70597 Stuttgart * +# * EMail: uz@ibb.schwaben.com * +# * * +# ***************************************************************************** + + + +# $Id: Makefile,v 1.3 1999/12/28 13:14:54 debacle Exp $ +# +# $Log: Makefile,v $ +# Revision 1.3 1999/12/28 13:14:54 debacle +# estic.ini added +# +# Revision 1.2 1999/12/28 08:57:20 debacle +# /usr/share/estic/ again. +# +# Revision 1.1 1999/12/26 15:51:21 debacle +# Debianisation. +# +# +# + + +# ------------------------------------------------------------------------------ +# Stuff you may want to edit + +# The name of the data file after installation. You may want to define +# AREACODE_DATAFILE before calling make instead +ifdef AREACODE_DATAFILE +DATATARGET=$(AREACODE_DATAFILE) +else +DATATARGET=/usr/lib/areacodes +endif + +# Command line for the installation of the data file +INSTALL = install -o bin -g bin -m 644 + +# ------------------------------------------------------------------------------ +# Definitions + +# Names of executables +AS = gas +AR = ar +LD = ld +ZIP = zip + +# Name of the data file +DATASOURCE=areacode.dat + +# ------------------------------------------------------------------------------ +# Implicit rules + +.c.o: + gcc $(CFLAGS) -c $< + +# ------------------------------------------------------------------------------ +# + +ifeq (.depend,$(wildcard .depend)) +all: actest acvers +include .depend +else +all: depend +endif + + +actest: areacode.o actest.o + gcc -o actest areacode.o actest.o + +acvers: acvers.o + gcc -o acvers acvers.o + +areacode.o: areacode.h areacode.c + gcc $(CFLAGS) -DDATA_FILENAME="\"$(DATATARGET)\"" \ + -DCHARSET_ISO -c -o areacode.o areacode.c + +install: areacode.o acvers + @if [ `id -u` != 0 ]; then \ + echo ""; \ + echo 'Do "make install" as root'; \ + echo ""; \ + false; \ + fi + @if [ -f $(DATATARGET) ]; then \ + NewVersion=`./acvers $(DATASOURCE) | awk '{ print $$3 }'`;\ + OldVersion=`./acvers $(DATATARGET) | awk '{ print $$3 }'`;\ + echo "Current datafile build number: $$OldVersion"; \ + echo "Build number of new datafile: $$NewVersion"; \ + if [ $$NewVersion -gt $$OldVersion ]; then \ + echo "Installing new datafile"; \ + $(INSTALL) $(DATASOURCE) $(DATATARGET); \ + else \ + echo "Installed datafile is same or newer, skipping...";\ + fi; \ + else \ + echo "Installing new datafile"; \ + $(INSTALL) $(DATASOURCE) $(DATATARGET); \ + fi + +# ------------------------------------------------------------------------------ +# Create a dependency file + +depend dep: + @echo "Creating dependency information" + $(CC) -MM *.c > .depend + +# ------------------------------------------------------------------------------ +# clean up + +distclean: clean + + +clean: + -rm -f *.bak *~ *.o .depend + -rm -f acvers actest + +zap: distclean + + +