security/authenticator: update to 4.1.6
Changes: https://gitlab.gnome.org/World/Authenticator/-/compare/4.0.3...4.1.6 Reported by: Repology
This commit is contained in:
Jan Beich
parent
38071ee399
commit
88a566688d
7 changed files with 971 additions and 1051 deletions
|
|
@ -1,12 +1,7 @@
|
||||||
PORTNAME= authenticator
|
PORTNAME= authenticator
|
||||||
DISTVERSION= 4.0.3
|
DISTVERSION= 4.1.6
|
||||||
PORTREVISION= 12
|
|
||||||
CATEGORIES= security
|
CATEGORIES= security
|
||||||
|
|
||||||
PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
|
|
||||||
PATCHFILES+= 5d68dae3c878.patch:-p1 # https://gitlab.gnome.org/World/Authenticator/-/merge_requests/211
|
|
||||||
PATCHFILES+= 76e7c31709a2.patch:-p1 # https://gitlab.gnome.org/World/Authenticator/-/merge_requests/215
|
|
||||||
|
|
||||||
MAINTAINER= jbeich@FreeBSD.org
|
MAINTAINER= jbeich@FreeBSD.org
|
||||||
COMMENT= Generate Two-Factor Codes
|
COMMENT= Generate Two-Factor Codes
|
||||||
WWW= https://gitlab.gnome.org/World/Authenticator
|
WWW= https://gitlab.gnome.org/World/Authenticator
|
||||||
|
|
@ -14,353 +9,398 @@ WWW= https://gitlab.gnome.org/World/Authenticator
|
||||||
LICENSE= GPLv3+
|
LICENSE= GPLv3+
|
||||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||||
|
|
||||||
IGNORE= crashes with libadwaita >= 1.0
|
BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
|
||||||
|
LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \
|
||||||
|
libzbar.so:graphics/zbar \
|
||||||
|
libpipewire-0.3.so:multimedia/pipewire
|
||||||
|
|
||||||
LIB_DEPENDS= libcurl.so:ftp/curl \
|
USES= cargo desktop-file-utils gettext gnome gstreamer meson pkgconfig sqlite ssl
|
||||||
libgraphene-1.0.so:graphics/graphene \
|
|
||||||
libzbar.so:graphics/zbar
|
|
||||||
|
|
||||||
USES= cargo gettext gnome gstreamer meson pkgconfig python:build shebangfix sqlite ssl
|
|
||||||
USE_GITLAB= yes
|
USE_GITLAB= yes
|
||||||
USE_GNOME= gtk40 libadwaita
|
USE_GNOME= gdkpixbuf2 gtk40 libadwaita
|
||||||
USE_GSTREAMER= gl gtk4 zbar
|
USE_GSTREAMER= zbar # XXX gtk4paintablesink
|
||||||
GL_SITE= https://gitlab.gnome.org
|
GL_SITE= https://gitlab.gnome.org
|
||||||
GL_ACCOUNT= World
|
GL_ACCOUNT= World
|
||||||
GL_PROJECT= Authenticator
|
GL_PROJECT= Authenticator
|
||||||
GL_COMMIT= ba1894159358275be2765bc42ef89782a2d1d45d
|
GL_COMMIT= fc8624342b3b4aa599b4efdefdda84514c223b18
|
||||||
SHEBANG_FILES= build-aux/meson_post_install.py
|
|
||||||
CARGO_ENV= ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib"
|
CARGO_ENV= ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib"
|
||||||
MAKE_ENV= ${CARGO_ENV}
|
MAKE_ENV= ${CARGO_ENV}
|
||||||
GLIB_SCHEMAS= com.belmoussaoui.Authenticator.gschema.xml
|
GLIB_SCHEMAS= com.belmoussaoui.Authenticator.gschema.xml
|
||||||
|
|
||||||
CARGO_CRATES= adler-1.0.2 \
|
CARGO_CRATES= adler-1.0.2 \
|
||||||
adler32-1.2.0 \
|
adler32-1.2.0 \
|
||||||
aead-0.3.2 \
|
aead-0.4.3 \
|
||||||
aes-0.6.0 \
|
aes-0.7.5 \
|
||||||
aes-gcm-0.8.0 \
|
aes-0.8.1 \
|
||||||
aes-soft-0.6.4 \
|
aes-gcm-0.9.4 \
|
||||||
aesni-0.10.0 \
|
aho-corasick-0.7.18 \
|
||||||
aho-corasick-0.7.15 \
|
ansi_term-0.12.1 \
|
||||||
anyhow-1.0.39 \
|
anyhow-1.0.57 \
|
||||||
arrayref-0.3.6 \
|
arrayref-0.3.6 \
|
||||||
arrayvec-0.5.2 \
|
arrayvec-0.7.2 \
|
||||||
|
ashpd-0.3.2 \
|
||||||
|
async-broadcast-0.4.0 \
|
||||||
async-channel-1.6.1 \
|
async-channel-1.6.1 \
|
||||||
async-executor-1.4.0 \
|
async-executor-1.4.1 \
|
||||||
async-global-executor-2.0.2 \
|
async-io-1.7.0 \
|
||||||
async-io-1.3.1 \
|
async-lock-2.5.0 \
|
||||||
async-lock-2.3.0 \
|
async-recursion-0.3.2 \
|
||||||
async-mutex-1.4.0 \
|
async-task-4.2.0 \
|
||||||
async-std-1.9.0 \
|
async-trait-0.1.56 \
|
||||||
async-task-4.0.3 \
|
|
||||||
async-trait-0.1.48 \
|
|
||||||
atomic-waker-1.0.0 \
|
|
||||||
atty-0.2.14 \
|
atty-0.2.14 \
|
||||||
autocfg-1.0.1 \
|
autocfg-1.1.0 \
|
||||||
base-x-0.2.8 \
|
|
||||||
base64-0.13.0 \
|
base64-0.13.0 \
|
||||||
|
base64ct-1.5.0 \
|
||||||
binascii-0.1.4 \
|
binascii-0.1.4 \
|
||||||
bitflags-1.2.1 \
|
bindgen-0.59.2 \
|
||||||
blake2b_simd-0.5.11 \
|
bitflags-1.3.2 \
|
||||||
|
blake2b_simd-1.0.0 \
|
||||||
block-0.1.6 \
|
block-0.1.6 \
|
||||||
block-buffer-0.9.0 \
|
block-buffer-0.10.2 \
|
||||||
block-modes-0.7.0 \
|
block-padding-0.3.2 \
|
||||||
block-padding-0.2.1 \
|
bumpalo-3.10.0 \
|
||||||
blocking-1.0.2 \
|
bytemuck-1.9.1 \
|
||||||
bumpalo-3.6.1 \
|
|
||||||
bytemuck-1.5.1 \
|
|
||||||
byteorder-1.4.3 \
|
byteorder-1.4.3 \
|
||||||
bytes-0.5.6 \
|
bytes-1.1.0 \
|
||||||
bytes-1.0.1 \
|
cache-padded-1.2.0 \
|
||||||
cache-padded-1.1.1 \
|
cairo-rs-0.15.11 \
|
||||||
cc-1.0.67 \
|
cairo-sys-rs-0.15.1 \
|
||||||
cfg-expr-0.7.4 \
|
cbc-0.1.2 \
|
||||||
|
cc-1.0.73 \
|
||||||
|
cexpr-0.6.0 \
|
||||||
|
cfg-expr-0.10.3 \
|
||||||
|
cfg-if-0.1.10 \
|
||||||
cfg-if-1.0.0 \
|
cfg-if-1.0.0 \
|
||||||
checked_int_cast-1.0.0 \
|
checked_int_cast-1.0.0 \
|
||||||
cipher-0.2.5 \
|
chrono-0.4.19 \
|
||||||
cmake-0.1.45 \
|
cipher-0.3.0 \
|
||||||
|
cipher-0.4.3 \
|
||||||
|
clang-sys-1.3.3 \
|
||||||
|
clap-2.34.0 \
|
||||||
color_quant-1.1.0 \
|
color_quant-1.1.0 \
|
||||||
concurrent-queue-1.2.2 \
|
concurrent-queue-1.2.2 \
|
||||||
const_fn-0.4.5 \
|
|
||||||
constant_time_eq-0.1.5 \
|
constant_time_eq-0.1.5 \
|
||||||
cookie-0.14.4 \
|
cookie-factory-0.3.2 \
|
||||||
cpuid-bool-0.1.2 \
|
core-foundation-0.9.3 \
|
||||||
cpuid-bool-0.2.0 \
|
core-foundation-sys-0.8.3 \
|
||||||
crc32fast-1.2.1 \
|
cpufeatures-0.2.2 \
|
||||||
crossbeam-channel-0.5.0 \
|
crc32fast-1.3.2 \
|
||||||
crossbeam-deque-0.8.0 \
|
crossbeam-utils-0.8.8 \
|
||||||
crossbeam-epoch-0.9.3 \
|
crypto-common-0.1.3 \
|
||||||
crossbeam-utils-0.8.3 \
|
ctr-0.8.0 \
|
||||||
crypto-mac-0.10.0 \
|
deflate-1.0.0 \
|
||||||
ctor-0.1.20 \
|
|
||||||
ctr-0.6.0 \
|
|
||||||
curl-0.4.35 \
|
|
||||||
curl-sys-0.4.41+curl-7.75.0 \
|
|
||||||
dashmap-4.0.2 \
|
|
||||||
data-encoding-2.3.2 \
|
|
||||||
deflate-0.8.6 \
|
|
||||||
derivative-2.2.0 \
|
derivative-2.2.0 \
|
||||||
diesel-1.4.6 \
|
diesel-1.4.8 \
|
||||||
diesel_derives-1.4.1 \
|
diesel_derives-1.4.1 \
|
||||||
diesel_migrations-1.4.0 \
|
diesel_migrations-1.4.0 \
|
||||||
digest-0.9.0 \
|
digest-0.10.3 \
|
||||||
discard-1.0.4 \
|
dirs-4.0.0 \
|
||||||
dlib-0.5.0 \
|
dirs-sys-0.3.7 \
|
||||||
doc-comment-0.3.3 \
|
doc-comment-0.3.3 \
|
||||||
downcast-rs-1.2.0 \
|
easy-parallel-3.2.0 \
|
||||||
either-1.6.1 \
|
either-1.6.1 \
|
||||||
encoding_rs-0.8.28 \
|
encoding_rs-0.8.31 \
|
||||||
enum-ordinalize-3.1.9 \
|
enum-ordinalize-3.1.11 \
|
||||||
enumflags2-0.6.4 \
|
enumflags2-0.7.5 \
|
||||||
enumflags2_derive-0.6.4 \
|
enumflags2_derive-0.7.4 \
|
||||||
env_logger-0.7.1 \
|
env_logger-0.9.0 \
|
||||||
event-listener-2.5.1 \
|
errno-0.2.8 \
|
||||||
fastrand-1.4.0 \
|
errno-dragonfly-0.1.2 \
|
||||||
field-offset-0.3.3 \
|
event-listener-2.5.2 \
|
||||||
flume-0.9.2 \
|
fastrand-1.7.0 \
|
||||||
|
field-offset-0.3.4 \
|
||||||
fnv-1.0.7 \
|
fnv-1.0.7 \
|
||||||
|
foreign-types-0.3.2 \
|
||||||
|
foreign-types-shared-0.1.1 \
|
||||||
form_urlencoded-1.0.1 \
|
form_urlencoded-1.0.1 \
|
||||||
freetype-0.7.0 \
|
fragile-1.2.0 \
|
||||||
freetype-sys-0.13.1 \
|
futures-0.3.21 \
|
||||||
futures-0.3.13 \
|
futures-channel-0.3.21 \
|
||||||
futures-channel-0.3.13 \
|
futures-core-0.3.21 \
|
||||||
futures-core-0.3.13 \
|
futures-executor-0.3.21 \
|
||||||
futures-executor-0.3.13 \
|
futures-io-0.3.21 \
|
||||||
futures-io-0.3.13 \
|
futures-lite-1.12.0 \
|
||||||
futures-lite-1.11.3 \
|
futures-macro-0.3.21 \
|
||||||
futures-macro-0.3.13 \
|
futures-sink-0.3.21 \
|
||||||
futures-sink-0.3.13 \
|
futures-task-0.3.21 \
|
||||||
futures-task-0.3.13 \
|
futures-util-0.3.21 \
|
||||||
futures-util-0.3.13 \
|
gdk-pixbuf-0.15.11 \
|
||||||
generic-array-0.14.4 \
|
gdk-pixbuf-sys-0.15.10 \
|
||||||
getrandom-0.1.16 \
|
gdk4-0.4.8 \
|
||||||
getrandom-0.2.2 \
|
gdk4-sys-0.4.8 \
|
||||||
gettext-rs-0.6.0 \
|
gdk4-wayland-0.4.8 \
|
||||||
gettext-sys-0.21.0 \
|
gdk4-wayland-sys-0.4.8 \
|
||||||
ghash-0.3.1 \
|
gdk4-x11-0.4.8 \
|
||||||
gif-0.11.2 \
|
gdk4-x11-sys-0.4.8 \
|
||||||
gloo-timers-0.2.1 \
|
generic-array-0.14.5 \
|
||||||
gtk-macros-0.2.0 \
|
getrandom-0.2.6 \
|
||||||
heck-0.3.2 \
|
gettext-rs-0.7.0 \
|
||||||
hermit-abi-0.1.18 \
|
gettext-sys-0.21.3 \
|
||||||
|
ghash-0.4.4 \
|
||||||
|
gio-0.15.11 \
|
||||||
|
gio-sys-0.15.10 \
|
||||||
|
glib-0.15.11 \
|
||||||
|
glib-macros-0.15.11 \
|
||||||
|
glib-sys-0.15.10 \
|
||||||
|
glob-0.3.0 \
|
||||||
|
gobject-sys-0.15.10 \
|
||||||
|
graphene-rs-0.15.1 \
|
||||||
|
graphene-sys-0.15.10 \
|
||||||
|
gsk4-0.4.8 \
|
||||||
|
gsk4-sys-0.4.8 \
|
||||||
|
gst-plugin-gtk4-0.1.1 \
|
||||||
|
gst-plugin-version-helper-0.7.3 \
|
||||||
|
gstreamer-0.18.8 \
|
||||||
|
gstreamer-base-0.18.0 \
|
||||||
|
gstreamer-base-sys-0.18.0 \
|
||||||
|
gstreamer-sys-0.18.0 \
|
||||||
|
gstreamer-video-0.18.7 \
|
||||||
|
gstreamer-video-sys-0.18.3 \
|
||||||
|
gtk-macros-0.3.0 \
|
||||||
|
gtk4-0.4.8 \
|
||||||
|
gtk4-macros-0.4.8 \
|
||||||
|
gtk4-sys-0.4.8 \
|
||||||
|
h2-0.3.13 \
|
||||||
|
hashbrown-0.11.2 \
|
||||||
|
heck-0.4.0 \
|
||||||
|
hermit-abi-0.1.19 \
|
||||||
hex-0.4.3 \
|
hex-0.4.3 \
|
||||||
hkdf-0.10.0 \
|
hkdf-0.12.3 \
|
||||||
hmac-0.10.1 \
|
hmac-0.12.1 \
|
||||||
http-0.2.3 \
|
http-0.2.7 \
|
||||||
http-client-6.3.5 \
|
http-body-0.4.5 \
|
||||||
http-types-2.10.0 \
|
httparse-1.7.1 \
|
||||||
humantime-1.3.0 \
|
httpdate-1.0.2 \
|
||||||
idna-0.2.2 \
|
humantime-2.1.0 \
|
||||||
|
hyper-0.14.19 \
|
||||||
|
hyper-tls-0.5.0 \
|
||||||
|
idna-0.2.3 \
|
||||||
image-0.23.14 \
|
image-0.23.14 \
|
||||||
infer-0.2.3 \
|
image-0.24.2 \
|
||||||
instant-0.1.9 \
|
indexmap-1.8.2 \
|
||||||
isahc-0.9.14 \
|
inout-0.1.3 \
|
||||||
itertools-0.9.0 \
|
instant-0.1.12 \
|
||||||
itertools-0.10.0 \
|
ipnet-2.5.0 \
|
||||||
itoa-0.4.7 \
|
itertools-0.10.3 \
|
||||||
jpeg-decoder-0.1.22 \
|
itoa-1.0.2 \
|
||||||
js-sys-0.3.49 \
|
js-sys-0.3.57 \
|
||||||
kv-log-macro-1.0.7 \
|
|
||||||
lazy_static-1.4.0 \
|
lazy_static-1.4.0 \
|
||||||
libc-0.2.91 \
|
lazycell-1.3.0 \
|
||||||
libloading-0.7.0 \
|
libadwaita-0.1.1 \
|
||||||
libnghttp2-sys-0.1.6+1.43.0 \
|
libadwaita-sys-0.1.0 \
|
||||||
libsqlite3-sys-0.20.1 \
|
libc-0.2.126 \
|
||||||
libz-sys-1.1.2 \
|
libloading-0.7.3 \
|
||||||
|
libspa-0.5.0 \
|
||||||
|
libspa-sys-0.5.0 \
|
||||||
|
libsqlite3-sys-0.22.2 \
|
||||||
locale_config-0.3.0 \
|
locale_config-0.3.0 \
|
||||||
lock_api-0.4.2 \
|
lock_api-0.4.7 \
|
||||||
log-0.4.14 \
|
log-0.4.17 \
|
||||||
malloc_buf-0.0.6 \
|
malloc_buf-0.0.6 \
|
||||||
matches-0.1.8 \
|
matches-0.1.9 \
|
||||||
memchr-2.3.4 \
|
memchr-2.5.0 \
|
||||||
memoffset-0.6.1 \
|
memoffset-0.6.5 \
|
||||||
migrations_internals-1.4.1 \
|
migrations_internals-1.4.1 \
|
||||||
migrations_macros-1.4.2 \
|
migrations_macros-1.4.2 \
|
||||||
mime-0.3.16 \
|
mime-0.3.16 \
|
||||||
mime_guess-2.0.3 \
|
minimal-lexical-0.2.1 \
|
||||||
miniz_oxide-0.3.7 \
|
miniz_oxide-0.5.3 \
|
||||||
miniz_oxide-0.4.4 \
|
mio-0.8.3 \
|
||||||
muldiv-1.0.0 \
|
muldiv-1.0.0 \
|
||||||
nb-connect-1.1.0 \
|
native-tls-0.2.10 \
|
||||||
nix-0.20.0 \
|
nix-0.14.1 \
|
||||||
num-0.3.1 \
|
nix-0.23.1 \
|
||||||
num-bigint-0.3.2 \
|
nom-7.1.1 \
|
||||||
num-complex-0.3.1 \
|
num-0.4.0 \
|
||||||
num-integer-0.1.44 \
|
num-bigint-0.4.3 \
|
||||||
num-iter-0.1.42 \
|
num-complex-0.4.1 \
|
||||||
|
num-integer-0.1.45 \
|
||||||
|
num-iter-0.1.43 \
|
||||||
num-rational-0.3.2 \
|
num-rational-0.3.2 \
|
||||||
num-rational-0.4.0 \
|
num-rational-0.4.0 \
|
||||||
num-traits-0.2.14 \
|
num-traits-0.2.15 \
|
||||||
num_cpus-1.13.0 \
|
num_cpus-1.13.1 \
|
||||||
objc-0.2.7 \
|
objc-0.2.7 \
|
||||||
objc-foundation-0.1.1 \
|
objc-foundation-0.1.1 \
|
||||||
objc_id-0.1.1 \
|
objc_id-0.1.1 \
|
||||||
once_cell-1.7.2 \
|
once_cell-1.12.0 \
|
||||||
|
oo7-0.1.0-alpha.5 \
|
||||||
opaque-debug-0.3.0 \
|
opaque-debug-0.3.0 \
|
||||||
openssl-probe-0.1.2 \
|
openssl-0.10.40 \
|
||||||
openssl-sys-0.9.61 \
|
openssl-macros-0.1.0 \
|
||||||
|
openssl-probe-0.1.5 \
|
||||||
|
openssl-sys-0.9.74 \
|
||||||
|
option-operations-0.4.0 \
|
||||||
|
ordered-stream-0.0.1 \
|
||||||
|
pango-0.15.10 \
|
||||||
|
pango-sys-0.15.10 \
|
||||||
parking-2.0.0 \
|
parking-2.0.0 \
|
||||||
parking_lot-0.11.1 \
|
parking_lot-0.11.2 \
|
||||||
parking_lot_core-0.8.3 \
|
parking_lot-0.12.1 \
|
||||||
paste-1.0.5 \
|
parking_lot_core-0.8.5 \
|
||||||
|
parking_lot_core-0.9.3 \
|
||||||
|
password-hash-0.4.1 \
|
||||||
|
paste-1.0.7 \
|
||||||
|
pbkdf2-0.11.0 \
|
||||||
|
peeking_take_while-0.1.2 \
|
||||||
percent-encoding-2.1.0 \
|
percent-encoding-2.1.0 \
|
||||||
pest-2.1.3 \
|
pest-2.1.3 \
|
||||||
pin-project-1.0.6 \
|
pin-project-lite-0.2.9 \
|
||||||
pin-project-internal-1.0.6 \
|
|
||||||
pin-project-lite-0.2.6 \
|
|
||||||
pin-utils-0.1.0 \
|
pin-utils-0.1.0 \
|
||||||
pkg-config-0.3.19 \
|
pipewire-0.5.0 \
|
||||||
png-0.16.8 \
|
pipewire-sys-0.5.0 \
|
||||||
polling-2.0.3 \
|
pkg-config-0.3.25 \
|
||||||
polyval-0.4.5 \
|
png-0.17.5 \
|
||||||
ppv-lite86-0.2.10 \
|
polling-2.2.0 \
|
||||||
pretty-hex-0.2.1 \
|
polyval-0.5.3 \
|
||||||
pretty_env_logger-0.4.0 \
|
ppv-lite86-0.2.16 \
|
||||||
proc-macro-crate-0.1.5 \
|
pretty-hex-0.3.0 \
|
||||||
|
proc-macro-crate-1.1.3 \
|
||||||
proc-macro-error-1.0.4 \
|
proc-macro-error-1.0.4 \
|
||||||
proc-macro-error-attr-1.0.4 \
|
proc-macro-error-attr-1.0.4 \
|
||||||
proc-macro-hack-0.5.19 \
|
proc-macro2-1.0.39 \
|
||||||
proc-macro-nested-0.1.7 \
|
prost-0.10.4 \
|
||||||
proc-macro2-1.0.24 \
|
prost-derive-0.10.1 \
|
||||||
qrcode-0.12.0 \
|
qrcode-0.12.0 \
|
||||||
quick-error-1.2.3 \
|
|
||||||
quick-xml-0.22.0 \
|
quick-xml-0.22.0 \
|
||||||
quote-1.0.9 \
|
quote-1.0.18 \
|
||||||
r2d2-0.8.9 \
|
r2d2-0.8.9 \
|
||||||
rand-0.7.3 \
|
rand-0.8.5 \
|
||||||
rand-0.8.3 \
|
rand_chacha-0.3.1 \
|
||||||
rand_chacha-0.2.2 \
|
rand_core-0.6.3 \
|
||||||
rand_chacha-0.3.0 \
|
redox_syscall-0.2.13 \
|
||||||
rand_core-0.5.1 \
|
redox_users-0.4.3 \
|
||||||
rand_core-0.6.2 \
|
regex-1.5.6 \
|
||||||
rand_hc-0.2.0 \
|
regex-syntax-0.6.26 \
|
||||||
rand_hc-0.3.0 \
|
|
||||||
rayon-1.5.0 \
|
|
||||||
rayon-core-1.9.0 \
|
|
||||||
redox_syscall-0.2.5 \
|
|
||||||
regex-1.4.5 \
|
|
||||||
regex-syntax-0.6.23 \
|
|
||||||
remove_dir_all-0.5.3 \
|
remove_dir_all-0.5.3 \
|
||||||
|
reqwest-0.11.10 \
|
||||||
ring-0.16.20 \
|
ring-0.16.20 \
|
||||||
roxmltree-0.13.1 \
|
roxmltree-0.13.1 \
|
||||||
rust-argon2-0.8.3 \
|
rust-argon2-1.0.0 \
|
||||||
rustc_version-0.2.3 \
|
rustc-hash-1.1.0 \
|
||||||
rustc_version-0.3.3 \
|
rustc_version-0.3.3 \
|
||||||
ryu-1.0.5 \
|
rustc_version-0.4.0 \
|
||||||
schannel-0.1.19 \
|
ryu-1.0.10 \
|
||||||
scheduled-thread-pool-0.2.5 \
|
salsa20-0.10.2 \
|
||||||
scoped-tls-1.0.0 \
|
schannel-0.1.20 \
|
||||||
scoped_threadpool-0.1.9 \
|
scheduled-thread-pool-0.2.6 \
|
||||||
scopeguard-1.1.0 \
|
scopeguard-1.1.0 \
|
||||||
secret-service-2.0.1 \
|
scrypt-0.10.0 \
|
||||||
semver-0.9.0 \
|
search-provider-0.3.0 \
|
||||||
|
security-framework-2.6.1 \
|
||||||
|
security-framework-sys-2.6.1 \
|
||||||
semver-0.11.0 \
|
semver-0.11.0 \
|
||||||
semver-parser-0.7.0 \
|
semver-1.0.9 \
|
||||||
semver-parser-0.10.2 \
|
semver-parser-0.10.2 \
|
||||||
serde-1.0.125 \
|
serde-1.0.137 \
|
||||||
serde_derive-1.0.125 \
|
serde_derive-1.0.137 \
|
||||||
serde_json-1.0.64 \
|
serde_json-1.0.81 \
|
||||||
serde_qs-0.7.2 \
|
serde_repr-0.1.8 \
|
||||||
serde_repr-0.1.6 \
|
serde_urlencoded-0.7.1 \
|
||||||
serde_urlencoded-0.7.0 \
|
sha1-0.6.1 \
|
||||||
sha1-0.6.0 \
|
sha1_smol-1.0.0 \
|
||||||
sha2-0.9.3 \
|
sha2-0.10.2 \
|
||||||
slab-0.4.2 \
|
sharded-slab-0.1.4 \
|
||||||
sluice-0.5.4 \
|
shlex-1.1.0 \
|
||||||
smallvec-1.6.1 \
|
signal-0.7.0 \
|
||||||
socket2-0.3.19 \
|
slab-0.4.6 \
|
||||||
socket2-0.4.0 \
|
smallvec-1.8.0 \
|
||||||
|
socket2-0.4.4 \
|
||||||
spin-0.5.2 \
|
spin-0.5.2 \
|
||||||
spinning_top-0.2.2 \
|
static_assertions-1.1.0 \
|
||||||
standback-0.2.17 \
|
strsim-0.8.0 \
|
||||||
stdweb-0.4.20 \
|
subtle-2.4.1 \
|
||||||
stdweb-derive-0.5.3 \
|
|
||||||
stdweb-internal-macros-0.2.9 \
|
|
||||||
stdweb-internal-runtime-0.1.5 \
|
|
||||||
strum-0.20.0 \
|
|
||||||
strum_macros-0.20.1 \
|
|
||||||
subtle-2.4.0 \
|
|
||||||
surf-2.2.0 \
|
|
||||||
svg_metadata-0.4.2 \
|
svg_metadata-0.4.2 \
|
||||||
syn-1.0.64 \
|
syn-1.0.96 \
|
||||||
system-deps-3.1.0 \
|
synstructure-0.12.6 \
|
||||||
tempfile-3.2.0 \
|
system-deps-6.0.2 \
|
||||||
termcolor-1.1.2 \
|
temp-dir-0.1.11 \
|
||||||
thiserror-1.0.24 \
|
tempfile-3.3.0 \
|
||||||
thiserror-impl-1.0.24 \
|
termcolor-1.1.3 \
|
||||||
tiff-0.6.1 \
|
textwrap-0.11.0 \
|
||||||
time-0.2.26 \
|
thiserror-1.0.31 \
|
||||||
time-macros-0.1.1 \
|
thiserror-impl-1.0.31 \
|
||||||
time-macros-impl-0.1.1 \
|
thread_local-1.1.4 \
|
||||||
tinyvec-1.1.1 \
|
tinyvec-1.6.0 \
|
||||||
tinyvec_macros-0.1.0 \
|
tinyvec_macros-0.1.0 \
|
||||||
toml-0.5.8 \
|
tokio-1.19.1 \
|
||||||
tracing-0.1.25 \
|
tokio-macros-1.8.0 \
|
||||||
tracing-attributes-0.1.15 \
|
tokio-native-tls-0.3.0 \
|
||||||
tracing-core-0.1.17 \
|
tokio-util-0.7.3 \
|
||||||
tracing-futures-0.2.5 \
|
toml-0.5.9 \
|
||||||
typenum-1.13.0 \
|
tower-service-0.3.1 \
|
||||||
|
tracing-0.1.34 \
|
||||||
|
tracing-attributes-0.1.21 \
|
||||||
|
tracing-core-0.1.26 \
|
||||||
|
tracing-log-0.1.3 \
|
||||||
|
tracing-subscriber-0.3.11 \
|
||||||
|
try-lock-0.2.3 \
|
||||||
|
typenum-1.15.0 \
|
||||||
ucd-trie-0.1.3 \
|
ucd-trie-0.1.3 \
|
||||||
|
uds_windows-1.0.2 \
|
||||||
unicase-2.6.0 \
|
unicase-2.6.0 \
|
||||||
unicode-bidi-0.3.4 \
|
unicode-bidi-0.3.8 \
|
||||||
unicode-normalization-0.1.17 \
|
unicode-ident-1.0.0 \
|
||||||
unicode-segmentation-1.7.1 \
|
unicode-normalization-0.1.19 \
|
||||||
unicode-xid-0.2.1 \
|
unicode-width-0.1.9 \
|
||||||
universal-hash-0.4.0 \
|
unicode-xid-0.2.3 \
|
||||||
|
universal-hash-0.4.1 \
|
||||||
untrusted-0.7.1 \
|
untrusted-0.7.1 \
|
||||||
url-2.2.1 \
|
url-2.2.2 \
|
||||||
value-bag-1.0.0-alpha.6 \
|
uuid-1.1.1 \
|
||||||
vcpkg-0.2.11 \
|
valuable-0.1.0 \
|
||||||
vec-arena-1.1.0 \
|
vcpkg-0.2.15 \
|
||||||
version-compare-0.0.11 \
|
vec_map-0.8.2 \
|
||||||
version_check-0.9.3 \
|
version-compare-0.1.0 \
|
||||||
|
version_check-0.9.4 \
|
||||||
|
void-1.0.2 \
|
||||||
waker-fn-1.1.0 \
|
waker-fn-1.1.0 \
|
||||||
wasi-0.9.0+wasi-snapshot-preview1 \
|
want-0.3.0 \
|
||||||
wasi-0.10.2+wasi-snapshot-preview1 \
|
wasi-0.10.2+wasi-snapshot-preview1 \
|
||||||
wasm-bindgen-0.2.72 \
|
wasi-0.11.0+wasi-snapshot-preview1 \
|
||||||
wasm-bindgen-backend-0.2.72 \
|
wasm-bindgen-0.2.80 \
|
||||||
wasm-bindgen-futures-0.4.22 \
|
wasm-bindgen-backend-0.2.80 \
|
||||||
wasm-bindgen-macro-0.2.72 \
|
wasm-bindgen-futures-0.4.30 \
|
||||||
wasm-bindgen-macro-support-0.2.72 \
|
wasm-bindgen-macro-0.2.80 \
|
||||||
wasm-bindgen-shared-0.2.72 \
|
wasm-bindgen-macro-support-0.2.80 \
|
||||||
wayland-client-0.28.5 \
|
wasm-bindgen-shared-0.2.80 \
|
||||||
wayland-commons-0.28.5 \
|
web-sys-0.3.57 \
|
||||||
wayland-scanner-0.28.5 \
|
wepoll-ffi-0.1.2 \
|
||||||
wayland-sys-0.28.5 \
|
which-4.2.5 \
|
||||||
web-sys-0.3.49 \
|
|
||||||
weezl-0.1.4 \
|
|
||||||
wepoll-sys-3.0.1 \
|
|
||||||
winapi-0.3.9 \
|
winapi-0.3.9 \
|
||||||
winapi-i686-pc-windows-gnu-0.4.0 \
|
winapi-i686-pc-windows-gnu-0.4.0 \
|
||||||
winapi-util-0.1.5 \
|
winapi-util-0.1.5 \
|
||||||
winapi-x86_64-pc-windows-gnu-0.4.0 \
|
winapi-x86_64-pc-windows-gnu-0.4.0 \
|
||||||
x11-2.18.2 \
|
windows-sys-0.36.1 \
|
||||||
xml-rs-0.8.3 \
|
windows_aarch64_msvc-0.36.1 \
|
||||||
|
windows_i686_gnu-0.36.1 \
|
||||||
|
windows_i686_msvc-0.36.1 \
|
||||||
|
windows_x86_64_gnu-0.36.1 \
|
||||||
|
windows_x86_64_msvc-0.36.1 \
|
||||||
|
winreg-0.10.1 \
|
||||||
xmlparser-0.13.3 \
|
xmlparser-0.13.3 \
|
||||||
zbar-rust-0.0.16 \
|
zbar-rust-0.0.19 \
|
||||||
zbus-1.8.0 \
|
zbus-2.2.0 \
|
||||||
zbus_macros-1.8.0 \
|
zbus_macros-2.2.0 \
|
||||||
zvariant-2.6.0 \
|
zbus_names-2.1.0 \
|
||||||
zvariant_derive-2.6.0 \
|
zeroize-1.5.5 \
|
||||||
gstreamer,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#762450bb5335d8c79cc29a6111874d89bd3b5c00 \
|
zeroize_derive-1.3.2 \
|
||||||
gdk4,gdk4-sys,gdk4-wayland,gdk4-wayland-sys,gdk4-x11,gdk4-x11-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#13a8317a2ef8738362b9fa7f55a29dd5d3dbc459 \
|
zvariant-3.2.1 \
|
||||||
libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#6ae4d3670565064acc9da2f51434eca0a0c51ac9 \
|
zvariant_derive-3.2.1
|
||||||
ashpd@git+https://github.com/bilelmoussaoui/ashpd\#d7ec2103565301b8476d6706ef34090e197b021c \
|
|
||||||
cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#6e3c8739f9f5b8dc0a234f4a485e254574af5953
|
|
||||||
CARGO_BUILD= no
|
CARGO_BUILD= no
|
||||||
CARGO_INSTALL= no
|
CARGO_INSTALL= no
|
||||||
CARGO_TEST= no
|
CARGO_TEST= no
|
||||||
|
|
||||||
pre-patch:
|
|
||||||
# Chase gtk-rs -> gtk3-rs rename for USES=cargo patching
|
|
||||||
@${GREP} --include='*/Cargo.toml' -lr 'git.*gtk-rs' ${WRKDIR} | ${XARGS} ${REINPLACE_CMD} \
|
|
||||||
's,\(gtk-rs\)/gtk-rs,\1/gtk3-rs,'
|
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@${REINPLACE_CMD} -e 's,"llvm-config,&${LLVM_DEFAULT},' \
|
||||||
|
${WRKSRC}/cargo-crates/clang-sys-*/build/common.rs \
|
||||||
|
${WRKSRC}/cargo-crates/clang-sys-*/src/support.rs
|
||||||
@${REINPLACE_CMD} -e '/gstreamer/s/1\.18/1.16/' \
|
@${REINPLACE_CMD} -e '/gstreamer/s/1\.18/1.16/' \
|
||||||
-e '/gstreamer.*bad/d' \
|
-e '/gstreamer.*bad/d' \
|
||||||
${WRKSRC}/meson.build
|
${WRKSRC}/meson.build
|
||||||
# Make each cargo subcommand very verbose
|
# Make each cargo subcommand very verbose
|
||||||
@${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \
|
# Add explicit <triple> subdir for --target from USES=cargo
|
||||||
${WRKSRC}/build-aux/cargo.sh
|
@${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \
|
||||||
|
-e "/cp/s,'src',& / '${CARGO_BUILD_TARGET}'," \
|
||||||
|
${WRKSRC}/src/meson.build
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,15 +0,0 @@
|
||||||
--- build-aux/cargo.sh.orig 2021-09-08 15:33:49 UTC
|
|
||||||
+++ build-aux/cargo.sh
|
|
||||||
@@ -12,10 +12,10 @@ if [ "$BUILDTYPE" = "release" ]; then
|
|
||||||
echo "RELEASE MODE"
|
|
||||||
cargo build --manifest-path \
|
|
||||||
"$MESON_SOURCE_ROOT"/Cargo.toml --release &&
|
|
||||||
- cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"
|
|
||||||
+ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT"
|
|
||||||
else
|
|
||||||
echo "DEBUG MODE"
|
|
||||||
cargo build --manifest-path \
|
|
||||||
"$MESON_SOURCE_ROOT"/Cargo.toml &&
|
|
||||||
- cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT"
|
|
||||||
+ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
https://gitlab.gnome.org/GNOME/libadwaita/-/commit/0509755b80d8
|
|
||||||
https://gitlab.gnome.org/World/Rust/libadwaita-rs/-/commit/986f12d5170d
|
|
||||||
|
|
||||||
$ RUST_BACKTRACE=1 authenticator
|
|
||||||
(<unknown>:1234): GLib-GObject-WARNING **: specified class size for type 'UrlRow' is smaller than the parent type's 'AdwActionRow' class size
|
|
||||||
(<unknown>:1234): GLib-GObject-WARNING **: cannot add private field to invalid (non-instantiatable) type '<invalid>'
|
|
||||||
thread 'main' panicked at 'assertion failed: type_.is_valid()', src/widgets/url_row.rs:17:5
|
|
||||||
stack backtrace:
|
|
||||||
0: rust_begin_unwind
|
|
||||||
1: core::panicking::panic_fmt
|
|
||||||
2: core::panicking::panic
|
|
||||||
3: <authenticator::widgets::url_row::imp::UrlRow as glib::subclass::types::ObjectSubclassType>::get_type
|
|
||||||
at src/widgets/url_row.rs:17:5
|
|
||||||
4: <authenticator::widgets::url_row::UrlRow as glib::types::StaticType>::static_type
|
|
||||||
at src/widgets/url_row.rs:86:1
|
|
||||||
5: <gtk4::subclass::widget::TemplateChild<T> as core::default::Default>::default
|
|
||||||
at gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gtk4/src/subclass/widget.rs:1124:9
|
|
||||||
6: <authenticator::widgets::accounts::details::imp::AccountDetailsPage as glib::subclass::types::ObjectSubclass>::new
|
|
||||||
at src/widgets/accounts/details.rs:36:30
|
|
||||||
7: glib::subclass::types::ObjectSubclass::with_class
|
|
||||||
at gtk3-rs-6e3c8739f9f5b8dc0a234f4a485e254574af5953/glib/src/subclass/types.rs:531:9
|
|
||||||
8: glib::subclass::types::instance_init
|
|
||||||
at gtk3-rs-6e3c8739f9f5b8dc0a234f4a485e254574af5953/glib/src/subclass/types.rs:722:15
|
|
||||||
[...]
|
|
||||||
|
|
||||||
--- ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/src/lib.rs.orig 2021-03-12 01:18:14 UTC
|
|
||||||
+++ ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/src/lib.rs
|
|
||||||
@@ -68,7 +68,7 @@ pub type AdwAvatarImageLoadFunc =
|
|
||||||
#[repr(C)]
|
|
||||||
#[derive(Copy, Clone)]
|
|
||||||
pub struct AdwActionRowClass {
|
|
||||||
- pub parent_class: gtk::GtkListBoxRowClass,
|
|
||||||
+ pub parent_class: AdwPreferencesRowClass,
|
|
||||||
pub activate: Option<unsafe extern "C" fn(*mut AdwActionRow)>,
|
|
||||||
pub padding: [gpointer; 4],
|
|
||||||
}
|
|
||||||
60
security/authenticator/files/patch-pipewire_init
Normal file
60
security/authenticator/files/patch-pipewire_init
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init
|
||||||
|
|
||||||
|
https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819
|
||||||
|
|
||||||
|
error[E0425]: cannot find function `pw_init` in crate `pw_sys`
|
||||||
|
--> cargo-crates/pipewire-0.5.0/src/lib.rs:160:49
|
||||||
|
|
|
||||||
|
160 | INITIALIZED.get_or_init(|| unsafe { pw_sys::pw_init(ptr::null_mut(), ptr::null_mut()) });
|
||||||
|
| ^^^^^^^ not found in `pw_sys`
|
||||||
|
|
||||||
|
error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
|
||||||
|
--> cargo-crates/pipewire-0.5.0/src/lib.rs:169:13
|
||||||
|
|
|
||||||
|
169 | pw_sys::pw_deinit()
|
||||||
|
| ^^^^^^^^^ not found in `pw_sys`
|
||||||
|
|
||||||
|
|
||||||
|
--- cargo-crates/pipewire-0.5.0/src/lib.rs.orig 1970-01-01 00:00:00 UTC
|
||||||
|
+++ cargo-crates/pipewire-0.5.0/src/lib.rs
|
||||||
|
@@ -157,7 +157,7 @@ pub fn init() {
|
||||||
|
pub fn init() {
|
||||||
|
use once_cell::sync::OnceCell;
|
||||||
|
static INITIALIZED: OnceCell<()> = OnceCell::new();
|
||||||
|
- INITIALIZED.get_or_init(|| unsafe { pw_sys::pw_init(ptr::null_mut(), ptr::null_mut()) });
|
||||||
|
+ INITIALIZED.get_or_init(|| unsafe { pw_sys::pipewire_init(ptr::null_mut(), ptr::null_mut()) });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Deinitialize PipeWire
|
||||||
|
@@ -166,7 +166,7 @@ pub unsafe fn deinit() {
|
||||||
|
/// This must only be called once during the lifetime of the process, once no PipeWire threads
|
||||||
|
/// are running anymore and all PipeWire resources are released.
|
||||||
|
pub unsafe fn deinit() {
|
||||||
|
- pw_sys::pw_deinit()
|
||||||
|
+ pw_sys::pipewire_deinit()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
--- cargo-crates/pipewire-sys-0.5.0/build.rs.orig 1970-01-01 00:00:00 UTC
|
||||||
|
+++ cargo-crates/pipewire-sys-0.5.0/build.rs
|
||||||
|
@@ -19,6 +19,7 @@ fn main() {
|
||||||
|
// included header files changed.
|
||||||
|
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
|
||||||
|
.size_t_is_usize(true)
|
||||||
|
+ .allowlist_function("pipewire_.*")
|
||||||
|
.allowlist_function("pw_.*")
|
||||||
|
.allowlist_type("pw_.*")
|
||||||
|
.allowlist_var("pw_.*")
|
||||||
|
--- cargo-crates/pipewire-sys-0.5.0/src/lib.rs.orig 1970-01-01 00:00:00 UTC
|
||||||
|
+++ cargo-crates/pipewire-sys-0.5.0/src/lib.rs
|
||||||
|
@@ -20,8 +20,8 @@ mod tests {
|
||||||
|
#[test]
|
||||||
|
fn init() {
|
||||||
|
unsafe {
|
||||||
|
- pw_init(std::ptr::null_mut(), std::ptr::null_mut());
|
||||||
|
- pw_deinit();
|
||||||
|
+ pipewire_init(std::ptr::null_mut(), std::ptr::null_mut());
|
||||||
|
+ pipewire_deinit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,226 +0,0 @@
|
||||||
https://gitlab.freedesktop.org/dbus/zbus/-/commit/01d8f0ec41d3
|
|
||||||
https://gitlab.freedesktop.org/dbus/zbus/-/commit/807909a6c7bf
|
|
||||||
https://gitlab.freedesktop.org/dbus/zbus/-/commit/e3e2f7ddfd6e
|
|
||||||
https://gitlab.freedesktop.org/dbus/zbus/-/commit/35d1b8778754
|
|
||||||
|
|
||||||
--- cargo-crates/zbus-1.8.0/Cargo.toml.orig 2021-01-07 11:47:37 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/Cargo.toml
|
|
||||||
@@ -48,7 +48,7 @@ version = "0.3.8"
|
|
||||||
version = "1.0.2"
|
|
||||||
|
|
||||||
[dependencies.nix]
|
|
||||||
-version = "^0.17"
|
|
||||||
+version = "0.20.0"
|
|
||||||
|
|
||||||
[dependencies.once_cell]
|
|
||||||
version = "1.4.0"
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/address.rs.orig 2020-12-18 16:22:53 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/address.rs
|
|
||||||
@@ -55,8 +55,9 @@ impl Address {
|
|
||||||
match env::var("DBUS_SESSION_BUS_ADDRESS") {
|
|
||||||
Ok(val) => Self::from_str(&val),
|
|
||||||
_ => {
|
|
||||||
- let uid = Uid::current();
|
|
||||||
- let path = format!("unix:path=/run/user/{}/bus", uid);
|
|
||||||
+ let runtime_dir = env::var("XDG_RUNTIME_DIR")
|
|
||||||
+ .unwrap_or_else(|_| format!("/run/user/{}", Uid::current()));
|
|
||||||
+ let path = format!("unix:path={}/bus", runtime_dir);
|
|
||||||
|
|
||||||
Self::from_str(&path)
|
|
||||||
}
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/azync/connection.rs.orig 2021-01-02 23:08:29 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/azync/connection.rs
|
|
||||||
@@ -177,13 +177,29 @@ where
|
|
||||||
/// Upon successful return, the connection is fully established and negotiated: D-Bus messages
|
|
||||||
/// can be sent and received.
|
|
||||||
pub async fn new_server(stream: S, guid: &Guid) -> Result<Self> {
|
|
||||||
- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials};
|
|
||||||
+ #[cfg(any(target_os = "android", target_os = "linux"))]
|
|
||||||
+ let client_uid = {
|
|
||||||
+ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials};
|
|
||||||
|
|
||||||
- // FIXME: Could and should this be async?
|
|
||||||
- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials)
|
|
||||||
- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?;
|
|
||||||
+ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials)
|
|
||||||
+ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?;
|
|
||||||
|
|
||||||
- let auth = Authenticated::server(Async::new(stream)?, guid.clone(), creds.uid()).await?;
|
|
||||||
+ creds.uid()
|
|
||||||
+ };
|
|
||||||
+ #[cfg(any(
|
|
||||||
+ target_os = "macos",
|
|
||||||
+ target_os = "ios",
|
|
||||||
+ target_os = "freebsd",
|
|
||||||
+ target_os = "dragonfly",
|
|
||||||
+ target_os = "openbsd",
|
|
||||||
+ target_os = "netbsd"
|
|
||||||
+ ))]
|
|
||||||
+ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd())
|
|
||||||
+ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?
|
|
||||||
+ .0
|
|
||||||
+ .into();
|
|
||||||
+
|
|
||||||
+ let auth = Authenticated::server(Async::new(stream)?, guid.clone(), client_uid).await?;
|
|
||||||
|
|
||||||
Ok(Self::new_authenticated(auth))
|
|
||||||
}
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/connection.rs.orig 2021-01-04 14:16:50 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/connection.rs
|
|
||||||
@@ -160,12 +160,29 @@ impl Connection {
|
|
||||||
/// Upon successful return, the connection is fully established and negotiated: D-Bus messages
|
|
||||||
/// can be sent and received.
|
|
||||||
pub fn new_unix_server(stream: UnixStream, guid: &Guid) -> Result<Self> {
|
|
||||||
- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials};
|
|
||||||
+ #[cfg(any(target_os = "android", target_os = "linux"))]
|
|
||||||
+ let client_uid = {
|
|
||||||
+ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials};
|
|
||||||
|
|
||||||
- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials)
|
|
||||||
- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?;
|
|
||||||
+ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials)
|
|
||||||
+ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?;
|
|
||||||
|
|
||||||
- let handshake = ServerHandshake::new(stream, guid.clone(), creds.uid());
|
|
||||||
+ creds.uid()
|
|
||||||
+ };
|
|
||||||
+ #[cfg(any(
|
|
||||||
+ target_os = "macos",
|
|
||||||
+ target_os = "ios",
|
|
||||||
+ target_os = "freebsd",
|
|
||||||
+ target_os = "dragonfly",
|
|
||||||
+ target_os = "openbsd",
|
|
||||||
+ target_os = "netbsd"
|
|
||||||
+ ))]
|
|
||||||
+ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd())
|
|
||||||
+ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?
|
|
||||||
+ .0
|
|
||||||
+ .into();
|
|
||||||
+
|
|
||||||
+ let handshake = ServerHandshake::new(stream, guid.clone(), client_uid);
|
|
||||||
handshake
|
|
||||||
.blocking_finish()
|
|
||||||
.map(Connection::new_authenticated_unix)
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/handshake.rs.orig 2020-12-18 16:22:53 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/handshake.rs
|
|
||||||
@@ -124,7 +124,7 @@ impl<S: Socket> ClientHandshake<S> {
|
|
||||||
|
|
||||||
fn flush_buffer(&mut self) -> Result<()> {
|
|
||||||
while !self.buffer.is_empty() {
|
|
||||||
- let written = self.socket.sendmsg(&self.buffer, &[])?;
|
|
||||||
+ let written = self.socket.sendmsg(&self.buffer, &[], false)?;
|
|
||||||
self.buffer.drain(..written);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
@@ -182,6 +182,15 @@ impl<S: Socket> Handshake<S> for ClientHandshake<S> {
|
|
||||||
self.step = ClientHandshakeStep::SendingOauth;
|
|
||||||
}
|
|
||||||
ClientHandshakeStep::SendingOauth => {
|
|
||||||
+ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
|
|
||||||
+ {
|
|
||||||
+ let zero = self.buffer.drain(..1).next().unwrap();
|
|
||||||
+ if self.socket.sendmsg(&[zero], &[], true)? != 1 {
|
|
||||||
+ return Err(Error::Handshake(
|
|
||||||
+ "Could not send zero byte with credentials".to_string(),
|
|
||||||
+ ));
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
self.flush_buffer()?;
|
|
||||||
self.step = ClientHandshakeStep::WaitOauth;
|
|
||||||
}
|
|
||||||
@@ -385,7 +394,7 @@ impl<S: Socket> ServerHandshake<S> {
|
|
||||||
|
|
||||||
fn flush_buffer(&mut self) -> Result<()> {
|
|
||||||
while !self.buffer.is_empty() {
|
|
||||||
- let written = self.socket.sendmsg(&self.buffer, &[])?;
|
|
||||||
+ let written = self.socket.sendmsg(&self.buffer, &[], false)?;
|
|
||||||
self.buffer.drain(..written);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/raw/connection.rs.orig 2020-12-17 17:09:36 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/raw/connection.rs
|
|
||||||
@@ -47,7 +47,7 @@ impl<S: Socket> Connection<S> {
|
|
||||||
// VecDeque should never return an empty front buffer if the VecDeque
|
|
||||||
// itself is not empty
|
|
||||||
debug_assert!(!front.is_empty());
|
|
||||||
- let written = self.socket.sendmsg(front, &[])?;
|
|
||||||
+ let written = self.socket.sendmsg(front, &[], false)?;
|
|
||||||
self.raw_out_buffer.drain(..written);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -55,14 +55,14 @@ impl<S: Socket> Connection<S> {
|
|
||||||
while let Some(msg) = self.msg_out_buffer.front() {
|
|
||||||
let mut data = msg.as_bytes();
|
|
||||||
let fds = msg.fds();
|
|
||||||
- let written = self.socket.sendmsg(data, &fds)?;
|
|
||||||
+ let written = self.socket.sendmsg(data, &fds, false)?;
|
|
||||||
// at least some part of the message has been sent, see if we can/need to send more
|
|
||||||
// now the message must be removed from msg_out_buffer and any leftover bytes
|
|
||||||
// must be stored into raw_out_buffer
|
|
||||||
let msg = self.msg_out_buffer.pop_front().unwrap();
|
|
||||||
data = &msg.as_bytes()[written..];
|
|
||||||
while !data.is_empty() {
|
|
||||||
- match self.socket.sendmsg(data, &[]) {
|
|
||||||
+ match self.socket.sendmsg(data, &[], false) {
|
|
||||||
Ok(n) => data = &data[n..],
|
|
||||||
Err(e) => {
|
|
||||||
// an error occured, we cannot send more, store the remaining into
|
|
||||||
--- cargo-crates/zbus-1.8.0/src/raw/socket.rs.orig 2021-01-02 23:09:29 UTC
|
|
||||||
+++ cargo-crates/zbus-1.8.0/src/raw/socket.rs
|
|
||||||
@@ -47,7 +47,7 @@ pub trait Socket {
|
|
||||||
///
|
|
||||||
/// If the underlying transport does not support transmitting file descriptors, this
|
|
||||||
/// will return `Err(ErrorKind::InvalidInput)`.
|
|
||||||
- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result<usize>;
|
|
||||||
+ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result<usize>;
|
|
||||||
|
|
||||||
/// Close the socket.
|
|
||||||
///
|
|
||||||
@@ -74,6 +74,10 @@ impl Socket for UnixStream {
|
|
||||||
Ok(msg) => {
|
|
||||||
let mut fds = vec![];
|
|
||||||
for cmsg in msg.cmsgs() {
|
|
||||||
+ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
|
|
||||||
+ if let ControlMessageOwned::ScmCreds(_) = cmsg {
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if let ControlMessageOwned::ScmRights(fd) = cmsg {
|
|
||||||
fds.extend(fd.iter().map(|&f| unsafe { OwnedFd::from_raw_fd(f) }));
|
|
||||||
} else {
|
|
||||||
@@ -90,12 +94,23 @@ impl Socket for UnixStream {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result<usize> {
|
|
||||||
- let cmsg = if !fds.is_empty() {
|
|
||||||
+ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result<usize> {
|
|
||||||
+ let mut cmsg = if !fds.is_empty() {
|
|
||||||
vec![ControlMessage::ScmRights(fds)]
|
|
||||||
} else {
|
|
||||||
vec![]
|
|
||||||
};
|
|
||||||
+ #[cfg(any(target_os = "android", target_os = "linux"))]
|
|
||||||
+ let unix_creds;
|
|
||||||
+ if creds {
|
|
||||||
+ #[cfg(any(target_os = "android", target_os = "linux"))]
|
|
||||||
+ {
|
|
||||||
+ unix_creds = Some(nix::sys::socket::UnixCredentials::new());
|
|
||||||
+ cmsg.push(ControlMessage::ScmCredentials(unix_creds.as_ref().unwrap()));
|
|
||||||
+ }
|
|
||||||
+ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
|
|
||||||
+ cmsg.push(ControlMessage::ScmCreds);
|
|
||||||
+ }
|
|
||||||
let iov = [IoVec::from_slice(buffer)];
|
|
||||||
match sendmsg(self.as_raw_fd(), &iov, &cmsg, MsgFlags::empty(), None) {
|
|
||||||
// can it really happen?
|
|
||||||
@@ -124,8 +139,8 @@ where
|
|
||||||
self.get_mut().recvmsg(buffer)
|
|
||||||
}
|
|
||||||
|
|
||||||
- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result<usize> {
|
|
||||||
- self.get_mut().sendmsg(buffer, fds)
|
|
||||||
+ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result<usize> {
|
|
||||||
+ self.get_mut().sendmsg(buffer, fds, creds)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn close(&self) -> io::Result<()> {
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
bin/authenticator
|
bin/authenticator
|
||||||
share/applications/com.belmoussaoui.Authenticator.desktop
|
share/applications/com.belmoussaoui.Authenticator.desktop
|
||||||
%%DATADIR%%/authenticator.gresource
|
%%DATADIR%%/authenticator.gresource
|
||||||
|
share/dbus-1/services/com.belmoussaoui.Authenticator.SearchProvider.service
|
||||||
|
share/gnome-shell/search-providers/com.belmoussaoui.Authenticator.search-provider.ini
|
||||||
share/icons/hicolor/scalable/apps/com.belmoussaoui.Authenticator.svg
|
share/icons/hicolor/scalable/apps/com.belmoussaoui.Authenticator.svg
|
||||||
share/icons/hicolor/symbolic/apps/com.belmoussaoui.Authenticator-symbolic.svg
|
share/icons/hicolor/symbolic/apps/com.belmoussaoui.Authenticator-symbolic.svg
|
||||||
share/locale/ar/LC_MESSAGES/authenticator.mo
|
share/locale/ar/LC_MESSAGES/authenticator.mo
|
||||||
|
|
@ -16,13 +18,18 @@ share/locale/fi/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/fr/LC_MESSAGES/authenticator.mo
|
share/locale/fr/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/fur/LC_MESSAGES/authenticator.mo
|
share/locale/fur/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/gl/LC_MESSAGES/authenticator.mo
|
share/locale/gl/LC_MESSAGES/authenticator.mo
|
||||||
|
share/locale/he/LC_MESSAGES/authenticator.mo
|
||||||
|
share/locale/hr/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/hu/LC_MESSAGES/authenticator.mo
|
share/locale/hu/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/id/LC_MESSAGES/authenticator.mo
|
share/locale/id/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/it/LC_MESSAGES/authenticator.mo
|
share/locale/it/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/ja/LC_MESSAGES/authenticator.mo
|
share/locale/ja/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/ko/LC_MESSAGES/authenticator.mo
|
share/locale/ko/LC_MESSAGES/authenticator.mo
|
||||||
|
share/locale/ms/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/nb/LC_MESSAGES/authenticator.mo
|
share/locale/nb/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/nl/LC_MESSAGES/authenticator.mo
|
share/locale/nl/LC_MESSAGES/authenticator.mo
|
||||||
|
share/locale/nn/LC_MESSAGES/authenticator.mo
|
||||||
|
share/locale/oc/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/pa/LC_MESSAGES/authenticator.mo
|
share/locale/pa/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/pl/LC_MESSAGES/authenticator.mo
|
share/locale/pl/LC_MESSAGES/authenticator.mo
|
||||||
share/locale/pt/LC_MESSAGES/authenticator.mo
|
share/locale/pt/LC_MESSAGES/authenticator.mo
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue