head	1.8;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.8
date	2009.04.29.18.53.10;	author rse;	state Exp;
branches;
next	1.7;
commitid	35H0fbvYlq2JAWLt;

1.7
date	2009.01.30.08.03.19;	author rse;	state Exp;
branches;
next	1.6;
commitid	IqqmEruQvek9RrAt;

1.6
date	2008.04.04.19.12.19;	author rse;	state Exp;
branches;
next	1.5;
commitid	3XPhtPvjICAwePXs;

1.5
date	2007.10.13.18.19.51;	author rse;	state Exp;
branches;
next	1.4;
commitid	yTt49U1mVn8ixsBs;

1.4
date	2007.06.03.08.16.12;	author rse;	state Exp;
branches;
next	1.3;
commitid	4lntgsn7ti9grrks;

1.3
date	2007.03.17.08.06.03;	author rse;	state Exp;
branches;
next	1.2;
commitid	xeEhIKIYGz2eTpas;

1.2
date	2006.12.08.08.47.42;	author rse;	state Exp;
branches;
next	1.1;
commitid	8rNn0YOUgg3OiHXr;

1.1
date	2006.08.25.18.31.45;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	FDppiChRGPnqUfKr;

1.1.2.1
date	2006.08.25.18.31.45;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.57.50;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.8
log
@upgrading package: vortex 1.1.0 -> 1.1.1
@
text
@Index: configure
--- configure.orig	2009-04-24 16:35:53 +0200
+++ configure	2009-04-29 19:34:17 +0200
@@@@ -20186,7 +20186,11 @@@@
 
 if test $vortex_p_t_r = yes; then
 
-      vortex_cv_pthreads_cflags="$flag"
+      if test ".$flag" != ".none"; then
+          vortex_cv_pthreads_cflags="$flag"
+      else 
+          vortex_cv_pthreads_cflags=""
+      fi
       break
 
 fi
Index: data/Makefile.in
--- data/Makefile.in.orig	2009-04-24 16:35:50 +0200
+++ data/Makefile.in	2009-04-29 19:34:42 +0200
@@@@ -208,7 +208,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-dtddir = $(datadir)/libvortex-1.1
+dtddir = $(datadir)/vortex
 dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd vortex-listener-conf.dtd
 EXTRA_DIST = $(dtd_DATA)
 all: all-am
Index: test/Makefile.in
--- test/Makefile.in.orig	2009-04-24 16:35:51 +0200
+++ test/Makefile.in	2009-04-29 19:35:17 +0200
@@@@ -479,7 +479,7 @@@@
 @@ENABLE_SASL_SUPPORT_TRUE@@SASL_SUPPORT_LIBS = $(top_builddir)/sasl/libvortex-sasl-1.1.la 
 @@ENABLE_TLS_SUPPORT_TRUE@@INCLUDE_TLS_SUPPORT = -DENABLE_TLS_SUPPORT
 @@ENABLE_TLS_SUPPORT_TRUE@@TLS_SUPPORT_LIBS = $(top_builddir)/tls/libvortex-tls-1.1.la 
-certfilesdir = $(datadir)/libvortex-1.1
+certfilesdir = $(datadir)/vortex
 certfiles_DATA = test-certificate.pem test-private-key.pem
 EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj vortex-regression-client.idl \
 	mime.example.1.txt  mime.example.body.1.txt  mime.example.2.txt  mime.example.3.txt  mime.example.body.2.txt 
Index: xml-rpc-gen/Makefile.in
--- xml-rpc-gen/Makefile.in.orig	2009-04-24 16:35:51 +0200
+++ xml-rpc-gen/Makefile.in	2009-04-29 19:34:17 +0200
@@@@ -231,7 +231,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-dtddir = $(datadir)/libvortex-1.1
+dtddir = $(datadir)/vortex
 dtd_DATA = xml-rpc.dtd
 idl_files = reg-test08.idl reg-test02.idl reg-test06.idl reg-test07.idl \
 	reg-test01.idl reg-test05.idl reg-test04.idl reg-test03.idl 
