<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15cfd6478951f4ddbd4ddcbf356cf9c732d7998a">https://github.com/macports/macports-ports/commit/15cfd6478951f4ddbd4ddcbf356cf9c732d7998a</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 15cfd64 dumpasn1: update to 20150808
</span>15cfd64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15cfd6478951f4ddbd4ddcbf356cf9c732d7998a
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Mon Jan 2 14:48:45 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> dumpasn1: update to 20150808
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move to use Debian's distfile and patches to make this easier to
</span><span style='display:block; white-space:pre;color:#404040;'> update. The downloading of the homepage's 2 distfiles often failed
</span><span style='display:block; white-space:pre;color:#404040;'> and did't allow version controlling.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/53032
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/47287
</span>---
textproc/dumpasn1/Portfile | 33 ++++++-------
textproc/dumpasn1/files/bug348856.patch | 83 +++++++++++++++++++++++++++++++++
textproc/dumpasn1/files/bug840771.patch | 51 ++++++++++++++++++++
3 files changed, 148 insertions(+), 19 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 4a04260..1c9c5d2 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,7 +3,7 @@
</span> PortSystem 1.0
name dumpasn1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20110202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20150808
</span> categories textproc security
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,22 +15,16 @@ long_description \
</span> many security-related objects.
homepage http://www.cs.auckland.ac.nz/~pgut001/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles dumpasn1.c dumpasn1.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums dumpasn1.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 65fbc959dcf36729f29d2c81d148002e934d192a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 514e3b49adb0b2e49f8bcfc47c20c5f4202bc7e9f7b1e90bcd4d4cf592d469f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dumpasn1.cfg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 27c96f45ae762b202fe7ee5a3973d7e7447415ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b7c0ad5a4186fcef9b37d5a95419886e8ed16f0c69603f9725c4007026958241
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.mkdir yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${distpath} dumpasn1.c dumpasn1.cfg ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites debian:d/${name}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${name}_${version}.orig${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 203d79e1ef0ea9a614557d178d388499245554c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6119a9e218c6d7744419fda413c8ea850c272a83c1d1716a5cc6b87a63215594
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles bug348856.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bug840771.patch
</span>
post-patch {
reinplace "s|/etc/dumpasn1/|$prefix/etc/|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,5 +46,6 @@ destroot {
</span> ${destroot}${prefix}/etc/dumpasn1.cfg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type moddate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0][lindex ${distfiles} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://http.debian.net/debian/pool/main/d/dumpasn1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}_(\[0-9\]+).orig${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dumpasn1/files/bug348856.patch b/textproc/dumpasn1/files/bug348856.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..44d3e5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/dumpasn1/files/bug348856.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: dumpasn1 doesn't properly display localized BMPString
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Victor B. Wagner <vitus@45.free.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/348856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-By: Mathieu Malaterre <malat@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: http://bugs.debian.org/348856#59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dumpasn1-20150808.orig/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,6 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <locale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef OS390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* OS390 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1315,13 +1316,13 @@ static int adjustLevel( const int level,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use wcstombs() to see if anything can be displayed, if it can't we drop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ back to trying to display the data as non-Unicode */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int displayUnicode( const wchar_t wCh, const int level )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int displayUnicode( const wchar_t wCh[], const int level )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char outBuf[ 8 ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int outLen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Check whether we can display this character */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- outLen = wcstombs( outBuf, &wCh, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ outLen = wcstombs( outBuf, wCh, 8 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( outLen < 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Tell the caller that this can't be displayed as Unicode */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1369,13 +1370,7 @@ static int displayUnicode( const wchar_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wChString[ 1 ] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf( output, "%ls", wChString );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( fwide( output, 1 ) > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fputwc( wCh, output );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fwide( output, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fputc( wCh, output );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf( output, "%s", outBuf );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1872,7 +1867,7 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const wchar_t wCh = ( ch << 8 ) | getc( inFile );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const wchar_t wCh[2] ={ ( ch << 8 ) | getc( inFile ),0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( displayUnicode( wCh, level ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1884,7 +1879,7 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The value can't be displayed as Unicode, fall back to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ displaying it as normal text */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ungetc( wCh & 0xFF, inFile );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ungetc( wCh[0] & 0xFF, inFile );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( strOption == STR_UTF8 && ( ch & 0x80 ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3118,7 +3113,14 @@ int main( int argc, char *argv[] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* __OS390__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long offset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int moreArgs = TRUE, doCheckOnly = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setlocale(LC_ALL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __WIN32__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ".OCP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __OS390__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset( pathPtr, '\0', sizeof( pathPtr ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2e368b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/dumpasn1/files/bug840771.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: segfaults on valid certificate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix stack smashing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: https://bugs.debian.org/840771#17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: https://bugs.debian.org/840771
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Mathieu Malaterre <malat@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dumpasn1-20150808.orig/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dumpasn1-20150808/dumpasn1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1362,7 +1362,7 @@ static int displayUnicode( const wchar_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This (and the "%ls" variant below) seem to be the least broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf( output, "%lc", wCh );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf( output, "%lc", wCh[0] );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wchar_t wChString[ 2 ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1885,13 +1885,13 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( strOption == STR_UTF8 && ( ch & 0x80 ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int secondCh = getc( inFile );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wchar_t wCh;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wchar_t wCh[2] = { 0, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* It's a multibyte UTF8 character, read it as a widechar */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( ( ch & 0xE0 ) == 0xC0 ) /* 111xxxxx -> 110xxxxx */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 2-byte character in the range 0x80...0x7FF */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wCh = ( ( ch & 0x1F ) << 6 ) | ( secondCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wCh[0] = ( ( ch & 0x1F ) << 6 ) | ( secondCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i++; /* We've read 2 characters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fPos += 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1902,12 +1902,12 @@ static void displayString( FILE *inFile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int thirdCh = getc( inFile );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 3-byte character in the range 0x800...0xFFFF */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wCh = ( ( ch & 0x1F ) << 12 ) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wCh[0] = ( ( ch & 0x1F ) << 12 ) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( ( secondCh & 0x3F ) << 6 ) | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( thirdCh & 0x3F );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wCh = '.';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wCh[0] = '.';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i += 2; /* We've read 3 characters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fPos += 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>