Fossil SCM

On Windows, avoid using BIO_ptr_ctrl with OpenSSL 1.1.1b as it does not appear to work as expected.

mistachkin 2019-05-17 23:34 trunk
Commit 344a3331d34d8967762a331652584fbcb6f4e643d9f05b6a571b8b4a1fea1587
Parent d14590dbff44620…
4 files changed +4 +2 +2 +2
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,10 +825,12 @@
825825
826826
 # With HTTPS support
827827
 ifdef FOSSIL_ENABLE_SSL
828828
 TCC += -DFOSSIL_ENABLE_SSL=1
829829
 RCC += -DFOSSIL_ENABLE_SSL=1
830
+TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
831
+RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
830832
 endif
831833
832834
 # With relative paths in external diff/gdiff
833835
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
834836
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1705,10 +1707,12 @@
17051707
 !endif
17061708
17071709
 !if $(FOSSIL_ENABLE_SSL)!=0
17081710
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
17091711
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1712
+TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1713
+RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
17101714
 LIBS = $(LIBS) $(SSLLIB)
17111715
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
17121716
 !endif
17131717
17141718
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
17151719
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,10 +825,12 @@
825
826 # With HTTPS support
827 ifdef FOSSIL_ENABLE_SSL
828 TCC += -DFOSSIL_ENABLE_SSL=1
829 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
830 endif
831
832 # With relative paths in external diff/gdiff
833 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
834 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1705,10 +1707,12 @@
1705 !endif
1706
1707 !if $(FOSSIL_ENABLE_SSL)!=0
1708 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1709 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
 
 
1710 LIBS = $(LIBS) $(SSLLIB)
1711 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1712 !endif
1713
1714 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1715
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,10 +825,12 @@
825
826 # With HTTPS support
827 ifdef FOSSIL_ENABLE_SSL
828 TCC += -DFOSSIL_ENABLE_SSL=1
829 RCC += -DFOSSIL_ENABLE_SSL=1
830 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
831 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
832 endif
833
834 # With relative paths in external diff/gdiff
835 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
836 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1705,10 +1707,12 @@
1707 !endif
1708
1709 !if $(FOSSIL_ENABLE_SSL)!=0
1710 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1711 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1712 TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1713 RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1714 LIBS = $(LIBS) $(SSLLIB)
1715 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1716 !endif
1717
1718 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1719
M win/Makefile.mingw
+2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,10 +288,12 @@
288288
289289
 # With HTTPS support
290290
 ifdef FOSSIL_ENABLE_SSL
291291
 TCC += -DFOSSIL_ENABLE_SSL=1
292292
 RCC += -DFOSSIL_ENABLE_SSL=1
293
+TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294
+RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
293295
 endif
294296
295297
 # With relative paths in external diff/gdiff
296298
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297299
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298300
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,10 +288,12 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
293 endif
294
295 # With relative paths in external diff/gdiff
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,10 +288,12 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
293 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295 endif
296
297 # With relative paths in external diff/gdiff
298 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300
M win/Makefile.mingw.mistachkin
+2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,10 +288,12 @@
288288
289289
 # With HTTPS support
290290
 ifdef FOSSIL_ENABLE_SSL
291291
 TCC += -DFOSSIL_ENABLE_SSL=1
292292
 RCC += -DFOSSIL_ENABLE_SSL=1
293
+TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294
+RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
293295
 endif
294296
295297
 # With relative paths in external diff/gdiff
296298
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297299
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298300
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,10 +288,12 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
293 endif
294
295 # With relative paths in external diff/gdiff
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,10 +288,12 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
293 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295 endif
296
297 # With relative paths in external diff/gdiff
298 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300
M win/Makefile.msc
+2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,10 +235,12 @@
235235
 !endif
236236
237237
 !if $(FOSSIL_ENABLE_SSL)!=0
238238
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239239
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
240
+TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
241
+RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
240242
 LIBS = $(LIBS) $(SSLLIB)
241243
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
242244
 !endif
243245
244246
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
245247
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,10 +235,12 @@
235 !endif
236
237 !if $(FOSSIL_ENABLE_SSL)!=0
238 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
 
 
240 LIBS = $(LIBS) $(SSLLIB)
241 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
242 !endif
243
244 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
245
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,10 +235,12 @@
235 !endif
236
237 !if $(FOSSIL_ENABLE_SSL)!=0
238 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
240 TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
241 RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
242 LIBS = $(LIBS) $(SSLLIB)
243 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
244 !endif
245
246 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
247

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button