@


1.7
log
@upgrading package: vortex 1.0.17 -> 1.1.0
@
text
@d2 3
a4 3
--- configure.orig	2009-01-29 10:22:29 +0100
+++ configure	2009-01-30 08:57:41 +0100
@@@@ -19985,7 +19985,11 @@@@
d18 2
a19 2
--- data/Makefile.in.orig	2009-01-29 10:22:27 +0100
+++ data/Makefile.in	2009-01-30 08:57:41 +0100
d24 1
a24 1
-dtddir = $(datadir)/libvortex
d30 4
a33 4
--- test/Makefile.in.orig	2009-01-29 10:22:27 +0100
+++ test/Makefile.in	2009-01-30 08:59:40 +0100
@@@@ -471,7 +471,7 @@@@
 @@ENABLE_SASL_SUPPORT_TRUE@@SASL_SUPPORT_LIBS = ../sasl/libvortex-sasl-1.1.la 
d35 1
a35 1
 @@ENABLE_TLS_SUPPORT_TRUE@@TLS_SUPPORT_LIBS = ../tls/libvortex-tls-1.1.la 
d42 2
a43 2
--- xml-rpc-gen/Makefile.in.orig	2009-01-29 10:22:28 +0100
+++ xml-rpc-gen/Makefile.in	2009-01-30 08:59:57 +0100
@


1.6
log
@upgrading package: vortex 1.0.13 -> 1.0.14
@
text
@d2 3
a4 3
--- configure.orig	2008-04-04 19:01:59 +0200
+++ configure	2008-04-04 21:05:47 +0200
@@@@ -19597,7 +19597,11 @@@@
d18 3
a20 3
--- data/Makefile.in.orig	2008-04-04 19:05:21 +0200
+++ data/Makefile.in	2008-04-04 21:05:47 +0200
@@@@ -199,7 +199,7 @@@@
a28 11
Index: src/vortex_tls.c
--- src/vortex_tls.c.orig	2008-03-27 20:22:47 +0100
+++ src/vortex_tls.c	2008-04-04 21:08:16 +0200
@@@@ -49,6 +49,7 @@@@
 #define LOG_DOMAIN "vortex-tls"
 
 #include <vortex.h>
+#undef boolean /* undefine AXL #define boolean int as it clashes with OpenSSL asn1.h */
 
 /* local include */
 #include <vortex_ctx_private.h>
d30 7
a36 7
--- test/Makefile.in.orig	2008-04-04 19:05:22 +0200
+++ test/Makefile.in	2008-04-04 21:05:47 +0200
@@@@ -354,7 +354,7 @@@@
 @@ENABLE_POLL_SUPPORT_TRUE@@INCLUDE_VORTEX_POLL = -DVORTEX_HAVE_POLL=1
 @@ENABLE_EPOLL_SUPPORT_TRUE@@INCLUDE_VORTEX_EPOLL = -DVORTEX_HAVE_EPOLL=1
 @@ENABLE_VORTEX_LOG_TRUE@@INCLUDE_VORTEX_LOG = -DENABLE_VORTEX_LOG
-certfilesdir = $(datadir)/libvortex
d39 2
a40 12
 EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj vortex-regression-client.idl
 INCLUDES = -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS)  $(PTHREAD_CFLAGS) \
Index: vortex.pc.in
--- vortex.pc.in.orig	2007-05-24 13:04:37 +0200
+++ vortex.pc.in	2008-04-04 21:05:47 +0200
@@@@ -7,5 +7,5 @@@@
 Description: Robust, full featured BEEP implementation (RFC 3080/RFC 3081)
 Requires: axl
 Version: @@VORTEX_VERSION@@
