diff --git a/bash/PKGBUILD b/bash/PKGBUILD index 64c4af2..2baf8ff 100644 --- a/bash/PKGBUILD +++ b/bash/PKGBUILD @@ -9,7 +9,7 @@ pkgname=bash _basever=5.2 _patchlevel=026 pkgver=${_basever}.${_patchlevel} -pkgrel=02 +pkgrel=03 pkgdesc='The GNU Bourne Again shell' _url='https://www.gnu.org/software/bash/bash.html' url="https://ftp.gnu.org/gnu" @@ -94,7 +94,7 @@ sha256sums=(a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb # 3e22bf86ae6708df7a6bceb88c67a00118275f9c0b5268f453dd388af7c43b53 # dot.bashrc e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2 # dot.bash_profile 4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5 # dot.bash_logout - 51ceca7cd615ff4e2f8f3373a46ac7bfd453be70bbaddc074cb17f6db1ac7370 # system.bashrc + 89053ee31f8607bf4371cba46864bda07c51625fd19c6806a9b7bbf526aaf7f4 # system.bashrc 025bccfb374a3edce0ff8154d990689f30976b78f7a932dc9a6fcef81821811e # system.bash_logout f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a # bash52-001 3a16ed6925e88255f9bf1435d418a11fc73a05b9efe65f4049e1de00f867d495 # bash52-001.sig @@ -149,4 +149,5 @@ sha256sums=(a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb # 96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac # bash52-026 f8ebf835ed0e92c03f7c13e706c872d22754508e59d9492997c5bbd2bb84417e) # bash52-026.sig -## 47aab6404cc987948fa8ba1320432599034d492d41c4730ece83165c996d4fba bash-5.2.026-02-x86_64.pkg.tar.lz +## 792fe452040b91d4c941489f1d87581a91b15ca7ccca11dcd5b030b0a7bdeb61 bash-5.2.026-03-x86_64.pkg.tar.lz + diff --git a/bash/PKGBUILD-arch b/bash/PKGBUILD-arch index 61059ea..958a311 100644 --- a/bash/PKGBUILD-arch +++ b/bash/PKGBUILD-arch @@ -8,7 +8,7 @@ pkgname=bash _basever=5.2 _patchlevel=026 pkgver=${_basever}.${_patchlevel} -pkgrel=2 +pkgrel=3 pkgdesc='The GNU Bourne Again shell' arch=(x86_64) license=('GPL-3.0-or-later') @@ -87,7 +87,7 @@ sha256sums=('a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb' '959bc596166c9758fdd68836581f6b8f1d6fdb947d580bf24dce607998a077b8' 'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2' '4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5' - '51ceca7cd615ff4e2f8f3373a46ac7bfd453be70bbaddc074cb17f6db1ac7370' + '89053ee31f8607bf4371cba46864bda07c51625fd19c6806a9b7bbf526aaf7f4' '025bccfb374a3edce0ff8154d990689f30976b78f7a932dc9a6fcef81821811e' 'f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a' 'SKIP' diff --git a/bash/system.bashrc b/bash/system.bashrc index 3e7fab6..5580d2f 100644 --- a/bash/system.bashrc +++ b/bash/system.bashrc @@ -5,8 +5,6 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return -[[ $DISPLAY ]] && shopt -s checkwinsize - PS1='[\u@\h \W]\$ ' case ${TERM} in diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD index eb50be5..f083a69 100644 --- a/pinentry/PKGBUILD +++ b/pinentry/PKGBUILD @@ -7,16 +7,13 @@ pkgname=pinentry pkgver=1.3.0 -pkgrel=01 ## useless rebuild due to Kwayland to 5 rebadging - waste of a core repository -### to be affected by KDE-plaZma crap --- WASTE!!! +pkgrel=02 pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol' url='https://gnupg.org/related_software/pinentry/' -depends=( - 'glibc' 'ncurses' 'libassuan' 'libsecret' 'glib2' - libsecret-1.so libncursesw.so libassuan.so libglib-2.0.so) -makedepends=('gtk2' 'qt5-base' 'qt6-base' 'gcr' 'qt5-x11extras') +depends=('glibc' 'ncurses' 'libassuan' 'libsecret' 'glib2' + libsecret-1.so libncursesw.so libassuan.so libglib-2.0.so) +makedepends=('qt5-base' 'qt6-base' 'gcr' 'qt5-x11extras') optdepends=( - 'gtk2: gtk2 backend' 'qt5-base: qt5 backend' 'qt6-base: qt6 backend' 'qt5-x11extras: qt backend' @@ -24,8 +21,7 @@ optdepends=( ) backup=('etc/pinentry/preexec') source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'pinentry' - 'preexec') + 'pinentry') ## --enable-pinentry-qt becomes qt6 base --enable-pinentry-qt5 needs to be specific ## Arch seems to just worry about plasma qt6 based applications @@ -37,12 +33,10 @@ build() { --enable-pinentry-curses \ --enable-fallback-curses \ --enable-pinentry-emacs \ - --enable-pinentry-gtk2 \ --enable-pinentry-gnome3 \ --enable-pinentry-qt5 \ --enable-pinentry-qt \ - --enable-libsecret \ - + --enable-libsecret make } @@ -51,7 +45,6 @@ package() { make DESTDIR="${pkgdir}" install install -Dm 755 ../pinentry -t "${pkgdir}/usr/bin" - install -Dm 755 ../preexec -t "${pkgdir}/etc/pinentry" } #---- arch license gpg-key & sha256sums ---- @@ -65,13 +58,8 @@ validpgpkeys=(D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch (dist sig) AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD) # Niibe Yutaka (GnuPG Release Key) sha256sums=(9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de # pinentry-1.3.0.tar.bz2 -## 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 # pinentry-1.2.1.tar.bz2 3d4753e5262a36651dee14ea4e0e9461126d93fddd05f2da2ef95be4cb3ce1f0 # pinentry-1.3.0.tar.bz2.sig -## 22b5493faad409a5f4b25d07d74d228c67631110258e10094bd954b16e9e55e2 # pinentry-1.2.1.tar.bz2.sig - af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86 # pinentry - f428f08d77f1f7830eadb8435af282a833fc13d8b623b122eefd9d3b628bef90) # preexec - - -## 708a826054699bbe421330a8243aa2c4ab8499cfe8bc77bc8dcd75aaa8c642fc pinentry-1.3.0-01-x86_64.pkg.tar.lz + af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86) # pinentry +## 9e9f0153526977d65d8a41c1c6d92615ded55130d9f9037c3ce2f4db79d7081e pinentry-1.3.0-02-x86_64.pkg.tar.lz diff --git a/pinentry/PKGBUILD-arch b/pinentry/PKGBUILD-arch index 5059173..bcda303 100644 --- a/pinentry/PKGBUILD-arch +++ b/pinentry/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=pinentry pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol' url='https://gnupg.org/related_software/pinentry/' arch=('x86_64') @@ -12,21 +12,18 @@ license=('GPL') depends=( 'glibc' 'ncurses' 'libassuan' 'libsecret' 'glib2' libsecret-1.so libncursesw.so libassuan.so libglib-2.0.so) -makedepends=('gtk2' 'qt6-base' 'qt5-x11extras' 'kwayland5' 'gcr') +makedepends=('qt6-base' 'qt5-x11extras' 'kwayland5' 'gcr') optdepends=( - 'gtk2: gtk2 backend' 'qt5-x11extras: qt backend' 'kwayland5: qt backend' 'gcr: gnome3 backend' ) backup=('etc/pinentry/preexec') source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'pinentry' - 'preexec') + 'pinentry') sha256sums=('9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de' 'SKIP' - 'af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86' - 'f428f08d77f1f7830eadb8435af282a833fc13d8b623b122eefd9d3b628bef90') + '983ae62694c7cbc5b8a573f9863c97a86135b32c5e5867f21c1be402c78e60a8') validpgpkeys=( 'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig) '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) @@ -41,10 +38,9 @@ build() { --enable-pinentry-curses \ --enable-fallback-curses \ --enable-pinentry-emacs \ - --enable-pinentry-gtk2 \ --enable-pinentry-gnome3 \ --enable-pinentry-qt \ - --enable-libsecret \ + --enable-libsecret make } @@ -52,9 +48,7 @@ build() { package() { cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm 755 ../pinentry -t "${pkgdir}/usr/bin" - install -Dm 755 ../preexec -t "${pkgdir}/etc/pinentry" } # vim: ts=2 sw=2 et: diff --git a/pinentry/deps b/pinentry/deps index f5dc7fc..cb8f174 100644 --- a/pinentry/deps +++ b/pinentry/deps @@ -1,4 +1,3 @@ -gtk2 qt5-base qt6-base gcr diff --git a/pinentry/diff.patch.1.3.0-01-02 b/pinentry/diff.patch.1.3.0-01-02 new file mode 100644 index 0000000..de569f9 --- /dev/null +++ b/pinentry/diff.patch.1.3.0-01-02 @@ -0,0 +1,58 @@ +--- PKGBUILD 2024-03-30 09:07:57.590355813 +0200 ++++ PKGBUILD 2024-07-02 11:43:31.309531592 +0300 +@@ -7,16 +7,13 @@ + + pkgname=pinentry + pkgver=1.3.0 +-pkgrel=01 ++pkgrel=02 + pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol' + url='https://gnupg.org/related_software/pinentry/' +-makedepends=('gtk2' 'qt5-base' 'qt6-base' 'gcr' 'qt5-x11extras') ++makedepends=('qt5-base' 'qt6-base' 'gcr' 'qt5-x11extras') + optdepends=( +- 'gtk2: gtk2 backend' + 'qt5-base: qt5 backend' + 'qt6-base: qt6 backend' + 'qt5-x11extras: qt backend' +@@ -24,8 +21,7 @@ + ) + backup=('etc/pinentry/preexec') + source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} +- 'pinentry' +- 'preexec') ++ 'pinentry') + + ## --enable-pinentry-qt becomes qt6 base --enable-pinentry-qt5 needs to be specific + ## Arch seems to just worry about plasma qt6 based applications +@@ -37,12 +33,10 @@ + --enable-pinentry-curses \ + --enable-fallback-curses \ + --enable-pinentry-emacs \ +- --enable-pinentry-gtk2 \ + --enable-pinentry-gnome3 \ + --enable-pinentry-qt5 \ + --enable-pinentry-qt \ +- --enable-libsecret \ +- ++ --enable-libsecret + make + } + +@@ -51,7 +45,6 @@ + make DESTDIR="${pkgdir}" install + + install -Dm 755 ../pinentry -t "${pkgdir}/usr/bin" +- install -Dm 755 ../preexec -t "${pkgdir}/etc/pinentry" + } + + #---- arch license gpg-key & sha256sums ---- +@@ -65,13 +58,8 @@ + AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD) # Niibe Yutaka (GnuPG Release Key) + + sha256sums=(9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de # pinentry-1.3.0.tar.bz2 + 3d4753e5262a36651dee14ea4e0e9461126d93fddd05f2da2ef95be4cb3ce1f0 # pinentry-1.3.0.tar.bz2.sig +- af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86 # pinentry +- f428f08d77f1f7830eadb8435af282a833fc13d8b623b122eefd9d3b628bef90) # preexec ++ af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86) # pinentry +