[arch-commits] Commit in wvstreams/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Fri May 19 17:49:53 UTC 2017
Date: Friday, May 19, 2017 @ 17:49:52
Author: arojas
Revision: 228591
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
wvstreams/repos/community-staging-i686/
wvstreams/repos/community-staging-i686/PKGBUILD
(from rev 228590, wvstreams/trunk/PKGBUILD)
wvstreams/repos/community-staging-i686/gcc-6.patch
(from rev 228590, wvstreams/trunk/gcc-6.patch)
wvstreams/repos/community-staging-i686/openssl-buildfix.patch
(from rev 228590, wvstreams/trunk/openssl-buildfix.patch)
wvstreams/repos/community-staging-i686/wvstreams-4.6.1-gcc47.patch
(from rev 228590, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
wvstreams/repos/community-staging-i686/wvstreams-4.6.1-glibc212.patch
(from rev 228590, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
wvstreams/repos/community-staging-x86_64/
wvstreams/repos/community-staging-x86_64/PKGBUILD
(from rev 228590, wvstreams/trunk/PKGBUILD)
wvstreams/repos/community-staging-x86_64/gcc-6.patch
(from rev 228590, wvstreams/trunk/gcc-6.patch)
wvstreams/repos/community-staging-x86_64/openssl-buildfix.patch
(from rev 228590, wvstreams/trunk/openssl-buildfix.patch)
wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-gcc47.patch
(from rev 228590, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-glibc212.patch
(from rev 228590, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
---------------------------------------------------------+
community-staging-i686/PKGBUILD | 61 ++++++++++++++
community-staging-i686/gcc-6.patch | 42 +++++++++
community-staging-i686/openssl-buildfix.patch | 14 +++
community-staging-i686/wvstreams-4.6.1-gcc47.patch | 50 +++++++++++
community-staging-i686/wvstreams-4.6.1-glibc212.patch | 24 +++++
community-staging-x86_64/PKGBUILD | 61 ++++++++++++++
community-staging-x86_64/gcc-6.patch | 42 +++++++++
community-staging-x86_64/openssl-buildfix.patch | 14 +++
community-staging-x86_64/wvstreams-4.6.1-gcc47.patch | 50 +++++++++++
community-staging-x86_64/wvstreams-4.6.1-glibc212.patch | 24 +++++
10 files changed, 382 insertions(+)
Copied: wvstreams/repos/community-staging-i686/PKGBUILD (from rev 228590, wvstreams/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=13
+pkgdesc="A network programming library written in C++"
+arch=('i686' 'x86_64')
+url="http://alumnit.ca/wiki/?page=WvStreams"
+license=('LGPL')
+depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline')
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz
+ wvstreams-4.6.1-glibc212.patch
+ wvstreams-4.6.1-gcc47.patch
+ openssl-buildfix.patch
+ gcc-6.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4'
+ 'bc728af9421e04d0c1f358415b6c1421')
+options=('!makeflags')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
+ patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
+ patch -p1 -i "$srcdir/openssl-buildfix.patch"
+ patch -p1 -i "$srcdir/gcc-6.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ CPPFLAGS=-I/usr/include/openssl-1.0 \
+ LDFLAGS=-L/usr/lib/openssl-1.0 \
+ ./configure --prefix=/usr \
+ --sbin=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --without-dbus \
+ --with-pam \
+ --with-openssl \
+ --without-tcl \
+ --without-qt
+ make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ # FS#15974
+ # --without-dbus still installs the pkg-config file
+ rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc"
+ # --without-qt still installs the pkg-config file
+ rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc"
+}
Copied: wvstreams/repos/community-staging-i686/gcc-6.patch (from rev 228590, wvstreams/trunk/gcc-6.patch)
===================================================================
--- community-staging-i686/gcc-6.patch (rev 0)
+++ community-staging-i686/gcc-6.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,42 @@
+Description: Fix compilation with gcc-6
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Updated: 2016-07-26
+Forwarded: No
+Bug-Debian: https://bugs.debian.org/811659
+Bug-Debian: https://bugs.debian.org/831146
+
+--- a/streams/wvstream.cc
++++ b/streams/wvstream.cc
+@@ -907,9 +907,9 @@
+
+ if (forceable)
+ {
+- si.wants.readable = readcb;
+- si.wants.writable = writecb;
+- si.wants.isexception = exceptcb;
++ si.wants.readable = static_cast<bool>(readcb);
++ si.wants.writable = static_cast<bool>(writecb);
++ si.wants.isexception = static_cast<bool>(exceptcb);
+ }
+ else
+ {
+@@ -1019,7 +1019,8 @@
+
+ IWvStream::SelectRequest WvStream::get_select_request()
+ {
+- return IWvStream::SelectRequest(readcb, writecb, exceptcb);
++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb),
++ static_cast<bool>(exceptcb));
+ }
+
+
+@@ -1107,7 +1108,8 @@
+ // inefficient, because if the alarm was expired then pre_select()
+ // returned true anyway and short-circuited the previous select().
+ TRACE("hello-%p\n", this);
+- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
++ return !alarm_was_ticking || select(0, static_cast<bool>(readcb),
++ static_cast<bool>(writecb), static_cast<bool>(exceptcb));
+ }
+
+
Copied: wvstreams/repos/community-staging-i686/openssl-buildfix.patch (from rev 228590, wvstreams/trunk/openssl-buildfix.patch)
===================================================================
--- community-staging-i686/openssl-buildfix.patch (rev 0)
+++ community-staging-i686/openssl-buildfix.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -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;
\ No newline at end of file
Copied: wvstreams/repos/community-staging-i686/wvstreams-4.6.1-gcc47.patch (from rev 228590, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
===================================================================
--- community-staging-i686/wvstreams-4.6.1-gcc47.patch (rev 0)
+++ community-staging-i686/wvstreams-4.6.1-gcc47.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -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;
Copied: wvstreams/repos/community-staging-i686/wvstreams-4.6.1-glibc212.patch (from rev 228590, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
===================================================================
--- community-staging-i686/wvstreams-4.6.1-glibc212.patch (rev 0)
+++ community-staging-i686/wvstreams-4.6.1-glibc212.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/333301
+https://bugs.archlinux.org/task/27188
+
+--- 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
+
Copied: wvstreams/repos/community-staging-x86_64/PKGBUILD (from rev 228590, wvstreams/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=13
+pkgdesc="A network programming library written in C++"
+arch=('i686' 'x86_64')
+url="http://alumnit.ca/wiki/?page=WvStreams"
+license=('LGPL')
+depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline')
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz
+ wvstreams-4.6.1-glibc212.patch
+ wvstreams-4.6.1-gcc47.patch
+ openssl-buildfix.patch
+ gcc-6.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4'
+ 'bc728af9421e04d0c1f358415b6c1421')
+options=('!makeflags')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
+ patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
+ patch -p1 -i "$srcdir/openssl-buildfix.patch"
+ patch -p1 -i "$srcdir/gcc-6.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ CPPFLAGS=-I/usr/include/openssl-1.0 \
+ LDFLAGS=-L/usr/lib/openssl-1.0 \
+ ./configure --prefix=/usr \
+ --sbin=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --without-dbus \
+ --with-pam \
+ --with-openssl \
+ --without-tcl \
+ --without-qt
+ make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ # FS#15974
+ # --without-dbus still installs the pkg-config file
+ rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc"
+ # --without-qt still installs the pkg-config file
+ rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc"
+}
Copied: wvstreams/repos/community-staging-x86_64/gcc-6.patch (from rev 228590, wvstreams/trunk/gcc-6.patch)
===================================================================
--- community-staging-x86_64/gcc-6.patch (rev 0)
+++ community-staging-x86_64/gcc-6.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,42 @@
+Description: Fix compilation with gcc-6
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Updated: 2016-07-26
+Forwarded: No
+Bug-Debian: https://bugs.debian.org/811659
+Bug-Debian: https://bugs.debian.org/831146
+
+--- a/streams/wvstream.cc
++++ b/streams/wvstream.cc
+@@ -907,9 +907,9 @@
+
+ if (forceable)
+ {
+- si.wants.readable = readcb;
+- si.wants.writable = writecb;
+- si.wants.isexception = exceptcb;
++ si.wants.readable = static_cast<bool>(readcb);
++ si.wants.writable = static_cast<bool>(writecb);
++ si.wants.isexception = static_cast<bool>(exceptcb);
+ }
+ else
+ {
+@@ -1019,7 +1019,8 @@
+
+ IWvStream::SelectRequest WvStream::get_select_request()
+ {
+- return IWvStream::SelectRequest(readcb, writecb, exceptcb);
++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb),
++ static_cast<bool>(exceptcb));
+ }
+
+
+@@ -1107,7 +1108,8 @@
+ // inefficient, because if the alarm was expired then pre_select()
+ // returned true anyway and short-circuited the previous select().
+ TRACE("hello-%p\n", this);
+- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
++ return !alarm_was_ticking || select(0, static_cast<bool>(readcb),
++ static_cast<bool>(writecb), static_cast<bool>(exceptcb));
+ }
+
+
Copied: wvstreams/repos/community-staging-x86_64/openssl-buildfix.patch (from rev 228590, wvstreams/trunk/openssl-buildfix.patch)
===================================================================
--- community-staging-x86_64/openssl-buildfix.patch (rev 0)
+++ community-staging-x86_64/openssl-buildfix.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -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;
\ No newline at end of file
Copied: wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-gcc47.patch (from rev 228590, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
===================================================================
--- community-staging-x86_64/wvstreams-4.6.1-gcc47.patch (rev 0)
+++ community-staging-x86_64/wvstreams-4.6.1-gcc47.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -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;
Copied: wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-glibc212.patch (from rev 228590, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
===================================================================
--- community-staging-x86_64/wvstreams-4.6.1-glibc212.patch (rev 0)
+++ community-staging-x86_64/wvstreams-4.6.1-glibc212.patch 2017-05-19 17:49:52 UTC (rev 228591)
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/333301
+https://bugs.archlinux.org/task/27188
+
+--- 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
+
More information about the arch-commits
mailing list