Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinentry version bump.

Browse Source
This commit is contained in:
4fury-c3440d8
2022-08-08 18:05:44 +03:00
parent 823fbe0b03
commit c3254d4a2f
4 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/crypt/pinentry/actions.py
+10 -13
View File
@@ -2,20 +2,20 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt # See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
j = ''.join([
' --enable-pinentry-tty',
' --enable-pinentry-curses',
' --enable-pinentry-gnome3',
' --enable-pinentry-qt5 '
])
def setup(): def setup():
#autotools.autoreconf("-vfi") autotools.configure(j)
autotools.configure("--prefix=/usr \
--enable-pinentry-curses \
--disable-pinentry-gtk \
--disable-pinentry-qt \
--enable-pinentry-gtk2 \
--disable-pinentry-qt4 \
--enable-fallback-curses")
def build(): def build():
autotools.make() autotools.make()
@@ -26,7 +26,4 @@ def install():
# We're using pinentry-wrapper as additional file instead of upstream pinentry symlink. # We're using pinentry-wrapper as additional file instead of upstream pinentry symlink.
pisitools.remove("/usr/bin/pinentry") pisitools.remove("/usr/bin/pinentry")
pisitools.dosym("pinentry-gtk-2", "/usr/bin/pinentry-gtk") pisitools.dodoc("AUTHORS", "NEWS", "THANKS")
#pisitools.dosym("pinentry-qt4", "/usr/bin/pinentry-qt")
pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "THANKS")
util/crypt/pinentry/files/pinentry-wrapper
+4 -12
View File
@@ -46,19 +46,11 @@ fi
# if KDE is detected and pinentry-qt exists, use pinentry-qt # if KDE is detected and pinentry-qt exists, use pinentry-qt
if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ] if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-qt" export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# otherwise test if pinentry-gtk-2 is installed # otherwise test if pinentry-gnome3 is installed
elif [ -x /usr/bin/pinentry-gtk-2 ] elif [ -x /usr/bin/pinentry-gnome3 ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" export PINENTRY_BINARY="/usr/bin/pinentry-gnome3"
# otherwise test if pinentry-qt3 is installed
elif [ -x /usr/bin/pinentry-qt3 ]
then
export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# otherwise test if pinentry-qt exists although KDE is not detected
elif [ -x /usr/bin/pinentry-qt ]
then
export PINENTRY_BINARY="/usr/bin/pinentry-qt3"
# pinentry-curses is installed by default # pinentry-curses is installed by default
else else
#test if gui binary is required #test if gui binary is required
util/crypt/pinentry/pspec.xml
+75 -41
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>pinentry</Name> <Name>pinentry</Name>
<Homepage>http://www.gnupg.org/aegypten/</Homepage> <Homepage>https://www.gnupg.org/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
@@ -12,21 +12,21 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol</Summary> <Summary>Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol</Summary>
<Description>Pinentry is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the aegypten project.</Description> <Description>Pinentry is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the aegypten project.</Description>
<Archive sha1sum="693bdf9f48dfb3e040d92f50b1bb464e268b9fb0" type="tarbz2">ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-1.1.0.tar.bz2</Archive> <Archive sha1sum="e37fb307f3842c1bb56ab94b4862b64beb38c629" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>libsecret-devel</Dependency> <Dependency>gcr-devel</Dependency>
<Dependency>libgpg-error-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>libassuan-devel</Dependency> <Dependency>gtk3-devel</Dependency>
<Dependency>gtk2-devel</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>pango-devel</Dependency> <Dependency>pango-devel</Dependency>
<Dependency>libcap-devel</Dependency> <Dependency>libcap-devel</Dependency>
<Dependency>ncurses-devel</Dependency> <Dependency>ncurses-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>libsecret-devel</Dependency>
<!-- <Dependency>gcr-devel</Dependency> --> <Dependency>libassuan-devel</Dependency>
<Dependency>fltk-devel</Dependency> <Dependency>libgpg-error-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch level="1">moreSecureMemoryForPinentry-qt.diff</Patch>--> <!-- <Patch level="1">missing.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -38,55 +38,89 @@
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
<RuntimeDependencies> <RuntimeDependencies>
<!-- <Dependency>gcr</Dependency> --> <!-- <Dependency></Dependency> -->
<Dependency>fltk</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libassuan</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>libgpg-error</Dependency>
<Dependency>libcap</Dependency>
<Dependency>ncurses</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile owner="root" permission="0755" target="/usr/bin/pinentry">pinentry-wrapper</AdditionalFile> <AdditionalFile owner="root" permission="0755" target="/usr/bin/pinentry">pinentry-wrapper</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
</Package> </Package>
<!--Package>
<Name>pinentry-qt</Name>
<Summary>pinentry for Qt4 toolkit</Summary>
<RuntimeDependencies>
<Dependency>qt</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>pinentry</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pinentry-qt*</Path>
</Files>
</Package-->
<Package> <Package>
<Name>pinentry-gtk</Name> <Name>pinentry-tty</Name>
<Summary>pinentry for GTK toolkit</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>pinentry</Dependency> <Dependency>pinentry</Dependency>
<Dependency>ncurses</Dependency> <Dependency>glib2</Dependency>
<Dependency>libcap</Dependency> <Dependency>libcap</Dependency>
<Dependency>libassuan</Dependency> <Dependency>libassuan</Dependency>
<Dependency>libsecret</Dependency> <Dependency>libsecret</Dependency>
<Dependency>libgpg-error</Dependency> <Dependency>libgpg-error</Dependency>
<Dependency>glib2</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>pango</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/pinentry-gtk*</Path> <Path fileType="executable">/usr/bin/pinentry-tty</Path>
</Files>
</Package>
<Package>
<Name>pinentry-curses</Name>
<RuntimeDependencies>
<Dependency>pinentry</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libcap</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>libassuan</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>libgpg-error</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pinentry-curses</Path>
</Files>
</Package>
<Package>
<Name>pinentry-gnome3</Name>
<RuntimeDependencies>
<Dependency>pinentry</Dependency>
<Dependency>gcr</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libcap</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>libassuan</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>libgpg-error</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pinentry-gnome3</Path>
</Files>
</Package>
<Package>
<Name>pinentry-qt</Name>
<RuntimeDependencies>
<Dependency>pinentry</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libcap</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>libassuan</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>libgpg-error</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/pinentry-qt</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="6"> <Update release="7">
<Date>2022-08-07</Date>
<Version>1.2.0</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="6">
<Date>2020-01-19</Date> <Date>2020-01-19</Date>
<Version>1.1.0</Version> <Version>1.1.0</Version>
<Comment>Rebuild</Comment> <Comment>Rebuild</Comment>
util/crypt/pinentry/translations.xml
+1 -1
View File
@@ -15,4 +15,4 @@
<Name>pinentry-qt</Name> <Name>pinentry-qt</Name>
<Summary xml:lang="tr">Qt4 ile yazılmış pinentry arayüzü</Summary> <Summary xml:lang="tr">Qt4 ile yazılmış pinentry arayüzü</Summary>
</Package> </Package>
</PISI> </PISI>