aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-07-24 09:57:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-07-24 09:58:08 +0000
commit88156e190ca8c5d84df19aaa134c1ef78677294f (patch)
treef2e1e18d5809e9326563e3efb5eaae0c68cee849
parent394ffdff3b8ba81cd74faed54d8192310e99e0b2 (diff)
downloadaports-88156e190ca8c5d84df19aaa134c1ef78677294f.tar.gz
aports-88156e190ca8c5d84df19aaa134c1ef78677294f.tar.bz2
aports-88156e190ca8c5d84df19aaa134c1ef78677294f.tar.xz
main/sqsh: fix build with freetds 1.2
remove patch that apparently is no longer needed
-rw-r--r--main/sqsh/APKBUILD31
-rw-r--r--main/sqsh/datetime.patch16
-rw-r--r--main/sqsh/freetds-1.2.patch25
3 files changed, 32 insertions, 40 deletions
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index 11d9ccb907..9416b274a3 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -7,34 +7,19 @@ case $pkgver in
*.*.*) _v=${pkgver%.*};;
*) _v=$pkgver;;
esac
-pkgrel=3
+pkgrel=4
pkgdesc="Sybase iSQL replacement"
url="http://www.sqsh.org"
arch="all"
license="GPL"
-depends=""
-depends_dev=""
makedepends="freetds-dev readline-dev ncurses-dev"
-install=""
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/project/sqsh/sqsh/sqsh-$_v/sqsh-$pkgver.tgz
tds-version.patch
- datetime.patch
+ freetds-1.2.patch
"
-
builddir="$srcdir"/$pkgname-$_v
-prepare() {
- local i
- cd "$builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$builddir"
SYBASE=/usr
export SYBASE
./configure \
@@ -43,17 +28,15 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/doc \
- --with-readline \
- || return 1
- make || return 1
+ --with-readline
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
- make DESTDIR="$pkgdir" install.man || return 1
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install.man
}
sha512sums="d011d413f5a21059e1b043c75f0a15ea29d10972b59ea980ebcb010b1b0e16eb377a66d21ba4f3ea4433c4deac5ba80b1af7e858129a306a6611de32da48981c sqsh-2.5.16.1.tgz
f73696f016e6a0f3c8f4020ba79b7dc9618c1958872dbb531e31c1b2709d7d7af227a3206b466bda932d8319443c838f6b05042b79b50560a9de842502274798 tds-version.patch
-6b424d995755d07fab6986a0594350e3d045c36fd4852f28608dee918d1052e0ec8e92b8758347c18f39a2eefa42a8421d44d54c799386a533a606b6b4802352 datetime.patch"
+563bb6805025f2560b0c0bae4528e3ee54d17598c51669848f988d2948dc45b177412d5113259d2af5509ab77ae70e5dfdb4e0eebe9fe5252293d9b57f325934 freetds-1.2.patch"
diff --git a/main/sqsh/datetime.patch b/main/sqsh/datetime.patch
deleted file mode 100644
index 2a02504c59..0000000000
--- a/main/sqsh/datetime.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/dsp_conv.c b/src/dsp_conv.c
-index 6c6878c..e141b99 100644
---- a/src/dsp_conv.c
-+++ b/src/dsp_conv.c
-@@ -660,11 +660,6 @@ CS_RETCODE dsp_datetime_conv( ctx, dt_fmt, dt, buf, len, type )
- * type of date that we are processing and replace the ms
- * field if it exists.
- */
--#if defined(CS_BIGDATETIME_TYPE) && defined(CS_BIGTIME_TYPE)
-- if (dt_fmt->datatype == CS_BIGDATETIME_TYPE || dt_fmt->datatype == CS_BIGTIME_TYPE)
-- fmt = dsp_datetime_strip( dt_fmt->datatype, conv_fmt, (int) dr.datesecfrac );
-- else
--#endif
- fmt = dsp_datetime_strip( dt_fmt->datatype, conv_fmt, (int) dr.datemsecond );
-
- /*
diff --git a/main/sqsh/freetds-1.2.patch b/main/sqsh/freetds-1.2.patch
new file mode 100644
index 0000000000..1679341ce3
--- /dev/null
+++ b/main/sqsh/freetds-1.2.patch
@@ -0,0 +1,25 @@
+FreeTDS 1.2 introduces CS_SEC_NETWORKAUTH but does not have CS_SEC_CHANBIND,
+CS_SEC_CONFIDENTIALITY, CS_SEC_INTEGRITY, etc
+
+diff --git a/src/cmd_connect.c b/src/cmd_connect.c
+index 2956050..c81b3dd 100644
+--- a/src/cmd_connect.c
++++ b/src/cmd_connect.c
+@@ -1875,7 +1875,7 @@ static CS_RETCODE SetNetAuth (conn, principal, keytab_file, secmech, req_options
+ CS_CHAR *req_options;
+ {
+
+-#if defined(CS_SEC_NETWORKAUTH)
++#if defined(CS_SEC_NETWORKAUTH) && defined(CS_SEC_CHANBIND) && defined(CS_SEC_CONFIDENTIALITY) && defined(CS_SEC_INTEGRITY)
+
+ 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 defined(CS_SEC_NETWORKAUTH) && defined(CS_SEC_CREDTIMEOUT)
+ CS_INT CredTimeOut;
+ CS_BOOL NETWORKAUTH;
+ char *datetime;