Fossil SCM

Openssl 1.0.2

jan.nijtmans 2015-01-27 03:33 sqlite3-compat
Commit 1afb9f7d9f419655dc6a6600912a4c5932a5556e
Parent 74ff0e1e41a3e73…
5 files changed +3 -3 +9 -8 +2 -2 +2 -2 +1 -1
~ src/makemake.tcl ~ src/schema.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+3 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -573,12 +573,12 @@
573573
 #### The directories where the OpenSSL include and library files are located.
574574
 # The recommended usage here is to use the Sysinternals junction tool
575575
 # to create a hard link between an "openssl-1.x" sub-directory of the
576576
 # Fossil source code directory and the target OpenSSL source directory.
577577
 #
578
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
579
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
578
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
579
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
580580
581581
 #### Either the directory where the Tcl library is installed or the Tcl
582582
 # source code directory resides (depending on the value of the macro
583583
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
584584
 # this directory must have "include" and "lib" sub-directories. If
@@ -1305,11 +1305,11 @@
13051305
13061306
 # Uncomment to enable Tcl support
13071307
 # FOSSIL_ENABLE_TCL = 1
13081308
13091309
 !ifdef FOSSIL_ENABLE_SSL
1310
-SSLDIR = $(B)\compat\openssl-1.0.1k
1310
+SSLDIR = $(B)\compat\openssl-1.0.2
13111311
 SSLINCDIR = $(SSLDIR)\inc32
13121312
 SSLLIBDIR = $(SSLDIR)\out32
13131313
 SSLLFLAGS = /nologo /opt:ref /debug
13141314
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
13151315
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
13161316
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -573,12 +573,12 @@
573 #### The directories where the OpenSSL include and library files are located.
574 # The recommended usage here is to use the Sysinternals junction tool
575 # to create a hard link between an "openssl-1.x" sub-directory of the
576 # Fossil source code directory and the target OpenSSL source directory.
577 #
578 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
579 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
580
581 #### Either the directory where the Tcl library is installed or the Tcl
582 # source code directory resides (depending on the value of the macro
583 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
584 # this directory must have "include" and "lib" sub-directories. If
@@ -1305,11 +1305,11 @@
1305
1306 # Uncomment to enable Tcl support
1307 # FOSSIL_ENABLE_TCL = 1
1308
1309 !ifdef FOSSIL_ENABLE_SSL
1310 SSLDIR = $(B)\compat\openssl-1.0.1k
1311 SSLINCDIR = $(SSLDIR)\inc32
1312 SSLLIBDIR = $(SSLDIR)\out32
1313 SSLLFLAGS = /nologo /opt:ref /debug
1314 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1315 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1316
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -573,12 +573,12 @@
573 #### The directories where the OpenSSL include and library files are located.
574 # The recommended usage here is to use the Sysinternals junction tool
575 # to create a hard link between an "openssl-1.x" sub-directory of the
576 # Fossil source code directory and the target OpenSSL source directory.
577 #
578 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
579 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
580
581 #### Either the directory where the Tcl library is installed or the Tcl
582 # source code directory resides (depending on the value of the macro
583 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
584 # this directory must have "include" and "lib" sub-directories. If
@@ -1305,11 +1305,11 @@
1305
1306 # Uncomment to enable Tcl support
1307 # FOSSIL_ENABLE_TCL = 1
1308
1309 !ifdef FOSSIL_ENABLE_SSL
1310 SSLDIR = $(B)\compat\openssl-1.0.2
1311 SSLINCDIR = $(SSLDIR)\inc32
1312 SSLLIBDIR = $(SSLDIR)\out32
1313 SSLLFLAGS = /nologo /opt:ref /debug
1314 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1315 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1316
M src/schema.c
+9 -8
--- src/schema.c
+++ src/schema.c
@@ -81,11 +81,11 @@
8181
 @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content
8282
 @ content BLOB, -- Compressed content of this record
8383
 @ CHECK( length(uuid)==40 AND rid>0 )
8484
 @ );
8585
 @ CREATE TABLE delta(
86
-@ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed
86
+@ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed
8787
 @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression
8888
 @ );
8989
 @ CREATE INDEX delta_i1 ON delta(srcid);
9090
 @
9191
 @ -------------------------------------------------------------------------
@@ -232,17 +232,18 @@
232232
 @ --
233233
 @ -- pid==0 if the file is added by checkin mid.
234234
 @ -- fid==0 if the file is removed by checkin mid.
235235
 @ --
236236
 @ CREATE TABLE mlink(
237
-@ mid INTEGER REFERENCES blob, -- Manifest ID where change occurs
238
-@ pid INTEGER REFERENCES blob, -- File ID in parent manifest
239
-@ fid INTEGER REFERENCES blob, -- Changed file ID in this manifest
237
+@ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
238
+@ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
239
+@ pmid INTEGER DEFAULT 0 -- (not used yet)
240
+@ pid INTEGER REFERENCES blob, -- Prev file content. 0 if new
240241
 @ fnid INTEGER REFERENCES filename, -- Name of the file
241242
 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
242
-@ mperm INTEGER -- File permissions. 1==exec
243
-@ isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary (not used yet)
243
+@ mperm INTEGER, -- File permissions. 1==exec
244
+@ isaux BOOLEAN DEFAULT 0 -- (not used yet)
244245
 @ );
245246
 @ CREATE INDEX mlink_i1 ON mlink(mid);
246247
 @ CREATE INDEX mlink_i2 ON mlink(fnid);
247248
 @ CREATE INDEX mlink_i3 ON mlink(fid);
248249
 @ CREATE INDEX mlink_i4 ON mlink(pid);
@@ -252,11 +253,11 @@
252253
 @ CREATE TABLE plink(
253254
 @ pid INTEGER REFERENCES blob, -- Parent manifest
254255
 @ cid INTEGER REFERENCES blob, -- Child manifest
255256
 @ isprim BOOLEAN, -- pid is the primary parent of cid
256257
 @ mtime DATETIME, -- the date/time stamp on cid. Julian day.
257
-@ baseid INTEGER REFERENCES blob, -- Baseline if child is a delta manifest
258
+@ baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest.
258259
 @ UNIQUE(pid, cid)
259260
 @ );
260261
 @ CREATE INDEX plink_i2 ON plink(cid,pid);
261262
 @
262263
 @ -- A "leaf" checkin is a checkin that has no children in the same
@@ -489,11 +490,11 @@
489490
 @ -- current version of the file is already in the repository.
490491
 @ --
