[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c6d6a7b2cfe87f68982e08257bf1ccf7cd45e8ac)

Ladislav Hagara scm at sourcemage.org
Tue Oct 25 07:16:55 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 net/wvstreams/HISTORY                             |    4 +
 net/wvstreams/PRE_BUILD                           |    5 +
 net/wvstreams/wvstreams-4.6.1-openssl-1.0.0.patch |   14 +++++
 net/wvstreams/wvstreams-4.6.1-parallel-make.patch |   58 ++++++++++++++++++++++
 4 files changed, 80 insertions(+), 1 deletion(-)

New commits:
commit c6d6a7b2cfe87f68982e08257bf1ccf7cd45e8ac
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wvstreams: updated to work with openssl 1.0.0 and parallel make

diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index f38de3b..1dc943e 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,7 @@
+2011-10-25 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD: updated to apply openssl 1.0.0 and parallel-make patches
+	* wvstreams-4.6.1-{openssl-1.0.0,parallel-make}.patch: added from Gentoo
+
 2011-10-12 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: removed optional dependency on qt-x11
 
diff --git a/net/wvstreams/PRE_BUILD b/net/wvstreams/PRE_BUILD
index b4ed63e..7326d15 100755
--- a/net/wvstreams/PRE_BUILD
+++ b/net/wvstreams/PRE_BUILD
@@ -1,3 +1,6 @@
 mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
+unpack_file &&
+
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/wvstreams-4.6.1-parallel-make.patch &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/wvstreams-4.6.1-openssl-1.0.0.patch &&
 patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/wvstreams-4.6.1-glibc212.patch
diff --git a/net/wvstreams/wvstreams-4.6.1-openssl-1.0.0.patch b/net/wvstreams/wvstreams-4.6.1-openssl-1.0.0.patch
new file mode 100644
index 0000000..6c32f06
--- /dev/null
+++ b/net/wvstreams/wvstreams-4.6.1-openssl-1.0.0.patch
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc	2008-10-23 22:23:49.000000000 +0200
++++ wvstreams-4.6.1-1/crypto/wvx509.cc	2010-01-27 11:09:06.000000000 +0100
+@@ -1157,7 +1157,11 @@
+         
+         if (ext)
+         {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#else
+             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#endif
+             if (!method)
+             {
+                 WvDynBuf buf;
diff --git a/net/wvstreams/wvstreams-4.6.1-parallel-make.patch b/net/wvstreams/wvstreams-4.6.1-parallel-make.patch
new file mode 100644
index 0000000..5ad79fd
--- /dev/null
+++ b/net/wvstreams/wvstreams-4.6.1-parallel-make.patch
@@ -0,0 +1,58 @@
+diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile
+--- wvstreams-4.6.1.orig/Makefile	2009-09-16 00:26:50.000000000 +0300
++++ wvstreams-4.6.1/Makefile	2010-01-04 18:06:15.000000000 +0200
+@@ -131,12 +131,19 @@
+ # libwvstreams: stream/event handling library
+ #
+ TARGETS += libwvstreams.so
+-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
++TARGETS += crypto/tests/ssltest                                                                                                                             
++crypto/tests/ssltest: $(LIBWVSTREAMS)                                                                                                                       
++
++TARGETS += ipstreams/tests/unixtest
++ipstreams/tests/unixtest: $(LIBWVSTREAMS)
++
+ TARGETS += crypto/tests/printcert
++crypto/tests/printcert: $(LIBWVSTREAMS)
+ 
+ ifndef _MACOS
+   ifneq ("$(with_readline)", "no")
+     TARGETS += ipstreams/tests/wsd
++    ipstreams/tests/wsd: $(LIBWVSTREAMS)
+     ipstreams/tests/wsd-LIBS += -lreadline
+   else
+     TEST_SKIP_OBJS += ipstreams/tests/wsd
+@@ -179,7 +186,11 @@
+ #
+ ifneq ("$(with_dbus)", "no")
+   TARGETS += libwvdbus.so
+-  TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
++  TARGETS += dbus/tests/wvdbus
++  dbus/tests/wvdbus: $(LIBWVDBUS)
++
++  TARGETS += dbus/tests/wvdbusd
++  dbus/tests/wvdbusd: $(LIBWVDBUS)
+   TESTS += $(call tests_cc,dbus/tests)
+   libwvdbus_OBJS += $(call objects,dbus)
+   libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
+diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk
+--- wvstreams-4.6.1.orig/wvrules-posix.mk	2008-10-21 18:31:58.000000000 +0300
++++ wvstreams-4.6.1/wvrules-posix.mk	2010-01-04 18:04:00.000000000 +0200
+@@ -85,12 +85,15 @@
+ 	$(AR) s $1
+ endef
+ 
+-CC: FORCE
++CC:
+ 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS)/gen-cc CC c
+ 
+-CXX: FORCE
++CXX:
+ 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS)/gen-cc CXX cc
+ 
++#All files must depend on the above two rules. This is a godawful hack.
++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
++
+ wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)


More information about the SM-Commit mailing list