Page MenuHomeSolus

D12895.diff
No OneTemporary

D12895.diff

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -7,14 +7,15 @@
libswtpm_libtpms.so.0:SWTPM_IO_Write
libswtpm_libtpms.so.0:SWTPM_NVRAM_DeleteName
libswtpm_libtpms.so.0:SWTPM_NVRAM_FileKey_Size
+libswtpm_libtpms.so.0:SWTPM_NVRAM_GetFilenameForName
libswtpm_libtpms.so.0:SWTPM_NVRAM_GetStateBlob
libswtpm_libtpms.so.0:SWTPM_NVRAM_Init
libswtpm_libtpms.so.0:SWTPM_NVRAM_LoadData
libswtpm_libtpms.so.0:SWTPM_NVRAM_MigrationKey_Size
+libswtpm_libtpms.so.0:SWTPM_NVRAM_PrintJson
libswtpm_libtpms.so.0:SWTPM_NVRAM_SetStateBlob
libswtpm_libtpms.so.0:SWTPM_NVRAM_Set_FileKey
libswtpm_libtpms.so.0:SWTPM_NVRAM_Set_MigrationKey
-libswtpm_libtpms.so.0:SWTPM_NVRAM_Set_TPMVersion
libswtpm_libtpms.so.0:SWTPM_NVRAM_Shutdown
libswtpm_libtpms.so.0:SWTPM_NVRAM_StoreData
libswtpm_libtpms.so.0:SWTPM_NVRAM_Store_Volatile
@@ -60,6 +61,9 @@
libswtpm_libtpms.so.0:mainLoop
libswtpm_libtpms.so.0:mainloop_cb_get_locality
libswtpm_libtpms.so.0:mainloop_terminate
+libswtpm_libtpms.so.0:nvram_dir_ops
+libswtpm_libtpms.so.0:nvram_linear_file_ops
+libswtpm_libtpms.so.0:nvram_linear_ops
libswtpm_libtpms.so.0:option_get_bool
libswtpm_libtpms.so.0:option_get_gid_t
libswtpm_libtpms.so.0:option_get_int
@@ -80,7 +84,6 @@
libswtpm_libtpms.so.0:server_get_flags
libswtpm_libtpms.so.0:server_new
libswtpm_libtpms.so.0:server_set_fd
-libswtpm_libtpms.so.0:state_directory
libswtpm_libtpms.so.0:thread_busy_lock
libswtpm_libtpms.so.0:thread_busy_signal
libswtpm_libtpms.so.0:tlv_data_append
@@ -100,11 +103,13 @@
libswtpm_libtpms.so.0:tpmlib_write_fatal_error_response
libswtpm_libtpms.so.0:tpmlib_write_locality_error_response
libswtpm_libtpms.so.0:tpmlib_write_success_response
-libswtpm_libtpms.so.0:tpmstate_get_dir
+libswtpm_libtpms.so.0:tpmstate_get_backend_uri
libswtpm_libtpms.so.0:tpmstate_get_mode
+libswtpm_libtpms.so.0:tpmstate_get_version
libswtpm_libtpms.so.0:tpmstate_global_free
-libswtpm_libtpms.so.0:tpmstate_set_dir
+libswtpm_libtpms.so.0:tpmstate_set_backend_uri
libswtpm_libtpms.so.0:tpmstate_set_mode
+libswtpm_libtpms.so.0:tpmstate_set_version
libswtpm_libtpms.so.0:uninstall_sighandlers
libswtpm_libtpms.so.0:worker_thread_end
libswtpm_libtpms.so.0:worker_thread_init
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -13,29 +13,35 @@
libc.so.6:__stack_chk_fail
libc.so.6:__strncpy_chk
libc.so.6:__vasprintf_chk
+libc.so.6:_exit
libc.so.6:accept
libc.so.6:access
libc.so.6:bind
libc.so.6:calloc
+libc.so.6:chdir
libc.so.6:chmod
libc.so.6:chown
libc.so.6:clock_gettime
libc.so.6:close
libc.so.6:closedir
libc.so.6:connect
-libc.so.6:daemon
+libc.so.6:dup2
libc.so.6:exit
libc.so.6:fchmod
libc.so.6:fclose
libc.so.6:fcntl
+libc.so.6:fflush
libc.so.6:fgetc
libc.so.6:flock
libc.so.6:fopen
+libc.so.6:fork
libc.so.6:fputs
libc.so.6:free
libc.so.6:freeaddrinfo
libc.so.6:fstat
libc.so.6:fstat64
+libc.so.6:fsync
+libc.so.6:ftruncate
libc.so.6:fwrite
libc.so.6:gai_strerror
libc.so.6:getaddrinfo
@@ -63,8 +69,13 @@
libc.so.6:malloc
libc.so.6:memcmp
libc.so.6:memcpy
+libc.so.6:memmove
libc.so.6:memset
libc.so.6:mkdir
+libc.so.6:mkstemp
+libc.so.6:mmap
+libc.so.6:msync
+libc.so.6:munmap
libc.so.6:open
libc.so.6:opendir
libc.so.6:optarg
@@ -85,6 +96,7 @@
libc.so.6:select
libc.so.6:setenv
libc.so.6:setgid
+libc.so.6:setsid
libc.so.6:setsockopt
libc.so.6:setuid
libc.so.6:setvbuf
@@ -112,19 +124,27 @@
libc.so.6:strtol
libc.so.6:strtoul
libc.so.6:strtoull
+libc.so.6:sysconf
libc.so.6:time
+libc.so.6:uname
libc.so.6:unlink
libc.so.6:usleep
libc.so.6:waitpid
libc.so.6:write
libc.so.6:writev
-libcrypto.so.1.1:AES_cbc_encrypt
-libcrypto.so.1.1:AES_set_decrypt_key
-libcrypto.so.1.1:AES_set_encrypt_key
libcrypto.so.1.1:BN_bin2bn
libcrypto.so.1.1:BN_free
libcrypto.so.1.1:BN_hex2bn
libcrypto.so.1.1:BN_new
+libcrypto.so.1.1:EVP_CIPHER_CTX_free
+libcrypto.so.1.1:EVP_CIPHER_CTX_new
+libcrypto.so.1.1:EVP_CIPHER_CTX_set_padding
+libcrypto.so.1.1:EVP_DecryptFinal_ex
+libcrypto.so.1.1:EVP_DecryptInit_ex
+libcrypto.so.1.1:EVP_DecryptUpdate
+libcrypto.so.1.1:EVP_EncryptFinal_ex
+libcrypto.so.1.1:EVP_EncryptInit_ex
+libcrypto.so.1.1:EVP_EncryptUpdate
libcrypto.so.1.1:EVP_MD_size
libcrypto.so.1.1:EVP_PKEY_CTX_ctrl
libcrypto.so.1.1:EVP_PKEY_CTX_free
@@ -134,6 +154,8 @@
libcrypto.so.1.1:EVP_PKEY_encrypt_init
libcrypto.so.1.1:EVP_PKEY_free
libcrypto.so.1.1:EVP_PKEY_new
+libcrypto.so.1.1:EVP_aes_128_cbc
+libcrypto.so.1.1:EVP_aes_256_cbc
libcrypto.so.1.1:EVP_sha1
libcrypto.so.1.1:EVP_sha256
libcrypto.so.1.1:EVP_sha512
@@ -163,20 +185,25 @@
libfuse.so.2:fuse_session_exit
libfuse.so.2:fuse_session_loop
libfuse.so.2:fuse_session_loop_mt
+libglib-2.0.so.0:g_build_filename
libglib-2.0.so.0:g_cond_init
libglib-2.0.so.0:g_cond_signal
libglib-2.0.so.0:g_cond_wait_until
libglib-2.0.so.0:g_dir_close
+libglib-2.0.so.0:g_dir_make_tmp
libglib-2.0.so.0:g_dir_open
libglib-2.0.so.0:g_dir_read_name
libglib-2.0.so.0:g_environ_setenv
libglib-2.0.so.0:g_error_free
libglib-2.0.so.0:g_file_get_contents
libglib-2.0.so.0:g_file_open_tmp
+libglib-2.0.so.0:g_file_set_contents
+libglib-2.0.so.0:g_file_test
libglib-2.0.so.0:g_find_program_in_path
libglib-2.0.so.0:g_free
libglib-2.0.so.0:g_get_environ
libglib-2.0.so.0:g_get_monotonic_time
+libglib-2.0.so.0:g_get_user_config_dir
libglib-2.0.so.0:g_getenv
libglib-2.0.so.0:g_malloc
libglib-2.0.so.0:g_malloc0
@@ -186,9 +213,11 @@
libglib-2.0.so.0:g_mutex_unlock
libglib-2.0.so.0:g_path_get_dirname
libglib-2.0.so.0:g_realloc
+libglib-2.0.so.0:g_rmdir
libglib-2.0.so.0:g_snprintf
libglib-2.0.so.0:g_spawn_async
libglib-2.0.so.0:g_spawn_sync
+libglib-2.0.so.0:g_str_equal
libglib-2.0.so.0:g_str_has_prefix
libglib-2.0.so.0:g_str_has_suffix
libglib-2.0.so.0:g_strchomp
@@ -202,7 +231,9 @@
libglib-2.0.so.0:g_strndup
libglib-2.0.so.0:g_strrstr
libglib-2.0.so.0:g_strsplit
+libglib-2.0.so.0:g_strsplit_set
libglib-2.0.so.0:g_strstr_len
+libglib-2.0.so.0:g_strv_contains
libglib-2.0.so.0:g_thread_pool_free
libglib-2.0.so.0:g_thread_pool_new
libglib-2.0.so.0:g_thread_pool_push
diff --git a/files/swtpm.sysusers b/files/swtpm.sysusers
new file mode 100644
--- /dev/null
+++ b/files/swtpm.sysusers
@@ -0,0 +1 @@
+u tss - "tss user for tpm2"
diff --git a/files/swtpm.tmpfiles b/files/swtpm.tmpfiles
new file mode 100644
--- /dev/null
+++ b/files/swtpm.tmpfiles
@@ -0,0 +1 @@
+z /var/lib/swtpm-localca 0750 tss root
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : swtpm
-version : 0.6.1
-release : 1
+version : 0.7.0
+release : 2
source :
- - https://github.com/stefanberger/swtpm/archive/refs/tags/v0.6.1.tar.gz : 114905d6a51af89baac9ac279bf6534761e01adcf9c9bb298f1c09c7d4b2599d
+ - https://github.com/stefanberger/swtpm/archive/refs/tags/v0.7.0.tar.gz : bed41871ad42ec852c450f5764be36b6c16456b943b912351eca9c29ce382976
license :
- BSD-3-Clause
- TCGL
@@ -27,3 +27,7 @@
%make
install : |
%make_install
+
+ rmdir -v $installdir/var/
+ install -Dm00644 $pkgfiles/swtpm.sysusers $installdir/%libdir%/sysusers.d/swtpm.conf
+ install -Dm00644 $pkgfiles/swtpm.tmpfiles $installdir/%libdir%/tmpfiles.d/swtpm.conf
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>swtpm</Name>
<Packager>
- <Name>Jacek Jagosz</Name>
- <Email>jacek.jagosz@outlook.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Packager>
<License>BSD-3-Clause</License>
<License>TCGL</License>
@@ -28,10 +28,13 @@
<Path fileType="executable">/usr/bin/swtpm_cert</Path>
<Path fileType="executable">/usr/bin/swtpm_cuse</Path>
<Path fileType="executable">/usr/bin/swtpm_ioctl</Path>
+ <Path fileType="executable">/usr/bin/swtpm_localca</Path>
<Path fileType="executable">/usr/bin/swtpm_setup</Path>
<Path fileType="library">/usr/lib64/swtpm/libswtpm_libtpms.so</Path>
<Path fileType="library">/usr/lib64/swtpm/libswtpm_libtpms.so.0</Path>
<Path fileType="library">/usr/lib64/swtpm/libswtpm_libtpms.so.0.0.0</Path>
+ <Path fileType="library">/usr/lib64/sysusers.d/swtpm.conf</Path>
+ <Path fileType="library">/usr/lib64/tmpfiles.d/swtpm.conf</Path>
<Path fileType="man">/usr/share/man/man3/swtpm_ioctls.3</Path>
<Path fileType="man">/usr/share/man/man8/swtpm-create-tpmca.8</Path>
<Path fileType="man">/usr/share/man/man8/swtpm-localca.8</Path>
@@ -42,13 +45,12 @@
<Path fileType="man">/usr/share/man/man8/swtpm_cert.8</Path>
<Path fileType="man">/usr/share/man/man8/swtpm_cuse.8</Path>
<Path fileType="man">/usr/share/man/man8/swtpm_ioctl.8</Path>
+ <Path fileType="man">/usr/share/man/man8/swtpm_localca.8</Path>
<Path fileType="man">/usr/share/man/man8/swtpm_setup.8</Path>
<Path fileType="man">/usr/share/man/man8/swtpm_setup.conf.8</Path>
- <Path fileType="man">/usr/share/man/man8/swtpm_setup.sh.8</Path>
<Path fileType="data">/usr/share/swtpm/swtpm-create-tpmca</Path>
<Path fileType="data">/usr/share/swtpm/swtpm-create-user-config-files</Path>
<Path fileType="data">/usr/share/swtpm/swtpm-localca</Path>
- <Path fileType="data">/var/lib/swtpm-localca</Path>
</Files>
</Package>
<Package>
@@ -58,19 +60,19 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="1">swtpm</Dependency>
+ <Dependency release="2">swtpm</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/swtpm/tpm_ioctl.h</Path>
</Files>
</Package>
<History>
- <Update release="1">
- <Date>2022-01-27</Date>
- <Version>0.6.1</Version>
+ <Update release="2">
+ <Date>2022-02-16</Date>
+ <Version>0.7.0</Version>
<Comment>Packaging update</Comment>
- <Name>Jacek Jagosz</Name>
- <Email>jacek.jagosz@outlook.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 1:56 PM (2 h, 40 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5860093
Default Alt Text
D12895.diff (10 KB)

Event Timeline