diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2012-08-13 22:17:35 +0800 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2012-08-13 22:17:35 +0800 |
| commit | 45433a5a88ca0c447ecf7d25249a27dc10037aca (patch) | |
| tree | 394706fdb224f71579a7a4ce1d93a10cdaf4932e /security | |
| parent | a99bce4ded68046f16e3c373992845f77576d952 (diff) | |
| download | freebsd-ports-gnome-45433a5a88ca0c447ecf7d25249a27dc10037aca.tar.gz freebsd-ports-gnome-45433a5a88ca0c447ecf7d25249a27dc10037aca.tar.zst freebsd-ports-gnome-45433a5a88ca0c447ecf7d25249a27dc10037aca.zip | |
Revert previous tty patch until matured.
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnupg/Makefile | 2 | ||||
| -rw-r--r-- | security/gnupg/files/patch-dev-tty | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 54410140f384..c5f6aee64519 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnupg PORTVERSION= 2.0.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg diff --git a/security/gnupg/files/patch-dev-tty b/security/gnupg/files/patch-dev-tty deleted file mode 100644 index d849be5d2f34..000000000000 --- a/security/gnupg/files/patch-dev-tty +++ /dev/null @@ -1,36 +0,0 @@ -$FreeBSD$ - -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) - { |