Skip to content

Commit f206cf0

Browse files
committed
upgrade freetds to 1.2.18
1 parent 40e1fb8 commit f206cf0

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ the [FreeTDS](http://www.freetds.org/) binaries into your project.
99
Optionally, set the FreeTDS version in a Heroku config like this:
1010

1111
```bash
12-
heroku config:set FREETDS_VERSION=1.00.109
12+
heroku config:set FREETDS_VERSION=1.2.18
1313
```
1414

1515
Make sure the version you're referencing exists on as a `.tar.gz` file on the [FreeTDS releases](ftp://ftp.freetds.org/pub/freetds/stable/).

bin/compile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ load_env_vars() {
5858
}
5959
load_env_vars "FREETDS_VERSION" "FREETDS_ARCHIVE_NAME" "TDS_VERSION" "FREETDS_REBUILD"
6060

61-
FREETDS_VERSION="${FREETDS_VERSION:-1.00.109}"
61+
FREETDS_VERSION="${FREETDS_VERSION:-1.2.18}"
6262
FREETDS_ARCHIVE_NAME="${FREETDS_ARCHIVE_NAME:-freetds-${FREETDS_VERSION}}"
63-
TDS_VERSION="${TDS_VERSION:-7.3}" # or TDSVER
63+
TDS_VERSION="${TDS_VERSION:-7.4}" # or TDSVER
6464

6565
CACHED_TAR="${CACHE_DIR}/freetds-${FREETDS_VERSION}-heroku.tar.bz2"
6666
# Default rebuild to true since I'm having issues linking the library to tiny_tds gem with a cached build.
@@ -125,7 +125,7 @@ download_and_extract_freetds_archive() {
125125
}
126126

127127
build_and_install_freetds() {
128-
topic "Building FreeTDS against OpenSSL $(openssl version)"
128+
topic "Building FreeTDS against GnuTLS"
129129
( # directory changes in subshells have no effect
130130
cd "${BUILD_DIR}/${FREETDS_ARCHIVE_NAME}"
131131

@@ -142,7 +142,8 @@ build_and_install_freetds() {
142142
"--prefix=${APP_TARGET_DIR}" \
143143
--disable-odbc \
144144
--disable-debug \
145-
"--with-tdsver=${TDS_VERSION}"
145+
"--with-tdsver=${TDS_VERSION}" \
146+
"--with-gnutls"
146147
EOF
147148
# TODO(BF): Print log when HEROKUR_FREETDS_BUILDPACK_DEBUG is set
148149
/bin/bash .build_options > build_log-configure.stdout.log 2> build_log-configure.stderr.log

0 commit comments

Comments
 (0)