[arch-commits] Commit in wvstreams/repos/community-x86_64 (11 files)

Antonio Rojas arojas at archlinux.org
Fri Apr 23 17:21:53 UTC 2021


    Date: Friday, April 23, 2021 @ 17:21:52
  Author: arojas
Revision: 923206

archrelease: copy trunk to community-x86_64

Added:
  wvstreams/repos/community-x86_64/PKGBUILD
    (from rev 923205, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-x86_64/gcc-6.patch
    (from rev 923205, wvstreams/trunk/gcc-6.patch)
  wvstreams/repos/community-x86_64/openssl-buildfix.patch
    (from rev 923205, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc10.patch
    (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-gcc10.patch)
  wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch
    (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-x86_64/wvstreams-4.6.1-glibc212.patch
    (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
Deleted:
  wvstreams/repos/community-x86_64/PKGBUILD
  wvstreams/repos/community-x86_64/gcc-6.patch
  wvstreams/repos/community-x86_64/openssl-buildfix.patch
  wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch
  wvstreams/repos/community-x86_64/wvstreams-4.6.1-glibc212.patch

--------------------------------+
 PKGBUILD                       |  123 +++++++++++++++++++--------------------
 gcc-6.patch                    |   84 +++++++++++++-------------
 openssl-buildfix.patch         |   28 ++++----
 wvstreams-4.6.1-gcc10.patch    |   25 +++++++
 wvstreams-4.6.1-gcc47.patch    |  100 +++++++++++++++----------------
 wvstreams-4.6.1-glibc212.patch |   48 +++++++--------
 6 files changed, 218 insertions(+), 190 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-23 17:21:37 UTC (rev 923205)
+++ PKGBUILD	2021-04-23 17:21:52 UTC (rev 923206)
@@ -1,60 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=wvstreams
-pkgver=4.6.1
-pkgrel=16
-pkgdesc="A network programming library written in C++"
-arch=('x86_64')
-url="https://web.archive.org/web/20110504183753/http://alumnit.ca:80/wiki/index.php?page=WvDial"
-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-x86_64/PKGBUILD (from rev 923205, wvstreams/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-23 17:21:52 UTC (rev 923206)
@@ -0,0 +1,63 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=17
+pkgdesc="A network programming library written in C++"
+arch=('x86_64')
+url="https://web.archive.org/web/20110504183753/http://alumnit.ca:80/wiki/index.php?page=WvDial"
+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
+        wvstreams-4.6.1-gcc10.patch
+        openssl-buildfix.patch
+        gcc-6.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+         '5f6e24864209055239cb4e7c9bbd4a41'
+         '217e5dedd7f1d50588a5a67d637fc8a1'
+         '9aa32c56494e82a84d92acdd6ef49d2b'
+         '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"
+  patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc10.patch" # Gentoo 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"
+}

Deleted: gcc-6.patch
===================================================================
--- gcc-6.patch	2021-04-23 17:21:37 UTC (rev 923205)
+++ gcc-6.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -1,42 +0,0 @@
-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-x86_64/gcc-6.patch (from rev 923205, wvstreams/trunk/gcc-6.patch)
===================================================================
--- gcc-6.patch	                        (rev 0)
+++ gcc-6.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -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));
+ }
+ 
+ 

Deleted: openssl-buildfix.patch
===================================================================
--- openssl-buildfix.patch	2021-04-23 17:21:37 UTC (rev 923205)
+++ openssl-buildfix.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -1,14 +0,0 @@
---- 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-x86_64/openssl-buildfix.patch (from rev 923205, wvstreams/trunk/openssl-buildfix.patch)
===================================================================
--- openssl-buildfix.patch	                        (rev 0)
+++ openssl-buildfix.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -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-x86_64/wvstreams-4.6.1-gcc10.patch (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-gcc10.patch)
===================================================================
--- wvstreams-4.6.1-gcc10.patch	                        (rev 0)
+++ wvstreams-4.6.1-gcc10.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -0,0 +1,25 @@
+--- a/include/xplc/module.h
++++ b/include/xplc/module.h
+@@ -100,19 +100,19 @@
+    * XPLC module magic number. This is to ensure that it is in fact a
+    * valid XPLC module that has been loaded.
+    */
+-  unsigned long magic;
++  signed long magic;
+   /**
+    * The XPLC module ABI version that this module conforms to. This
+    * should always be the first member of the XPLC_ModuleInfo
+    * structure, as the meaning of the following members depend on it.
+    */
+-  unsigned int version_major;
++  signed int version_major;
+   /**
+    * The XPLC module ABI sub-version that this module conforms
+    * to. This is used for optional and backward-compatible changes in
+    * the module ABI.
+    */
+-  unsigned int version_minor;
++  signed int version_minor;
+ 
+   /**
+    * Description string for the module.

Deleted: wvstreams-4.6.1-gcc47.patch
===================================================================
--- wvstreams-4.6.1-gcc47.patch	2021-04-23 17:21:37 UTC (rev 923205)
+++ wvstreams-4.6.1-gcc47.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -1,50 +0,0 @@
-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-x86_64/wvstreams-4.6.1-gcc47.patch (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
===================================================================
--- wvstreams-4.6.1-gcc47.patch	                        (rev 0)
+++ wvstreams-4.6.1-gcc47.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -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;

Deleted: wvstreams-4.6.1-glibc212.patch
===================================================================
--- wvstreams-4.6.1-glibc212.patch	2021-04-23 17:21:37 UTC (rev 923205)
+++ wvstreams-4.6.1-glibc212.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -1,24 +0,0 @@
-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-x86_64/wvstreams-4.6.1-glibc212.patch (from rev 923205, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
===================================================================
--- wvstreams-4.6.1-glibc212.patch	                        (rev 0)
+++ wvstreams-4.6.1-glibc212.patch	2021-04-23 17:21:52 UTC (rev 923206)
@@ -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