Merge branch 'master' of gitler.moe:suwako/sp into macos

diff --cc CHANGELOG.md
index 68f4cb0855805da902f51047be9f206fe99fd418,7157a38021e574dd5e1c678f809a11c9421de4fe..c800109bc53627e83b57fdc3833a139c8b92cd0f
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,5 -1,5 +1,6 @@@
  # 1.4.0
+ * Haiku対応
 +* macOS対応
  
  # 1.3.0
  * 英訳の追加 (レミリア・スカーレットさん)

diff --cc README.md
index e5a5458af52b63d63f3c788cf14f9b8d56ba993d,10bf9f11328a66960b4f682cae69b29f78a4e6d9..8e9f00c12299562cd0d7b1d9f1d4146fe8c91bd6
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -43,14 -35,14 +43,22 @@@ doas make instal
  doas make install-zsh
  ```
  
+ ### Haiku
+ ```sh
+ pkgman install bmake libassuan libassuan_devel gpgme gpgme_devel gnupg llvm18_clang
+ bmake
+ bmake install
+ bmake install-zsh
+ ```
+ 
 +### macOS
 +```sh
 +brew install bmake libassuan gpgme gnupg pinentry pinentry-mac
 +bmake
 +doas bmake install
 +doas bmake install-zsh
 +```
 +
  ## 初期設定 | Initial setup
  「gpg -k」でGPG鍵IDを確認して、「sp -i [GPG ID]」を実行して下さい。
  Confirm your GPG key ID with "gpg -k", and run "sp -i [GPG ID]".

diff --cc src/otppass.c
Simple merge