From 5b09a3d47b85dc29c1776dbb683aba1428a8c85f Mon Sep 17 00:00:00 2001 From: joborun Date: Sat, 30 Mar 2024 09:23:32 +0200 Subject: [PATCH] upg pinentry remove xz from built repository --- pinentry/PKGBUILD | 23 +++-- pinentry/PKGBUILD-arch | 8 +- pinentry/configure | 194 +++++++++++++++++++++++++++++++++++++++++ pinentry/deps | 1 + xz/PKGBUILD | 51 +++++++---- xz/deps | 2 +- xz/deps-arch | 6 ++ 7 files changed, 255 insertions(+), 30 deletions(-) create mode 100644 pinentry/configure create mode 100644 xz/deps-arch diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD index 6fd1e7e..eb50be5 100644 --- a/pinentry/PKGBUILD +++ b/pinentry/PKGBUILD @@ -6,18 +6,19 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pinentry -pkgver=1.2.1 -pkgrel=03 ## useless rebuild due to Kwayland to 5 rebadging - waste of a core repository +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!!! 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' 'gcr' 'qt5-x11extras') +makedepends=('gtk2' 'qt5-base' 'qt6-base' 'gcr' 'qt5-x11extras') optdepends=( 'gtk2: gtk2 backend' - 'qt5-base: qt backend' + 'qt5-base: qt5 backend' + 'qt6-base: qt6 backend' 'qt5-x11extras: qt backend' 'gcr: gnome3 backend' ) @@ -26,6 +27,8 @@ source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz 'pinentry' 'preexec') +## --enable-pinentry-qt becomes qt6 base --enable-pinentry-qt5 needs to be specific +## Arch seems to just worry about plasma qt6 based applications build() { cd "${pkgname}-${pkgver}" ./configure \ @@ -36,6 +39,7 @@ build() { --enable-pinentry-emacs \ --enable-pinentry-gtk2 \ --enable-pinentry-gnome3 \ + --enable-pinentry-qt5 \ --enable-pinentry-qt \ --enable-libsecret \ @@ -60,9 +64,14 @@ validpgpkeys=(D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch (dist sig) 6DAA6E64A76D2840571B4902528897B826403ADA # Werner Koch (dist signing 2020) AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD) # Niibe Yutaka (GnuPG Release Key) -sha256sums=(457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 # pinentry-1.2.1.tar.bz2 - 22b5493faad409a5f4b25d07d74d228c67631110258e10094bd954b16e9e55e2 # pinentry-1.2.1.tar.bz2.sig +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 -## 3c2b785813a2788b919001fa5547305c1936484723271ad4860759d30369f1f2 pinentry-1.2.1-03-x86_64.pkg.tar.lz + +## 708a826054699bbe421330a8243aa2c4ab8499cfe8bc77bc8dcd75aaa8c642fc pinentry-1.3.0-01-x86_64.pkg.tar.lz + + diff --git a/pinentry/PKGBUILD-arch b/pinentry/PKGBUILD-arch index 24b0e4a..5059173 100644 --- a/pinentry/PKGBUILD-arch +++ b/pinentry/PKGBUILD-arch @@ -3,8 +3,8 @@ # Contributor: Gaetan Bisson pkgname=pinentry -pkgver=1.2.1 -pkgrel=3 +pkgver=1.3.0 +pkgrel=1 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,7 +12,7 @@ license=('GPL') depends=( 'glibc' 'ncurses' 'libassuan' 'libsecret' 'glib2' libsecret-1.so libncursesw.so libassuan.so libglib-2.0.so) -makedepends=('gtk2' 'qt5-base' 'qt5-x11extras' 'kwayland5' 'gcr') +makedepends=('gtk2' 'qt6-base' 'qt5-x11extras' 'kwayland5' 'gcr') optdepends=( 'gtk2: gtk2 backend' 'qt5-x11extras: qt backend' @@ -23,7 +23,7 @@ backup=('etc/pinentry/preexec') source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} 'pinentry' 'preexec') -sha256sums=('457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067' +sha256sums=('9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de' 'SKIP' 'af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86' 'f428f08d77f1f7830eadb8435af282a833fc13d8b623b122eefd9d3b628bef90') diff --git a/pinentry/configure b/pinentry/configure new file mode 100644 index 0000000..1b88148 --- /dev/null +++ b/pinentry/configure @@ -0,0 +1,194 @@ +`configure' configures pinentry 1.3.0 to adapt to many kinds of systems. + +Usage: src/pinentry-1.3.0/configure [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print `checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for `--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or `..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr/local] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, `make install' will install all the files in +`/usr/local/bin', `/usr/local/lib' etc. You can specify +an installation prefix other than `/usr/local' using `--prefix', +for instance `--prefix=$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/pinentry] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-pinentry-curses + build curses pinentry + --enable-fallback-curses + include curses fallback + --disable-ncurses don't prefer -lncurses over -lcurses + --enable-pinentry-tty build tty pinentry + --disable-rpath do not hardcode runtime library paths + --enable-pinentry-emacs build emacs pinentry + --enable-inside-emacs include emacs hack + --enable-pinentry-efl build EFL pinentry + --enable-pinentry-gtk2 build GTK+-2 pinentry + --enable-pinentry-gnome3 + build GNOME 3 pinentry + --enable-libsecret optionally cache passphrases using libsecret + --enable-pinentry-qt5 build Qt5 pinentry + --disable-pinentry-qt5 Don't use qt5 even if it is available. + --enable-pinentry-qt build Qt6 pinentry + --enable-pinentry-qt4 build Qt4 pinentry + --enable-pinentry-tqt build tqt pinentry + --enable-pinentry-fltk build FLTK 1.3 pinentry + --disable-doc do not build the documentation + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-libgpg-error-prefix=PFX + prefix where GPG Error is installed (optional) + + --with-libassuan-prefix=PFX + prefix where LIBASSUAN is installed (optional) + --with-ncurses-include-dir=DIR + Set directory containing the include files for use + with -lncurses, when it isn't installed as the + default curses library. If DIR is "none", then no + special ncurses include files are used. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + PKG_CONFIG path to pkg-config utility + NCURSES_CFLAGS + C compiler flags for NCURSES, overriding pkg-config + NCURSES_LIBS + linker flags for NCURSES, overriding pkg-config + EFL_CFLAGS C compiler flags for EFL, overriding pkg-config + EFL_LIBS linker flags for EFL, overriding pkg-config + GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config + GTK2_LIBS linker flags for GTK2, overriding pkg-config + GNOME3_CFLAGS + C compiler flags for GNOME3, overriding pkg-config + GNOME3_LIBS linker flags for GNOME3, overriding pkg-config + LIBSECRET_CFLAGS + C compiler flags for LIBSECRET, overriding pkg-config + LIBSECRET_LIBS + linker flags for LIBSECRET, overriding pkg-config + LIBX11_CFLAGS + C compiler flags for LIBX11, overriding pkg-config + LIBX11_LIBS linker flags for LIBX11, overriding pkg-config + KF5WAYLANDCLIENT_CFLAGS + C compiler flags for KF5WAYLANDCLIENT, overriding pkg-config + KF5WAYLANDCLIENT_LIBS + linker flags for KF5WAYLANDCLIENT, overriding pkg-config + KF6GUIADDONS_CFLAGS + C compiler flags for KF6GUIADDONS, overriding pkg-config + KF6GUIADDONS_LIBS + linker flags for KF6GUIADDONS, overriding pkg-config + PINENTRY_QT5_CFLAGS + C compiler flags for PINENTRY_QT5, overriding pkg-config + PINENTRY_QT5_LIBS + linker flags for PINENTRY_QT5, overriding pkg-config + PINENTRY_QT5_REQUIRE_CPP11_CFLAGS + C compiler flags for PINENTRY_QT5_REQUIRE_CPP11, overriding + pkg-config + PINENTRY_QT5_REQUIRE_CPP11_LIBS + linker flags for PINENTRY_QT5_REQUIRE_CPP11, overriding + pkg-config + PINENTRY_QT5_X11_EXTRAS_CFLAGS + C compiler flags for PINENTRY_QT5_X11_EXTRAS, overriding + pkg-config + PINENTRY_QT5_X11_EXTRAS_LIBS + linker flags for PINENTRY_QT5_X11_EXTRAS, overriding pkg-config + PINENTRY_QT6_CFLAGS + C compiler flags for PINENTRY_QT6, overriding pkg-config + PINENTRY_QT6_LIBS + linker flags for PINENTRY_QT6, overriding pkg-config + PINENTRY_QT6TEST_CFLAGS + C compiler flags for PINENTRY_QT6TEST, overriding pkg-config + PINENTRY_QT6TEST_LIBS + linker flags for PINENTRY_QT6TEST, overriding pkg-config + KF6WINDOWSYSTEM_CFLAGS + C compiler flags for KF6WINDOWSYSTEM, overriding pkg-config + KF6WINDOWSYSTEM_LIBS + linker flags for KF6WINDOWSYSTEM, overriding pkg-config + PINENTRY_QT4_CFLAGS + C compiler flags for PINENTRY_QT4, overriding pkg-config + PINENTRY_QT4_LIBS + linker flags for PINENTRY_QT4, overriding pkg-config + PINENTRY_TQT_CFLAGS + C compiler flags for PINENTRY_TQT, overriding pkg-config + PINENTRY_TQT_LIBS + linker flags for PINENTRY_TQT, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . diff --git a/pinentry/deps b/pinentry/deps index 19ccc8a..f5dc7fc 100644 --- a/pinentry/deps +++ b/pinentry/deps @@ -1,5 +1,6 @@ gtk2 qt5-base +qt6-base gcr libglvnd qt5-x11extras diff --git a/xz/PKGBUILD b/xz/PKGBUILD index 00f979e..b4e4797 100644 --- a/xz/PKGBUILD +++ b/xz/PKGBUILD @@ -1,3 +1,20 @@ +echo "DO NOT USE THIS" +echo "Read comments first, use arch: core/xz 5.6.1-2 + +Due to the uncovered back door 3/29/24 +and according to Arch building from git was safer than from tar ball, but +they also + +Both tar ball and git source at github is removed +We have copies of both but we will not use either +till this clears up. + +As far as we can research ONLY when sshd was run by systemd would this +backdoor be effective, so we have nothing to worry about even if the +code is in our copies of xz + + + #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit # Maintainer : Joe Bo Run @@ -10,25 +27,18 @@ pkgver=5.6.1 pkgrel=02 pkgdesc='Library and command line tools for XZ and LZMA compressed files' #makedepends=('git' 'po4a' 'doxygen') # useless doxygen branding and some icons with the trade name -# No thank you - fuck you very much! -## makedepends=('po4a' 'doxygen') # from tarball not git depends=('sh') provides=('liblzma.so') #options=('debug') ##### uncomment this to produce the debug pkg url='https://xz.tukaani.org/xz-utils/' source=("https://github.com/tukaani-project/xz/releases/download/v${pkgver}/xz-${pkgver}.tar.gz"{,.sig}) - -# Unnecessary rebuild made from entire xz git .. classic wasteful 1st world -# behavior "we have fiberoptic speeds the rest of you fuck off" -# No fuck you yankees and N.Europeans! -# source=("git+https://github.com/tukaani-project/xz#tag=v${pkgver}") +#source=("git+https://github.com/tukaani-project/xz#tag=v${pkgver}") # previous sources # source=("https://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) # temporary use of unsigned mirror at SF since zoner.fi is down # Sums same with arch #source=("xz-5.2.9.tar.gz:https://downloads.sourceforge.net/project/lzmautils/xz-5.2.9.tar.gz?ts=gAAAAABjiAaACqaAp0YyfNS0hoSgTfR8z7zafIiHfu8jZuEf9Dk3IX7wbWPwuuekp1LHnfAHvVrsFD4kpAbKm9HOsRMfAzd3CA%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Flzmautils%2Ffiles%2Fxz-5.2.9.tar.gz") ## "https://tukaani.org/${pkgname}/xzgrep-ZDI-CAN-16587.patch"{,.sig}) -## Then they add 1/2 Gb additional dependencies to run doxygen for no real benefit other than promo and icons #prepare() { ## cd ${pkgname} @@ -44,20 +54,24 @@ source=("https://github.com/tukaani-project/xz/releases/download/v${pkgver}/xz-$ build() { cd "${srcdir}/${pkgname}-${pkgver}" - +# cd ${pkgname} ./configure --prefix=/usr \ --disable-rpath \ --enable-werror make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} +## Some of the reading on this indicates the code is injected by +## blobs used to run the following tests +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +## cd ${pkgname} +# make check +#} package() { cd "${srcdir}/${pkgname}-${pkgver}" +# cd ${pkgname} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/xz/" ln -sf /usr/share/doc/xz/COPYING "${pkgdir}/usr/share/licenses/xz/" @@ -73,13 +87,14 @@ license=('GPL' 'LGPL' 'custom') validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620' # Lasse Collin '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan -# git sums -#sha256sums=('e10fa4254d5ff033c78dcbfd2866e79a762b8a719503a7c146758e590de945dc') -#sha512sums=('8f4ee2e5c9b46d0917d8bdf8b172a70d02a6cf2d4d78a2e99ae942e32979b72b407809ffda2885af41e2c9d801c19eab5e4fd73888fbaf042346be957df406fc') - # tarball sums sha256sums=(2398f4a8e53345325f44bdd9f0cc7401bd9025d736c6d43b372f4dea77bf75b8 # xz-5.6.1.tar.gz 2a0745db95fee581cba776c3f68e75729d8bdc0f3db6e4453d6391894c100dac) # xz-5.6.1.tar.gz.sig -## 63aeec9a16218a4f420b70b2ba078705c7e09328eead349bd16d66ec97963997 xz-5.6.1-02-x86_64.pkg.tar.lz +# git sums +#sha512sums=('8f4ee2e5c9b46d0917d8bdf8b172a70d02a6cf2d4d78a2e99ae942e32979b72b407809ffda2885af41e2c9d801c19eab5e4fd73888fbaf042346be957df406fc') +#sha256sums=(e10fa4254d5ff033c78dcbfd2866e79a762b8a719503a7c146758e590de945dc) # xz +## 8466a47ac4224181b2f56bbf17ef7afea38849abd1d1ffa2da3b5ae8b1e7f941 xz-5.6.1-02-x86_64.pkg.tar.lz + +## diff --git a/xz/deps b/xz/deps index b28b04f..f4099d9 100644 --- a/xz/deps +++ b/xz/deps @@ -1,3 +1,3 @@ - +git diff --git a/xz/deps-arch b/xz/deps-arch new file mode 100644 index 0000000..2195e40 --- /dev/null +++ b/xz/deps-arch @@ -0,0 +1,6 @@ +po4a +doxygen +autoconf +automake + +