1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

devel/pijul: Update to 1.0.0.a52

- Update to latest version
- Unbreak port
This commit is contained in:
Carlo Strub 2021-07-21 22:20:46 +02:00
parent fe2114db68
commit 94e419b201
No known key found for this signature in database
GPG Key ID: 1C7A2F39D966052B
5 changed files with 807 additions and 894 deletions

View File

@ -1,301 +1,293 @@
# Created by: Carlo Strub
PORTNAME= pijul
PORTVERSION= 0.12.0
PORTREVISION= 26
PORTVERSION= 1.0.0.a52
CATEGORIES= devel
MASTER_SITES= https://pijul.org/releases/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cs@FreeBSD.org
COMMENT= Distributed version control system
LICENSE= GPLv2
BROKEN= unfechtable
BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
LIB_DEPENDS= libgmp.so:math/gmp \
libnettle.so:security/nettle \
libsodium.so:security/libsodium
LIB_DEPENDS= libzstd.so:archivers/zstd \
libxxhash.so:devel/xxhash
USES= cargo ssl
CARGO_CRATES= MacTypes-sys-2.1.0 \
adler32-1.0.3 \
advapi32-sys-0.2.0 \
aho-corasick-0.6.10 \
ansi_term-0.11.0 \
argon2rs-0.2.5 \
arrayvec-0.4.10 \
ascii-canvas-1.0.0 \
atty-0.2.11 \
autocfg-0.1.2 \
backtrace-0.3.14 \
backtrace-sys-0.1.28 \
base64-0.10.1 \
base64-0.9.3 \
bincode-1.1.2 \
bindgen-0.43.2 \
bit-set-0.5.1 \
bit-vec-0.4.4 \
bit-vec-0.5.1 \
bitflags-1.0.4 \
blake2-rfc-0.2.18 \
block-buffer-0.7.0 \
block-padding-0.1.3 \
bs58-0.2.2 \
buffered-reader-0.3.0 \
build_const-0.2.1 \
byte-tools-0.3.1 \
byteorder-1.3.1 \
bytes-0.4.12 \
bzip2-0.3.3 \
bzip2-sys-0.1.7 \
cc-1.0.31 \
cexpr-0.3.5 \
cfg-if-0.1.7 \
chrono-0.4.6 \
clang-sys-0.26.4 \
clap-2.32.0 \
cloudabi-0.0.3 \
constant_time_eq-0.1.3 \
core-foundation-0.5.1 \
core-foundation-sys-0.5.1 \
crc-1.8.1 \
crc32fast-1.2.0 \
crossbeam-channel-0.3.8 \
crossbeam-deque-0.7.1 \
crossbeam-epoch-0.7.1 \
crossbeam-queue-0.1.2 \
crossbeam-utils-0.6.5 \
cryptovec-0.4.6 \
diff-0.1.11 \
diffs-0.3.0 \
digest-0.8.0 \
dirs-1.0.5 \
docopt-1.0.2 \
dtoa-0.4.3 \
either-1.5.1 \
ena-0.11.0 \
encoding_rs-0.8.17 \
env_logger-0.6.1 \
failure-0.1.5 \
failure_derive-0.1.5 \
fake-simd-0.1.2 \
filetime-0.2.4 \
fixedbitset-0.1.9 \
flate2-1.0.7 \
fnv-1.0.6 \
CARGO_INSTALL= no
CARGO_CRATES= ${PORTNAME}-1.0.0-alpha.52 \
addr2line-0.15.2 \
adler-1.0.2 \
adler32-1.2.0 \
aes-0.7.4 \
aho-corasick-0.7.18 \
anyhow-1.0.42 \
arrayref-0.3.6 \
arrayvec-0.5.2 \
atty-0.2.14 \
autocfg-1.0.1 \
backtrace-0.3.60 \
base64-0.13.0 \
base64ct-1.0.0 \
bcrypt-pbkdf-0.6.1 \
bincode-1.3.3 \
bit-vec-0.6.3 \
bitflags-1.2.1 \
blake3-0.3.8 \
block-buffer-0.9.0 \
block-modes-0.8.1 \
block-padding-0.2.1 \
blowfish-0.8.0 \
bs58-0.4.0 \
bstr-0.2.16 \
bumpalo-3.7.0 \
byteorder-1.4.3 \
bytes-1.0.1 \
canonical-path-2.0.2 \
cc-1.0.68 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
chrono-0.4.19 \
cipher-0.3.0 \
clap-3.0.0-beta.2 \
clap_derive-3.0.0-beta.2 \
constant_time_eq-0.1.5 \
core-foundation-0.9.1 \
core-foundation-sys-0.8.2 \
cpufeatures-0.1.5 \
crc32fast-1.2.1 \
crossbeam-deque-0.8.0 \
crossbeam-epoch-0.9.5 \
crossbeam-utils-0.8.5 \
crypto-mac-0.8.0 \
crypto-mac-0.11.0 \
cryptovec-0.6.1 \
ctr-0.7.0 \
ctrlc-3.1.9 \
curve25519-dalek-3.1.0 \
data-encoding-2.3.2 \
diffs-0.4.1 \
digest-0.9.0 \
dirs-3.0.2 \
dirs-next-2.0.0 \
dirs-sys-0.3.6 \
dirs-sys-next-0.1.2 \
ed25519-1.1.1 \
ed25519-dalek-1.0.1 \
edit-0.1.3 \
either-1.6.1 \
encoding_rs-0.8.28 \
env_logger-0.8.4 \
errno-0.2.7 \
errno-dragonfly-0.1.1 \
filetime-0.2.14 \
flate2-1.0.20 \
fnv-1.0.7 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
form_urlencoded-1.0.1 \
fs2-0.4.3 \
fuchsia-cprng-0.1.1 \
fuchsia-zircon-0.3.3 \
fuchsia-zircon-sys-0.3.3 \
futures-0.1.25 \
futures-cpupool-0.1.8 \
generic-array-0.12.0 \
getch-0.2.1 \
glob-0.2.11 \
globset-0.4.2 \
h2-0.1.17 \
hex-0.3.2 \
http-0.1.16 \
httparse-1.3.3 \
humantime-1.2.0 \
hyper-0.12.25 \
hyper-tls-0.3.2 \
idna-0.1.5 \
ignore-0.4.6 \
indexmap-1.0.2 \
iovec-0.1.2 \
itertools-0.8.0 \
itoa-0.4.3 \
kernel32-sys-0.2.2 \
lalrpop-0.16.3 \
lalrpop-util-0.16.3 \
lazy_static-1.3.0 \
lazycell-1.2.1 \
libc-0.2.50 \
libloading-0.5.0 \
libpijul-0.12.0 \
line-0.1.15 \
lock_api-0.1.5 \
log-0.4.6 \
mach_o_sys-0.1.1 \
futures-0.3.15 \
futures-channel-0.3.15 \
futures-core-0.3.15 \
futures-executor-0.3.15 \
futures-io-0.3.15 \
futures-macro-0.3.15 \
futures-sink-0.3.15 \
futures-task-0.3.15 \
futures-util-0.3.15 \
gcc-0.3.55 \
generic-array-0.14.4 \
getrandom-0.1.16 \
getrandom-0.2.3 \
gimli-0.24.0 \
git2-0.13.20 \
globset-0.4.8 \
h2-0.3.3 \
hashbrown-0.11.2 \
heck-0.3.3 \
hermit-abi-0.1.19 \
hmac-0.11.0 \
http-0.2.4 \
http-body-0.4.2 \
httparse-1.4.1 \
httpdate-1.0.1 \
human-panic-1.0.3 \
humantime-2.1.0 \
hyper-0.14.10 \
hyper-tls-0.5.0 \
idna-0.2.3 \
ignore-0.4.18 \
indexmap-1.7.0 \
instant-0.1.9 \
ipnet-2.3.1 \
itoa-0.4.7 \
jobserver-0.1.22 \
js-sys-0.3.51 \
lazy_static-1.4.0 \
libc-0.2.98 \
libgit2-sys-0.12.21+1.1.0 \
libpijul-1.0.0-alpha.45 \
libsodium-sys-0.2.7 \
libssh2-sys-0.2.21 \
libz-sys-1.1.3 \
linked-hash-map-0.5.4 \
lock_api-0.4.4 \
log-0.4.14 \
lru-cache-0.1.2 \
matches-0.1.8 \
memchr-2.2.0 \
md5-0.7.0 \
memchr-2.4.0 \
memmap-0.7.0 \
memoffset-0.2.1 \
memsec-0.5.4 \
mime-0.3.13 \
mime_guess-2.0.0-alpha.6 \
miniz-sys-0.1.11 \
miniz_oxide-0.2.1 \
miniz_oxide_c_api-0.2.1 \
mio-0.6.16 \
mio-uds-0.6.7 \
miow-0.2.1 \
native-tls-0.2.2 \
net2-0.2.33 \
nettle-4.0.0 \
nettle-sys-1.0.1 \
new_debug_unreachable-1.0.3 \
nodrop-0.1.13 \
nom-4.2.3 \
num-0.1.42 \
num-bigint-0.1.44 \
num-complex-0.1.43 \
num-integer-0.1.39 \
num-iter-0.1.37 \
num-rational-0.1.42 \
num-traits-0.2.6 \
num_cpus-1.10.0 \
opaque-debug-0.2.2 \
openssl-0.10.20 \
openssl-probe-0.1.2 \
openssl-sys-0.9.43 \
ordermap-0.3.5 \
owning_ref-0.4.0 \
parking_lot-0.7.1 \
parking_lot_core-0.4.0 \
pathdiff-0.1.0 \
peeking_take_while-0.1.2 \
percent-encoding-1.0.1 \
petgraph-0.4.13 \
phf-0.7.24 \
phf_codegen-0.7.24 \
phf_generator-0.7.24 \
phf_shared-0.7.24 \
pkg-config-0.3.14 \
precomputed-hash-0.1.1 \
proc-macro2-0.3.5 \
proc-macro2-0.4.27 \
progrs-0.1.1 \
quick-error-1.2.2 \
quickcheck-0.8.2 \
quote-0.5.2 \
quote-0.6.11 \
rand-0.4.6 \
rand-0.5.6 \
rand-0.6.5 \
rand_chacha-0.1.1 \
rand_core-0.3.1 \
rand_core-0.4.0 \
rand_hc-0.1.0 \
rand_isaac-0.1.1 \
rand_jitter-0.1.3 \
rand_os-0.1.3 \
rand_pcg-0.1.2 \
rand_xorshift-0.1.1 \
rdrand-0.4.0 \
redox_syscall-0.1.51 \
redox_termios-0.1.1 \
redox_users-0.3.0 \
regex-1.1.2 \
regex-syntax-0.6.5 \
remove_dir_all-0.5.1 \
reqwest-0.9.12 \
rpassword-2.1.0 \
rustc-demangle-0.1.13 \
rustc-serialize-0.3.24 \
rustc_version-0.2.3 \
ryu-0.2.7 \
safemem-0.3.0 \
same-file-1.0.4 \
sanakirja-0.10.2 \
schannel-0.1.15 \
scoped_threadpool-0.1.9 \
scopeguard-0.3.3 \
security-framework-0.2.2 \
security-framework-sys-0.2.3 \
semver-0.9.0 \
semver-parser-0.7.0 \
sequoia-openpgp-0.4.1 \
serde-1.0.89 \
serde_derive-1.0.89 \
serde_json-1.0.39 \
serde_urlencoded-0.5.4 \
sha2-0.8.0 \
shell-escape-0.1.4 \
siphasher-0.2.3 \
slab-0.4.2 \
smallvec-0.6.9 \
stable_deref_trait-1.1.1 \
string-0.1.3 \
string_cache-0.7.3 \
string_cache_codegen-0.4.2 \
string_cache_shared-0.3.0 \
strsim-0.7.0 \
syn-0.15.29 \
synstructure-0.10.1 \
tar-0.4.22 \
tempdir-0.3.7 \
tempfile-3.0.7 \
term-0.4.6 \
term-0.5.1 \
termcolor-1.0.4 \
termion-1.5.1 \
termios-0.2.2 \
textwrap-0.10.0 \
thread_local-0.3.6 \
thrussh-0.20.7 \
thrussh-config-0.1.2 \
thrussh-keys-0.11.9 \
thrussh-libsodium-0.1.3 \
time-0.1.42 \
tokio-0.1.18 \
tokio-codec-0.1.1 \
tokio-current-thread-0.1.6 \
tokio-executor-0.1.7 \
tokio-fs-0.1.6 \
tokio-io-0.1.12 \
tokio-reactor-0.1.9 \
tokio-sync-0.1.4 \
tokio-tcp-0.1.3 \
tokio-threadpool-0.1.13 \
tokio-timer-0.2.10 \
tokio-trace-core-0.1.0 \
tokio-udp-0.1.3 \
tokio-uds-0.2.5 \
toml-0.4.10 \
try-lock-0.2.2 \
typenum-1.10.0 \
ucd-util-0.1.3 \
unicase-1.4.2 \
unicase-2.3.0 \
unicode-bidi-0.3.4 \
unicode-normalization-0.1.8 \
unicode-width-0.1.5 \
unicode-xid-0.1.0 \
url-1.7.2 \
username-0.2.0 \
utf8-ranges-1.0.2 \
utf8parse-0.1.1 \
uuid-0.7.3 \
vcpkg-0.2.6 \
vec_map-0.8.1 \
version_check-0.1.5 \
walkdir-2.2.7 \
want-0.0.6 \
which-1.0.5 \
winapi-0.2.8 \
winapi-0.3.6 \
winapi-build-0.1.1 \
memoffset-0.6.4 \
mime-0.3.16 \
miniz_oxide-0.4.4 \
mio-0.7.13 \
miow-0.3.7 \
native-tls-0.2.7 \
nix-0.20.0 \
ntapi-0.3.6 \
num-bigint-0.4.0 \
num-integer-0.1.44 \
num-traits-0.2.14 \
num_cpus-1.13.0 \
object-0.25.3 \
once_cell-1.8.0 \
opaque-debug-0.3.0 \
openssl-0.10.35 \
openssl-probe-0.1.4 \
openssl-sys-0.9.65 \
os_str_bytes-2.4.0 \
os_type-2.3.0 \
pager-0.16.0 \
parking_lot-0.11.1 \
parking_lot_core-0.8.3 \
password-hash-0.2.1 \
path-slash-0.1.4 \
pbkdf2-0.8.0 \
percent-encoding-2.1.0 \
pijul-macros-0.4.0 \
pin-project-lite-0.2.7 \
pin-utils-0.1.0 \
pkg-config-0.3.19 \
ppv-lite86-0.2.10 \
proc-macro-error-1.0.4 \
proc-macro-error-attr-1.0.4 \
proc-macro-hack-0.5.19 \
proc-macro-nested-0.1.7 \
proc-macro2-1.0.27 \
quote-1.0.9 \
rand-0.7.3 \
rand-0.8.4 \
rand_chacha-0.2.2 \
rand_chacha-0.3.1 \
rand_core-0.5.1 \
rand_core-0.6.3 \
rand_hc-0.2.0 \
rand_hc-0.3.1 \
redox_syscall-0.2.9 \
redox_users-0.4.0 \
regex-1.5.4 \
regex-syntax-0.6.25 \
remove_dir_all-0.5.3 \
reqwest-0.11.4 \
rpassword-5.0.1 \
rustc-demangle-0.1.20 \
ryu-1.0.5 \
same-file-1.0.6 \
sanakirja-1.2.5 \
sanakirja-core-1.2.9 \
schannel-0.1.19 \
scopeguard-1.1.0 \
security-framework-2.3.1 \
security-framework-sys-2.3.0 \
serde-1.0.126 \
serde_bytes-0.11.5 \
serde_derive-1.0.126 \
serde_json-1.0.64 \
serde_urlencoded-0.7.0 \
sha2-0.9.5 \
signal-hook-registry-1.4.0 \
signature-1.3.1 \
slab-0.4.3 \
smallvec-1.6.1 \
socket2-0.4.0 \
static_assertions-1.1.0 \
strsim-0.10.0 \
subtle-2.4.0 \
syn-1.0.73 \
synstructure-0.12.5 \
tar-0.4.35 \
tempfile-3.2.0 \
termcolor-1.1.2 \
terminal_size-0.1.17 \
textwrap-0.12.1 \
thiserror-1.0.26 \
thiserror-impl-1.0.26 \
thread_local-1.1.3 \
threadpool-1.8.1 \
thrussh-0.33.5 \
thrussh-config-0.5.0 \
thrussh-keys-0.21.0 \
thrussh-libsodium-0.2.1 \
time-0.1.43 \
tinyvec-1.2.0 \
tinyvec_macros-0.1.0 \
tokio-1.8.1 \
tokio-macros-1.3.0 \
tokio-native-tls-0.3.0 \
tokio-stream-0.1.7 \
tokio-util-0.6.7 \
toml-0.5.8 \
tower-service-0.3.1 \
tracing-0.1.26 \
tracing-core-0.1.18 \
try-lock-0.2.3 \
twox-hash-1.6.0 \
typenum-1.13.0 \
unicode-bidi-0.3.5 \
unicode-normalization-0.1.19 \
unicode-segmentation-1.8.0 \
unicode-width-0.1.8 \
unicode-xid-0.2.2 \
url-2.2.2 \
uuid-0.8.2 \
vcpkg-0.2.15 \
vec_map-0.8.2 \
version_check-0.9.3 \
walkdir-2.3.2 \
want-0.3.0 \
wasi-0.9.0+wasi-snapshot-preview1 \
wasi-0.10.2+wasi-snapshot-preview1 \
wasm-bindgen-0.2.74 \
wasm-bindgen-backend-0.2.74 \
wasm-bindgen-futures-0.4.24 \
wasm-bindgen-macro-0.2.74 \
wasm-bindgen-macro-support-0.2.74 \
wasm-bindgen-shared-0.2.74 \
web-sys-0.3.51 \
which-4.1.0 \
whoami-0.9.0 \
whoami-1.1.2 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.2 \
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
wincolor-1.0.1 \
ws2_32-sys-0.2.1 \
winreg-0.7.0 \
xattr-0.2.2 \
yasna-0.1.3
CARGO_INSTALL_PATH= pijul
yasna-0.4.0 \
zeroize-1.3.0 \
zeroize_derive-1.1.0 \
zstd-seekable-0.1.7
PLIST_FILES= bin/pijul
post-patch:
${MV} ${WRKSRC}/cargo-crates/pijul-1.0.0-alpha.52/* ${WRKSRC}/
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/target/release/pijul ${STAGEDIR}${PREFIX}/bin/pijul
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pijul
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pijul
.include <bsd.port.mk>

File diff suppressed because it is too large Load Diff

View File

@ -1,51 +0,0 @@
From af76e728b3f309b6962847f06876e6c4c6a8c065 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 1 Jul 2019 12:05:09 +0200
Subject: [PATCH] Do not bind the openssl-compat interface.
* In Nettle 3.5, the libdes/openssl compatibility interface is
removed, breaking the build of nettle-sys.
* Fix this by not binding any of the compatibility interfaces
present in Nettle.
* Fixes #4.
From 7ec219212af8c1331a645b5a153bc2271bef19e6 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 8 Jul 2019 11:55:37 +0200
Subject: [PATCH] Fix building against latest Nettle.
- `nettle/nettle-stdint.h` is no longer distributed with Nettle.
Dropping it from `bindgen-wrapper.h` does not change the generated
bindings, hence we do not need to bump the major version.
- Tested against Nettle revision
eead7cfa32c341b5193a697273de9fc7336e694a.
- Fixes #5.
--- cargo-crates/nettle-sys-1.0.1/bindgen-wrapper.h.orig 2017-11-30 11:38:42 UTC
+++ cargo-crates/nettle-sys-1.0.1/bindgen-wrapper.h
@@ -16,9 +16,7 @@
#include <nettle/chacha.h>
#include <nettle/ctr.h>
#include <nettle/curve25519.h>
-#include <nettle/des-compat.h>
#include <nettle/des.h>
-#include <nettle/dsa-compat.h>
#include <nettle/dsa.h>
#include <nettle/eax.h>
#include <nettle/ecc-curve.h>
@@ -33,12 +31,10 @@
#include <nettle/macros.h>
#include <nettle/md2.h>
#include <nettle/md4.h>
-#include <nettle/md5-compat.h>
#include <nettle/md5.h>
#include <nettle/memops.h>
#include <nettle/memxor.h>
#include <nettle/nettle-meta.h>
-#include <nettle/nettle-stdint.h>
#include <nettle/nettle-types.h>
#include <nettle/pbkdf2.h>
#include <nettle/pgp.h>

View File

@ -0,0 +1,11 @@
--- cargo-crates/pager-0.16.0/src/utils.rs.orig 2021-07-20 20:40:27 UTC
+++ cargo-crates/pager-0.16.0/src/utils.rs
@@ -66,7 +66,7 @@ pub(crate) fn execvpe(cmd: &OsString, envs: &[OsString
};
#[cfg(not(target_os = "macos"))]
unsafe {
- libc::execvpe(args[0], args.as_ptr(), envs.as_ptr())
+ libc::execve(args[0], args.as_ptr(), envs.as_ptr())
};
}

View File

@ -1,27 +0,0 @@
error[E0382]: assign to part of moved value: `newkeys`
--> .../cargo-crates/thrussh-0.20.7/src/client/connection.rs:550:13
|
539 | let mut newkeys = kexdhdone.compute_keys(
| ----------- move occurs because `newkeys` has type `session::NewKeys`, which does not implement the `Copy` trait
...
549 | session.0.kex = Some(Kex::NewKeys(newkeys));
| ------- value moved here
550 | newkeys.sent = true;
| ^^^^^^^^^^^^^^^^^^^ value partially assigned here after move
error: aborting due to previous error
https://nest.pijul.com/pijul_org/thrussh/patches/AsyuWkJg4jAwNaG3H1yv1kbECx5E3GQAtjzXWBDB8yEGMswyfKbxKvYmAGWCohTVaTipdvF8mHh63yU5PTr5F9py
--- cargo-crates/thrussh-0.20.7/src/client/connection.rs.orig 2019-12-17 08:35:47 UTC
+++ cargo-crates/thrussh-0.20.7/src/client/connection.rs
@@ -546,8 +546,8 @@ impl<R: AsyncRead + AsyncWrite, H: Handler> Connection
&[msg::NEWKEYS],
&mut session.0.write_buffer,
);
- session.0.kex = Some(Kex::NewKeys(newkeys));
newkeys.sent = true;
+ session.0.kex = Some(Kex::NewKeys(newkeys));
}
Ok(())
}