Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jeos-firstboot for openSUSE:Factory
checked in at 2024-10-02 21:32:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jeos-firstboot (Old)
and /work/SRC/openSUSE:Factory/.jeos-firstboot.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jeos-firstboot"
Wed Oct 2 21:32:45 2024 rev:63 rq:1204945 version:1.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/jeos-firstboot/jeos-firstboot.changes
2024-09-25 21:52:55.735377506 +0200
+++ /work/SRC/openSUSE:Factory/.jeos-firstboot.new.19354/jeos-firstboot.changes
2024-10-02 21:33:06.785704598 +0200
@@ -1,0 +2,6 @@
+Tue Oct 01 14:07:29 UTC 2024 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 1.5.3:
+ * otp: Show the QR code in a separate window if necessary (bsc#1231177)
+
+-------------------------------------------------------------------
Old:
----
jeos-firstboot-1.5.2.obscpio
New:
----
jeos-firstboot-1.5.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jeos-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.lmMmy3/_old 2024-10-02 21:33:07.385729544 +0200
+++ /var/tmp/diff_new_pack.lmMmy3/_new 2024-10-02 21:33:07.385729544 +0200
@@ -23,7 +23,7 @@
%endif
Name: jeos-firstboot
-Version: 1.5.2
+Version: 1.5.3
Release: 0
Summary: Simple text based JeOS first boot wizard
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.lmMmy3/_old 2024-10-02 21:33:07.437731706 +0200
+++ /var/tmp/diff_new_pack.lmMmy3/_new 2024-10-02 21:33:07.441731872 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/jeos-firstboot.git</param>
- <param
name="changesrevision">8886e4784b3a980d5bad4d4b5626fcc0f6ac6ce9</param></service></servicedata>
+ <param
name="changesrevision">f3ae15f25ffbfb9144de9d0099ef35e5c67891c4</param></service></servicedata>
(No newline at EOF)
++++++ jeos-firstboot-1.5.2.obscpio -> jeos-firstboot-1.5.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jeos-firstboot-1.5.2/files/usr/share/jeos-firstboot/modules/otp
new/jeos-firstboot-1.5.3/files/usr/share/jeos-firstboot/modules/otp
--- old/jeos-firstboot-1.5.2/files/usr/share/jeos-firstboot/modules/otp
2024-08-08 14:53:12.000000000 +0200
+++ new/jeos-firstboot-1.5.3/files/usr/share/jeos-firstboot/modules/otp
2024-10-01 16:07:03.000000000 +0200
@@ -28,21 +28,36 @@
printf $"Configuring time-based one-time password (TOTP)
authentication for the user '%s'.\n\n" "$user"
printf $"Enroll with your desired TOTP application by scanning
the QR code or entering the secret manually, then enter the generated 6 digit
code below to confirm successful enrollment. "
printf $"Once confirmed, the Cockpit Web UI will ask for an OTP
value on each login.\n\n"
- printf $"TOTP Secret: %s\n\n" "${totp_secret}"
- qrencode -t UTF8i -m 1 <<<"$url"
+ printf $"TOTP Secret: %s" "${totp_secret}"
)"
-
+ local qrcode="$(qrencode -t UTF8i -m 1 <<<"$url")"
+ local msg_with_qr="$(printf "%s\n\n%s" "${msg}" "${qrcode}")"
while true; do
- d_with_result --title "$otp_title" \
- --cancel-label $"Skip" \
- --no-nl-expand --no-collapse \
- --mixedform "${msg}" 37 60 1 \
- $"OTP value:" 1 0 "" 1 15 45 0 0
+ # If the screen is to small to fit the text and QR code at once,
+ # show only the text but add a button to show the QR code.
+ if [ "$LINES" -ge 37 ] && [ "$COLUMNS" -ge 24 ]; then
+ d_with_result --title "$otp_title" \
+ --cancel-label $"Skip" \
+ --no-nl-expand --no-collapse \
+ --mixedform "${msg_with_qr}" 37 60 1 \
+ $"OTP value:" 1 0 "" 1 15 45 0 0
+ else
+ d_with_result --title "$otp_title" \
+ --cancel-label $"Skip" \
+ --no-nl-expand --no-collapse \
+ --extra-button --extra-label $"QR Code" \
+ --mixedform "${msg}" 17 60 1 \
+ $"OTP value:" 1 0 "" 1 15 45 0 0
+ fi
local ret=$?
if [ "$ret" -eq 1 ]; then
# Skip button pressed
return 0
+ elif [ "$ret" -eq 3 ]; then
+ # QR code button pressed
+ d_styled --title "$otp_title" --no-nl-expand
--no-collapse --msgbox "${qrcode}" 23 50 || :
+ continue
elif [ "$ret" -eq 255 ]; then
# ESC
if d_styled --yesno $"Do you really want to quit?" 0 0;
then
++++++ jeos-firstboot.obsinfo ++++++
--- /var/tmp/diff_new_pack.lmMmy3/_old 2024-10-02 21:33:07.545736196 +0200
+++ /var/tmp/diff_new_pack.lmMmy3/_new 2024-10-02 21:33:07.549736362 +0200
@@ -1,5 +1,5 @@
name: jeos-firstboot
-version: 1.5.2
-mtime: 1723121592
-commit: 8886e4784b3a980d5bad4d4b5626fcc0f6ac6ce9
+version: 1.5.3
+mtime: 1727791623
+commit: f3ae15f25ffbfb9144de9d0099ef35e5c67891c4
