[arch-commits] Commit in proxytunnel/repos (8 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Mar 2 18:52:47 UTC 2016
Date: Wednesday, March 2, 2016 @ 19:52:46
Author: foutrelis
Revision: 164229
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
proxytunnel/repos/community-staging-i686/
proxytunnel/repos/community-staging-i686/PKGBUILD
(from rev 164228, proxytunnel/trunk/PKGBUILD)
proxytunnel/repos/community-staging-i686/fix-Makefile-ssl-FTBFS.patch
(from rev 164228, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
proxytunnel/repos/community-staging-i686/migrate-from-SSLv3.patch
(from rev 164228, proxytunnel/trunk/migrate-from-SSLv3.patch)
proxytunnel/repos/community-staging-x86_64/
proxytunnel/repos/community-staging-x86_64/PKGBUILD
(from rev 164228, proxytunnel/trunk/PKGBUILD)
proxytunnel/repos/community-staging-x86_64/fix-Makefile-ssl-FTBFS.patch
(from rev 164228, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
proxytunnel/repos/community-staging-x86_64/migrate-from-SSLv3.patch
(from rev 164228, proxytunnel/trunk/migrate-from-SSLv3.patch)
-------------------------------------------------------+
community-staging-i686/PKGBUILD | 35 ++++++++++++++++
community-staging-i686/fix-Makefile-ssl-FTBFS.patch | 17 +++++++
community-staging-i686/migrate-from-SSLv3.patch | 12 +++++
community-staging-x86_64/PKGBUILD | 35 ++++++++++++++++
community-staging-x86_64/fix-Makefile-ssl-FTBFS.patch | 17 +++++++
community-staging-x86_64/migrate-from-SSLv3.patch | 12 +++++
6 files changed, 128 insertions(+)
Copied: proxytunnel/repos/community-staging-i686/PKGBUILD (from rev 164228, proxytunnel/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Georg Grabler (STiAT) <ggrabler at gmail.com>
+
+pkgname=proxytunnel
+pkgver=1.9.0
+pkgrel=5
+pkgdesc="a program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
+arch=('i686' 'x86_64')
+url="http://proxytunnel.sourceforge.net"
+license=('GPL')
+depends=('openssl')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
+ fix-Makefile-ssl-FTBFS.patch
+ migrate-from-SSLv3.patch)
+md5sums=('d74472b89c3f3b3b0abf6bd809ae34c2'
+ '2c6c2a4c37cd2f28ee09e92d00274334'
+ '502197e4f4b7530e54933733f02c4112')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's|PREFIX =/usr/local|PREFIX =/usr|g' Makefile
+ patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch
+ patch -Np1 -i ../migrate-from-SSLv3.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Copied: proxytunnel/repos/community-staging-i686/fix-Makefile-ssl-FTBFS.patch (from rev 164228, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
===================================================================
--- community-staging-i686/fix-Makefile-ssl-FTBFS.patch (rev 0)
+++ community-staging-i686/fix-Makefile-ssl-FTBFS.patch 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,10 +48,11 @@
+
+ # END system dependant block
+
+-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
+-ifeq ($(SSL_LIBS),)
++# We're not using libssl, so comment out the following line
++# SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
++# ifeq ($(SSL_LIBS),)
+ SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
+-endif
++# endif
+ ifeq ($(SSL_LIBS),)
+ SSL_LIBS := -lssl -lcrypto
+ endif
Copied: proxytunnel/repos/community-staging-i686/migrate-from-SSLv3.patch (from rev 164228, proxytunnel/trunk/migrate-from-SSLv3.patch)
===================================================================
--- community-staging-i686/migrate-from-SSLv3.patch (rev 0)
+++ community-staging-i686/migrate-from-SSLv3.patch 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,12 @@
+diff -upr proxytunnel-1.9.0.orig/ptstream.c proxytunnel-1.9.0/ptstream.c
+--- proxytunnel-1.9.0.orig/ptstream.c 2008-02-27 01:27:27.000000000 +0200
++++ proxytunnel-1.9.0/ptstream.c 2016-03-02 20:43:32.909153946 +0200
+@@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
+
+ /* Initialise the connection */
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv3_client_method();
++ meth = SSLv23_client_method();
+ SSL_load_error_strings();
+
+ ctx = SSL_CTX_new (meth);
Copied: proxytunnel/repos/community-staging-x86_64/PKGBUILD (from rev 164228, proxytunnel/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Georg Grabler (STiAT) <ggrabler at gmail.com>
+
+pkgname=proxytunnel
+pkgver=1.9.0
+pkgrel=5
+pkgdesc="a program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
+arch=('i686' 'x86_64')
+url="http://proxytunnel.sourceforge.net"
+license=('GPL')
+depends=('openssl')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
+ fix-Makefile-ssl-FTBFS.patch
+ migrate-from-SSLv3.patch)
+md5sums=('d74472b89c3f3b3b0abf6bd809ae34c2'
+ '2c6c2a4c37cd2f28ee09e92d00274334'
+ '502197e4f4b7530e54933733f02c4112')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's|PREFIX =/usr/local|PREFIX =/usr|g' Makefile
+ patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch
+ patch -Np1 -i ../migrate-from-SSLv3.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Copied: proxytunnel/repos/community-staging-x86_64/fix-Makefile-ssl-FTBFS.patch (from rev 164228, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
===================================================================
--- community-staging-x86_64/fix-Makefile-ssl-FTBFS.patch (rev 0)
+++ community-staging-x86_64/fix-Makefile-ssl-FTBFS.patch 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,10 +48,11 @@
+
+ # END system dependant block
+
+-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
+-ifeq ($(SSL_LIBS),)
++# We're not using libssl, so comment out the following line
++# SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
++# ifeq ($(SSL_LIBS),)
+ SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
+-endif
++# endif
+ ifeq ($(SSL_LIBS),)
+ SSL_LIBS := -lssl -lcrypto
+ endif
Copied: proxytunnel/repos/community-staging-x86_64/migrate-from-SSLv3.patch (from rev 164228, proxytunnel/trunk/migrate-from-SSLv3.patch)
===================================================================
--- community-staging-x86_64/migrate-from-SSLv3.patch (rev 0)
+++ community-staging-x86_64/migrate-from-SSLv3.patch 2016-03-02 18:52:46 UTC (rev 164229)
@@ -0,0 +1,12 @@
+diff -upr proxytunnel-1.9.0.orig/ptstream.c proxytunnel-1.9.0/ptstream.c
+--- proxytunnel-1.9.0.orig/ptstream.c 2008-02-27 01:27:27.000000000 +0200
++++ proxytunnel-1.9.0/ptstream.c 2016-03-02 20:43:32.909153946 +0200
+@@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
+
+ /* Initialise the connection */
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv3_client_method();
++ meth = SSLv23_client_method();
+ SSL_load_error_strings();
+
+ ctx = SSL_CTX_new (meth);
More information about the arch-commits
mailing list