<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/614f7968b4c42d48c8fdffc4518329bfa67ce4bb">https://github.com/macports/macports-ports/commit/614f7968b4c42d48c8fdffc4518329bfa67ce4bb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 614f7968b4c dumpasn1: update to 20210212
</span>614f7968b4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 614f7968b4c42d48c8fdffc4518329bfa67ce4bb
</span>Author: Allan Que <allan.que@gmail.com>
AuthorDate: Sun Jul 3 10:39:29 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> dumpasn1: update to 20210212
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> License set to Permissive:
</span><span style='display:block; white-space:pre;color:#404040;'> "You can use this code in whatever way you want, as long as you don't try to
</span><span style='display:block; white-space:pre;color:#404040;'> claim you wrote it."
</span>---
textproc/dumpasn1/Portfile | 12 ++---
textproc/dumpasn1/files/bug348856.patch | 83 ---------------------------------
textproc/dumpasn1/files/bug840771.patch | 51 --------------------
3 files changed, 5 insertions(+), 141 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dumpasn1/Portfile b/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12c0e6cdd12..de50849a96f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,11 @@
</span> PortSystem 1.0
name dumpasn1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20150808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210212
</span> categories textproc security
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license permissive
</span>
description an ASN.1 decoder and pretty-printer
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,12 +20,9 @@ homepage http://www.cs.auckland.ac.nz/~pgut001/
</span> master_sites debian:d/${name}/
distfiles ${name}_${version}.orig${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 203d79e1ef0ea9a614557d178d388499245554c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6119a9e218c6d7744419fda413c8ea850c272a83c1d1716a5cc6b87a63215594
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles bug348856.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bug840771.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2839333bda3675cb0ebec7092a3637f4e861c4a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6748ab9f6142711ed584ddc18753c6a44b26dec156aabbaaaa619389084db6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 67893
</span>
post-patch {
reinplace "s|/etc/dumpasn1/|${prefix}/etc/|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dumpasn1/files/bug348856.patch b/textproc/dumpasn1/files/bug348856.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44d3e5e64a3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/dumpasn1/files/bug348856.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,83 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Description: dumpasn1 doesn't properly display localized BMPString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Victor B. Wagner <vitus@45.free.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: http://bugs.debian.org/348856
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-By: Mathieu Malaterre <malat@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Forwarded: http://bugs.debian.org/348856#59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dumpasn1-20150808.orig/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <locale.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef OS390
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* OS390 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1315,13 +1316,13 @@ static int adjustLevel( const int level,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use wcstombs() to see if anything can be displayed, if it can't we drop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- back to trying to display the data as non-Unicode */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static int displayUnicode( const wchar_t wCh, const int level )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int displayUnicode( const wchar_t wCh[], const int level )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char outBuf[ 8 ];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int outLen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Check whether we can display this character */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- outLen = wcstombs( outBuf, &wCh, 1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ outLen = wcstombs( outBuf, wCh, 8 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( outLen < 1 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Tell the caller that this can't be displayed as Unicode */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1369,13 +1370,7 @@ static int displayUnicode( const wchar_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wChString[ 1 ] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf( output, "%ls", wChString );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( fwide( output, 1 ) > 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fputwc( wCh, output );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fwide( output, -1 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fputc( wCh, output );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf( output, "%s", outBuf );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1872,7 +1867,7 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const wchar_t wCh = ( ch << 8 ) | getc( inFile );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const wchar_t wCh[2] ={ ( ch << 8 ) | getc( inFile ),0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( displayUnicode( wCh, level ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1884,7 +1879,7 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The value can't be displayed as Unicode, fall back to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displaying it as normal text */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ungetc( wCh & 0xFF, inFile );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ungetc( wCh[0] & 0xFF, inFile );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( strOption == STR_UTF8 && ( ch & 0x80 ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3118,7 +3113,14 @@ int main( int argc, char *argv[] )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __OS390__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long offset = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int moreArgs = TRUE, doCheckOnly = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlocale(LC_ALL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __WIN32__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ".OCP"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __OS390__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memset( pathPtr, '\0', sizeof( pathPtr ) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getcwd( pathPtr, sizeof( pathPtr ) );
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dumpasn1/files/bug840771.patch b/textproc/dumpasn1/files/bug840771.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e368b2f037..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/dumpasn1/files/bug840771.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Description: segfaults on valid certificate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Fix stack smashing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Origin: https://bugs.debian.org/840771#17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug-Debian: https://bugs.debian.org/840771
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Mathieu Malaterre <malat@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dumpasn1-20150808.orig/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1362,7 +1362,7 @@ static int displayUnicode( const wchar_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This (and the "%ls" variant below) seem to be the least broken
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf( output, "%lc", wCh );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf( output, "%lc", wCh[0] );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wchar_t wChString[ 2 ];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1885,13 +1885,13 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( strOption == STR_UTF8 && ( ch & 0x80 ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int secondCh = getc( inFile );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wchar_t wCh;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wchar_t wCh[2] = { 0, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* It's a multibyte UTF8 character, read it as a widechar */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ( ch & 0xE0 ) == 0xC0 ) /* 111xxxxx -> 110xxxxx */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* 2-byte character in the range 0x80...0x7FF */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wCh = ( ( ch & 0x1F ) << 6 ) | ( secondCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wCh[0] = ( ( ch & 0x1F ) << 6 ) | ( secondCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i++; /* We've read 2 characters */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fPos += 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1902,12 +1902,12 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int thirdCh = getc( inFile );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* 3-byte character in the range 0x800...0xFFFF */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wCh = ( ( ch & 0x1F ) << 12 ) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wCh[0] = ( ( ch & 0x1F ) << 12 ) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( ( secondCh & 0x3F ) << 6 ) | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( thirdCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wCh = '.';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wCh[0] = '.';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i += 2; /* We've read 3 characters */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fPos += 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>