Commit bb5b4b8a authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2.9.2-1+dfsg

parent 264af7d4

CHANGES.md

+11 −0
Original line number Diff line number Diff line 
# NCBI External Developer Release:





## NCBI VDB 2.9.2-1

**July 31, 2018**

  **vdb**: restored lost exported attribute on several entries in the private API





## NCBI VDB 2.9.2

**July 23, 2018**

  **kfg, vfs**: Introduced enhanced handling of download-only NGC files that lack read/decrypt permissions





## NCBI VDB 2.9.1-1

**June 25, 2018**

build/Makefile.vers

+1 −1
Original line number Diff line number Diff line
@@ -23,4 +23,4 @@ 
# ===========================================================================



# NCBI-VDB and library version

VERSION = 2.9.1
 
VERSION = 2.9.2

libs/blast/blast-mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include <stdio.h> /* fprintf */

#include <string.h> /* memset */



#define TOOLKIT "sratoolkit2_9_1"

#define TOOLKIT "sratoolkit2_9_2"



/******************************************************************************/

libs/kdb/libkdb.vers.h

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 
*

*/



#define LIBKDB_VERS 0x0207001A
 
#define LIBKDB_VERS 0x0207001B

libs/kfg/keystore.c

+16 −8
Original line number Diff line number Diff line
@@ -174,6 +174,11 @@ rc_t ReadEncKey(const KFile* file, char* buf, size_t bufsize) 


    if (rc == 0)

    {

        char * pc;



        /* ensure buffer is NUL terminated */

        buf [ readNum ] = 0;

        

        /* -----

         * trim back the contents of the file to

         * a single ASCII/UTF-8 text line
@@ -181,17 +186,20 @@ rc_t ReadEncKey(const KFile* file, char* buf, size_t bufsize) 
         * end of line characters so it could have other

         * control characters...

         */

        char* pc = string_chr (buf, readNum, '\r');

        pc = memchr ( buf, '\r', readNum );

        if ( pc == NULL )

            pc = string_chr (buf, readNum, '\n');



            pc = memchr ( buf, '\n', readNum );

        if (pc != NULL)

            *pc = 0;

        else

            buf[readNum]=0;



        if (string_measure(buf, NULL) == 0)

        /* disallow a length of 0 */

        if ( buf [ 0 ] == 0 )

            rc = RC (rcKFG, rcEncryptionKey, rcRetrieving, rcSize, rcTooShort);

        else if ( memcmp ( buf, "n/a", 4 ) == 0 )

        {

            /* download-only NGC file */

            rc = RC ( rcKFG, rcEncryptionKey, rcRetrieving, rcEncryptionKey, rcNoPerm );

        }

    }

    return rc;

}