<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c005012127417d173cd927f920dc622c535f08b3">https://github.com/macports/macports-ports/commit/c005012127417d173cd927f920dc622c535f08b3</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 c005012 sqsh: patch to fix builds with FreeTDS 1.0+
</span>c005012 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c005012127417d173cd927f920dc622c535f08b3
</span>Author: Isaac M. Good <imgood@amazon.com>
AuthorDate: Tue Apr 25 16:48:35 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> sqsh: patch to fix builds with FreeTDS 1.0+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> FreeTDS 1.0 removed some constants that SQSH depends upon, breaking
</span><span style='display:block; white-space:pre;color:#404040;'> compatibility. This patch re-defines those constants the same way that
</span><span style='display:block; white-space:pre;color:#404040;'> sqsh-3.0 (unreleased) does.
</span>---
sysutils/sqsh/Portfile | 3 ++-
sysutils/sqsh/files/patch-cmd_connect.diff | 25 +++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/sqsh/Portfile b/sysutils/sqsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4314c2..0b08c78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/sqsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/sqsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,8 @@ checksums md5 0ad6cc9452d3257866ccde5f14ffa013 \
</span> depends_lib port:readline port:freetds
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sqsh_readline.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-sqsh_readline.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmd_connect.diff
</span>
post-patch {
reinplace "s|malloc.h|stdlib.h|" ${worksrcpath}/src/sqsh_parser/tsql.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/sqsh/files/patch-cmd_connect.diff b/sysutils/sqsh/files/patch-cmd_connect.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1acb3ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/sqsh/files/patch-cmd_connect.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmd_connect.c.orig 2017-04-25 18:09:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmd_connect.c 2017-04-25 18:10:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,10 +45,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char RCS_Id[] = "$Id: cmd_connect.c,v 1.34 2013/08/22 19:54:34 mwesdorp Exp $";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE(RCS_Id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !defined(lint) */
</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;'>++ * patch taken from sqsh-3.0 development branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Define FreeTDS enumerated values to prevent compile errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * when using different versions of FreeTDS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_70 7365
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_71 7366
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_72 7367
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_73 7368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_74 7369
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CS_TDS_80 CS_TDS_71
</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;'>+ * sqsh-2.1.6 - Structure for Network Security Options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _NetSecService {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CS_INT service;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CS_CHAR optchar;
</span></pre><pre style='margin:0'>
</pre>