Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
F
FreeBSD ports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
FreeBSD
FreeBSD ports
Commits
2881de3f
Commit
2881de3f
authored
8 months ago
by
Sergey A. Osokin
Browse files
Options
Downloads
Patches
Plain Diff
www/jwt-cli: update 6.0.0 -> 6.1.0
parent
74a2f870
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
www/jwt-cli/Makefile
+40
-43
40 additions, 43 deletions
www/jwt-cli/Makefile
www/jwt-cli/distinfo
+79
-83
79 additions, 83 deletions
www/jwt-cli/distinfo
www/jwt-cli/files/patch-cargo-crates_ring-0.16.20
+0
-125
0 additions, 125 deletions
www/jwt-cli/files/patch-cargo-crates_ring-0.16.20
with
119 additions
and
251 deletions
www/jwt-cli/Makefile
+
40
−
43
View file @
2881de3f
PORTNAME
=
jwt-cli
PORTVERSION
=
6.0.0
PORTREVISION
=
8
PORTVERSION
=
6.1.0
CATEGORIES
=
www
MAINTAINER
=
osa@FreeBSD.org
...
...
@@ -17,26 +16,30 @@ GH_ACCOUNT= mike-engel
CARGO_CRATES
=
aho-corasick-0.7.19
\
android-tzdata-0.1.1
\
android_system_properties-0.1.5
\
anstream-0.
3.0
\
anstream-0.
6.7
\
anstyle-1.0.0
\
anstyle-parse-0.2.0
\
anstyle-query-1.0.0
\
anstyle-wincon-
1
.0.
0
\
anstyle-wincon-
3
.0.
1
\
atty-0.2.14
\
autocfg-1.1.0
\
base64-0.13.1
\
base64-0.21.2
\
base64-0.21.7
\
bitflags-1.3.2
\
bumpalo-3.11.1
\
bunt-0.2.8
\
bunt-macros-0.2.8
\
cc-1.0.
7
3
\
cc-1.0.
8
3
\
cfg-if-1.0.0
\
chrono-0.4.26
\
clap-4.3.4
\
clap_builder-4.3.4
\
clap_derive-4.3.2
\
clap_lex-0.5.0
\
chrono-0.4.38
\
clap-3.2.25
\
clap-4.5.4
\
clap_builder-4.5.2
\
clap_complete-3.2.5
\
clap_complete-4.5.2
\
clap_derive-4.5.4
\
clap_generate-3.0.3
\
clap_lex-0.2.4
\
clap_lex-0.7.0
\
codespan-reporting-0.11.1
\
colorchoice-1.0.0
\
core-foundation-sys-0.8.3
\
...
...
@@ -44,23 +47,20 @@ CARGO_CRATES= aho-corasick-0.7.19 \
cxx-build-1.0.80
\
cxxbridge-flags-1.0.80
\
cxxbridge-macro-1.0.80
\
errno-0.3.0
\
errno-dragonfly-0.1.2
\
fuchsia-cprng-0.1.1
\
heck-0.4.0
\
getrandom-0.2.12
\
hashbrown-0.12.3
\
heck-0.5.0
\
hermit-abi-0.1.19
\
hermit-abi-0.3.1
\
iana-time-zone-0.1.51
\
iana-time-zone-haiku-0.1.1
\
io-lifetimes-1.0.2
\
is-terminal-0.4.6
\
indexmap-1.9.3
\
itoa-1.0.4
\
js-sys-0.3.60
\
jsonwebtoken-
8.3
.0
\
jsonwebtoken-
9.2
.0
\
lazy_static-1.4.0
\
libc-0.2.1
40
\
libc-0.2.1
52
\
link-cplusplus-1.0.7
\
linux-raw-sys-0.3.1
\
litrs-0.2.3
\
log-0.4.17
\
memchr-2.5.0
\
...
...
@@ -73,9 +73,10 @@ CARGO_CRATES= aho-corasick-0.7.19 \
num-rational-0.2.4
\
num-traits-0.2.15
\
once_cell-1.15.0
\
os_str_bytes-6.6.1
\
parse_duration-2.1.1
\
pem-
1.1.0
\
proc-macro2-1.0.
54
\
pem-
3.0.3
\
proc-macro2-1.0.
78
\
quote-1.0.26
\
rand-0.4.6
\
rand_core-0.3.1
\
...
...
@@ -84,61 +85,57 @@ CARGO_CRATES= aho-corasick-0.7.19 \
regex-1.6.0
\
regex-syntax-0.6.27
\
remove_dir_all-0.5.3
\
ring-0.16.20
\
rustix-0.37.6
\
ring-0.17.7
\
ryu-1.0.11
\
scratch-1.0.2
\
serde-1.0.147
\
serde_derive-1.0.147
\
serde_json-1.0.9
7
\
serde_json-1.0.9
9
\
simple_asn1-0.6.2
\
spin-0.
5.2
\
strsim-0.1
0
.0
\
spin-0.
9.8
\
strsim-0.1
1
.0
\
syn-1.0.103
\
syn-2.0.10
\
tempdir-0.3.7
\
termcolor-1.1.3
\
textwrap-0.16.1
\
thiserror-1.0.37
\
thiserror-impl-1.0.37
\
time-0.1.44
\
time-0.3.17
\
time-core-0.1.0
\
time-macros-0.2.6
\
unicode-ident-1.0.5
\
unicode-width-0.1.10
\
unicode-xid-0.2.4
\
untrusted-0.
7.1
\
untrusted-0.
9.0
\
utf8parse-0.2.1
\
wasi-0.1
0
.0+wasi-snapshot-preview1
\
wasi-0.1
1
.0+wasi-snapshot-preview1
\
wasm-bindgen-0.2.83
\
wasm-bindgen-backend-0.2.83
\
wasm-bindgen-macro-0.2.83
\
wasm-bindgen-macro-support-0.2.83
\
wasm-bindgen-shared-0.2.83
\
web-sys-0.3.60
\
winapi-0.3.9
\
winapi-i686-pc-windows-gnu-0.4.0
\
winapi-util-0.1.5
\
winapi-x86_64-pc-windows-gnu-0.4.0
\
windows-sys-0.42.0
\
windows-sys-0.45.0
\
windows-sys-0.48.0
\
windows-targets-0.42.2
\
windows-targets-0.48.0
\
windows
_aarch64_gnullvm
-0.
4
2.
2
\
windows
-targets
-0.
5
2.
0
\
windows_aarch64_gnullvm-0.48.0
\
windows_aarch64_
msvc
-0.
4
2.
2
\
windows_aarch64_
gnullvm
-0.
5
2.
0
\
windows_aarch64_msvc-0.48.0
\
windows_
i686_gnu
-0.
4
2.
2
\
windows_
aarch64_msvc
-0.
5
2.
0
\
windows_i686_gnu-0.48.0
\
windows_i686_
msvc
-0.
4
2.
2
\
windows_i686_
gnu
-0.
5
2.
0
\
windows_i686_msvc-0.48.0
\
windows_
x
86_
64_gnu
-0.
4
2.
2
\
windows_
i6
86_
msvc
-0.
5
2.
0
\
windows_x86_64_gnu-0.48.0
\
windows_x86_64_gnu
llvm
-0.
4
2.
2
\
windows_x86_64_gnu-0.
5
2.
0
\
windows_x86_64_gnullvm-0.48.0
\
windows_x86_64_msvc-0.42.2
\
windows_x86_64_msvc-0.48.0
windows_x86_64_gnullvm-0.52.0
\
windows_x86_64_msvc-0.48.0
\
windows_x86_64_msvc-0.52.0
PLIST_FILES
=
bin/jwt
...
...
This diff is collapsed.
Click to expand it.
www/jwt-cli/distinfo
+
79
−
83
View file @
2881de3f
This diff is collapsed.
Click to expand it.
www/jwt-cli/files/patch-cargo-crates_ring-0.16.20
deleted
100644 → 0
+
0
−
125
View file @
74a2f870
https://github.com/briansmith/ring/pull/1007
--- cargo-crates/ring-0.16.20/Cargo.toml.orig 2020-12-02 03:20:32.000000000 +0100
+++ cargo-crates/ring-0.16.20/Cargo.toml 2020-12-09 09:54:26.615745000 +0100
@@ -64,10 +64,10 @@
wasm32_c = []
version = "0.3.37"
features = ["Crypto", "Window"]
default-features = false
-[target."cfg(any(target_arch = \"x86\",target_arch = \"x86_64\", all(any(target_arch = \"aarch64\", target_arch = \"arm\"), any(target_os = \"android\", target_os = \"fuchsia\", target_os = \"linux\"))))".dependencies.spin]
+[target."cfg(any(target_arch = \"x86\",target_arch = \"x86_64\", all(any(target_arch = \"aarch64\", target_arch = \"arm\"), any(target_os = \"android\", target_os = \"freebsd\", target_os = \"fuchsia\", target_os = \"linux\"))))".dependencies.spin]
version = "0.5.2"
default-features = false
-[target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.libc]
+[target."cfg(any(target_os = \"android\", target_os = \"freebsd\", target_os = \"linux\"))".dependencies.libc]
version = "0.2.69"
default-features = false
--- cargo-crates/ring-0.16.20/src/cpu.rs.orig 2020-11-30 21:30:03.000000000 +0100
+++ cargo-crates/ring-0.16.20/src/cpu.rs 2020-12-09 09:53:52.469225000 +0100
@@ -31,7 +31,7 @@
pub(crate) fn features() -> Features {
target_arch = "x86_64",
all(
any(target_arch = "aarch64", target_arch = "arm"),
- any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+ any(target_os = "android", target_os = "fuchsia", target_os = "freebsd", target_os = "linux")
)
))]
{
@@ -49,7 +49,7 @@
pub(crate) fn features() -> Features {
#[cfg(all(
any(target_arch = "aarch64", target_arch = "arm"),
- any(target_os = "android", target_os = "fuchsia", target_os = "linux")
+ any(target_os = "android", target_os = "fuchsia", target_os = "freebsd", target_os = "linux")
))]
{
arm::setup();
@@ -62,28 +62,58 @@
pub(crate) fn features() -> Features {
pub(crate) mod arm {
#[cfg(all(
- any(target_os = "android", target_os = "linux"),
+ any(target_os = "android", target_os = "freebsd", target_os = "linux"),
any(target_arch = "aarch64", target_arch = "arm")
))]
pub fn setup() {
use libc::c_ulong;
+ #[cfg(target_os = "freebsd")]
+ use libc::{c_int, c_void};
+ #[cfg(target_os = "freebsd")]
+ extern crate std;
// XXX: The `libc` crate doesn't provide `libc::getauxval` consistently
// across all Android/Linux targets, e.g. musl.
+ #[cfg(any(target_os = "android", target_os = "linux"))]
extern "C" {
fn getauxval(type_: c_ulong) -> c_ulong;
}
+ #[cfg(target_os = "freebsd")]
+ extern "C" {
+ fn elf_aux_info(aux: c_int, buf: *mut c_void, buflen: c_int) -> c_int;
+ }
+
+ #[cfg(not(target_os = "freebsd"))]
const AT_HWCAP: c_ulong = 16;
+ #[cfg(target_os = "freebsd")]
+ const AT_HWCAP: c_int = 25;
+
#[cfg(target_arch = "aarch64")]
const HWCAP_NEON: c_ulong = 1 << 1;
#[cfg(target_arch = "arm")]
const HWCAP_NEON: c_ulong = 1 << 12;
+ #[cfg(not(target_os = "freebsd"))]
let caps = unsafe { getauxval(AT_HWCAP) };
+ #[cfg(target_os = "freebsd")]
+ let caps: c_ulong = 0;
+
+ #[cfg(target_os = "freebsd")]
+ {
+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void;
+ unsafe {
+ let _ret = elf_aux_info(
+ AT_HWCAP,
+ buffer,
+ std::mem::size_of_val(&caps) as i32
+ );
+ }
+ }
+
// We assume NEON is available on AARCH64 because it is a required
// feature.
#[cfg(target_arch = "aarch64")]
@@ -100,11 +130,26 @@
pub(crate) mod arm {
#[cfg(target_arch = "arm")]
const OFFSET: c_ulong = 0;
- #[cfg(target_arch = "arm")]
+ #[cfg(target_os = "freebsd")]
+ let buffer : *mut c_void = { let t: *const c_ulong = ∩︀ t} as *mut c_void;
+
+ #[cfg(not(target_os = "freebsd"))]
let caps = {
const AT_HWCAP2: c_ulong = 26;
unsafe { getauxval(AT_HWCAP2) }
};
+
+ #[cfg(target_os = "freebsd")]
+ {
+ const AT_HWCAP2: c_int = 26;
+ unsafe {
+ let _ret = elf_aux_info(
+ AT_HWCAP2,
+ buffer,
+ std::mem::size_of_val(&caps) as i32
+ );
+ };
+ }
const HWCAP_AES: c_ulong = 1 << 0 + OFFSET;
const HWCAP_PMULL: c_ulong = 1 << 1 + OFFSET;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment