Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
databases/sqlrelay/patches/patch-ac
View File

@@ -1,22 +0,0 @@
$NetBSD: patch-ac,v 1.3 2011/11/02 13:59:29 fhajny Exp $
--- etc/Makefile.orig 2006-07-08 03:18:01.000000000 +0000
+++ etc/Makefile
@@ -5,12 +5,10 @@ include ../config.mk
.PHONY: install uninstall
install:
- $(MKINSTALLDIRS) $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
+ $(MKINSTALLDIRS) ${DESTDIR}$(EXAMPLESDIR)
+ $(INSTALL) -m 644 sqlrelay.conf.example ${DESTDIR}$(EXAMPLESDIR)
+ $(INSTALL) -m 644 sqlrelay.dtd ${DESTDIR}$(EXAMPLESDIR)
uninstall:
- $(RM) $(sysconfdir)/sqlrelay.conf.example
- $(RM) $(sysconfdir)/sqlrelay.dtd
- $(RM) $(EXAMPLEDIR)/sqlrelay.conf
+ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.conf.example
+ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.dtd

7
databases/sqlrelay/patches/patch-ad
View File

@@ -1,8 +1,9 @@
$NetBSD: patch-ad,v 1.1 2008/10/03 18:14:46 joerg Exp $
$NetBSD: patch-ad,v 1.3 2014/05/27 13:24:43 fhajny Exp $
--- Makefile.orig 2008-10-03 18:08:41.000000000 +0000
We install init scripts ourselves.
--- Makefile.orig 2013-10-19 12:27:13.000000000 +0000
+++ Makefile
@@ -25,7 +25,6 @@ install:
@@ -17,7 +17,6 @@ install:
$(MAKE) -C src install
$(MAKE) -C bin install
$(MAKE) -C etc install

32
databases/sqlrelay/patches/patch-configure Normal file
View File

@@ -0,0 +1,32 @@
$NetBSD: patch-configure,v 1.2 2014/05/27 13:24:43 fhajny Exp $
Look for history/readline at proper places.
--- configure.orig 2014-03-26 14:50:53.000000000 +0000
+++ configure
@@ -17557,7 +17557,7 @@ fi
$as_echo_n "checking for history... " >&6; }
-SEARCHPATH=/usr
+SEARCHPATH=${prefix}
NAME=history
HEADER=readline/history.h
LIBNAME=history
@@ -17893,7 +17893,7 @@ fi
$as_echo_n "checking for readline... " >&6; }
-SEARCHPATH=/usr
+SEARCHPATH=${prefix}
NAME=readline
HEADER=readline/readline.h
LIBNAME=readline
@@ -18501,7 +18501,7 @@ rm -f core conftest.err conftest.$ac_obj
-SEARCHPATH=/usr
+SEARCHPATH=${prefix}
NAME=iconv
HEADER=iconv.h
LIBNAME=iconv

