head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2012.08.13.14.17.35;	author kuriyama;	state dead;
branches;
next	1.1;

1.1
date	2012.08.05.09.41.57;	author kuriyama;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 302469 on 2012-08-13 14:17:35Z by kuriyama

Revert previous tty patch until matured.
@
text
@$FreeBSD: ports/security/gnupg/files/patch-dev-tty,v 1.1 2012/08/05 09:41:57 kuriyama Exp $

diff -ur common/session-env.c.orig common/session-env.c
--- common/session-env.c.orig	2012-03-27 01:00:37.000000000 -0700
+++ common/session-env.c	2012-07-29 18:35:08.000000000 -0700
@@@@ -328,8 +328,12 @@@@
   
   /* Get the default value with and additional fallback for GPG_TTY.  */
   defvalue = getenv (name);
-  if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY") && ttyname (0))
-    defvalue = ttyname (0);
+  if ((!defvalue || !*defvalue) && !strcmp (name, "GPG_TTY"))
+    {
+      defvalue = ttyname (0);
+      if (!defvalue)
+        defvalue = "/dev/tty";
+    }
   if (defvalue)
     {
       /* Record the default value for later use so that we are safe
diff -ur common/simple-pwquery.c.orig common/simple-pwquery.c
--- common/simple-pwquery.c.orig	2012-03-27 01:00:37.000000000 -0700
+++ common/simple-pwquery.c	2012-07-29 18:37:38.000000000 -0700
@@@@ -224,7 +224,11 @@@@
   dft_ttyname = getenv ("GPG_TTY");
 #ifndef HAVE_W32_SYSTEM
   if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
-    dft_ttyname = ttyname (0);
+    {
+      dft_ttyname = ttyname (0);
+      if (!dft_ttyname)
+        dft_ttyname = "/dev/tty";
+    }
 #endif
   if (dft_ttyname && *dft_ttyname)
     {
@


1.1
log
@SVN rev 302102 on 2012-08-05 09:41:57Z by kuriyama

- Convert to OptionsNG.
- Don't install gpg-zip.1 manpage as gpg-zip script is not installed
  [1].
- Fix /dev/tty brokenness [2].

PR:		ports/170327 [1], ports/170269 [2]
Submitted by:	Alfred Bartsch <bartsch@@dssgmbh.de> [1],
	  	Ben Cottrell <tamino@@wolfhut.org> [2]
@
text
@d1 1
a1 1
$FreeBSD$
@

