diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2005-08-31 19:03:43 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2005-08-31 19:03:43 +0000 |
| commit | 04225b60bfb837367c0d297fc52dcf29187b5dcb (patch) | |
| tree | 4709bb6147f6d067e5730f357ef7a1dac502ae5c /databases/oracle_odbc_driver/files | |
| parent | New port: oracle8-client 0.1.1 (diff) | |
New port: oracle_odbc_driver 0.5.5
Oracle Open Source ODBC driver.
Diffstat (limited to 'databases/oracle_odbc_driver/files')
3 files changed, 91 insertions, 0 deletions
diff --git a/databases/oracle_odbc_driver/files/patch-configure b/databases/oracle_odbc_driver/files/patch-configure new file mode 100644 index 000000000000..bdf64962c667 --- /dev/null +++ b/databases/oracle_odbc_driver/files/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig Thu Jun 9 07:30:50 2005 ++++ configure Thu Jun 9 19:03:32 2005 +@@ -4719,7 +4719,7 @@ + echo $ECHO_N "checking for libclntsh.so ... $ECHO_C" >&6 + for d in $oraclehome/lib /usr/lib /usr/local/lib + do +-if test -f $d/libclntsh.so || test -f $d/libclntsh.a ++if test -f $d/libclntsh.so || test -f $d/libclntsh.a || test -f $d/libclntst8.a + then + echo "$as_me:$LINENO: result: found libclntsh.so in $d" >&5 + echo "${ECHO_T}found libclntsh.so in $d" >&6 +@@ -4756,7 +4756,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lclntsh "-L$oraldir" $LIBS" ++LIBS="-lclntst8 "-L$oraldir" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -4812,7 +4812,7 @@ + fi + + +- ORALIB="-lclntsh" ++ ORALIB="-lclntst8 -lcompat -lpthread -lm" + + + +@@ -4822,7 +4822,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lclntsh "-L$oraldir" $LIBS" ++LIBS="-lclntst8 "-L$oraldir" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c b/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c new file mode 100644 index 000000000000..e11fec3729ed --- /dev/null +++ b/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c @@ -0,0 +1,18 @@ +--- src/oracle_functions.c.orig Wed Jun 8 19:39:20 2005 ++++ src/oracle_functions.c Wed Jun 8 19:39:32 2005 +@@ -48,6 +48,7 @@ +
+ long local_min(long a, long b){if(a<b)return a; return b;}
+
++#if 0
+ int epc_exit_handler()
+ {
+ /* in oracle 8.1.6 and 8.1.7 libclntsh.so registers an
+@@ -65,6 +66,7 @@ + printf("neener neener caught the exit handler bug!\n");
+ return 0;
+ }
++#endif
+
+ #ifdef UNIX_DEBUG
+ /*
diff --git a/databases/oracle_odbc_driver/files/patch-src-string_functions.c b/databases/oracle_odbc_driver/files/patch-src-string_functions.c new file mode 100644 index 000000000000..f3529c3c13d9 --- /dev/null +++ b/databases/oracle_odbc_driver/files/patch-src-string_functions.c @@ -0,0 +1,35 @@ +--- src/string_functions.c.orig Thu Jun 9 18:18:53 2005 ++++ src/string_functions.c Thu Jun 9 18:18:36 2005 +@@ -81,19 +81,25 @@ + { + char *local_str=NULL; + int i; +- if(str_len==SQL_NTS){ +- if(str&&str[0]) +- for(i=0; i<strlen(str); i++) +- str[i]=toupper(str[i]); +- return((char*)str); +- } ++ ++ if(str_len==SQL_NTS) ++ { ++ if(!str || !str[0]) ++ return((char*)str); ++ ++ /* ++ * always copy to malloc'ed string because str ++ * may point to read-only memory ++ */ ++ str_len = strlen(str); ++ } + if(str_len>=0) + { + local_str=ORAMALLOC(str_len+1); + memcpy(local_str,str,str_len); + local_str[str_len] = '\0'; + } +- for(i=0; i<str_len; i++)local_str[i]=toupper(local_str[i]); ++ for(i=0; i<str_len; i++)local_str[i]=toupper((unsigned char) local_str[i]); + return(local_str); + } + |