jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New package: wvstreams-4.6.1

Browse source
This commit is contained in:
Enno Boland 2014-12-11 02:34:15 +01:00
parent 377ecc4fd5
commit 86a6dd650e
9 changed files with 205 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/shlibs
View file

@ -1856,3 +1856,7 @@ libopencv_stitching.so.2.4 libopencv-2.4.10_1
libopencv_photo.so.2.4 libopencv-2.4.10_1
libopencv_legacy.so.2.4 libopencv-2.4.10_1
libcgmanager.so.0 libcgmanager-0.33_1
libuniconf.so.4.6 uniconf-4.6.1_1
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1

1
srcpkgs/uniconf Symbolic link
View file

@ -0,0 +1 @@
wvstreams

1
srcpkgs/wvstreams-devel Symbolic link
View file

@ -0,0 +1 @@
wvstreams

19
srcpkgs/wvstreams/patches/tripledes.patch Normal file
View file

@ -0,0 +1,19 @@
--- include/wvtripledes.h.old 2014-12-11 01:53:28.157613918 +0100
+++ include/wvtripledes.h 2014-12-11 01:53:46.005612583 +0100
@@ -70,11 +70,11 @@ protected:
private:
Mode mode;
- des_cblock key;
- des_key_schedule deskey1;
- des_key_schedule deskey2;
- des_key_schedule deskey3;
- des_cblock ivec; // initialization vector
+ DES_cblock key;
+ DES_key_schedule deskey1;
+ DES_key_schedule deskey2;
+ DES_key_schedule deskey3;
+ DES_cblock ivec; // initialization vector
int ivecoff; // current offset into initvec
};

50
srcpkgs/wvstreams/patches/wvstreams-4.6.1-gcc47.patch Normal file
View file

@ -0,0 +1,50 @@
http://bugs.gentoo.org/419563
http://bugs.gentoo.org/419971
See -gcc47-patch and -magic.patch in Fedora git:
http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
--- include/wvtask.h
+++ include/wvtask.h
@@ -45,7 +45,8 @@
typedef void TaskFunc(void *userdata);
static int taskcount, numtasks, numrunning;
- int magic_number, *stack_magic;
+ int volatile magic_number;
+ int *stack_magic;
WvString name;
int tid;
@@ -84,7 +85,7 @@
static WvTaskMan *singleton;
static int links;
- static int magic_number;
+ static int volatile magic_number;
static WvTaskList all_tasks, free_tasks;
static void get_stack(WvTask &task, size_t size);
--- include/wvuid.h
+++ include/wvuid.h
@@ -7,6 +7,7 @@
#ifndef __WVUID_H
#define __WVUID_H
+#include <unistd.h>
#include "wvstring.h"
#if WIN32
--- utils/wvtask.cc
+++ utils/wvtask.cc
@@ -58,7 +58,8 @@
int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
WvTaskMan *WvTaskMan::singleton;
-int WvTaskMan::links, WvTaskMan::magic_number;
+int WvTaskMan::links;
+int volatile WvTaskMan::magic_number;
WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
WvTaskMan::toplevel;

23
srcpkgs/wvstreams/patches/wvstreams-4.6.1-glibc212.patch Normal file
View file

@ -0,0 +1,23 @@
http://bugs.gentoo.org/333301
--- ipstreams/wvunixdgsocket.cc
+++ ipstreams/wvunixdgsocket.cc
@@ -1,5 +1,5 @@
#include "wvunixdgsocket.h"
-#ifdef MACOS
+#if defined(MACOS) || defined(__GNUC__)
#include <sys/types.h>
#include <sys/stat.h>
#endif
--- streams/wvatomicfile.cc
+++ streams/wvatomicfile.cc
@@ -11,7 +11,8 @@
#include "wvfileutils.h"
#include "wvstrutils.h"
-#ifdef MACOS
+#if defined(MACOS) || defined(__GNUC__)
+#include <sys/types.h>
#include <sys/stat.h>
#endif

16
srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.0.0.patch Normal file
View file

@ -0,0 +1,16 @@
http://bugs.gentoo.org/304283
--- crypto/wvx509.cc
+++ crypto/wvx509.cc
@@ -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;

56
srcpkgs/wvstreams/patches/wvstreams-4.6.1-parallel-make.patch Normal file
View file

@ -0,0 +1,56 @@
--- Makefile
+++ Makefile
@@ -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)
--- wvrules-posix.mk
+++ wvrules-posix.mk
@@ -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)

35
srcpkgs/wvstreams/template Normal file
View file

@ -0,0 +1,35 @@
# Template file for 'wvstreams'
pkgname=wvstreams
version=4.6.1
revision=1
build_style=gnu-configure
maintainer="Enno Boland <eb@s01.de>"
license="GPL-2"
short_desc="Library for doing network in C++"
homepage="https://code.google.com/p/wvstreams"
distfiles="https://wvstreams.googlecode.com/files/wvstreams-$version.tar.gz"
makedepends="libressl-devel zlib-devel"
checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
configure_args="--without-dbus --without-tcl --without-qt"
conf_files="/etc/uniconf.conf"
wvstreams-devel_package() {
depends="${sourcepkg}>=${version}_${revision} $makedepends"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
uniconf_package() {
short_desc="UniConf configuration system"
pkg_install() {
vmove usr/bin
vmove usr/sbin
vmove usr/share
vmove "usr/lib/libuniconf.so.*"
}
}