Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11006127
D14245.id34731.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
15 KB
Referenced Files
None
Subscribers
None
D14245.id34731.diff
View Options
diff --git a/abi_libs b/abi_libs
--- a/abi_libs
+++ b/abi_libs
@@ -1,4 +1,7 @@
coredumpctl
+libcryptsetup-token-systemd-fido2.so
+libcryptsetup-token-systemd-pkcs11.so
+libcryptsetup-token-systemd-tpm2.so
libnss_myhostname.so.2
libnss_mymachines.so.2
libnss_resolve.so.2
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -18,6 +18,26 @@
coredumpctl:decompress_stream_lz4
coredumpctl:decompress_stream_xz
coredumpctl:decompress_stream_zstd
+libcryptsetup-token-systemd-fido2.so:CRYPTSETUP_TOKEN_1.0
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_buffer_free
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_dump
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_open
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_open_pin
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_validate
+libcryptsetup-token-systemd-fido2.so:cryptsetup_token_version
+libcryptsetup-token-systemd-pkcs11.so:CRYPTSETUP_TOKEN_1.0
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_buffer_free
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_dump
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_open
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_open_pin
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_validate
+libcryptsetup-token-systemd-pkcs11.so:cryptsetup_token_version
+libcryptsetup-token-systemd-tpm2.so:CRYPTSETUP_TOKEN_1.0
+libcryptsetup-token-systemd-tpm2.so:cryptsetup_token_buffer_free
+libcryptsetup-token-systemd-tpm2.so:cryptsetup_token_dump
+libcryptsetup-token-systemd-tpm2.so:cryptsetup_token_open
+libcryptsetup-token-systemd-tpm2.so:cryptsetup_token_validate
+libcryptsetup-token-systemd-tpm2.so:cryptsetup_token_version
libnss_myhostname.so.2:_nss_myhostname_gethostbyaddr2_r
libnss_myhostname.so.2:_nss_myhostname_gethostbyaddr_r
libnss_myhostname.so.2:_nss_myhostname_gethostbyname2_r
@@ -1763,8 +1783,10 @@
libsystemd-shared-251.so:dissected_image_verity_sig_ready
libsystemd-shared-251.so:dlopen_bpf
libsystemd-shared-251.so:dlopen_cryptsetup
+libsystemd-shared-251.so:dlopen_libfido2
libsystemd-shared-251.so:dlopen_many_sym_or_warn_sentinel
libsystemd-shared-251.so:dlopen_pcre2
+libsystemd-shared-251.so:dlopen_tpm2
libsystemd-shared-251.so:dlsym_many_or_warn_sentinel
libsystemd-shared-251.so:dm_deferred_remove_cancel
libsystemd-shared-251.so:dns_cache_mode_from_string
@@ -1955,8 +1977,10 @@
libsystemd-shared-251.so:fgetsgent_sane
libsystemd-shared-251.so:fgetspent_sane
libsystemd-shared-251.so:fido2_find_device_auto
+libsystemd-shared-251.so:fido2_generate_hmac_hash
libsystemd-shared-251.so:fido2_have_device
libsystemd-shared-251.so:fido2_list_devices
+libsystemd-shared-251.so:fido2_use_hmac_hash
libsystemd-shared-251.so:file_in_same_dir
libsystemd-shared-251.so:file_url_from_path
libsystemd-shared-251.so:file_url_is_valid
@@ -2876,6 +2900,7 @@
libsystemd-shared-251.so:parse_env_filev
libsystemd-shared-251.so:parse_errno
libsystemd-shared-251.so:parse_ether_addr
+libsystemd-shared-251.so:parse_fido2_algorithm
libsystemd-shared-251.so:parse_fractional_part_u
libsystemd-shared-251.so:parse_hw_addr_full
libsystemd-shared-251.so:parse_ifindex
@@ -2970,8 +2995,21 @@
libsystemd-shared-251.so:pid_is_unwaited
libsystemd-shared-251.so:pidfd_get_pid
libsystemd-shared-251.so:pipe_eof
+libsystemd-shared-251.so:pkcs11_crypt_device_callback
+libsystemd-shared-251.so:pkcs11_crypt_device_callback_data_release
+libsystemd-shared-251.so:pkcs11_find_token
libsystemd-shared-251.so:pkcs11_find_token_auto
+libsystemd-shared-251.so:pkcs11_get_slot_list_malloc
libsystemd-shared-251.so:pkcs11_list_tokens
+libsystemd-shared-251.so:pkcs11_token_acquire_rng
+libsystemd-shared-251.so:pkcs11_token_decrypt_data
+libsystemd-shared-251.so:pkcs11_token_find_private_key
+libsystemd-shared-251.so:pkcs11_token_find_x509_certificate
+libsystemd-shared-251.so:pkcs11_token_label
+libsystemd-shared-251.so:pkcs11_token_login
+libsystemd-shared-251.so:pkcs11_token_login_by_pin
+libsystemd-shared-251.so:pkcs11_token_manufacturer_id
+libsystemd-shared-251.so:pkcs11_token_model
libsystemd-shared-251.so:pkcs11_uri_valid
libsystemd-shared-251.so:polkit_agent_close
libsystemd-shared-251.so:polkit_agent_open
@@ -4267,6 +4305,29 @@
libsystemd-shared-251.so:swap_state_from_string
libsystemd-shared-251.so:swap_state_to_string
libsystemd-shared-251.so:switch_root
+libsystemd-shared-251.so:sym_Esys_Create
+libsystemd-shared-251.so:sym_Esys_CreatePrimary
+libsystemd-shared-251.so:sym_Esys_Finalize
+libsystemd-shared-251.so:sym_Esys_FlushContext
+libsystemd-shared-251.so:sym_Esys_Free
+libsystemd-shared-251.so:sym_Esys_GetCapability
+libsystemd-shared-251.so:sym_Esys_GetRandom
+libsystemd-shared-251.so:sym_Esys_Initialize
+libsystemd-shared-251.so:sym_Esys_Load
+libsystemd-shared-251.so:sym_Esys_PCR_Read
+libsystemd-shared-251.so:sym_Esys_PolicyAuthValue
+libsystemd-shared-251.so:sym_Esys_PolicyGetDigest
+libsystemd-shared-251.so:sym_Esys_PolicyPCR
+libsystemd-shared-251.so:sym_Esys_StartAuthSession
+libsystemd-shared-251.so:sym_Esys_Startup
+libsystemd-shared-251.so:sym_Esys_TRSess_SetAttributes
+libsystemd-shared-251.so:sym_Esys_TR_SetAuth
+libsystemd-shared-251.so:sym_Esys_Unseal
+libsystemd-shared-251.so:sym_Tss2_MU_TPM2B_PRIVATE_Marshal
+libsystemd-shared-251.so:sym_Tss2_MU_TPM2B_PRIVATE_Unmarshal
+libsystemd-shared-251.so:sym_Tss2_MU_TPM2B_PUBLIC_Marshal
+libsystemd-shared-251.so:sym_Tss2_MU_TPM2B_PUBLIC_Unmarshal
+libsystemd-shared-251.so:sym_Tss2_RC_Decode
libsystemd-shared-251.so:sym_crypt_activate_by_passphrase
libsystemd-shared-251.so:sym_crypt_activate_by_signed_key
libsystemd-shared-251.so:sym_crypt_activate_by_volume_key
@@ -4298,8 +4359,54 @@
libsystemd-shared-251.so:sym_crypt_suspend
libsystemd-shared-251.so:sym_crypt_token_json_get
libsystemd-shared-251.so:sym_crypt_token_json_set
+libsystemd-shared-251.so:sym_crypt_token_max
libsystemd-shared-251.so:sym_crypt_token_status
libsystemd-shared-251.so:sym_crypt_volume_key_get
+libsystemd-shared-251.so:sym_fido_assert_allow_cred
+libsystemd-shared-251.so:sym_fido_assert_free
+libsystemd-shared-251.so:sym_fido_assert_hmac_secret_len
+libsystemd-shared-251.so:sym_fido_assert_hmac_secret_ptr
+libsystemd-shared-251.so:sym_fido_assert_new
+libsystemd-shared-251.so:sym_fido_assert_set_clientdata_hash
+libsystemd-shared-251.so:sym_fido_assert_set_extensions
+libsystemd-shared-251.so:sym_fido_assert_set_hmac_salt
+libsystemd-shared-251.so:sym_fido_assert_set_rp
+libsystemd-shared-251.so:sym_fido_assert_set_up
+libsystemd-shared-251.so:sym_fido_assert_set_uv
+libsystemd-shared-251.so:sym_fido_cbor_info_extensions_len
+libsystemd-shared-251.so:sym_fido_cbor_info_extensions_ptr
+libsystemd-shared-251.so:sym_fido_cbor_info_free
+libsystemd-shared-251.so:sym_fido_cbor_info_new
+libsystemd-shared-251.so:sym_fido_cbor_info_options_len
+libsystemd-shared-251.so:sym_fido_cbor_info_options_name_ptr
+libsystemd-shared-251.so:sym_fido_cbor_info_options_value_ptr
+libsystemd-shared-251.so:sym_fido_cred_free
+libsystemd-shared-251.so:sym_fido_cred_id_len
+libsystemd-shared-251.so:sym_fido_cred_id_ptr
+libsystemd-shared-251.so:sym_fido_cred_new
+libsystemd-shared-251.so:sym_fido_cred_set_clientdata_hash
+libsystemd-shared-251.so:sym_fido_cred_set_extensions
+libsystemd-shared-251.so:sym_fido_cred_set_rk
+libsystemd-shared-251.so:sym_fido_cred_set_rp
+libsystemd-shared-251.so:sym_fido_cred_set_type
+libsystemd-shared-251.so:sym_fido_cred_set_user
+libsystemd-shared-251.so:sym_fido_cred_set_uv
+libsystemd-shared-251.so:sym_fido_dev_close
+libsystemd-shared-251.so:sym_fido_dev_free
+libsystemd-shared-251.so:sym_fido_dev_get_assert
+libsystemd-shared-251.so:sym_fido_dev_get_cbor_info
+libsystemd-shared-251.so:sym_fido_dev_info_free
+libsystemd-shared-251.so:sym_fido_dev_info_manifest
+libsystemd-shared-251.so:sym_fido_dev_info_manufacturer_string
+libsystemd-shared-251.so:sym_fido_dev_info_new
+libsystemd-shared-251.so:sym_fido_dev_info_path
+libsystemd-shared-251.so:sym_fido_dev_info_product_string
+libsystemd-shared-251.so:sym_fido_dev_info_ptr
+libsystemd-shared-251.so:sym_fido_dev_is_fido2
+libsystemd-shared-251.so:sym_fido_dev_make_cred
+libsystemd-shared-251.so:sym_fido_dev_new
+libsystemd-shared-251.so:sym_fido_dev_open
+libsystemd-shared-251.so:sym_fido_strerr
libsystemd-shared-251.so:sym_pcre2_code_free
libsystemd-shared-251.so:sym_pcre2_compile
libsystemd-shared-251.so:sym_pcre2_get_error_message
@@ -4405,7 +4512,9 @@
libsystemd-shared-251.so:tpm2_pcr_bank_to_string
libsystemd-shared-251.so:tpm2_primary_alg_from_string
libsystemd-shared-251.so:tpm2_primary_alg_to_string
+libsystemd-shared-251.so:tpm2_seal
libsystemd-shared-251.so:tpm2_support
+libsystemd-shared-251.so:tpm2_unseal
libsystemd-shared-251.so:triple_timestamp_by_clock
libsystemd-shared-251.so:triple_timestamp_from_realtime
libsystemd-shared-251.so:triple_timestamp_get
@@ -4550,6 +4659,10 @@
libsystemd-shared-251.so:unoctchar
libsystemd-shared-251.so:unsafe_transition
libsystemd-shared-251.so:update_reboot_parameter_and_warn
+libsystemd-shared-251.so:uri_from_module_info
+libsystemd-shared-251.so:uri_from_slot_info
+libsystemd-shared-251.so:uri_from_string
+libsystemd-shared-251.so:uri_from_token_info
libsystemd-shared-251.so:urlify_enabled
libsystemd-shared-251.so:urlsafe_base64char
libsystemd-shared-251.so:use_audit
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -15,6 +15,7 @@
liblzma.so.5
libm.so.6
libmount.so.1
+libp11-kit.so.0
libpam.so.0
libpam_misc.so.0
libz.so.1
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -531,6 +531,7 @@
libcryptsetup.so.12:crypt_activate_by_passphrase
libcryptsetup.so.12:crypt_activate_by_signed_key
libcryptsetup.so.12:crypt_activate_by_token
+libcryptsetup.so.12:crypt_activate_by_token_pin
libcryptsetup.so.12:crypt_activate_by_volume_key
libcryptsetup.so.12:crypt_deactivate
libcryptsetup.so.12:crypt_format
@@ -539,6 +540,7 @@
libcryptsetup.so.12:crypt_get_cipher_mode
libcryptsetup.so.12:crypt_get_device_name
libcryptsetup.so.12:crypt_get_type
+libcryptsetup.so.12:crypt_get_uuid
libcryptsetup.so.12:crypt_get_volume_key_size
libcryptsetup.so.12:crypt_init
libcryptsetup.so.12:crypt_init_by_name
@@ -547,9 +549,13 @@
libcryptsetup.so.12:crypt_keyslot_max
libcryptsetup.so.12:crypt_keyslot_status
libcryptsetup.so.12:crypt_load
+libcryptsetup.so.12:crypt_logf
libcryptsetup.so.12:crypt_set_data_device
libcryptsetup.so.12:crypt_status
+libcryptsetup.so.12:crypt_token_external_path
+libcryptsetup.so.12:crypt_token_json_get
libcryptsetup.so.12:crypt_token_json_set
+libcryptsetup.so.12:crypt_token_max
libcryptsetup.so.12:crypt_volume_key_get
libcurl.so.4:curl_easy_cleanup
libcurl.so.4:curl_easy_getinfo
@@ -729,6 +735,20 @@
libmount.so.1:mnt_table_parse_stream
libmount.so.1:mnt_table_parse_swaps
libmount.so.1:mnt_unref_monitor
+libp11-kit.so.0:p11_kit_module_get_name
+libp11-kit.so.0:p11_kit_modules_finalize_and_release
+libp11-kit.so.0:p11_kit_modules_load_and_initialize
+libp11-kit.so.0:p11_kit_strerror
+libp11-kit.so.0:p11_kit_uri_format
+libp11-kit.so.0:p11_kit_uri_free
+libp11-kit.so.0:p11_kit_uri_get_attributes
+libp11-kit.so.0:p11_kit_uri_get_module_info
+libp11-kit.so.0:p11_kit_uri_get_slot_info
+libp11-kit.so.0:p11_kit_uri_get_token_info
+libp11-kit.so.0:p11_kit_uri_match_token_info
+libp11-kit.so.0:p11_kit_uri_message
+libp11-kit.so.0:p11_kit_uri_new
+libp11-kit.so.0:p11_kit_uri_parse
libpam.so.0:pam_acct_mgmt
libpam.so.0:pam_close_session
libpam.so.0:pam_end
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : systemd
version : '251.15'
-release : 113
+release : 114
source :
- https://github.com/systemd/systemd-stable/archive/refs/tags/v251.15.tar.gz : 570b30b5b9a649d7481ca2bd0355a2d659f9a0ebb71a24588c6c365cda90c298
license :
@@ -20,8 +20,11 @@
- lto
builddeps :
- pkgconfig(libcryptsetup)
+ - pkgconfig(libfido2)
- pkgconfig(libkmod)
- pkgconfig(libpcre2-8)
+ - pkgconfig(p11-kit-1)
+ - pkgconfig(tss2-esys)
- pkgconfig32(blkid)
- pkgconfig32(dbus-1)
- pkgconfig32(glib-2.0)
@@ -85,6 +88,7 @@
-Dkmod=$depends_emul32 \
-Dlibcryptsetup=$depends_emul32 \
-Dlibcurl=true \
+ -Dlibfido2=$depends_emul32 \
-Dlink-udev-shared=false \
-Dlocaled=$depends_emul32 \
-Dman=$depends_emul32 \
@@ -95,7 +99,7 @@
-Doomd=true \
-Dopenssl=false \
-Dpamlibdir=/lib/security \
- -Dp11kit=false \
+ -Dp11kit=$depends_emul32 \
-Dpam=true \
-Dpcre2=$depends_emul32 \
-Dpolkit=true \
@@ -107,6 +111,8 @@
-Dsplit-usr=true \
-Dsysvinit-path=/etc/init.d \
-Dtimesyncd=$depends_emul32 \
+ -Dtpm=$depends_emul32 \
+ -Dtpm2=$depends_emul32 \
-Dusers-gid=100 \
-Duserdb=false
build : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>systemd</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Silke Hofstra</Name>
+ <Email>silke@slxh.eu</Email>
</Packager>
<License>LGPL-2.1-or-later</License>
<License>GPL-2.0-or-later</License>
@@ -582,6 +582,9 @@
<Path fileType="library">/usr/lib/udev/rules.d/README</Path>
<Path fileType="library">/usr/lib/udev/scsi_id</Path>
<Path fileType="library">/usr/lib/udev/v4l_id</Path>
+ <Path fileType="library">/usr/lib64/cryptsetup/libcryptsetup-token-systemd-fido2.so</Path>
+ <Path fileType="library">/usr/lib64/cryptsetup/libcryptsetup-token-systemd-pkcs11.so</Path>
+ <Path fileType="library">/usr/lib64/cryptsetup/libcryptsetup-token-systemd-tpm2.so</Path>
<Path fileType="library">/usr/lib64/libnss_myhostname.so.2</Path>
<Path fileType="library">/usr/lib64/libnss_mymachines.so.2</Path>
<Path fileType="library">/usr/lib64/libnss_resolve.so.2</Path>
@@ -1069,7 +1072,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="113">systemd</Dependency>
+ <Dependency release="114">systemd</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libnss_myhostname.so.2</Path>
@@ -1091,8 +1094,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="113">systemd-devel</Dependency>
- <Dependency release="113">systemd-32bit</Dependency>
+ <Dependency release="114">systemd-devel</Dependency>
+ <Dependency release="114">systemd-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/lib32/pkgconfig/libsystemd.pc</Path>
@@ -1106,7 +1109,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="113">systemd</Dependency>
+ <Dependency release="114">systemd</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/libudev.h</Path>
@@ -1871,12 +1874,12 @@
</Files>
</Package>
<History>
- <Update release="113">
- <Date>2023-05-10</Date>
+ <Update release="114">
+ <Date>2023-07-09</Date>
<Version>251.15</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Silke Hofstra</Name>
+ <Email>silke@slxh.eu</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Aug 2, 1:17 PM (6 d, 1 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5880942
Default Alt Text
D14245.id34731.diff (15 KB)
Attached To
Mode
D14245: systemd: Enable FIDO2, PKCS11 and TPM2 cryptsetup integration
Attached
Detach File
Event Timeline
Log In to Comment