491492
 @ CREATE TABLE vfile(
492493
 @ id INTEGER PRIMARY KEY, -- ID of the checked out file
493494
 @ vid INTEGER REFERENCES blob, -- The baseline this file is part of.
494
-@ chnged INT DEFAULT 0, -- 0:unchnged 1:edited 2:m-chng 3:m-add 4:i-chng 5:i-add
495
+@ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add
495496
 @ deleted BOOLEAN DEFAULT 0, -- True if deleted
496497
 @ isexe BOOLEAN, -- True if file should be executable
497498
 @ islink BOOLEAN, -- True if file should be symlink
498499
 @ rid INTEGER, -- Originally from this repository record
499500
 @ mrid INTEGER, -- Based on this record due to a merge
500501
--- src/schema.c
+++ src/schema.c
@@ -81,11 +81,11 @@
81 @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content
82 @ content BLOB, -- Compressed content of this record
83 @ CHECK( length(uuid)==40 AND rid>0 )
84 @ );
85 @ CREATE TABLE delta(
86 @ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed
87 @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression
88 @ );
89 @ CREATE INDEX delta_i1 ON delta(srcid);
90 @
91 @ -------------------------------------------------------------------------
@@ -232,17 +232,18 @@
232 @ --
233 @ -- pid==0 if the file is added by checkin mid.
234 @ -- fid==0 if the file is removed by checkin mid.
235 @ --
236 @ CREATE TABLE mlink(
237 @ mid INTEGER REFERENCES blob, -- Manifest ID where change occurs
238 @ pid INTEGER REFERENCES blob, -- File ID in parent manifest
239 @ fid INTEGER REFERENCES blob, -- Changed file ID in this manifest
 
240 @ fnid INTEGER REFERENCES filename, -- Name of the file
241 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
242 @ mperm INTEGER -- File permissions. 1==exec
243 @ isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary (not used yet)
244 @ );
245 @ CREATE INDEX mlink_i1 ON mlink(mid);
246 @ CREATE INDEX mlink_i2 ON mlink(fnid);
247 @ CREATE INDEX mlink_i3 ON mlink(fid);
248 @ CREATE INDEX mlink_i4 ON mlink(pid);
@@ -252,11 +253,11 @@
252 @ CREATE TABLE plink(
253 @ pid INTEGER REFERENCES blob, -- Parent manifest
254 @ cid INTEGER REFERENCES blob, -- Child manifest
255 @ isprim BOOLEAN, -- pid is the primary parent of cid
256 @ mtime DATETIME, -- the date/time stamp on cid. Julian day.
257 @ baseid INTEGER REFERENCES blob, -- Baseline if child is a delta manifest
258 @ UNIQUE(pid, cid)
259 @ );
260 @ CREATE INDEX plink_i2 ON plink(cid,pid);
261 @
262 @ -- A "leaf" checkin is a checkin that has no children in the same
@@ -489,11 +490,11 @@
489 @ -- current version of the file is already in the repository.
490 @ --
491 @ CREATE TABLE vfile(
492 @ id INTEGER PRIMARY KEY, -- ID of the checked out file
493 @ vid INTEGER REFERENCES blob, -- The baseline this file is part of.
494 @ chnged INT DEFAULT 0, -- 0:unchnged 1:edited 2:m-chng 3:m-add 4:i-chng 5:i-add
495 @ deleted BOOLEAN DEFAULT 0, -- True if deleted
496 @ isexe BOOLEAN, -- True if file should be executable
497 @ islink BOOLEAN, -- True if file should be symlink
498 @ rid INTEGER, -- Originally from this repository record
499 @ mrid INTEGER, -- Based on this record due to a merge
500
--- src/schema.c
+++ src/schema.c
@@ -81,11 +81,11 @@
81 @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content
82 @ content BLOB, -- Compressed content of this record
83 @ CHECK( length(uuid)==40 AND rid>0 )
84 @ );
85 @ CREATE TABLE delta(
86 @ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed
87 @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression
88 @ );
89 @ CREATE INDEX delta_i1 ON delta(srcid);
90 @
91 @ -------------------------------------------------------------------------
@@ -232,17 +232,18 @@
232 @ --
233 @ -- pid==0 if the file is added by checkin mid.
234 @ -- fid==0 if the file is removed by checkin mid.
235 @ --
236 @ CREATE TABLE mlink(
237 @ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
238 @ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
239 @ pmid INTEGER DEFAULT 0 -- (not used yet)
240 @ pid INTEGER REFERENCES blob, -- Prev file content. 0 if new
241 @ fnid INTEGER REFERENCES filename, -- Name of the file
242 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
243 @ mperm INTEGER, -- File permissions. 1==exec
244 @ isaux BOOLEAN DEFAULT 0 -- (not used yet)
245 @ );
246 @ CREATE INDEX mlink_i1 ON mlink(mid);
247 @ CREATE INDEX mlink_i2 ON mlink(fnid);
248 @ CREATE INDEX mlink_i3 ON mlink(fid);
249 @ CREATE INDEX mlink_i4 ON mlink(pid);
@@ -252,11 +253,11 @@
253 @ CREATE TABLE plink(
254 @ pid INTEGER REFERENCES blob, -- Parent manifest
255 @ cid INTEGER REFERENCES blob, -- Child manifest
256 @ isprim BOOLEAN, -- pid is the primary parent of cid
257 @ mtime DATETIME, -- the date/time stamp on cid. Julian day.
258 @ baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest.
259 @ UNIQUE(pid, cid)
260 @ );
261 @ CREATE INDEX plink_i2 ON plink(cid,pid);
262 @
263 @ -- A "leaf" checkin is a checkin that has no children in the same
@@ -489,11 +490,11 @@
490 @ -- current version of the file is already in the repository.
491 @ --
492 @ CREATE TABLE vfile(
493 @ id INTEGER PRIMARY KEY, -- ID of the checked out file
494 @ vid INTEGER REFERENCES blob, -- The baseline this file is part of.
495 @ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add
496 @ deleted BOOLEAN DEFAULT 0, -- True if deleted
497 @ isexe BOOLEAN, -- True if file should be executable
498 @ islink BOOLEAN, -- True if file should be symlink
499 @ rid INTEGER, -- Originally from this repository record
500 @ mrid INTEGER, -- Based on this record due to a merge
501
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,12 +146,12 @@
146146
 #### The directories where the OpenSSL include and library files are located.
147147
 # The recommended usage here is to use the Sysinternals junction tool
148148
 # to create a hard link between an "openssl-1.x" sub-directory of the
149149
 # Fossil source code directory and the target OpenSSL source directory.
150150
 #
151
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
152
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
151
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
152
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
153153
154154
 #### Either the directory where the Tcl library is installed or the Tcl
155155
 # source code directory resides (depending on the value of the macro
156156
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157157
 # this directory must have "include" and "lib" sub-directories. If
158158
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,12 +146,12 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
152 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
153
154 #### Either the directory where the Tcl library is installed or the Tcl
155 # source code directory resides (depending on the value of the macro
156 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157 # this directory must have "include" and "lib" sub-directories. If
158
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,12 +146,12 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
152 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
153
154 #### Either the directory where the Tcl library is installed or the Tcl
155 # source code directory resides (depending on the value of the macro
156 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157 # this directory must have "include" and "lib" sub-directories. If
158
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,12 +146,12 @@
146146
 #### The directories where the OpenSSL include and library files are located.
147147
 # The recommended usage here is to use the Sysinternals junction tool
148148
 # to create a hard link between an "openssl-1.x" sub-directory of the
149149
 # Fossil source code directory and the target OpenSSL source directory.
150150
 #
151
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
152
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
151
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
152
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
153153
154154
 #### Either the directory where the Tcl library is installed or the Tcl
155155
 # source code directory resides (depending on the value of the macro
156156
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157157
 # this directory must have "include" and "lib" sub-directories. If
158158
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,12 +146,12 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1k/include
152 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1k
153
154 #### Either the directory where the Tcl library is installed or the Tcl
155 # source code directory resides (depending on the value of the macro
156 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157 # this directory must have "include" and "lib" sub-directories. If
158
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,12 +146,12 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.2/include
152 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.2
153
154 #### Either the directory where the Tcl library is installed or the Tcl
155 # source code directory resides (depending on the value of the macro
156 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
157 # this directory must have "include" and "lib" sub-directories. If
158
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
5555
5656
 # Uncomment to enable Tcl support
5757
 # FOSSIL_ENABLE_TCL = 1
5858
5959
 !ifdef FOSSIL_ENABLE_SSL
60
-SSLDIR = $(B)\compat\openssl-1.0.1k
60
+SSLDIR = $(B)\compat\openssl-1.0.2
6161
 SSLINCDIR = $(SSLDIR)\inc32
6262
 SSLLIBDIR = $(SSLDIR)\out32
6363
 SSLLFLAGS = /nologo /opt:ref /debug
6464
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
6565
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
6666
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
55
56 # Uncomment to enable Tcl support
57 # FOSSIL_ENABLE_TCL = 1
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.1k
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
55
56 # Uncomment to enable Tcl support
57 # FOSSIL_ENABLE_TCL = 1
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.2
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66

Keyboard Shortcuts

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