head 1.11; access; symbols OPENPKG_E1_MP_HEAD:1.9 OPENPKG_E1_MP:1.9 OPENPKG_E1_MP_2_STABLE:1.8 OPENPKG_E1_FP:1.8 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.8 OPENPKG_2_STABLE_20060622:1.8 OPENPKG_2_STABLE:1.8.0.2 OPENPKG_2_STABLE_BP:1.8 OPENPKG_2_5_RELEASE:1.7 OPENPKG_2_5_SOLID:1.7.0.2 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.2 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.14 OPENPKG_2_3_SOLID_BP:1.1 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.12 OPENPKG_2_2_SOLID_BP:1.1 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.10 OPENPKG_2_1_SOLID_BP:1.1 OPENPKG_2_0_RELEASE:1.1 OPENPKG_2_0_SOLID:1.1.0.8 OPENPKG_2_0_SOLID_BP:1.1 OPENPKG_1_3_RELEASE:1.1.2.2 OPENPKG_1_3_SOLID:1.1.2.2.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.2 OPENPKG_1_2_SOLID:1.1.0.6 OPENPKG_1_1_SOLID:1.1.0.4 OPENPKG_1_STABLE:1.1.0.2; locks; strict; comment @# @; 1.11 date 2009.03.15.09.31.33; author rse; state Exp; branches; next 1.10; commitid h0s4n6vPg5qJV6Gt; 1.10 date 2007.01.18.07.43.18; author rse; state Exp; branches; next 1.9; commitid e1Vbrf7l6GN0DX2s; 1.9 date 2006.12.04.17.11.20; author cs; state Exp; branches; next 1.8; commitid SD0olhmVIDGydeXr; 1.8 date 2006.06.10.21.02.45; author rse; state Exp; branches; next 1.7; commitid eHl19VfptumGbvAr; 1.7 date 2005.10.06.17.26.37; author rse; state Exp; branches; next 1.6; 1.6 date 2005.09.28.19.41.23; author thl; state Exp; branches; next 1.5; 1.5 date 2005.09.27.19.39.26; author thl; state Exp; branches; next 1.4; 1.4 date 2005.09.26.14.38.15; author thl; state Exp; branches; next 1.3; 1.3 date 2005.07.25.18.08.35; author rse; state Exp; branches; next 1.2; 1.2 date 2005.06.07.12.59.53; author mk; state Exp; branches; next 1.1; 1.1 date 2003.03.19.12.43.28; author mlelstv; state dead; branches 1.1.2.1 1.1.4.1 1.1.6.1; next ; 1.1.2.1 date 2003.03.19.12.43.28; author mlelstv; state Exp; branches; next 1.1.2.2; 1.1.2.2 date 2003.07.24.20.43.59; author rse; state dead; branches; next ; 1.1.4.1 date 2003.03.19.13.02.10; author mlelstv; state Exp; branches; next ; 1.1.6.1 date 2003.03.19.13.02.15; author mlelstv; state Exp; branches; next ; desc @@ 1.11 log @upgrading package: delegate 9.9.1 -> 9.9.2 @ text @Index: maker/__forkpty.c --- maker/__forkpty.c.orig 2007-06-12 08:17:50 +0200 +++ maker/__forkpty.c 2009-03-15 10:19:26 +0100 @@@@ -6,8 +6,12 @@@@ #include #include #include +#if defined(__NetBSD__) +#include +#else #include #endif +#endif int _Forkpty(int *pty,char *name){ int pid; Index: src/Makefile --- src/Makefile.orig 2009-03-03 03:33:26 +0100 +++ src/Makefile 2009-03-15 10:22:41 +0100 @@@@ -289,7 +289,7 @@@@ SUBIN = subin #endif ############# #ifdef UNIX,OS2EMX ################################################ -CFLAGSPLUS = if(WITHCPLUS,UNIX,OS2EMX) -x c++ -DQS +CFLAGSPLUS = if(WITHCPLUS,UNIX,OS2EMX) DGEXE = ./dg.exe COPY = cp -f -p CFLAGS = if(UNIX,OS2EMX) -O2 Index: src/X.c --- src/X.c.orig 2007-10-29 09:43:06 +0100 +++ src/X.c 2009-03-15 10:19:26 +0100 @@@@ -25,6 +25,13 @@@@ #include "delegate.h" #include "fpoll.h" #include "proc.h" + +/* #undef CS unconditionally + * real problem exists under Solaris (10) that defines CS in + * /usr/include/sys/ucontext.h which is included together with stdlib.h + */ +#undef CS + void DBGMSG(PCStr(fmt),...); static jmp_buf tel_env; Index: src/dget.c --- src/dget.c.orig 2008-12-06 22:45:07 +0100 +++ src/dget.c 2009-03-15 10:19:26 +0100 @@@@ -39,6 +39,12 @@@@ const char *DELEGATE_getEnv(PCStr(name)); char *fgetsTIMEOUT(xPVStr(b),int s,FILE *fp); +/* #undef ERR unconditionally + * real problem exists under Solaris (10) that defines ERR in + * /usr/include/sys/regset.h which is included together with stdlib.h + */ +#undef ERR + const char *strid_find(int tab,int hx,int id); int connect2server(Connection *Conn,PCStr(proto),PCStr(host),int port); Index: src/smtpgate.c --- src/smtpgate.c.orig 2009-01-19 05:24:58 +0100 +++ src/smtpgate.c 2009-03-15 10:19:26 +0100 @@@@ -53,6 +53,12 @@@@ #include "file.h" #include "auth.h" +/* #undef FS unconditionally + * real problem exists under Solaris (10) that defines FS in + * /usr/include/sys/ucontext.h which is included together with stdlib.h + */ +#undef FS + #define LNSIZE 1024 #define lfprintf SMTP_lfprintf void SMTP_lfprintf(FILE *log,FILE *tosc,PCStr(fmt),...); Index: src/telnet.c --- src/telnet.c.orig 2008-12-14 10:33:10 +0100 +++ src/telnet.c 2009-03-15 10:19:26 +0100 @@@@ -29,6 +29,12 @@@@ #include "auth.h" #include "proc.h" +/* #undef CS unconditionally + * real problem exists under Solaris (10) that defines CS in + * /usr/include/sys/ucontext.h which is included together with stdlib.h + */ +#undef CS + extern int IO_TIMEOUT; int connectToSsh(Connection *Conn,const char *host,int port,PCStr(user),PCStr(pass)); Index: src/textconv.c --- src/textconv.c.orig 2009-01-19 05:49:47 +0100 +++ src/textconv.c 2009-03-15 10:19:26 +0100 @@@@ -695,7 +695,7 @@@@ int *ccx_global; -void setCCX(Connection *Conn,PVStr(code),PVStr(stat)) +static void local_setCCX(Connection *Conn,PVStr(code),PVStr(stat)) { const char *st; int thru = 0; @@@@ -731,7 +731,7 @@@@ } void global_setCCX(Connection *Conn,PVStr(code),PVStr(stat)) { - setCCX(Conn,AVStr(code),AVStr(stat)); + local_setCCX(Conn,AVStr(code),AVStr(stat)); ccx_global = (int*)CCX0; } Index: src/urlfind.c --- src/urlfind.c.orig 2006-03-16 09:07:57 +0100 +++ src/urlfind.c 2009-03-15 10:19:26 +0100 @@@@ -25,6 +25,12 @@@@ #include "ystring.h" #include "dglib.h" +/* #undef ERR unconditionally + * real problem exists under Solaris (10) that defines ERR in + * /usr/include/sys/regset.h which is included together with stdlib.h + */ +#undef ERR + static const char *usage = "\ Usage: urlfind URL\n\ -- Find recursively in URL space.\n\ Index: teleport/vehicle.c --- teleport/vehicle.c.orig 2006-02-08 11:25:36 +0100 +++ teleport/vehicle.c 2009-03-15 10:19:26 +0100 @@@@ -22,6 +22,12 @@@@ #include #include "teleport.h" +/* #undef ERR unconditionally + * real problem exists under Solaris (10) that defines ERR in + * /usr/include/sys/regset.h which is included together with stdlib.h + */ +#undef ERR + #define TP_INVITE "INVITE" #define TP_ROUTE "ROUTE" #define IMSIZE (1024*8) @ 1.10 log @upgrading package: delegate 9.4.1 -> 9.4.2 @ text @d2 2 a3 2 --- maker/__forkpty.c.orig 2005-07-30 09:42:26 +0200 +++ maker/__forkpty.c 2007-01-18 08:33:12 +0100 d15 1 a15 1 int Forkpty(int *pty,char *name){ d18 3 a20 3 --- src/Makefile.orig 2006-11-29 17:57:54 +0100 +++ src/Makefile 2007-01-18 08:33:12 +0100 @@@@ -255,7 +255,7 @@@@ d24 2 a25 2 -CFLAGSPLUS = if(UNIX,OS2EMX) -x c++ -DQS +CFLAGSPLUS = if(UNIX,OS2EMX) d28 1 a28 1 CFLAGS = if(UNIX,OS2EMX) -O d30 2 a31 2 --- src/X.c.orig 2005-06-08 04:54:43 +0200 +++ src/X.c 2007-01-18 08:33:12 +0100 d47 3 a49 4 --- src/dget.c.orig 2006-09-29 12:29:26 +0200 +++ src/dget.c 2007-01-18 08:33:12 +0100 @@@@ -33,6 +33,12 @@@@ d51 1 d63 3 a65 3 --- src/smtpgate.c.orig 2007-01-16 19:28:57 +0100 +++ src/smtpgate.c 2007-01-18 08:33:12 +0100 @@@@ -52,6 +52,12 @@@@ d79 2 a80 2 --- src/telnet.c.orig 2006-11-09 07:40:08 +0100 +++ src/telnet.c 2007-01-18 08:33:12 +0100 d93 1 a93 1 int makeXproxy(Connection *Conn,PVStr(pxdisplay),PCStr(display),PVStr(pxhost),PCStr(relhost),PCStr(me),int timeo); d95 3 a97 3 --- src/textconv.c.orig 2007-01-04 21:23:23 +0100 +++ src/textconv.c 2007-01-18 08:37:54 +0100 @@@@ -656,7 +656,7 @@@@ d106 1 a106 1 @@@@ -692,7 +692,7 @@@@ d117 1 a117 1 +++ src/urlfind.c 2007-01-18 08:33:12 +0100 d133 1 a133 1 +++ teleport/vehicle.c 2007-01-18 08:33:12 +0100 @ 1.9 log @upgrading package: delegate 9.2.4 -> 9.4.0 @ text @d3 1 a3 1 +++ maker/__forkpty.c 2006-06-10 22:56:33 +0200 d19 1 a19 1 +++ src/Makefile 2006-12-04 18:05:38 +0100 d31 2 a32 2 +++ src/X.c 2006-06-10 22:56:33 +0200 @@@@ -24,6 +24,13 @@@@ d47 3 a49 3 --- src/dget.c.orig 2006-06-01 21:34:16 +0200 +++ src/dget.c 2006-06-10 22:56:33 +0200 @@@@ -32,6 +32,12 @@@@ d63 3 a65 3 --- src/smtpgate.c.orig 2006-05-04 23:37:38 +0200 +++ src/smtpgate.c 2006-06-10 22:56:33 +0200 @@@@ -49,6 +49,12 @@@@ d79 3 a81 3 --- src/telnet.c.orig 2006-03-16 09:03:23 +0100 +++ src/telnet.c 2006-06-10 22:56:33 +0200 @@@@ -28,6 +28,12 @@@@ d94 21 d117 1 a117 1 +++ src/urlfind.c 2006-06-10 22:56:33 +0200 d133 2 a134 2 +++ teleport/vehicle.c 2006-06-10 22:56:33 +0200 @@@@ -21,6 +21,12 @@@@ @ 1.8 log @upgrading package: delegate 9.2.1 -> 9.2.2 @ text @d18 3 a20 3 --- src/Makefile.orig 2006-05-06 10:57:09 +0200 +++ src/Makefile 2006-06-10 22:56:33 +0200 @@@@ -248,7 +248,7 @@@@ d26 2 a27 1 COPY = cp -p a28 1 CCINX = .c @ 1.7 log @fix one more BASE package @ text @d1 28 d30 2 a31 2 --- src/X.c.orig 2005-01-18 08:12:16 +0100 +++ src/X.c 2005-07-25 19:53:26 +0200 d47 5 a51 5 --- src/dget.c.orig 2005-03-14 03:29:45 +0100 +++ src/dget.c 2005-07-25 19:53:26 +0200 @@@@ -27,6 +27,12 @@@@ #include "file.h" #include "auth.h" d63 2 a64 2 --- src/smtpgate.c.orig 2005-02-28 23:38:56 +0100 +++ src/smtpgate.c 2005-07-25 19:53:26 +0200 d79 2 a80 2 --- src/telnet.c.orig 2005-03-01 00:25:53 +0100 +++ src/telnet.c 2005-07-25 19:53:26 +0200 d95 2 a96 2 --- src/urlfind.c.orig 2005-02-27 01:05:45 +0100 +++ src/urlfind.c 2005-07-25 19:53:26 +0200 d111 2 a112 2 --- teleport/vehicle.c.orig 2005-03-01 00:44:54 +0100 +++ teleport/vehicle.c 2005-07-25 19:53:26 +0200 a125 40 Index: src/Makefile --- src/Makefile.orig 2005-08-04 22:10:31 +0200 +++ src/Makefile 2005-09-27 20:37:04 +0200 @@@@ -244,7 +244,7 @@@@ SUBIN = subin #endif ############# #ifdef UNIX,OS2EMX ################################################ -CFLAGSPLUS = if(UNIX,OS2EMX) -x c++ -DQS +CFLAGSPLUS = if(UNIX,OS2EMX) COPY = cp -p CFLAGS = if(UNIX,OS2EMX) -O CCINX = .c Index: include/vsocket.h --- include/vsocket.h.orig 2005-05-28 09:29:18.000000000 +0000 +++ include/vsocket.h 2005-09-28 19:33:45.411406000 +0000 @@@@ -36,7 +36,7 @@@@ #include #include #include -#ifdef __osf__ +#if defined(__osf__) || defined(sun) #define gethostbyname2(name,af) ((af==AF_INET)?gethostbyname(name):NULL) #endif Index: maker/__forkpty.c --- maker/__forkpty.c.orig 2005-07-30 09:42:26 +0200 +++ maker/__forkpty.c 2005-10-06 19:23:56 +0200 @@@@ -6,8 +6,12 @@@@ #include #include #include +#if defined(__NetBSD__) +#include +#else #include #endif +#endif int Forkpty(int *pty,char *name){ int pid; @ 1.6 log @Solaris does not have gethostbyname2 @ text @d122 16 @ 1.5 log @more compatiblity with BSD and Linux @ text @d110 12 @ 1.4 log @move delegate to bleeding edge, gaining gcc4 support @ text @d98 12 @ 1.3 log @upgrading package: delegate 8.11.4 -> 8.11.5 @ text @a33 16 Index: src/ftp.c --- src/ftp.c.orig 2005-03-14 10:21:33 +0100 +++ src/ftp.c 2005-07-25 19:53:26 +0200 @@@@ -33,6 +33,12 @@@@ #include "auth.h" #include "proc.h" +/* #undef FS unconditionally + * real problem exists under Solaris (10) that defines FS in + * /usr/include/sys/ucontext.h which is included together with stdlib.h + */ +#undef FS + int connect_ftp_data(Connection*Conn,PCStr(port),int cntrlsock,PCStr(lhost),int lport); void putFileInHTTP(FILE *tc,PCStr(path),PCStr(file)); FILE *dirtar_fopen(PCStr(path)); @ 1.2 log @modifying package: delegate-8.11.4 20050520 -> 20050607 @ text @a0 18 Index: maker/_-poll.c =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/maker/_-poll.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 _-poll.c --- maker/_-poll.c 6 Jun 2005 15:53:41 -0000 1.1.1.1 +++ maker/_-poll.c 7 Jun 2005 06:55:38 -0000 @@@@ -10,8 +10,8 @@@@ #include #include "vsocket.h" #include "yselect.h" /* FD_SETSIZE */ -int syslog_ERROR(const char fmt*,...); -int syslog_DEBUG(const char fmt*,...); +int syslog_ERROR(const char *fmt,...); +int syslog_DEBUG(const char *fmt,...); static int _gotRESET = -1; int connRESETbypeer(){ return _gotRESET; } d2 2 a3 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/X.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 X.c --- src/X.c 6 Jun 2005 15:53:39 -0000 1.1.1.1 +++ src/X.c 7 Jun 2005 06:55:38 -0000 d19 2 a20 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/dget.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 dget.c --- src/dget.c 6 Jun 2005 15:53:39 -0000 1.1.1.1 +++ src/dget.c 7 Jun 2005 06:55:38 -0000 d35 2 a36 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/ftp.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 ftp.c --- src/ftp.c 6 Jun 2005 15:53:40 -0000 1.1.1.1 +++ src/ftp.c 7 Jun 2005 06:55:38 -0000 d51 2 a52 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/smtpgate.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 smtpgate.c --- src/smtpgate.c 6 Jun 2005 15:53:40 -0000 1.1.1.1 +++ src/smtpgate.c 7 Jun 2005 06:55:38 -0000 d67 2 a68 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/telnet.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 telnet.c --- src/telnet.c 6 Jun 2005 15:53:40 -0000 1.1.1.1 +++ src/telnet.c 7 Jun 2005 06:55:38 -0000 d83 2 a84 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/src/urlfind.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 urlfind.c --- src/urlfind.c 6 Jun 2005 15:53:40 -0000 1.1.1.1 +++ src/urlfind.c 7 Jun 2005 06:55:38 -0000 d99 2 a100 6 =================================================================== RCS file: /cvs/opkg/vendor_stuff/delegate/teleport/vehicle.c,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 vehicle.c --- teleport/vehicle.c 6 Jun 2005 15:53:40 -0000 1.1.1.1 +++ teleport/vehicle.c 7 Jun 2005 06:55:38 -0000 @ 1.1 log @file delegate.patch was initially added on branch OPENPKG_1_STABLE. @ text @d1 159 @ 1.1.6.1 log @MFS: SA-2003.023 @ text @a0 14 --- src/httpd.c.dist Wed Mar 19 13:15:03 2003 +++ src/httpd.c Wed Mar 19 13:16:54 2003 @@@@ -2170,6 +2170,11 @@@@ records[ti][tx++] = sp; if( np = strchr(sp,'\n') ) np++; + + if( 1000 < tx ){ + sv1log("#### Too large /robots.txt\n"); + break; + } } records[ti][tx++] = rts[ti] + strlen(rts[ti]); records[ti][tx] = 0; @ 1.1.4.1 log @MFS: SA-2003.023 @ text @a0 14 --- src/httpd.c.dist Wed Mar 19 13:15:03 2003 +++ src/httpd.c Wed Mar 19 13:16:54 2003 @@@@ -2170,6 +2170,11 @@@@ records[ti][tx++] = sp; if( np = strchr(sp,'\n') ) np++; + + if( 1000 < tx ){ + sv1log("#### Too large /robots.txt\n"); + break; + } } records[ti][tx++] = rts[ti] + strlen(rts[ti]); records[ti][tx] = 0; @ 1.1.2.1 log @SA-2003.023 @ text @a0 14 --- src/httpd.c.dist Wed Mar 19 13:15:03 2003 +++ src/httpd.c Wed Mar 19 13:16:54 2003 @@@@ -2170,6 +2170,11 @@@@ records[ti][tx++] = sp; if( np = strchr(sp,'\n') ) np++; + + if( 1000 < tx ){ + sv1log("#### Too large /robots.txt\n"); + break; + } } records[ti][tx++] = rts[ti] + strlen(rts[ti]); records[ti][tx] = 0; @ 1.1.2.2 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @@