[arch-commits] Commit in wvstreams/repos (10 files)

2016-03-03 Thread Evangelos Foutras
Date: Thursday, March 3, 2016 @ 10:08:38
  Author: foutrelis
Revision: 164395

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 164394, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-i686/openssl-buildfix.patch
(from rev 164394, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-gcc47.patch
(from rev 164394, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-glibc212.patch
(from rev 164394, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
  wvstreams/repos/community-staging-x86_64/
  wvstreams/repos/community-staging-x86_64/PKGBUILD
(from rev 164394, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-x86_64/openssl-buildfix.patch
(from rev 164394, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-gcc47.patch
(from rev 164394, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-glibc212.patch
(from rev 164394, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)

-+
 community-staging-i686/PKGBUILD |   54 ++
 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   |   54 ++
 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 ++
 8 files changed, 284 insertions(+)

Copied: wvstreams/repos/community-staging-i686/PKGBUILD (from rev 164394, 
wvstreams/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-03-03 09:08:38 UTC (rev 164395)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+# Contributor: dorphell 
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=9
+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' 'readline')
+source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz 
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch 
openssl-buildfix.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4')
+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"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./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/openssl-buildfix.patch (from rev 
164394, wvstreams/trunk/openssl-buildfix.patch)
===
--- community-staging-i686/openssl-buildfix.patch   
(rev 0)
+++ community-staging-i686/openssl-buildfix.patch   2016-03-03 09:08:38 UTC 
(rev 164395)
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc2008-10-23 22:23:49.0 +0200
 wvstreams-4.6.1-1/crypto/wvx509.cc  2010-01-27 11:09:06.0 +0100
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x1000L
++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 164394, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)

[arch-commits] Commit in wvstreams/repos (10 files)

2015-12-05 Thread Antonio Rojas
Date: Saturday, December 5, 2015 @ 19:01:34
  Author: arojas
Revision: 148603

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 148602, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-i686/openssl-buildfix.patch
(from rev 148602, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-gcc47.patch
(from rev 148602, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-glibc212.patch
(from rev 148602, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
  wvstreams/repos/community-staging-x86_64/
  wvstreams/repos/community-staging-x86_64/PKGBUILD
(from rev 148602, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-x86_64/openssl-buildfix.patch
(from rev 148602, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-gcc47.patch
(from rev 148602, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-glibc212.patch
(from rev 148602, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)

-+
 community-staging-i686/PKGBUILD |   54 ++
 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   |   54 ++
 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 ++
 8 files changed, 284 insertions(+)

Copied: wvstreams/repos/community-staging-i686/PKGBUILD (from rev 148602, 
wvstreams/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-05 18:01:34 UTC (rev 148603)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+# Contributor: dorphell 
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=8
+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' 'readline')
+source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz 
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch 
openssl-buildfix.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4')
+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"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./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/openssl-buildfix.patch (from rev 
148602, wvstreams/trunk/openssl-buildfix.patch)
===
--- community-staging-i686/openssl-buildfix.patch   
(rev 0)
+++ community-staging-i686/openssl-buildfix.patch   2015-12-05 18:01:34 UTC 
(rev 148603)
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc2008-10-23 22:23:49.0 +0200
 wvstreams-4.6.1-1/crypto/wvx509.cc  2010-01-27 11:09:06.0 +0100
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x1000L
++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 148602, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)

[arch-commits] Commit in wvstreams/repos (10 files)

2013-10-22 Thread Felix Yan
Date: Tuesday, October 22, 2013 @ 10:21:40
  Author: fyan
Revision: 98998

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  wvstreams/repos/community-testing-i686/
  wvstreams/repos/community-testing-i686/PKGBUILD
(from rev 98997, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-testing-i686/openssl-buildfix.patch
(from rev 98997, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-testing-i686/wvstreams-4.6.1-gcc47.patch
(from rev 98997, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-testing-i686/wvstreams-4.6.1-glibc212.patch
(from rev 98997, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
  wvstreams/repos/community-testing-x86_64/
  wvstreams/repos/community-testing-x86_64/PKGBUILD
(from rev 98997, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-testing-x86_64/openssl-buildfix.patch
(from rev 98997, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-testing-x86_64/wvstreams-4.6.1-gcc47.patch
(from rev 98997, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-testing-x86_64/wvstreams-4.6.1-glibc212.patch
(from rev 98997, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)

-+
 community-testing-i686/PKGBUILD |   54 ++
 community-testing-i686/openssl-buildfix.patch   |   14 +++
 community-testing-i686/wvstreams-4.6.1-gcc47.patch  |   50 
 community-testing-i686/wvstreams-4.6.1-glibc212.patch   |   24 ++
 community-testing-x86_64/PKGBUILD   |   54 ++
 community-testing-x86_64/openssl-buildfix.patch |   14 +++
 community-testing-x86_64/wvstreams-4.6.1-gcc47.patch|   50 
 community-testing-x86_64/wvstreams-4.6.1-glibc212.patch |   24 ++
 8 files changed, 284 insertions(+)

Copied: wvstreams/repos/community-testing-i686/PKGBUILD (from rev 98997, 
wvstreams/trunk/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-10-22 08:21:40 UTC (rev 98998)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan felixonm...@gmail.com
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=7
+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' 'readline')
+source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz 
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch 
openssl-buildfix.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4')
+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
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./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-testing-i686/openssl-buildfix.patch (from rev 
98997, wvstreams/trunk/openssl-buildfix.patch)
===
--- community-testing-i686/openssl-buildfix.patch   
(rev 0)
+++ community-testing-i686/openssl-buildfix.patch   2013-10-22 08:21:40 UTC 
(rev 98998)
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc2008-10-23 22:23:49.0 +0200
 wvstreams-4.6.1-1/crypto/wvx509.cc  2010-01-27 11:09:06.0 +0100
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER = 0x1000L
++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-testing-i686/wvstreams-4.6.1-gcc47.patch 
(from rev 98997, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)

[arch-commits] Commit in wvstreams/repos (10 files)

2013-05-30 Thread Eric BĂ©langer
Date: Thursday, May 30, 2013 @ 23:25:12
  Author: eric
Revision: 91999

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 91997, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-i686/openssl-buildfix.patch
(from rev 91997, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-gcc47.patch
(from rev 91997, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-i686/wvstreams-4.6.1-glibc212.patch
(from rev 91997, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)
  wvstreams/repos/community-staging-x86_64/
  wvstreams/repos/community-staging-x86_64/PKGBUILD
(from rev 91998, wvstreams/trunk/PKGBUILD)
  wvstreams/repos/community-staging-x86_64/openssl-buildfix.patch
(from rev 91998, wvstreams/trunk/openssl-buildfix.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-gcc47.patch
(from rev 91998, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
  wvstreams/repos/community-staging-x86_64/wvstreams-4.6.1-glibc212.patch
(from rev 91998, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch)

-+
 community-staging-i686/PKGBUILD |   54 ++
 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   |   54 ++
 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 ++
 8 files changed, 284 insertions(+)

Copied: wvstreams/repos/community-staging-i686/PKGBUILD (from rev 91997, 
wvstreams/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-05-30 21:25:12 UTC (rev 91999)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=wvstreams
+pkgver=4.6.1
+pkgrel=6
+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' 'readline')
+source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz 
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch 
openssl-buildfix.patch)
+md5sums=('2760dac31a43d452a19a3147bfde571c'
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '217e5dedd7f1d50588a5a67d637fc8a1'
+ 'df423c68134a09439b3961c34635e0b4')
+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
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./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/openssl-buildfix.patch (from rev 
91997, wvstreams/trunk/openssl-buildfix.patch)
===
--- community-staging-i686/openssl-buildfix.patch   
(rev 0)
+++ community-staging-i686/openssl-buildfix.patch   2013-05-30 21:25:12 UTC 
(rev 91999)
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc2008-10-23 22:23:49.0 +0200
 wvstreams-4.6.1-1/crypto/wvx509.cc  2010-01-27 11:09:06.0 +0100
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER = 0x1000L
++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 91997, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch)
===
---