--------------------- PatchSet 5450 Date: 2002/10/27 13:14:18 Author: serassio Branch: nt-2_5 Tag: (none) Log: Backport of WIN32 changes from nt branch Members: port/win32/LDAP_auth/LDAP_auth.dsp:1.1.2.5->1.1.2.6 port/win32/NCSA_auth/NCSA_auth.dsp:1.1.4.2->1.1.4.3 port/win32/cf_gen/cf_gen.dsp:1.1.2.2->1.1.2.3 port/win32/fake_auth/fake_auth.dsp:1.1.2.4->1.1.2.5 port/win32/include/autoconf.h:1.1.2.24->1.1.2.25 port/win32/nt_auth/nt_auth.dsp:1.1.2.5->1.1.2.6 port/win32/ntlm_win32_auth/ntlm_win32_auth.dsp:1.1.2.5->1.1.2.6 port/win32/squid/buildver.h:1.1.2.17->1.1.2.18 port/win32/win32_check_group/win32_check_group.dsp:1.1.4.2->1.1.4.3 snmplib/Makefile.am:1.2->1.2.40.1 Index: squid/port/win32/LDAP_auth/LDAP_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/LDAP_auth/Attic/LDAP_auth.dsp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/port/win32/LDAP_auth/LDAP_auth.dsp 7 Sep 2002 20:09:59 -0000 1.1.2.5 +++ squid/port/win32/LDAP_auth/LDAP_auth.dsp 27 Oct 2002 13:16:17 -0000 1.1.2.6 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 Wldap32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 Wldap32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Wldap32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 Wldap32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF Index: squid/port/win32/NCSA_auth/NCSA_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/NCSA_auth/Attic/NCSA_auth.dsp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -r1.1.4.2 -r1.1.4.3 --- squid/port/win32/NCSA_auth/NCSA_auth.dsp 29 Jun 2002 12:58:30 -0000 1.1.4.2 +++ squid/port/win32/NCSA_auth/NCSA_auth.dsp 27 Oct 2002 13:16:17 -0000 1.1.4.3 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/cf_gen/cf_gen.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/cf_gen/Attic/cf_gen.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/cf_gen/cf_gen.dsp 27 Mar 2002 21:01:11 -0000 1.1.2.2 +++ squid/port/win32/cf_gen/cf_gen.dsp 27 Oct 2002 13:16:17 -0000 1.1.2.3 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "cf_gen - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/fake_auth/fake_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/fake_auth/Attic/fake_auth.dsp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/port/win32/fake_auth/fake_auth.dsp 29 Jun 2002 13:14:52 -0000 1.1.2.4 +++ squid/port/win32/fake_auth/fake_auth.dsp 27 Oct 2002 13:16:17 -0000 1.1.2.5 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "fake_auth - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.2.24 retrieving revision 1.1.2.25 diff -u -r1.1.2.24 -r1.1.2.25 --- squid/port/win32/include/autoconf.h 27 Oct 2002 10:48:32 -0000 1.1.2.24 +++ squid/port/win32/include/autoconf.h 27 Oct 2002 13:15:04 -0000 1.1.2.25 @@ -22,7 +22,7 @@ * */ -/* $Id: autoconf.h,v 1.1.2.24 2002/10/27 10:48:32 serassio Exp $ */ +/* $Id: autoconf.h,v 1.1.2.25 2002/10/27 13:15:04 serassio Exp $ */ /* * configure command line used to configure Squid @@ -108,7 +108,7 @@ * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. * Use with caution. */ -#undef KILL_PARENT_OPT +/* #undef KILL_PARENT_OPT */ /* Define to enable SNMP monitoring of Squid */ #undef SQUID_SNMP @@ -117,7 +117,7 @@ /* * Define to enable WCCP */ -#undef USE_WCCP +/* #undef USE_WCCP */ /* * Squid frequently calls gettimeofday() for accurate timestamping. Index: squid/port/win32/nt_auth/nt_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/nt_auth/Attic/nt_auth.dsp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/port/win32/nt_auth/nt_auth.dsp 16 Jul 2002 13:00:48 -0000 1.1.2.5 +++ squid/port/win32/nt_auth/nt_auth.dsp 27 Oct 2002 13:16:17 -0000 1.1.2.6 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 advapi32.lib netapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "nt_auth - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 advapi32.lib netapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/ntlm_win32_auth/ntlm_win32_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/ntlm_win32_auth/Attic/ntlm_win32_auth.dsp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/port/win32/ntlm_win32_auth/ntlm_win32_auth.dsp 16 Jul 2002 13:00:48 -0000 1.1.2.5 +++ squid/port/win32/ntlm_win32_auth/ntlm_win32_auth.dsp 27 Oct 2002 13:16:17 -0000 1.1.2.6 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Netapi32.lib Advapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 Netapi32.lib Advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "ntlm_win32_auth - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Netapi32.lib Advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 Netapi32.lib Advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/squid/buildver.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/buildver.h,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -r1.1.2.17 -r1.1.2.18 --- squid/port/win32/squid/buildver.h 28 Sep 2002 14:27:50 -0000 1.1.2.17 +++ squid/port/win32/squid/buildver.h 27 Oct 2002 13:16:18 -0000 1.1.2.18 @@ -1,4 +1,4 @@ -#define FILEVER 2,5,1,2 -#define PRODUCTVER 2,5,1,2 -#define STRFILEVER "2, 5, 1, 2\0" -#define STRPRODUCTVER "2, 5, 1, 2\0" +#define FILEVER 2,5,1,65 +#define PRODUCTVER 2,5,1,65 +#define STRFILEVER "2, 5, 1, 65\0" +#define STRPRODUCTVER "2, 5, 1, 65\0" Index: squid/port/win32/win32_check_group/win32_check_group.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/win32_check_group/Attic/win32_check_group.dsp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -r1.1.4.2 -r1.1.4.3 --- squid/port/win32/win32_check_group/win32_check_group.dsp 7 Jul 2002 19:51:18 -0000 1.1.4.2 +++ squid/port/win32/win32_check_group/win32_check_group.dsp 27 Oct 2002 13:16:19 -0000 1.1.4.3 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 netapi32.lib Advapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 netapi32.lib Advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "win32_check_group - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 netapi32.lib Advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 netapi32.lib Advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/snmplib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/snmplib/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.40.1 diff -u -r1.2 -r1.2.40.1 --- squid/snmplib/Makefile.am 1 Sep 2001 11:46:49 -0000 1.2 +++ squid/snmplib/Makefile.am 27 Oct 2002 13:14:18 -0000 1.2.40.1 @@ -8,7 +8,11 @@ mib.c snmp_api_error.c \ snmp_msg.c \ snmp_pdu.c snmplib_debug.c -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +if ENABLE_MINGW32SPECIFIC +INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include +else +INCLUDES = -I$(top_srcdir)/include +endif VERSION = 3.4 DEFS = -DSQUID_SNMP=1