Skip to content

Commit ad49d64

Browse files
author
Jan Mercl
committed
retract v1.33.0
1 parent cc08747 commit ad49d64

File tree

3,035 files changed

+986735
-1125296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,035 files changed

+986735
-1125296
lines changed

Diff for: ‎Makefile

+1-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style
33
# license that can be found in the LICENSE file.
44

5-
.PHONY: all build_all_targets clean edit editor test vendor work libc
5+
.PHONY: all build_all_targets clean edit editor test vendor work
66

77
all: editor
88
golint 2>&1
@@ -68,7 +68,6 @@ editor:
6868
test:
6969
go test -v -timeout 24h 2>&1 | tee log-test
7070

71-
# Checkout the desired libsqlite3 version in ../libsqlite3/ and run '$ make vendor'.
7271
vendor:
7372
go run vendor_libsqlite3.go && make build_all_targets
7473
make build_all_targets
@@ -84,25 +83,3 @@ work:
8483
go work use ../libtcl8.6
8584
go work use ../libsqlite3
8685
go work use ../libz
87-
88-
# Checkout the desired libc version in ../libc/ and run '$ make libc'.
89-
libc:
90-
rm -rf internal/
91-
mkdir internal/
92-
cp -r ../libc/ internal/
93-
rm -rf \
94-
internal/libc/*.gz \
95-
internal/libc/*_test.go \
96-
internal/libc/.git/ \
97-
internal/libc/Makefile \
98-
internal/libc/addport.go \
99-
internal/libc/builder.json \
100-
internal/libc/go.* \
101-
internal/libc/internal \
102-
internal/libc/log* \
103-
internal/libc/surface.* \
104-
internal/libc/unconvert.sh \
105-
# go install -v modernc.org/uncomment@latest
106-
sed -i 's/"modernc.org\/libc/"modernc.org\/sqlite\/internal\/libc/' $(shell find . -name \*.go)
107-
uncomment -v -gofmt lib/*.go $(shell find internal -name \*.go)
108-
go build -v ./...

Diff for: ‎all_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/google/pprof/profile"
3232
util "modernc.org/fileutil/ccgo"
33-
"modernc.org/sqlite/internal/libc"
33+
"modernc.org/libc"
3434
"modernc.org/mathutil"
3535
sqlite3 "modernc.org/sqlite/lib"
3636
"modernc.org/sqlite/vfs"

Diff for: ‎bind_blob.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package sqlite // import "modernc.org/sqlite"
99
import (
1010
"unsafe"
1111

12-
"modernc.org/sqlite/internal/libc"
12+
"modernc.org/libc"
1313
sqlite3 "modernc.org/sqlite/lib"
1414
)
1515

Diff for: ‎bind_blob_musl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package sqlite // import "modernc.org/sqlite"
99
import (
1010
"unsafe"
1111

12-
"modernc.org/sqlite/internal/libc"
12+
"modernc.org/libc"
1313
sqlite3 "modernc.org/sqlite/lib"
1414
)
1515

Diff for: ‎doc.go

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
//
5050
// See the discussion at https://gitlab.com/cznic/sqlite/-/issues/177 for more details.
5151
//
52-
// Update 2024-09-04: This package now uses its internal libc copy.
53-
//
5452
// # Changelog
5553
//
5654
// 2024-07-22: v1.31.0

Diff for: ‎fcntl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"runtime"
99
"unsafe"
1010

11-
"modernc.org/sqlite/internal/libc"
11+
"modernc.org/libc"
1212
sqlite3 "modernc.org/sqlite/lib"
1313
)
1414

Diff for: ‎go.mod

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ module modernc.org/sqlite
33
go 1.20
44

55
require (
6-
github.com/dustin/go-humanize v1.0.1
76
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd
8-
github.com/google/uuid v1.6.0
9-
github.com/mattn/go-isatty v0.0.20
10-
github.com/ncruces/go-strftime v0.1.9
117
golang.org/x/sys v0.22.0
128
modernc.org/fileutil v1.3.0
139
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6
10+
modernc.org/libc v1.55.3
1411
modernc.org/mathutil v1.6.0
15-
modernc.org/memory v1.8.0
1612
)
1713

1814
require (
15+
github.com/dustin/go-humanize v1.0.1 // indirect
16+
github.com/google/uuid v1.6.0 // indirect
1917
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
18+
github.com/mattn/go-isatty v0.0.20 // indirect
19+
github.com/ncruces/go-strftime v0.1.9 // indirect
2020
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
21+
modernc.org/memory v1.8.0 // indirect
2122
modernc.org/strutil v1.2.0 // indirect
2223
modernc.org/token v1.1.0 // indirect
2324
)
@@ -29,3 +30,5 @@ retract v1.19.0 // module source tree too large (max size is 524288000 bytes)
2930
retract v1.20.1 // https://gitlab.com/cznic/sqlite/-/issues/123
3031

3132
retract v1.29.4 // tagged accidentally w/o builders checking the commit
33+
34+
retract v1.33.0 // intended to resolve #177 but break clients

Diff for: ‎go.sum

+9-2
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,26 @@ github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJm
1313
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1414
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
1515
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
16-
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
16+
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
1717
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1818
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
1919
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
20-
golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
20+
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
21+
modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
22+
modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
2123
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
2224
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
25+
modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
2326
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
2427
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
28+
modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
29+
modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
2530
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
2631
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
2732
modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
2833
modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
34+
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
35+
modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
2936
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
3037
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
3138
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

Diff for: ‎internal/libc/.gitignore

-4
This file was deleted.

Diff for: ‎internal/libc/AUTHORS

-20
This file was deleted.

Diff for: ‎internal/libc/CONTRIBUTORS

-22
This file was deleted.

Diff for: ‎internal/libc/COPYRIGHT-MUSL

-193
This file was deleted.

0 commit comments

Comments
 (0)