[arch-commits] Commit in socat/repos (6 files)

Gaëtan Bisson bisson at archlinux.org
Thu Feb 2 17:20:50 UTC 2017


    Date: Thursday, February 2, 2017 @ 17:20:49
  Author: bisson
Revision: 287912

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  socat/repos/extra-i686/PKGBUILD
    (from rev 287911, socat/trunk/PKGBUILD)
  socat/repos/extra-x86_64/PKGBUILD
    (from rev 287911, socat/trunk/PKGBUILD)
Deleted:
  socat/repos/extra-i686/PKGBUILD
  socat/repos/extra-i686/add-missing-checks.patch
  socat/repos/extra-x86_64/PKGBUILD
  socat/repos/extra-x86_64/add-missing-checks.patch

---------------------------------------+
 /PKGBUILD                             |   58 +++++++++++++++++++
 extra-i686/PKGBUILD                   |   36 ------------
 extra-i686/add-missing-checks.patch   |   95 --------------------------------
 extra-x86_64/PKGBUILD                 |   36 ------------
 extra-x86_64/add-missing-checks.patch |   95 --------------------------------
 5 files changed, 58 insertions(+), 262 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-02 17:20:14 UTC (rev 287911)
+++ extra-i686/PKGBUILD	2017-02-02 17:20:49 UTC (rev 287912)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=socat
-pkgver=1.7.3.1
-pkgrel=3
-pkgdesc='Multipurpose relay'
-url='http://www.dest-unreach.org/socat/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('readline' 'openssl')
-source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz"
-        'add-missing-checks.patch')
-sha1sums=('a6f1d8ab3e85f565dbe172f33a9be6708dd52ffb'
-          'cfdaa269dac053ceec4c4f763d9075983c4c9307')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -Np1 -i ../add-missing-checks.patch
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: socat/repos/extra-i686/PKGBUILD (from rev 287911, socat/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-02 17:20:49 UTC (rev 287912)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=socat
+pkgver=1.7.3.2
+pkgrel=1
+pkgdesc='Multipurpose relay'
+url='http://www.dest-unreach.org/socat/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('readline' 'openssl')
+source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('28eca1f8efeadde3f96c1ac89e553c28d736d41d')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/add-missing-checks.patch
===================================================================
--- extra-i686/add-missing-checks.patch	2017-02-02 17:20:14 UTC (rev 287911)
+++ extra-i686/add-missing-checks.patch	2017-02-02 17:20:49 UTC (rev 287912)
@@ -1,95 +0,0 @@
-diff -Nru socat-1.7.3.0.orig/sslcls.c socat-1.7.3.0/sslcls.c
---- socat-1.7.3.0.orig/sslcls.c	2015-01-24 05:15:22.000000000 -0500
-+++ socat-1.7.3.0/sslcls.c	2015-11-29 14:14:13.252000000 -0500
-@@ -55,6 +55,7 @@
- }
- #endif
- 
-+#if HAVE_SSLv3_client_method
- const SSL_METHOD *sycSSLv3_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv3_client_method()");
-@@ -62,7 +63,9 @@
-    Debug1("SSLv3_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv3_server_method
- const SSL_METHOD *sycSSLv3_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv3_server_method()");
-@@ -70,7 +73,9 @@
-    Debug1("SSLv3_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv23_client_method
- const SSL_METHOD *sycSSLv23_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv23_client_method()");
-@@ -78,7 +83,9 @@
-    Debug1("SSLv23_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv23_server_method
- const SSL_METHOD *sycSSLv23_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv23_server_method()");
-@@ -86,7 +93,9 @@
-    Debug1("SSLv23_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_TLSv1_client_method
- const SSL_METHOD *sycTLSv1_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("TLSv1_client_method()");
-@@ -94,7 +103,9 @@
-    Debug1("TLSv1_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_TLSv1_server_method
- const SSL_METHOD *sycTLSv1_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("TLSv1_server_method()");
-@@ -102,6 +113,7 @@
-    Debug1("TLSv1_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
- #if HAVE_TLSv1_1_client_method
- const SSL_METHOD *sycTLSv1_1_client_method(void) {
-@@ -143,6 +155,7 @@
- }
- #endif
- 
-+#if HAVE_DTLSv1_client_method
- const SSL_METHOD *sycDTLSv1_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("DTLSv1_client_method()");
-@@ -150,7 +163,9 @@
-    Debug1("DTLSv1_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_DTLSv1_server_method
- const SSL_METHOD *sycDTLSv1_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("DTLSv1_server_method()");
-@@ -158,6 +173,7 @@
-    Debug1("DTLSv1_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
- SSL_CTX *sycSSL_CTX_new(const SSL_METHOD *method) {
-    SSL_CTX *result;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-02 17:20:14 UTC (rev 287911)
+++ extra-x86_64/PKGBUILD	2017-02-02 17:20:49 UTC (rev 287912)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=socat
-pkgver=1.7.3.1
-pkgrel=3
-pkgdesc='Multipurpose relay'
-url='http://www.dest-unreach.org/socat/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('readline' 'openssl')
-source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz"
-        'add-missing-checks.patch')
-sha1sums=('a6f1d8ab3e85f565dbe172f33a9be6708dd52ffb'
-          'cfdaa269dac053ceec4c4f763d9075983c4c9307')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -Np1 -i ../add-missing-checks.patch
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: socat/repos/extra-x86_64/PKGBUILD (from rev 287911, socat/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-02 17:20:49 UTC (rev 287912)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=socat
+pkgver=1.7.3.2
+pkgrel=1
+pkgdesc='Multipurpose relay'
+url='http://www.dest-unreach.org/socat/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('readline' 'openssl')
+source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('28eca1f8efeadde3f96c1ac89e553c28d736d41d')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/add-missing-checks.patch
===================================================================
--- extra-x86_64/add-missing-checks.patch	2017-02-02 17:20:14 UTC (rev 287911)
+++ extra-x86_64/add-missing-checks.patch	2017-02-02 17:20:49 UTC (rev 287912)
@@ -1,95 +0,0 @@
-diff -Nru socat-1.7.3.0.orig/sslcls.c socat-1.7.3.0/sslcls.c
---- socat-1.7.3.0.orig/sslcls.c	2015-01-24 05:15:22.000000000 -0500
-+++ socat-1.7.3.0/sslcls.c	2015-11-29 14:14:13.252000000 -0500
-@@ -55,6 +55,7 @@
- }
- #endif
- 
-+#if HAVE_SSLv3_client_method
- const SSL_METHOD *sycSSLv3_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv3_client_method()");
-@@ -62,7 +63,9 @@
-    Debug1("SSLv3_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv3_server_method
- const SSL_METHOD *sycSSLv3_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv3_server_method()");
-@@ -70,7 +73,9 @@
-    Debug1("SSLv3_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv23_client_method
- const SSL_METHOD *sycSSLv23_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv23_client_method()");
-@@ -78,7 +83,9 @@
-    Debug1("SSLv23_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_SSLv23_server_method
- const SSL_METHOD *sycSSLv23_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("SSLv23_server_method()");
-@@ -86,7 +93,9 @@
-    Debug1("SSLv23_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_TLSv1_client_method
- const SSL_METHOD *sycTLSv1_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("TLSv1_client_method()");
-@@ -94,7 +103,9 @@
-    Debug1("TLSv1_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_TLSv1_server_method
- const SSL_METHOD *sycTLSv1_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("TLSv1_server_method()");
-@@ -102,6 +113,7 @@
-    Debug1("TLSv1_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
- #if HAVE_TLSv1_1_client_method
- const SSL_METHOD *sycTLSv1_1_client_method(void) {
-@@ -143,6 +155,7 @@
- }
- #endif
- 
-+#if HAVE_DTLSv1_client_method
- const SSL_METHOD *sycDTLSv1_client_method(void) {
-    const SSL_METHOD *result;
-    Debug("DTLSv1_client_method()");
-@@ -150,7 +163,9 @@
-    Debug1("DTLSv1_client_method() -> %p", result);
-    return result;
- }
-+#endif
- 
-+#if HAVE_DTLSv1_server_method
- const SSL_METHOD *sycDTLSv1_server_method(void) {
-    const SSL_METHOD *result;
-    Debug("DTLSv1_server_method()");
-@@ -158,6 +173,7 @@
-    Debug1("DTLSv1_server_method() -> %p", result);
-    return result;
- }
-+#endif
- 
- SSL_CTX *sycSSL_CTX_new(const SSL_METHOD *method) {
-    SSL_CTX *result;



More information about the arch-commits mailing list