18
databases/sqlrelay/patches/patch-etc_Makefile Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-etc_Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $
Install config file examples properly.
--- etc/Makefile.orig 2012-05-21 04:54:54.000000000 +0000
+++ etc/Makefile
@@ -5,10 +5,8 @@ include ../config.mk
.PHONY: install uninstall
install:
- $(MKINSTALLDIRS) $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)
+ $(INSTALL) -m 644 sqlrelay.dtd $(EXAMPLEDIR)
+ $(INSTALL) -m 644 sqlrelay.xsd $(EXAMPLEDIR)
$(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
uninstall:

37
databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in
View File

@@ -1,37 +0,0 @@
$NetBSD: patch-init__netbsd__rc.d__sqlrelay.in,v 1.1 2011/11/02 13:59:29 fhajny Exp $
--- init/netbsd/rc.d/sqlrelay.in.orig 2007-05-29 20:09:18.000000000 +0000
+++ init/netbsd/rc.d/sqlrelay.in
@@ -31,7 +31,7 @@ cleanup(){
if ( test -r "$i" )
then
PID=`cat $i`
- if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener'`" )
+ if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener|sqlr-scaler'`" )
then
echo "$PID is not sqlr! removing pidfile ..."
rm $i
@@ -42,9 +42,9 @@ cleanup(){
start(){
echo -n $"Starting SQL Relay: "
- if ( test -r "/etc/sqlrelay" ); then
+ if ( test -r "@sysconfdir@/sqlrelay" ); then
launched=0
- for connid in `grep -v ^# /etc/sqlrelay`; do
+ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do
echo
echo -n $"Launching instance with id '${connid}':"
sqlr-start -id ${connid} 0<&- 1>&- 2>&-
@@ -69,9 +69,9 @@ start(){
stop(){
echo -n $"Stopping SQL Relay: "
- if ( test -r "/etc/sqlrelay" ); then
+ if ( test -r "@sysconfdir@/sqlrelay" ); then
launched=0
- for connid in `grep -v ^# /etc/sqlrelay`; do
+ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do
echo
echo -n $"Launching instance with id '${connid}':"
sqlr-stop ${connid} 0<&- 1>&- 2>&-

14
databases/sqlrelay/patches/patch-init_rc.sqlrelay.in Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-init_rc.sqlrelay.in,v 1.1 2014/05/22 12:50:48 fhajny Exp $
Instance definition under PKG_SYSCONFDIR.
--- init/rc.sqlrelay.in.orig 2013-10-20 02:33:20.000000000 +0000
+++ init/rc.sqlrelay.in
@@ -119,7 +119,7 @@ fi
# define instance file
-instances=/etc/sqlrelay
+instances=${sysconfdir}/sqlrelay
if ( test -r "/etc/sysconfig/sqlrelay" )
then
instances=/etc/sysconfig/sqlrelay

13
databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-src__listener__sqlrlistener.h,v 1.1 2011/11/02 13:59:29 fhajny Exp $
--- src/listener/sqlrlistener.h.orig 2011-06-28 20:38:49.000000000 +0000
+++ src/listener/sqlrlistener.h
@@ -26,6 +26,8 @@
#include <defines.h>
+#include <cstring>
+
#ifdef RUDIMENTS_NAMESPACE
using namespace rudiments;
#endif

48
databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp Normal file
View File

@@ -0,0 +1,48 @@
$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.1 2014/11/17 19:00:39 joerg Exp $
Don't mess with system headers by pretending to be C or removing defines.
Just expect php.h to work.
--- src/api/php/sql_relay.cpp.orig 2014-09-02 01:51:20.000000000 +0000
+++ src/api/php/sql_relay.cpp
@@ -3,39 +3,7 @@
#include <sqlrelay/sqlrclient.h>
-#ifdef WIN32
- #undef uid_t
- #undef gid_t
- #undef ssize_t
- #undef socklen_t
- #undef pid_t
- #undef mode_t
- #define PHP_WIN32
- #define ZEND_WIN32
- #define ZEND_DEBUG 0
- #define ZTS 1
-#endif
-
-extern "C" {
- #ifndef WIN32
- #ifdef __cplusplus
- #undef __cplusplus
- #define cpluspluswasdefined
- #endif
- #ifndef HAVE_SOCKLEN_T
- #define HAVE_SOCKLEN_T
- #endif
- #ifndef _WCHAR_T_DEFINED_
- #define _WCHAR_T_DEFINED_
- #endif
- #endif
- #include <php.h>
- #ifndef WIN32
- #ifdef cpluspluswasdefined
- #define __cplusplus
- #endif
- #endif
-}
+#include <php.h>
#include <config.h>

17
databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h
View File

@@ -1,17 +0,0 @@
$NetBSD: patch-src_connection_sqlrcursor.h,v 1.1 2013/10/20 18:18:28 joerg Exp $
--- src/connection/sqlrcursor.h.orig 2013-10-17 12:20:42.000000000 +0000
+++ src/connection/sqlrcursor.h
@@ -167,9 +167,9 @@ class sqlrcursor_svr {
// methods/variables used by derived classes
stringbuffer *fakeInputBinds(const char *query);
- bool skipComment(char **ptr, const char *endptr);
- bool skipWhitespace(char **ptr, const char *endptr);
- bool advance(char **ptr, const char *endptr,
+ bool skipComment(const char **ptr, const char *endptr);
+ bool skipWhitespace(const char **ptr, const char *endptr);
+ bool advance(const char **ptr, const char *endptr,
uint16_t steps);
sqlrconnection_svr *conn;

41
databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C
View File

@@ -1,41 +0,0 @@
$NetBSD: patch-src_connection_sqlrcursor_queryparse.C,v 1.1 2013/10/20 18:18:28 joerg Exp $
--- src/connection/sqlrcursor/queryparse.C.orig 2013-10-17 12:19:25.000000000 +0000
+++ src/connection/sqlrcursor/queryparse.C
@@ -49,8 +49,8 @@ char *sqlrcursor_svr::skipWhitespaceAndC
void sqlrcursor_svr::checkForTempTable(const char *query, uint32_t length) {
- char *ptr=(char *)query;
- char *endptr=(char *)query+length;
+ const char *ptr=query;
+ const char *endptr=query+length;
// skip any leading comments
if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) ||
@@ -78,7 +78,7 @@ void sqlrcursor_svr::checkForTempTable(c
conn->addSessionTempTableForDrop(tablename.getString());
}
-bool sqlrcursor_svr::skipComment(char **ptr, const char *endptr) {
+bool sqlrcursor_svr::skipComment(const char **ptr, const char *endptr) {
while (*ptr<endptr && !charstring::compare(*ptr,"--",2)) {
while (**ptr && **ptr!='\n') {
(*ptr)++;
@@ -87,14 +87,14 @@ bool sqlrcursor_svr::skipComment(char **
return *ptr!=endptr;
}
-bool sqlrcursor_svr::skipWhitespace(char **ptr, const char *endptr) {
+bool sqlrcursor_svr::skipWhitespace(const char **ptr, const char *endptr) {
while ((**ptr==' ' || **ptr=='\n' || **ptr==' ') && *ptr<endptr) {
(*ptr)++;
}
return *ptr!=endptr;
}
-bool sqlrcursor_svr::advance(char **ptr, const char *endptr, uint16_t steps) {
+bool sqlrcursor_svr::advance(const char **ptr, const char *endptr, uint16_t steps) {
for (uint16_t i=0; i<steps && *ptr<endptr; i++) {
(*ptr)++;
}

15
databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-src_connections_oracle8_oracle8connection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $
--- src/connections/oracle8/oracle8connection.C.orig 2013-10-17 12:22:31.000000000 +0000
+++ src/connections/oracle8/oracle8connection.C
@@ -1076,8 +1076,8 @@ void oracle8cursor::returnOutputBindClob
void oracle8cursor::checkForTempTable(const char *query, uint32_t length) {
- char *ptr=(char *)query;
- char *endptr=(char *)query+length;
+ const char *ptr=query;
+ const char *endptr=query+length;
// skip any leading comments
if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) ||

15
databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-src_connections_router_routerconnection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $
--- src/connections/router/routerconnection.C.orig 2013-10-17 12:22:33.000000000 +0000
+++ src/connections/router/routerconnection.C
@@ -600,8 +600,8 @@ void routercursor::checkForTempTable(con
// for oracle db's...
- char *ptr=(char *)query;
- char *endptr=(char *)query+length;
+ const char *ptr=query;
+ const char *endptr=query+length;
// skip any leading comments
if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) ||

13
databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_loggers_custom__sc.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $
--- src/loggers/custom_sc.cpp.orig 2014-05-23 17:02:08.000000000 +0000
+++ src/loggers/custom_sc.cpp
@@ -131,7 +131,7 @@ bool custom_sc::run(sqlrlistener *sqlrl,
// get the client IP, it's needed for some events
const char *clientaddr="unknown";
- if (sqlrcon && sqlrcon->cont->connstats->clientaddr) {
+ if (sqlrcon && sqlrcon->cont->connstats->clientaddr[0]) {
clientaddr=sqlrcon->cont->connstats->clientaddr;
}