-Libs: -L${libdir} -lvortex @@TLS_SUPPORT_FLAGS@@ @@SASL_LIBS@@ @@PTHREAD_LIBS@@
+Libs: -L${libdir} -lvortex @@TLS_SUPPORT_FLAGS@@ @@SASL_LIBS@@ @@LIBRARIES_LIBS@@ @@PTHREAD_LIBS@@
 Cflags: -I${includedir}/vortex @@SASL_CFLAGS@@ @@PTHREAD_CFLAGS@@
d42 3
a44 3
--- xml-rpc-gen/Makefile.in.orig	2008-04-04 19:05:22 +0200
+++ xml-rpc-gen/Makefile.in	2008-04-04 21:05:47 +0200
@@@@ -222,7 +222,7 @@@@
d48 1
a48 1
-dtddir = $(datadir)/libvortex
d51 2
a52 2
 EXTRA_DIST = $(dtd_DATA) $(wildcard *.idl) $(wildcard *.xdl) $(wildcard *.c) _support.c 
 INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src
@


1.5
log
@upgrading package: vortex 1.0.7 -> 1.0.8
@
text
@d2 3
a4 3
--- configure.orig	2007-10-11 17:56:36 +0200
+++ configure	2007-10-13 20:14:04 +0200
@@@@ -19598,7 +19598,11 @@@@
d18 2
a19 2
--- data/Makefile.in.orig	2007-10-11 17:56:34 +0200
+++ data/Makefile.in	2007-10-13 20:07:38 +0200
d30 3
a32 3
--- src/vortex_tls.c.orig	2007-09-17 16:53:26 +0200
+++ src/vortex_tls.c	2007-10-13 20:07:38 +0200
@@@@ -48,6 +48,7 @@@@
a36 1
 #include <openssl/err.h>
d38 2
a39 1
 /* some keys to store creation handlers and its associate data */
d41 3
a43 3
--- test/Makefile.in.orig	2007-10-11 17:56:35 +0200
+++ test/Makefile.in	2007-10-13 20:07:38 +0200
@@@@ -336,7 +336,7 @@@@
d54 1
a54 1
+++ vortex.pc.in	2007-10-13 20:07:38 +0200
d63 2
a64 2
--- xml-rpc-gen/Makefile.in.orig	2007-10-11 17:56:35 +0200
+++ xml-rpc-gen/Makefile.in	2007-10-13 20:07:38 +0200
@


1.4
log
@upgrading package: vortex 1.0.2 -> 1.0.3
@
text
@d1 16
d18 3
a20 3
--- data/Makefile.in.orig	2007-05-30 19:44:34 +0200
+++ data/Makefile.in	2007-06-02 13:14:12 +0200
@@@@ -200,7 +200,7 @@@@
d30 2
a31 2
--- src/vortex_tls.c.orig	2007-05-18 22:03:57 +0200
+++ src/vortex_tls.c	2007-06-02 13:14:12 +0200
d41 3
a43 3
--- test/Makefile.in.orig	2007-05-30 19:44:34 +0200
+++ test/Makefile.in	2007-06-02 13:14:36 +0200
@@@@ -324,7 +324,7 @@@@
d50 2
a51 2
 EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj
 INCLUDES = -I$(top_srcdir)/libvortex/src \
d53 2
a54 2
--- vortex.pc.in.orig	2007-05-27 09:17:32 +0200
+++ vortex.pc.in	2007-06-02 13:15:00 +0200
d63 3
a65 3
--- xml-rpc-gen/Makefile.in.orig	2007-05-30 19:44:35 +0200
+++ xml-rpc-gen/Makefile.in	2007-06-02 13:14:12 +0200
@@@@ -224,7 +224,7 @@@@
d73 1
a73 1
 INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src
@


