[med-svn] [Git][med-team/ncbi-tools6][master] Initialize SSL for taxblast, accidentally missed earlier.

[Aaron Ucko]

Aaron Ucko pushed to branch master at Debian Med / ncbi-tools6


Commits:
c44833bc by Aaron M. Ucko at 2018-04-12T19:50:15-04:00
Initialize SSL for taxblast, accidentally missed earlier.

* demo/taxblast_main.c: Call SOCK_SetupSSL.
* make/makenet.unx: Link taxblast against $(LIBTLS) and $(GNUTLS_LIBS).

- - - - -


4 changed files:

- debian/changelog
- debian/patches/debian-changes
- demo/taxblast_main.c
- make/makenet.unx


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ ncbi-tools6 (6.1.20170106-3) UNRELEASED; urgency=medium
   * debian/source/options: single-debian-patch (tracking changes purely
     with git for now).
   * debian/source/patch-header: "Combined patches from git."
+  * demo/taxblast_main.c: Call SOCK_SetupSSL (accidentally missed earlier).
+  * make/makenet.unx: Link taxblast against $(LIBTLS) and $(GNUTLS_LIBS).
 
- -- Aaron M. Ucko <ucko at debian.org>  Sun, 25 Mar 2018 20:59:34 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Thu, 12 Apr 2018 19:50:13 -0400
 
 ncbi-tools6 (6.1.20170106-2) unstable; urgency=medium
 


=====================================
debian/patches/debian-changes
=====================================
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -591,6 +591,15 @@ Combined patches from git.
  	$(VIB_POST_LINK) entrez2
  
  # demo program (spidey)
+@@ -1285,7 +1297,7 @@ bl2seq : bl2seq.c
+ taxblast: taxblast_main.c $(BLIB41) $(BLIB40)
+ 	$(CC) -g -o taxblast $(LDFLAGS) taxblast_main.c \
+ 		$(LIB61) $(LIB60) $(LIB36) $(LIB41) $(LIB40) $(LIB23) $(LIBCOMPADJ) \
+-		$(NETCLILIB) $(LIB2) $(LIB1) $(OTHERLIBS)
++		$(NETCLILIB) $(LIB2) $(LIBTLS) $(LIB1) $(GNUTLS_LIBS) $(OTHERLIBS)
+ 
+ # test client for the suggest network service
+ suggcli: suggcli.c $(BNETCLILIB) $(BLIB24)
 --- ncbi-tools6-6.1.20170106.orig/make/makeshlb.unx
 +++ ncbi-tools6-6.1.20170106/make/makeshlb.unx
 @@ -1,4 +1,4 @@
@@ -821,3 +830,23 @@ Combined patches from git.
    Nlm_RegisterWindows ();
    Nlm_RegisterTexts ();
    Nlm_RegisterSlates ();
+--- ncbi-tools6-6.1.20170106.orig/demo/taxblast_main.c
++++ ncbi-tools6-6.1.20170106/demo/taxblast_main.c
+@@ -41,6 +41,8 @@ static char const rcsid[] = "$Id: taxbla
+ #include <objgen.h>
+ #include <taxblast.h>
+ 
++#include <connect/ncbi_gnutls.h>
++
+ 
+ #define NUMARG (sizeof(myargs)/sizeof(myargs[0]))
+ 
+@@ -63,6 +65,8 @@ Int2 Main (void)
+     FILE *outfile;
+     Char ofile[128];
+     
++    SOCK_SetupSSL(NcbiSetupGnuTls);
++
+     if (!GetArgs("txblast", NUMARG, myargs)) {
+         return 1;
+     }


=====================================
demo/taxblast_main.c
=====================================
--- a/demo/taxblast_main.c
+++ b/demo/taxblast_main.c
@@ -41,6 +41,8 @@ static char const rcsid[] = "$Id: taxblast_main.c,v";
 #include <objgen.h>
 #include <taxblast.h>
 
+#include <connect/ncbi_gnutls.h>
+
 
 #define NUMARG (sizeof(myargs)/sizeof(myargs[0]))
 
@@ -63,6 +65,8 @@ Int2 Main (void)
     FILE *outfile;
     Char ofile[128];
     
+    SOCK_SetupSSL(NcbiSetupGnuTls);
+
     if (!GetArgs("txblast", NUMARG, myargs)) {
         return 1;
     }


=====================================
make/makenet.unx
=====================================
--- a/make/makenet.unx
+++ b/make/makenet.unx
@@ -1297,7 +1297,7 @@ bl2seq : bl2seq.c
 taxblast: taxblast_main.c $(BLIB41) $(BLIB40)
 	$(CC) -g -o taxblast $(LDFLAGS) taxblast_main.c \
 		$(LIB61) $(LIB60) $(LIB36) $(LIB41) $(LIB40) $(LIB23) $(LIBCOMPADJ) \
-		$(NETCLILIB) $(LIB2) $(LIB1) $(OTHERLIBS)
+		$(NETCLILIB) $(LIB2) $(LIBTLS) $(LIB1) $(GNUTLS_LIBS) $(OTHERLIBS)
 
 # test client for the suggest network service
 suggcli: suggcli.c $(BNETCLILIB) $(BLIB24)



View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/commit/c44833bce4eba98d49c35fb6f2df58873ce76af9

---
View it on GitLab: https://salsa.debian.org/med-team/ncbi-tools6/commit/c44833bce4eba98d49c35fb6f2df58873ce76af9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180412/a946bd34/attachment-0001.html>