Mercurial > oi > oi-build
changeset 401:bf52ef48020c
7061153 error message for tcsd lists incorrect man page information
7066704 gpg2 -c can no longer get my passphrase
author | Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM> |
---|---|
date | Thu, 14 Jul 2011 11:09:26 -0700 |
parents | 675bae2e4833 |
children | 94ae4d75524c |
files | components/gnupg/Makefile components/gnupg/depend.mk components/pinentry/pinentry.p5m components/trousers/tcsd.xml |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/components/gnupg/Makefile Thu Jul 14 10:55:47 2011 -0700 +++ b/components/gnupg/Makefile Thu Jul 14 11:09:26 2011 -0700 @@ -67,7 +67,7 @@ CONFIGURE_OPTIONS += --enable-nls CONFIGURE_OPTIONS += --enable-largefile CONFIGURE_OPTIONS += --disable-selinux-support -CONFIGURE_OPTIONS += --with-pinentry-pgm=$(CONFIGURE_LIBDIR)/pinentry +CONFIGURE_OPTIONS += --with-pinentry-pgm=$(CONFIGURE_PREFIX)/lib/pinentry CONFIGURE_OPTIONS += --with-gpg-error-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-libassuan-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-ksba-prefix=$(CONFIGURE_PREFIX)
--- a/components/gnupg/depend.mk Thu Jul 14 10:55:47 2011 -0700 +++ b/components/gnupg/depend.mk Thu Jul 14 11:09:26 2011 -0700 @@ -1,1 +1,1 @@ -gnupg: libksba libassuan gpgme +gnupg: libksba libassuan gpgme pinentry
--- a/components/pinentry/pinentry.p5m Thu Jul 14 10:55:47 2011 -0700 +++ b/components/pinentry/pinentry.p5m Thu Jul 14 11:09:26 2011 -0700 @@ -37,8 +37,8 @@ dir path=usr/share dir path=usr/share/info # -file path=usr/lib/pinentry-curses -file path=usr/lib/pinentry-gtk-2 +file path=usr/lib/pinentry-curses mode=0555 +file path=usr/lib/pinentry-gtk-2 mode=0555 file path=usr/share/info/pinentry.info # link path=usr/lib/pinentry target=pinentry-gtk-2
--- a/components/trousers/tcsd.xml Thu Jul 14 10:55:47 2011 -0700 +++ b/components/trousers/tcsd.xml Thu Jul 14 11:09:26 2011 -0700 @@ -100,7 +100,7 @@ </loctext> </common_name> <documentation> - <manpage title='tcsd' section='1' /> + <manpage title='tcsd' section='8' /> </documentation> </template> </service>