[notify] pinentry: 0.7.5 -> 0.8.0
The pinentry port was split into: pinentry pinentry-gtk2 pinentry-qt4 whereas the -gtk2 and -qt4 ports depend on pinentry. This allows you to have pinentry without it's usual X dependencies installed. The pinentry port now only contains the curses-based interface and a wrapper to automatically select the interface.
This commit is contained in:
parent
444a6b5b6d
commit
fef6b25033
@ -1,5 +1,4 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
lrwxrwxrwx root/root usr/bin/pinentry -> pinentry-gtk-2
|
||||
-rwxr-xr-x root/root usr/bin/pinentry
|
||||
-rwxr-xr-x root/root usr/bin/pinentry-curses
|
||||
-rwxr-xr-x root/root usr/bin/pinentry-gtk-2
|
||||
|
@ -1,2 +1,2 @@
|
||||
75037de4a7c18df1f1d1cc5b7e58aa51 pinentry-0.7.5.patch
|
||||
ca492afbbb59cd19f1c875533f18b269 pinentry-0.7.5.tar.gz
|
||||
b66d05feddf92184d9b1db4fff4bfe66 pinentry
|
||||
590be1b00f9ab63205843c7fed8caf35 pinentry-0.8.0.tar.gz
|
||||
|
@ -1,27 +1,26 @@
|
||||
# Description: Secure PinEntry Dialog
|
||||
# URL: http://www.gnupg.org
|
||||
# Maintainer: Simon Glossner, viper at hometux dot de
|
||||
# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve
|
||||
# Depends on: ncurses, xorg-libx11
|
||||
# Nice to have: gtk, qt3
|
||||
# URL: http://www.gnupg.org
|
||||
# Maintainer: Thomas Penteker, tek at serverop dot de
|
||||
# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve
|
||||
# Depends on:
|
||||
# Nice to have: pinentry-gtk2 pinentry-qt4
|
||||
|
||||
name=pinentry
|
||||
version=0.7.5
|
||||
release=3
|
||||
source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.gz $name-$version.patch)
|
||||
version=0.8.0
|
||||
release=1
|
||||
source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.gz pinentry)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 < $SRC/$name-$version.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--with-qt-dir=/usr/share/qt3 \
|
||||
--enable-fallback-curses \
|
||||
--disable-pinentry-gtk
|
||||
--prefix=/usr \
|
||||
--disable-pinentry-{gtk,gtk2,qt,qt4} \
|
||||
--enable-pinentry-curses
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
rm -rf $PKG/usr/share
|
||||
rm $PKG/usr/bin/pinentry
|
||||
install -m 755 ../pinentry $PKG/usr/bin/pinentry
|
||||
}
|
||||
|
17
pinentry/pinentry
Executable file
17
pinentry/pinentry
Executable file
@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
# pinentry wrapper
|
||||
|
||||
if [ -x /usr/bin/pinentry-qt4 ];then
|
||||
exec /usr/bin/pinentry-qt4 "$@"
|
||||
fi
|
||||
|
||||
if [ -x /usr/bin/pinentry-gtk-2 ];then
|
||||
exec /usr/bin/pinentry-gtk-2 "$@"
|
||||
fi
|
||||
|
||||
if [ -x /usr/bin/pinentry-curses ];then
|
||||
exec /usr/bin/pinentry-curses "$@"
|
||||
else
|
||||
echo "no pinentry binary available" > /dev/stderr
|
||||
exit 1
|
||||
fi
|
@ -1,30 +0,0 @@
|
||||
diff -Nru pinentry-0.7.5/gtk+-2/gtksecentry.c pinentry-0.7.5-new/gtk+-2/gtksecentry.c
|
||||
--- pinentry-0.7.5/gtk+-2/gtksecentry.c 2007-11-19 12:20:50.000000000 +0100
|
||||
+++ pinentry-0.7.5-new/gtk+-2/gtksecentry.c 2008-04-02 17:49:43.000000000 +0200
|
||||
@@ -270,7 +270,7 @@
|
||||
|
||||
|
||||
gpointer
|
||||
-g_malloc(gulong size)
|
||||
+g_malloc(gsize size)
|
||||
{
|
||||
gpointer p;
|
||||
|
||||
@@ -288,7 +288,7 @@
|
||||
}
|
||||
|
||||
gpointer
|
||||
-g_malloc0(gulong size)
|
||||
+g_malloc0(gsize size)
|
||||
{
|
||||
gpointer p;
|
||||
|
||||
@@ -308,7 +308,7 @@
|
||||
}
|
||||
|
||||
gpointer
|
||||
-g_realloc(gpointer mem, gulong size)
|
||||
+g_realloc(gpointer mem, gsize size)
|
||||
{
|
||||
gpointer p;
|
||||
|
Loading…
x
Reference in New Issue
Block a user