Fossil SCM
Update top OpenSSL 1.0.2l. Minor (harmless) compiler warnings in mkversion and codecheck1 (-Wall)
Commit
23895c7b99d91794a480f0000ec93358385510ef7677d6c129bdf03b62116d43
Parent
7c0b971437fdbc7…
9 files changed
+4
-4
+2
-2
+1
-1
+4
-4
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+4
-4
| --- src/codecheck1.c | ||
| +++ src/codecheck1.c | ||
| @@ -510,14 +510,14 @@ | ||
| 510 | 510 | static int scan_file(const char *zName, const char *zContent){ |
| 511 | 511 | const char *z; |
| 512 | 512 | int ln = 0; |
| 513 | 513 | int szToken; |
| 514 | 514 | int eToken; |
| 515 | - const char *zPrev; | |
| 516 | - int ePrev; | |
| 517 | - int szPrev; | |
| 518 | - int lnPrev; | |
| 515 | + const char *zPrev = 0; | |
| 516 | + int ePrev = 0; | |
| 517 | + int szPrev = 0; | |
| 518 | + int lnPrev = 0; | |
| 519 | 519 | int nCurly = 0; |
| 520 | 520 | int x; |
| 521 | 521 | unsigned fmtFlags = 0; |
| 522 | 522 | int nErr = 0; |
| 523 | 523 | |
| 524 | 524 |
| --- src/codecheck1.c | |
| +++ src/codecheck1.c | |
| @@ -510,14 +510,14 @@ | |
| 510 | static int scan_file(const char *zName, const char *zContent){ |
| 511 | const char *z; |
| 512 | int ln = 0; |
| 513 | int szToken; |
| 514 | int eToken; |
| 515 | const char *zPrev; |
| 516 | int ePrev; |
| 517 | int szPrev; |
| 518 | int lnPrev; |
| 519 | int nCurly = 0; |
| 520 | int x; |
| 521 | unsigned fmtFlags = 0; |
| 522 | int nErr = 0; |
| 523 | |
| 524 |
| --- src/codecheck1.c | |
| +++ src/codecheck1.c | |
| @@ -510,14 +510,14 @@ | |
| 510 | static int scan_file(const char *zName, const char *zContent){ |
| 511 | const char *z; |
| 512 | int ln = 0; |
| 513 | int szToken; |
| 514 | int eToken; |
| 515 | const char *zPrev = 0; |
| 516 | int ePrev = 0; |
| 517 | int szPrev = 0; |
| 518 | int lnPrev = 0; |
| 519 | int nCurly = 0; |
| 520 | int x; |
| 521 | unsigned fmtFlags = 0; |
| 522 | int nErr = 0; |
| 523 | |
| 524 |
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -676,11 +676,11 @@ | ||
| 676 | 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | 680 | # |
| 681 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 681 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 682 | 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | 684 | |
| 685 | 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | ||
| 1507 | 1507 | !ifndef USE_SEE |
| 1508 | 1508 | USE_SEE = 0 |
| 1509 | 1509 | !endif |
| 1510 | 1510 | |
| 1511 | 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 1512 | +SSLDIR = $(B)\compat\openssl-1.0.2l | |
| 1513 | 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | 1516 | !else |
| 1517 | 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1518 | 1518 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.0.2k |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1518 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -676,11 +676,11 @@ | |
| 676 | #### The directories where the OpenSSL include and library files are located. |
| 677 | # The recommended usage here is to use the Sysinternals junction tool |
| 678 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 679 | # Fossil source code directory and the target OpenSSL source directory. |
| 680 | # |
| 681 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 682 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 683 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 684 | |
| 685 | #### Either the directory where the Tcl library is installed or the Tcl |
| 686 | # source code directory resides (depending on the value of the macro |
| @@ -1507,11 +1507,11 @@ | |
| 1507 | !ifndef USE_SEE |
| 1508 | USE_SEE = 0 |
| 1509 | !endif |
| 1510 | |
| 1511 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1512 | SSLDIR = $(B)\compat\openssl-1.0.2l |
| 1513 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1514 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1515 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1516 | !else |
| 1517 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1518 |
+1
-1
| --- src/markdown.md | ||
| +++ src/markdown.md | ||
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | # Markdown Overview # |
| 2 | 2 | |
| 3 | 3 | ## Paragraphs ## |
| 4 | 4 | |
| 5 | -> Paragraphs are divided by blank lines. | |
| 5 | +> Paragraphs are divided by blank lines. | |
| 6 | 6 | > End a line with two or more spaces to force a mid-paragraph line break. |
| 7 | 7 | |
| 8 | 8 | ## Headings ## |
| 9 | 9 | |
| 10 | 10 | > |
| 11 | 11 |
| --- src/markdown.md | |
| +++ src/markdown.md | |
| @@ -1,10 +1,10 @@ | |
| 1 | # Markdown Overview # |
| 2 | |
| 3 | ## Paragraphs ## |
| 4 | |
| 5 | > Paragraphs are divided by blank lines. |
| 6 | > End a line with two or more spaces to force a mid-paragraph line break. |
| 7 | |
| 8 | ## Headings ## |
| 9 | |
| 10 | > |
| 11 |
| --- src/markdown.md | |
| +++ src/markdown.md | |
| @@ -1,10 +1,10 @@ | |
| 1 | # Markdown Overview # |
| 2 | |
| 3 | ## Paragraphs ## |
| 4 | |
| 5 | > Paragraphs are divided by blank lines. |
| 6 | > End a line with two or more spaces to force a mid-paragraph line break. |
| 7 | |
| 8 | ## Headings ## |
| 9 | |
| 10 | > |
| 11 |
+4
-4
| --- src/mkversion.c | ||
| +++ src/mkversion.c | ||
| @@ -12,11 +12,14 @@ | ||
| 12 | 12 | #include <stdlib.h> |
| 13 | 13 | |
| 14 | 14 | int main(int argc, char *argv[]){ |
| 15 | 15 | FILE *m,*u,*v; |
| 16 | 16 | char *z; |
| 17 | - int i, j, x, d; | |
| 17 | +#if defined(__DMC__) /* e.g. 0x857 */ | |
| 18 | + int i = 0; | |
| 19 | +#endif | |
| 20 | + int j = 0, x = 0, d = 0; | |
| 18 | 21 | int vn[3]; |
| 19 | 22 | char b[1000]; |
| 20 | 23 | char vx[1000]; |
| 21 | 24 | memset(b,0,sizeof(b)); |
| 22 | 25 | memset(vx,0,sizeof(vx)); |
| @@ -45,12 +48,10 @@ | ||
| 45 | 48 | } |
| 46 | 49 | fclose(v); |
| 47 | 50 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 48 | 51 | *z = 0; |
| 49 | 52 | printf("#define RELEASE_VERSION \"%s\"\n", b); |
| 50 | - x=0; | |
| 51 | - i=j=0; | |
| 52 | 53 | z=b; |
| 53 | 54 | vn[0] = vn[1] = vn[2] = 0; |
| 54 | 55 | while(1){ |
| 55 | 56 | if( z[0]>='0' && z[0]<='9' ){ |
| 56 | 57 | x = x*10 + z[0] - '0'; |
| @@ -63,11 +64,10 @@ | ||
| 63 | 64 | } |
| 64 | 65 | for(z=vx; z[0]=='0'; z++){} |
| 65 | 66 | printf("#define RELEASE_VERSION_NUMBER %d%02d%02d\n", vn[0], vn[1], vn[2]); |
| 66 | 67 | memset(vx,0,sizeof(vx)); |
| 67 | 68 | strcpy(vx,b); |
| 68 | - d = 0; | |
| 69 | 69 | for(z=vx; z[0]; z++){ |
| 70 | 70 | if( z[0]=='-' ){ |
| 71 | 71 | z[0] = 0; |
| 72 | 72 | break; |
| 73 | 73 | } |
| 74 | 74 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -12,11 +12,14 @@ | |
| 12 | #include <stdlib.h> |
| 13 | |
| 14 | int main(int argc, char *argv[]){ |
| 15 | FILE *m,*u,*v; |
| 16 | char *z; |
| 17 | int i, j, x, d; |
| 18 | int vn[3]; |
| 19 | char b[1000]; |
| 20 | char vx[1000]; |
| 21 | memset(b,0,sizeof(b)); |
| 22 | memset(vx,0,sizeof(vx)); |
| @@ -45,12 +48,10 @@ | |
| 45 | } |
| 46 | fclose(v); |
| 47 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 48 | *z = 0; |
| 49 | printf("#define RELEASE_VERSION \"%s\"\n", b); |
| 50 | x=0; |
| 51 | i=j=0; |
| 52 | z=b; |
| 53 | vn[0] = vn[1] = vn[2] = 0; |
| 54 | while(1){ |
| 55 | if( z[0]>='0' && z[0]<='9' ){ |
| 56 | x = x*10 + z[0] - '0'; |
| @@ -63,11 +64,10 @@ | |
| 63 | } |
| 64 | for(z=vx; z[0]=='0'; z++){} |
| 65 | printf("#define RELEASE_VERSION_NUMBER %d%02d%02d\n", vn[0], vn[1], vn[2]); |
| 66 | memset(vx,0,sizeof(vx)); |
| 67 | strcpy(vx,b); |
| 68 | d = 0; |
| 69 | for(z=vx; z[0]; z++){ |
| 70 | if( z[0]=='-' ){ |
| 71 | z[0] = 0; |
| 72 | break; |
| 73 | } |
| 74 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -12,11 +12,14 @@ | |
| 12 | #include <stdlib.h> |
| 13 | |
| 14 | int main(int argc, char *argv[]){ |
| 15 | FILE *m,*u,*v; |
| 16 | char *z; |
| 17 | #if defined(__DMC__) /* e.g. 0x857 */ |
| 18 | int i = 0; |
| 19 | #endif |
| 20 | int j = 0, x = 0, d = 0; |
| 21 | int vn[3]; |
| 22 | char b[1000]; |
| 23 | char vx[1000]; |
| 24 | memset(b,0,sizeof(b)); |
| 25 | memset(vx,0,sizeof(vx)); |
| @@ -45,12 +48,10 @@ | |
| 48 | } |
| 49 | fclose(v); |
| 50 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| 51 | *z = 0; |
| 52 | printf("#define RELEASE_VERSION \"%s\"\n", b); |
| 53 | z=b; |
| 54 | vn[0] = vn[1] = vn[2] = 0; |
| 55 | while(1){ |
| 56 | if( z[0]>='0' && z[0]<='9' ){ |
| 57 | x = x*10 + z[0] - '0'; |
| @@ -63,11 +64,10 @@ | |
| 64 | } |
| 65 | for(z=vx; z[0]=='0'; z++){} |
| 66 | printf("#define RELEASE_VERSION_NUMBER %d%02d%02d\n", vn[0], vn[1], vn[2]); |
| 67 | memset(vx,0,sizeof(vx)); |
| 68 | strcpy(vx,b); |
| 69 | for(z=vx; z[0]; z++){ |
| 70 | if( z[0]=='-' ){ |
| 71 | z[0] = 0; |
| 72 | break; |
| 73 | } |
| 74 |
+2
-2
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -1252,11 +1252,11 @@ | ||
| 1252 | 1252 | @ </blockquote> |
| 1253 | 1253 | @ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page |
| 1254 | 1254 | @ finishes loading. But the first check-box below can be set to require mouse |
| 1255 | 1255 | @ movement before enabling the links. One can also set a delay prior to enabling |
| 1256 | 1256 | @ links by enter a positive number of milliseconds in the entry box above.</p> |
| 1257 | - @ (Properties: "auto-hyperlink", "auto-hyperlink-ishuman", | |
| 1257 | + @ (Properties: "auto-hyperlink", "auto-hyperlink-ishuman", | |
| 1258 | 1258 | @ "auto-hyperlink-mouseover", and "auto-hyperlink-delay")</p> |
| 1259 | 1259 | |
| 1260 | 1260 | @ <hr /> |
| 1261 | 1261 | onoff_attribute("Require a CAPTCHA if not logged in", |
| 1262 | 1262 | "require-captcha", "reqcapt", 1, 0); |
| @@ -1789,11 +1789,11 @@ | ||
| 1789 | 1789 | @ <b>Ad-Unit Notes:</b><ul> |
| 1790 | 1790 | @ <li>Leave both Ad-Units blank to disable all advertising. |
| 1791 | 1791 | @ <li>The "Banner Ad-Unit" is used for wide pages. |
| 1792 | 1792 | @ <li>The "Right-Column Ad-Unit" is used on pages with tall, narrow content. |
| 1793 | 1793 | @ <li>If the "Right-Column Ad-Unit" is blank, the "Banner Ad-Unit" is used on all pages. |
| 1794 | - @ <li>Properties: "adunit", "adunit-right", "adunit-omit-if-admin", and | |
| 1794 | + @ <li>Properties: "adunit", "adunit-right", "adunit-omit-if-admin", and | |
| 1795 | 1795 | @ "adunit-omit-if-user". |
| 1796 | 1796 | @ <li>Suggested <a href="setup_skinedit?w=0">CSS</a> changes: |
| 1797 | 1797 | @ <blockquote><pre> |
| 1798 | 1798 | @ div.adunit_banner { |
| 1799 | 1799 | @ margin: auto; |
| 1800 | 1800 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1252,11 +1252,11 @@ | |
| 1252 | @ </blockquote> |
| 1253 | @ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page |
| 1254 | @ finishes loading. But the first check-box below can be set to require mouse |
| 1255 | @ movement before enabling the links. One can also set a delay prior to enabling |
| 1256 | @ links by enter a positive number of milliseconds in the entry box above.</p> |
| 1257 | @ (Properties: "auto-hyperlink", "auto-hyperlink-ishuman", |
| 1258 | @ "auto-hyperlink-mouseover", and "auto-hyperlink-delay")</p> |
| 1259 | |
| 1260 | @ <hr /> |
| 1261 | onoff_attribute("Require a CAPTCHA if not logged in", |
| 1262 | "require-captcha", "reqcapt", 1, 0); |
| @@ -1789,11 +1789,11 @@ | |
| 1789 | @ <b>Ad-Unit Notes:</b><ul> |
| 1790 | @ <li>Leave both Ad-Units blank to disable all advertising. |
| 1791 | @ <li>The "Banner Ad-Unit" is used for wide pages. |
| 1792 | @ <li>The "Right-Column Ad-Unit" is used on pages with tall, narrow content. |
| 1793 | @ <li>If the "Right-Column Ad-Unit" is blank, the "Banner Ad-Unit" is used on all pages. |
| 1794 | @ <li>Properties: "adunit", "adunit-right", "adunit-omit-if-admin", and |
| 1795 | @ "adunit-omit-if-user". |
| 1796 | @ <li>Suggested <a href="setup_skinedit?w=0">CSS</a> changes: |
| 1797 | @ <blockquote><pre> |
| 1798 | @ div.adunit_banner { |
| 1799 | @ margin: auto; |
| 1800 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1252,11 +1252,11 @@ | |
| 1252 | @ </blockquote> |
| 1253 | @ <p>Hyperlinks for user "nobody" are normally enabled as soon as the page |
| 1254 | @ finishes loading. But the first check-box below can be set to require mouse |
| 1255 | @ movement before enabling the links. One can also set a delay prior to enabling |
| 1256 | @ links by enter a positive number of milliseconds in the entry box above.</p> |
| 1257 | @ (Properties: "auto-hyperlink", "auto-hyperlink-ishuman", |
| 1258 | @ "auto-hyperlink-mouseover", and "auto-hyperlink-delay")</p> |
| 1259 | |
| 1260 | @ <hr /> |
| 1261 | onoff_attribute("Require a CAPTCHA if not logged in", |
| 1262 | "require-captcha", "reqcapt", 1, 0); |
| @@ -1789,11 +1789,11 @@ | |
| 1789 | @ <b>Ad-Unit Notes:</b><ul> |
| 1790 | @ <li>Leave both Ad-Units blank to disable all advertising. |
| 1791 | @ <li>The "Banner Ad-Unit" is used for wide pages. |
| 1792 | @ <li>The "Right-Column Ad-Unit" is used on pages with tall, narrow content. |
| 1793 | @ <li>If the "Right-Column Ad-Unit" is blank, the "Banner Ad-Unit" is used on all pages. |
| 1794 | @ <li>Properties: "adunit", "adunit-right", "adunit-omit-if-admin", and |
| 1795 | @ "adunit-omit-if-user". |
| 1796 | @ <li>Suggested <a href="setup_skinedit?w=0">CSS</a> changes: |
| 1797 | @ <blockquote><pre> |
| 1798 | @ div.adunit_banner { |
| 1799 | @ margin: auto; |
| 1800 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | !ifndef USE_SEE |
| 99 | 99 | USE_SEE = 0 |
| 100 | 100 | !endif |
| 101 | 101 | |
| 102 | 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | -SSLDIR = $(B)\compat\openssl-1.0.2k | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2l | |
| 104 | 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | 107 | !else |
| 108 | 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 | 109 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -98,11 +98,11 @@ | |
| 98 | !ifndef USE_SEE |
| 99 | USE_SEE = 0 |
| 100 | !endif |
| 101 | |
| 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | SSLDIR = $(B)\compat\openssl-1.0.2k |
| 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -98,11 +98,11 @@ | |
| 98 | !ifndef USE_SEE |
| 99 | USE_SEE = 0 |
| 100 | !endif |
| 101 | |
| 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | SSLDIR = $(B)\compat\openssl-1.0.2l |
| 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -136,11 +136,11 @@ | ||
| 136 | 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | -"<b>compat/openssl-1.0.2k</b>"), then make sure that some recent | |
| 141 | +"<b>compat/openssl-1.0.2l</b>"), then make sure that some recent | |
| 142 | 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | 143 | and finally run one of the following commands: |
| 144 | 144 | <blockquote><pre> |
| 145 | 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | 146 | </pre></blockquote> |
| 147 | 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2k</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2l</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |