OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Jan-2009 09:03:20
Branch: HEAD Handle: 2009013008031900
Modified files:
openpkg-src/vortex vortex.patch vortex.spec
Log:
upgrading package: vortex 1.0.17 -> 1.1.0
Summary:
Revision Changes Path
1.7 +21 -42 openpkg-src/vortex/vortex.patch
1.25 +3 -3 openpkg-src/vortex/vortex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 vortex.patch
--- openpkg-src/vortex/vortex.patch 4 Apr 2008 19:12:19 -0000 1.6
+++ openpkg-src/vortex/vortex.patch 30 Jan 2009 08:03:19 -0000 1.7
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2008-04-04 19:01:59 +0200
-+++ configure 2008-04-04 21:05:47 +0200
-@@ -19597,7 +19597,11 @@
+--- configure.orig 2009-01-29 10:22:29 +0100
++++ configure 2009-01-30 08:57:41 +0100
+@@ -19985,7 +19985,11 @@
if test $vortex_p_t_r = yes; then
@@ -15,9 +15,9 @@
fi
Index: data/Makefile.in
---- 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 @@
+--- data/Makefile.in.orig 2009-01-29 10:22:27 +0100
++++ data/Makefile.in 2009-01-30 08:57:41 +0100
+@@ -208,7 +208,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -26,48 +26,27 @@
dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd
vortex-listener-conf.dtd
EXTRA_DIST = $(dtd_DATA)
all: all-am
-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>
Index: test/Makefile.in
---- 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_t...@include_vortex_poll = -DVORTEX_HAVE_POLL=1
- @enable_epoll_support_t...@include_vortex_epoll = -DVORTEX_HAVE_EPOLL=1
- @enable_vortex_log_t...@include_vortex_log = -DENABLE_VORTEX_LOG
--certfilesdir = $(datadir)/libvortex
+--- 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_t...@sasl_support_libs = ../sasl/libvortex-sasl-1.1.la
+ @enable_tls_support_t...@include_tls_support = -DENABLE_TLS_SUPPORT
+ @enable_tls_support_t...@tls_support_libs = ../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
- 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@
+ 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 2008-04-04 19:05:22 +0200
-+++ xml-rpc-gen/Makefile.in 2008-04-04 21:05:47 +0200
-@@ -222,7 +222,7 @@
+--- 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
+@@ -231,7 +231,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
--dtddir = $(datadir)/libvortex
+-dtddir = $(datadir)/libvortex-1.1
+dtddir = $(datadir)/vortex
dtd_DATA = xml-rpc.dtd
- 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
+ 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 vortex.spec
--- openpkg-src/vortex/vortex.spec 22 Jan 2009 18:29:51 -0000 1.24
+++ openpkg-src/vortex/vortex.spec 30 Jan 2009 08:03:19 -0000 1.25
@@ -22,8 +22,8 @@
##
# package version
-%define V_external 1.0.17
-%define V_internal b3739.g3739
+%define V_external 1.1.0
+%define V_internal b3749.g3749
# package information
Name: vortex
@@ -36,7 +36,7 @@
Group: Network
License: LGPL
Version: %{V_external}
-Release: 20090122
+Release: 20090130
# package options
%option with_ssl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
