diff options
| author | Chris Reffett <geekboy72@gmail.com> | 2012-08-05 00:00:34 -0400 |
|---|---|---|
| committer | Chris Reffett <geekboy72@gmail.com> | 2012-08-05 00:00:34 -0400 |
| commit | 0446b2bbf7a764b0161e3d4aa4555c955a3d300f (patch) | |
| tree | db50d0283cd2ff1ba998791596445a182d962f71 /dev-db/virtuoso-server/files | |
| parent | 78341b2255cd60f32347fba1a09e948cf863d0f4 (diff) | |
| download | kde-0446b2bbf7a764b0161e3d4aa4555c955a3d300f.tar.gz kde-0446b2bbf7a764b0161e3d4aa4555c955a3d300f.tar.bz2 kde-0446b2bbf7a764b0161e3d4aa4555c955a3d300f.zip | |
[dev-db/virtuoso-{server,odbc}] Moved to tree.
Diffstat (limited to 'dev-db/virtuoso-server/files')
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch | 11 | ||||
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch | 36 |
2 files changed, 0 insertions, 47 deletions
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch deleted file mode 100644 index 43248217128..00000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c -+++ virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c -@@ -423,7 +423,7 @@ - socksreq[8] = 0; /* no name */ - if (name) - { -- strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8); -+ strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 9); - socksreq[sizeof (socksreq) - 1] = 0; - packetsize = 9 + strlen ((char *) socksreq + 8); - } diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch deleted file mode 100644 index 143c35905b2..00000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in ---- virtuoso-opensource-6.1.4.orig/configure.in 2011-11-20 03:38:18.000000000 +0400 -+++ virtuoso-opensource-6.1.4/configure.in 2011-11-20 03:42:44.000000000 +0400 -@@ -1550,14 +1550,15 @@ - then - AC_CHECK_HEADER(zlib.h) - AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) -+ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) - fi - if test "x$with_zlib" = "xinternal" - then - ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' - ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' - else -- ZLIB_INC="" -- ZLIB_LIB="-lz" -+ ZLIB_INC=`pkg-config --cflags zlib minizip` -+ ZLIB_LIB=`pkg-config --libs zlib minizip` - fi - AC_SUBST(ZLIB_INC) - AC_SUBST(ZLIB_LIB) -diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c ---- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c 2011-10-26 17:54:19.000000000 +0400 -+++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c 2011-11-20 03:44:36.000000000 +0400 -@@ -6167,10 +6167,7 @@ - #define fopen64 fopen - #endif - --#include "zlib/contrib/minizip/unzip.h" --#include "zlib/contrib/minizip/ioapi.h" --#include "zlib/contrib/minizip/ioapi.c" --#include "zlib/contrib/minizip/unzip.c" -+#include "unzip.h" - - static caddr_t - bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) |