switch sqsh to fork at github, update to sqsh-3.0pre20231205

This commit is contained in:
sthen
2025-06-15 09:58:45 +00:00
parent f555450030
commit a6a006e314
4 changed files with 14 additions and 59 deletions
+7 -8
View File
@@ -1,22 +1,21 @@
COMMENT= SQL shell for FreeTDS
DISTNAME= sqsh-2.5.16.1
REVISION= 5
WRKDIST= ${WRKDIR}/sqsh-2.5
EXTRACT_SUFX= .tgz
GH_ACCOUNT= vonloxley
GH_PROJECT= sqsh
GH_COMMIT= c71e518895059ae172bfc53434f8b654dd104b7f
DISTNAME= sqsh-3.0pre20231205
CATEGORIES= databases shells
HOMEPAGE= https://sourceforge.net/projects/sqsh/
# original at https://sourceforge.net/projects/sqsh/
HOMEPAGE= https://vonloxley.github.io/sqsh/
MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>
# GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB += c ct>=2 iconv curses m pthread readline
SITES= ${SITE_SOURCEFORGE:=sqsh/}
WANTLIB += c ct>=2 iconv curses m readline
LIB_DEPENDS= converters/libiconv \
databases/freetds
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (sqsh-2.5.16.1.tgz) = 1mQfNlrOYCJfwPpI+Cudvtd6TlBqDkl+toieCWuDIPI=
SIZE (sqsh-2.5.16.1.tgz) = 623715
SHA256 (sqsh-3.0pre20231205-c71e5188.tar.gz) = 8WWvkMaMwX/IekQuy2pKJ7rxsFJsmFXK69nqwyLOeAo=
SIZE (sqsh-3.0pre20231205-c71e5188.tar.gz) = 666969
+5 -4
View File
@@ -1,6 +1,7 @@
--- aclocal.m4.orig Sat Jun 7 11:03:08 2014
+++ aclocal.m4 Sat Jun 7 11:04:37 2014
@@ -274,10 +274,6 @@ AC_DEFUN([AC_SYBASE_ASE], [
Index: aclocal.m4
--- aclocal.m4.orig
+++ aclocal.m4
@@ -279,10 +279,6 @@ AC_DEFUN([AC_SYBASE_ASE], [
else
SYBASE_LIBDIR="$SYBASE_OCOS/lib"
fi
@@ -11,7 +12,7 @@
case "${host_os}" in
*cygwin)
SYBASE_LIBS="-lct"
@@ -364,6 +360,8 @@ AC_DEFUN([AC_SYBASE_ASE], [
@@ -369,6 +365,8 @@ AC_DEFUN([AC_SYBASE_ASE], [
case "${host_os}" in
linux*)
SYBASE_OS="-ldl -lm";;
@@ -1,45 +0,0 @@
- CS_TDS_80 used to be #defined to CS_TDS_71 but has now been removed.
- Disable CS_SEC_NETWORKAUTH code. FreeTDS 1.2 introduces CS_SEC_NETWORKAUTH
but doesn't have CS_MAX_CHAR, CS_SEC_CHANBIND, CS_SEC_CONFIDENTIALITY,
CS_SEC_INTEGRITY, etc.
Index: src/cmd_connect.c
--- src/cmd_connect.c.orig
+++ src/cmd_connect.c
@@ -861,7 +861,7 @@ int cmd_connect( argc, argv )
else if (strcmp(tds_version, "7.0") == 0)
version = CS_TDS_70;
else if (strcmp(tds_version, "8.0") == 0)
- version = CS_TDS_80;
+ version = CS_TDS_71;
#endif
else version = CS_TDS_50; /* default version */
@@ -1258,7 +1258,7 @@ int cmd_connect( argc, argv )
case CS_TDS_70:
env_set( g_env, "tds_version", "7.0" );
break;
- case CS_TDS_80:
+ case CS_TDS_71:
env_set( g_env, "tds_version", "8.0" );
break;
#endif
@@ -1875,7 +1875,7 @@ static CS_RETCODE SetNetAuth (conn, principal, keytab_
CS_CHAR *req_options;
{
-#if defined(CS_SEC_NETWORKAUTH)
+#if 0 && defined(CS_SEC_NETWORKAUTH)
CS_CHAR buf[CS_MAX_CHAR+1];
CS_INT buflen;
@@ -2051,7 +2051,7 @@ static CS_RETCODE ShowNetAuthCredExp (conn, cmdname)
CS_CONNECTION *conn;
CS_CHAR *cmdname;
{
-#if defined(CS_SEC_NETWORKAUTH)
+#if 0 && defined(CS_SEC_NETWORKAUTH)
CS_INT CredTimeOut;
CS_BOOL NETWORKAUTH;
char *datetime;