# HG changeset patch
# User Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
# Date 1310666966 25200
# Node ID bf52ef48020c51f7b3ac491b8368b478df6ea2e2
# Parent  675bae2e483337cffc976bb3b1d89c899597e415
7061153 error message for tcsd lists incorrect man page information
7066704 gpg2 -c can no longer get my passphrase

diff -r 675bae2e4833 -r bf52ef48020c components/gnupg/Makefile
--- 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)
diff -r 675bae2e4833 -r bf52ef48020c components/gnupg/depend.mk
--- 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
diff -r 675bae2e4833 -r bf52ef48020c components/pinentry/pinentry.p5m
--- 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
diff -r 675bae2e4833 -r bf52ef48020c components/trousers/tcsd.xml
--- 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>