1.3
log
@upgrading package: vortex 1.0.1 -> 1.0.2
@
text
@d2 3
a4 3
--- data/Makefile.in.orig	2007-03-16 18:19:11 +0100
+++ data/Makefile.in	2007-03-17 08:24:22 +0100
@@@@ -188,7 +188,7 @@@@
d14 2
a15 2
--- src/vortex_tls.c.orig	2007-03-15 15:43:52 +0100
+++ src/vortex_tls.c	2007-03-17 08:24:22 +0100
d25 6
a30 6
--- test/Makefile.in.orig	2007-03-16 18:19:12 +0100
+++ test/Makefile.in	2007-03-17 08:24:22 +0100
@@@@ -308,7 +308,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
d35 1
a35 1
 INCLUDES = -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS) -I$(READLINE_PATH)/include -Wall -g -ansi -DVERSION=\""$(VORTEX_VERSION)"\" -I../src
d37 2
a38 2
--- vortex.pc.in.orig	2006-07-12 12:30:25 +0200
+++ vortex.pc.in	2007-03-17 08:24:22 +0100
d40 2
a41 2
 Description: A BEEP implementation for af-arch (RFC 3080/RFC 3081 compliant)
 Requires: glib-2.0 gthread-2.0 axl
d43 3
a45 3
-Libs: -L${libdir} -lvortex @@TLS_SUPPORT_FLAGS@@ @@SASL_LIBS@@
+Libs: -L${libdir} -lvortex @@TLS_SUPPORT_FLAGS@@ @@SASL_LIBS@@ @@LIBRARIES_LIBS@@
 Cflags: -I${includedir}/vortex @@SASL_CFLAGS@@ 
d47 3
a49 3
--- xml-rpc-gen/Makefile.in.orig	2007-03-16 18:19:12 +0100
+++ xml-rpc-gen/Makefile.in	2007-03-17 08:24:22 +0100
@@@@ -212,7 +212,7 @@@@
d57 1
a57 16
 INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS) $(EXARG_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src
Index: xml-rpc-gen/xml-rpc-support.c
--- xml-rpc-gen/xml-rpc-support.c.orig	2007-03-15 09:49:39 +0100
+++ xml-rpc-gen/xml-rpc-support.c	2007-03-17 09:03:24 +0100
@@@@ -298,8 +298,9 @@@@
 		ask_msg ("\n");
 		ask_msg ("file already exists, and differs: %s\n", path);
 		ask_msg ("Do you want me to: Write (w), Skip (s): ");
-		size = getline (&reply, &size, stdin);
-		reply [size - 1] = 0;
+		size = 1024;
+		reply = (char *)malloc(size);
+		fgets(reply, size, stdin);
 		if (axl_cmp (reply, "w")) {
 			goto write_file;
 		} else if (axl_cmp (reply, "s")) {
@


1.2
log
@upgrading package: vortex 0.9.0 -> 1.0
@
text
@d2 2
a3 2
--- data/Makefile.in.orig	2006-12-07 16:18:56 +0100
+++ data/Makefile.in	2006-12-08 09:44:03 +0100
d14 2
a15 2
--- src/vortex_tls.c.orig	2006-12-04 09:58:38 +0100
+++ src/vortex_tls.c	2006-12-08 09:45:08 +0100
d23 1
a23 1
 
d25 3
a27 3
--- test/Makefile.in.orig	2006-12-07 16:18:56 +0100
+++ test/Makefile.in	2006-12-08 09:44:03 +0100
@@@@ -301,7 +301,7 @@@@
d34 2
a35 2
 EXTRA_DIST = Makefile.win $(certfiles_DATA)
 INCLUDES = -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS) -I$(READLINE_PATH)/include -Wall -g -DVERSION=\""$(VORTEX_VERSION)"\" -I../src
d38 1
a38 1
+++ vortex.pc.in	2006-12-08 09:45:30 +0100
d47 3
a49 3
--- xml-rpc-gen/Makefile.in.orig	2006-12-07 16:18:57 +0100
+++ xml-rpc-gen/Makefile.in	2006-12-08 09:44:03 +0100
@@@@ -211,7 +211,7 @@@@
d58 15
@


1.1
log
@new package: vortex 0.9.0 (BEEP Core Network Protocol Toolkit)
@
text
@d2 3
a4 3
--- data/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ data/Makefile.in	2006-08-25 20:26:46 +0200
@@@@ -163,7 +163,7 @@@@
a10 1
 
d12 1
d14 2
a15 2
--- src/vortex_tls.c.orig	2006-06-18 23:11:59 +0200
+++ src/vortex_tls.c	2006-08-25 20:26:46 +0200
d21 1
a23 1
 /** 
d25 3
a27 3
--- test/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ test/Makefile.in	2006-08-25 20:26:46 +0200
@@@@ -164,7 +164,7 @@@@
d35 1
a35 1
 bin_PROGRAMS = vortex-client 
d37 2
a38 2
--- vortex.pc.in.orig	2006-04-11 18:16:32 +0200
+++ vortex.pc.in	2006-08-25 20:26:46 +0200
d43 3
a45 3
-Libs: -L${libdir} -lvortex
+Libs: -L${libdir} -lvortex @@LIBRARIES_LIBS@@
 Cflags: -I${includedir}/vortex
d47 3
a49 3
--- xml-rpc-gen/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ xml-rpc-gen/Makefile.in	2006-08-25 20:27:46 +0200
@@@@ -164,7 +164,7 @@@@
a55 1
 
d57 1
@


1.1.2.1
log
@file vortex.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:57:50 +0000
@
text
@d1 57
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 57
Index: data/Makefile.in
--- data/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ data/Makefile.in	2006-08-25 20:26:46 +0200
@@@@ -163,7 +163,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-dtddir = $(datadir)/libvortex
+dtddir = $(datadir)/vortex
 dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd vortex-listener-conf.dtd
 
 EXTRA_DIST = $(dtd_DATA)
Index: src/vortex_tls.c
--- src/vortex_tls.c.orig	2006-06-18 23:11:59 +0200
+++ src/vortex_tls.c	2006-08-25 20:26:46 +0200
@@@@ -48,6 +48,7 @@@@
 #define LOG_DOMAIN "vortex-tls"
 
 #include <vortex.h>
+#undef boolean /* undefine AXL #define boolean int as it clashes with OpenSSL asn1.h */
 
 
 /** 
Index: test/Makefile.in
--- test/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ test/Makefile.in	2006-08-25 20:26:46 +0200
@@@@ -164,7 +164,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-certfilesdir = $(datadir)/libvortex
+certfilesdir = $(datadir)/vortex
 certfiles_DATA = test-certificate.pem test-private-key.pem
 EXTRA_DIST = Makefile.win $(certfiles_DATA)
 bin_PROGRAMS = vortex-client 
Index: vortex.pc.in
--- vortex.pc.in.orig	2006-04-11 18:16:32 +0200
+++ vortex.pc.in	2006-08-25 20:26:46 +0200
@@@@ -7,5 +7,5 @@@@
 Description: A BEEP implementation for af-arch (RFC 3080/RFC 3081 compliant)
 Requires: glib-2.0 gthread-2.0 axl
 Version: @@VORTEX_VERSION@@
-Libs: -L${libdir} -lvortex
+Libs: -L${libdir} -lvortex @@LIBRARIES_LIBS@@
 Cflags: -I${includedir}/vortex
Index: xml-rpc-gen/Makefile.in
--- xml-rpc-gen/Makefile.in.orig	2006-07-08 09:32:10 +0200
+++ xml-rpc-gen/Makefile.in	2006-08-25 20:27:46 +0200
@@@@ -164,7 +164,7 @@@@
 sharedstatedir = @@sharedstatedir@@
 sysconfdir = @@sysconfdir@@
 target_alias = @@target_alias@@
-dtddir = $(datadir)/libvortex
+dtddir = $(datadir)/vortex
 dtd_DATA = xml-rpc.dtd
 
 EXTRA_DIST = $(dtd_DATA) $(wildcard *.idl) $(wildcard *.xdl) $(wildcard *.c) _support.c 
@