1 |
commit: 5bf104f4104b700d8c3c1ab17a834f4c78e47d0f |
2 |
Author: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 9 22:50:34 2012 +0000 |
4 |
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jul 9 22:50:34 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5bf104f4 |
7 |
|
8 |
[dev-db/virtuoso-server] Add to overlay for testing, version bump to 6.1.5 |
9 |
|
10 |
(Portage version: 2.2.0_alpha116/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
.../virtuoso-server-6.1.4-strncat-overflow.patch | 11 +++ |
14 |
.../virtuoso-server-6.1.4-unbundle-minizip.patch | 36 ++++++++ |
15 |
dev-db/virtuoso-server/metadata.xml | 22 +++++ |
16 |
.../virtuoso-server/virtuoso-server-6.1.5.ebuild | 86 ++++++++++++++++++++ |
17 |
4 files changed, 155 insertions(+), 0 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 0000000..4324821 |
22 |
--- /dev/null |
23 |
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c |
26 |
++++ virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c |
27 |
+@@ -423,7 +423,7 @@ |
28 |
+ socksreq[8] = 0; /* no name */ |
29 |
+ if (name) |
30 |
+ { |
31 |
+- strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8); |
32 |
++ strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 9); |
33 |
+ socksreq[sizeof (socksreq) - 1] = 0; |
34 |
+ packetsize = 9 + strlen ((char *) socksreq + 8); |
35 |
+ } |
36 |
|
37 |
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 |
38 |
new file mode 100644 |
39 |
index 0000000..143c359 |
40 |
--- /dev/null |
41 |
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch |
42 |
@@ -0,0 +1,36 @@ |
43 |
+diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in |
44 |
+--- virtuoso-opensource-6.1.4.orig/configure.in 2011-11-20 03:38:18.000000000 +0400 |
45 |
++++ virtuoso-opensource-6.1.4/configure.in 2011-11-20 03:42:44.000000000 +0400 |
46 |
+@@ -1550,14 +1550,15 @@ |
47 |
+ then |
48 |
+ AC_CHECK_HEADER(zlib.h) |
49 |
+ AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) |
50 |
++ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) |
51 |
+ fi |
52 |
+ if test "x$with_zlib" = "xinternal" |
53 |
+ then |
54 |
+ ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' |
55 |
+ ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' |
56 |
+ else |
57 |
+- ZLIB_INC="" |
58 |
+- ZLIB_LIB="-lz" |
59 |
++ ZLIB_INC=`pkg-config --cflags zlib minizip` |
60 |
++ ZLIB_LIB=`pkg-config --libs zlib minizip` |
61 |
+ fi |
62 |
+ AC_SUBST(ZLIB_INC) |
63 |
+ AC_SUBST(ZLIB_LIB) |
64 |
+diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c |
65 |
+--- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c 2011-10-26 17:54:19.000000000 +0400 |
66 |
++++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c 2011-11-20 03:44:36.000000000 +0400 |
67 |
+@@ -6167,10 +6167,7 @@ |
68 |
+ #define fopen64 fopen |
69 |
+ #endif |
70 |
+ |
71 |
+-#include "zlib/contrib/minizip/unzip.h" |
72 |
+-#include "zlib/contrib/minizip/ioapi.h" |
73 |
+-#include "zlib/contrib/minizip/ioapi.c" |
74 |
+-#include "zlib/contrib/minizip/unzip.c" |
75 |
++#include "unzip.h" |
76 |
+ |
77 |
+ static caddr_t |
78 |
+ bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) |
79 |
|
80 |
diff --git a/dev-db/virtuoso-server/metadata.xml b/dev-db/virtuoso-server/metadata.xml |
81 |
new file mode 100644 |
82 |
index 0000000..13eb31d |
83 |
--- /dev/null |
84 |
+++ b/dev-db/virtuoso-server/metadata.xml |
85 |
@@ -0,0 +1,22 @@ |
86 |
+<?xml version="1.0" encoding="UTF-8"?> |
87 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
88 |
+<pkgmetadata> |
89 |
+ <herd>kde</herd> |
90 |
+ <maintainer> |
91 |
+ <email>reavertm@g.o</email> |
92 |
+ <name>Maciej Mrozowski</name> |
93 |
+ </maintainer> |
94 |
+ <maintainer> |
95 |
+ <email>creffett@g.o</email> |
96 |
+ <name>Chris Reffett</name> |
97 |
+ </maintainer> |
98 |
+ <longdescription> |
99 |
+OpenLink Virtuoso Open-Source Edition is a new generation of hybrid data server |
100 |
+product called a "Universal Server". It implements a wide range of industry |
101 |
+standard APIs and protocols, covering a broad range of functionality realms |
102 |
+that include: Object-Relational Data Managemtent, Virtualization of |
103 |
+Heterogeneous Data Sources (SQL, XML, RDF), Document Web Server (WebDAV/HTTP), |
104 |
+Data Web Server (RDF Linked Data Deployment), Web Services Platform, Discussion |
105 |
+Server, and many more. |
106 |
+ </longdescription> |
107 |
+</pkgmetadata> |
108 |
|
109 |
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild |
110 |
new file mode 100644 |
111 |
index 0000000..8e2263f |
112 |
--- /dev/null |
113 |
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild |
114 |
@@ -0,0 +1,86 @@ |
115 |
+# Copyright 1999-2012 Gentoo Foundation |
116 |
+# Distributed under the terms of the GNU General Public License v2 |
117 |
+# $Header: $ |
118 |
+ |
119 |
+EAPI=4 |
120 |
+ |
121 |
+inherit virtuoso |
122 |
+ |
123 |
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database" |
124 |
+ |
125 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
126 |
+IUSE="kerberos ldap readline" |
127 |
+ |
128 |
+# Bug 305077 |
129 |
+RESTRICT="test" |
130 |
+ |
131 |
+# zeroconf support looks like broken - disabling - last checked around 5.0.12 |
132 |
+# mono support fetches mono source and compiles it manually - disabling for now |
133 |
+# mono? ( dev-lang/mono ) |
134 |
+COMMON_DEPEND=" |
135 |
+ dev-libs/libxml2:2 |
136 |
+ >=dev-libs/openssl-0.9.7i:0 |
137 |
+ >=sys-libs/zlib-1.2.5.1-r2:0[minizip] |
138 |
+ kerberos? ( app-crypt/mit-krb5 ) |
139 |
+ ldap? ( net-nds/openldap ) |
140 |
+ readline? ( sys-libs/readline:0 ) |
141 |
+" |
142 |
+DEPEND="${COMMON_DEPEND} |
143 |
+ sys-apps/gawk |
144 |
+ >=sys-devel/bison-2.3 |
145 |
+ >=sys-devel/flex-2.5.33 |
146 |
+ virtual/pkgconfig |
147 |
+" |
148 |
+RDEPEND="${COMMON_DEPEND} |
149 |
+ ~dev-db/virtuoso-odbc-${PV}:${SLOT} |
150 |
+" |
151 |
+ |
152 |
+VOS_EXTRACT=" |
153 |
+ libsrc/Dk |
154 |
+ libsrc/Thread |
155 |
+ libsrc/Tidy |
156 |
+ libsrc/Wi |
157 |
+ libsrc/Xml.new |
158 |
+ libsrc/langfunc |
159 |
+ libsrc/odbcsdk |
160 |
+ libsrc/plugin |
161 |
+ libsrc/util |
162 |
+ binsrc/virtuoso |
163 |
+ binsrc/tests |
164 |
+" |
165 |
+ |
166 |
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README) |
167 |
+ |
168 |
+PATCHES=( |
169 |
+ "${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch" |
170 |
+ "${FILESDIR}/${PN}-6.1.4-strncat-overflow.patch" |
171 |
+ |
172 |
+) |
173 |
+ |
174 |
+src_prepare() { |
175 |
+ sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \ |
176 |
+ || die "failed to disable installation of static lib" |
177 |
+ |
178 |
+ virtuoso_src_prepare |
179 |
+} |
180 |
+ |
181 |
+src_configure() { |
182 |
+ myconf+=" |
183 |
+ $(use_enable kerberos krb) |
184 |
+ $(use_enable ldap openldap) |
185 |
+ $(use_with readline) |
186 |
+ --disable-static |
187 |
+ --disable-hslookup |
188 |
+ --disable-rendezvous |
189 |
+ --without-iodbc |
190 |
+ --program-transform-name="s/isql/isql-v/" |
191 |
+ " |
192 |
+ |
193 |
+ virtuoso_src_configure |
194 |
+} |
195 |
+ |
196 |
+src_install() { |
197 |
+ virtuoso_src_install |
198 |
+ |
199 |
+ keepdir /var/lib/virtuoso/db |
200 |
+} |