diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2014-11-28 10:53:40 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2014-11-28 10:53:40 +0000 |
commit | c6c66b733899aefbb288091d241abcaba85b6aae (patch) | |
tree | 33464d8c36ee3335c483f9144c5a85acb04e82e9 /security | |
parent | 5faae916d1641acd73eef5f0df86f170f528b181 (diff) | |
download | pkgsrc-c6c66b733899aefbb288091d241abcaba85b6aae.tar.gz |
Fix off-by-one in tty output library. Patch provided by Wada Keiji in
PR pkg/49312.
Diffstat (limited to 'security')
-rw-r--r-- | security/pgp5/Makefile | 4 | ||||
-rw-r--r-- | security/pgp5/distinfo | 5 | ||||
-rw-r--r-- | security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c | 4 | ||||
-rw-r--r-- | security/pgp5/patches/patch-lib_ttyui_pgpOutput.c | 13 |
4 files changed, 20 insertions, 6 deletions
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index 6ef8b37eadd..62be41f1c53 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.41 2014/05/29 23:37:25 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2014/11/28 10:53:40 bsiegert Exp $ # DISTNAME= pgp50i-unix-src PKGNAME= pgp5-5.0i -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \ ftp://ftp.au.pgpi.com/pub/pgp/5.0/unix/ diff --git a/security/pgp5/distinfo b/security/pgp5/distinfo index 57c42948e9d..daff5fa59cf 100644 --- a/security/pgp5/distinfo +++ b/security/pgp5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/11/26 17:20:27 joerg Exp $ +$NetBSD: distinfo,v 1.10 2014/11/28 10:53:40 bsiegert Exp $ SHA1 (pgp50i-unix-src.tar.gz) = b740afe0bf557deedb53604274997cb2bbecac33 RMD160 (pgp50i-unix-src.tar.gz) = 8400bef0e3a4452e1c89373c070a11dce71572f4 @@ -25,4 +25,5 @@ SHA1 (patch-bf) = e942fc19adf55474ae839c4baba92e46ed618d0b SHA1 (patch-bg) = 9fe1e716cd7ea19b1b171fc8097ed638a95e3d82 SHA1 (patch-bh) = 3725da941b7c1e8ad4c5394d78cd6ce2639ee74e SHA1 (patch-bi) = 17274af8773ad006b7f0aad1e734d16449f5166e -SHA1 (patch-lib_pgp_keys_pgpRngRead.c) = e506fd5cf5684206fa62b023d0ab29ea7098207a +SHA1 (patch-lib_pgp_keys_pgpRngRead.c) = 7de4e5fbe376c74d4805e7385fb1e49cb13d4717 +SHA1 (patch-lib_ttyui_pgpOutput.c) = ba0e1be61816fa852f32ae6c46008550b5431904 diff --git a/security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c b/security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c index 9bf8f7767e3..052727ee489 100644 --- a/security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c +++ b/security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c @@ -1,6 +1,6 @@ -$NetBSD: patch-lib_pgp_keys_pgpRngRead.c,v 1.1 2011/11/26 17:20:28 joerg Exp $ +$NetBSD: patch-lib_pgp_keys_pgpRngRead.c,v 1.2 2014/11/28 10:53:40 bsiegert Exp $ ---- lib/pgp/keys/pgpRngRead.c.orig 2011-11-26 03:16:29.000000000 +0000 +--- lib/pgp/keys/pgpRngRead.c.orig 1997-08-09 21:45:09.000000000 +0000 +++ lib/pgp/keys/pgpRngRead.c @@ -3368,7 +3368,7 @@ ringWrapObject (struct RingSet const *se (void)obj; diff --git a/security/pgp5/patches/patch-lib_ttyui_pgpOutput.c b/security/pgp5/patches/patch-lib_ttyui_pgpOutput.c new file mode 100644 index 00000000000..fc17c1c8880 --- /dev/null +++ b/security/pgp5/patches/patch-lib_ttyui_pgpOutput.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_ttyui_pgpOutput.c,v 1.1 2014/11/28 10:53:40 bsiegert Exp $ + +--- lib/ttyui/pgpOutput.c.orig 2014-11-28 10:49:41.000000000 +0000 ++++ lib/ttyui/pgpOutput.c +@@ -38,7 +38,7 @@ char OutputHeader[OUTPUT_LAST + 1][4] = + Boolean gShowHeaders = FALSE; + + static PREFS *pInternalLanguageStrings = NULL; +-static FILE *OutputHandle[OUTPUT_LAST]; ++static FILE *OutputHandle[OUTPUT_LAST + 1]; + static int RawOutputID(int OutputType, + PgpSeverityLevel Level, + Boolean DisplayHeader, |