Update to version 0.36.1.

4 files changed, 36 insertions, 29 deletions

diff --git a/databases/sqlrelay/files/patch-acsite.m4 b/databases/sqlrelay/files/patch-acsite.m4
index 18fc8eafd648..e4e0e744f203 100644
--- a/databases/sqlrelay/files/patch-acsite.m4
+++ b/databases/sqlrelay/files/patch-acsite.m4
@@ -20,29 +20,3 @@
  FW_INCLUDES(pthreads,[$PTHREADINCLUDES])
  FW_LIBS(pthreads,[$PTHREADLIBS])
  
-@@ -1857,8 +1859,8 @@
- 
- 		if ( test -n "$PYTHONPATH" )
- 		then
--		
--			for i in "2.3" "2.2" "2.1" "2.0" "1.6" "1.5"
-+
-+			for i in "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5"
- 			do
- 				if ( test -d "$PYTHONPATH/include/python$i" -a -d "$PYTHONPATH/lib/python$i/config" )
- 				then
-@@ -2149,13 +2151,7 @@
- 			FW_CHECK_FILE("$JAVAPATH/include/jni.h",[JAVAINCLUDES=\"-I$JAVAPATH/include\"])
- 			if ( test -n "$JAVAINCLUDES" )
- 			then
--				for i in `ls -d $JAVAPATH/include/*`
--				do
--					if ( test -d "$i" )
--					then
--						JAVAINCLUDES="$JAVAINCLUDES -I$i"
--					fi
--				done
-+				JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
- 			fi
- 		fi
- 		
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index a4f1e5e66c89..03eda37c54be 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,6 +1,6 @@
---- config.mk.in.orig	Tue Dec 30 20:17:23 2003
-+++ config.mk.in	Fri May 28 15:59:37 2004
-@@ -14,7 +14,7 @@
+--- config.mk.in.orig	Sun Mar 27 09:48:06 2005
++++ config.mk.in	Mon May  9 01:51:07 2005
+@@ -16,7 +16,7 @@
  exec_prefix= @exec_prefix@
  includedir = @includedir@
  libdir = @libdir@
@@ -9,3 +9,12 @@
  libexecdir = @libexecdir@
  bindir = @bindir@
  localstatedir = @localstatedir@
+@@ -88,7 +88,7 @@
+ # rudiments library
+ RUDIMENTSPATH = @RUDIMENTSPATH@
+ RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@
+-RUDIMENTSLIBS = @RUDIMENTSLIBS@
++RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl
+ RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ 
+ 
+ # perl
diff --git a/databases/sqlrelay/files/patch-init-Makefile b/databases/sqlrelay/files/patch-init-Makefile
new file mode 100644
index 000000000000..bee228d80884
--- /dev/null
+++ b/databases/sqlrelay/files/patch-init-Makefile
@@ -0,0 +1,13 @@
+--- init/Makefile.orig	Mon May  9 01:50:51 2005
++++ init/Makefile	Mon May  9 01:56:03 2005
+@@ -44,8 +44,8 @@
+ endif
+ ifeq ($(UNAME),FreeBSD)
+ 	$(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d
+-	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d
+-	$(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc
++	$(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh-sample
++	$(INSTALL) -m 644 freebsd/sqlrelay $(sysconfdir)/sqlrelay-sample
+ endif
+ ifeq ($(UNAME),SCO_SV)
+ 	$(MKINSTALLDIRS) $(initroot)/etc/init.d
diff --git a/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in b/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in
new file mode 100644
index 000000000000..cfa24ba9446b
--- /dev/null
+++ b/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in
@@ -0,0 +1,11 @@
+--- init/freebsd/rc.d/sqlrelay.in.orig	Fri Jan 28 06:00:16 2005
++++ init/freebsd/rc.d/sqlrelay.in	Mon May  9 01:53:52 2005
+@@ -23,7 +23,7 @@
+ 
+ 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
+             echo