[arch-commits] Commit in proxytunnel/repos (12 files)
Sergej Pupykin
spupykin at archlinux.org
Thu Jun 16 10:39:59 UTC 2016
Date: Thursday, June 16, 2016 @ 10:39:59
Author: spupykin
Revision: 180314
archrelease: copy trunk to community-i686, community-x86_64
Added:
proxytunnel/repos/community-i686/PKGBUILD
(from rev 180313, proxytunnel/trunk/PKGBUILD)
proxytunnel/repos/community-i686/fix-Makefile-ssl-FTBFS.patch
(from rev 180313, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
proxytunnel/repos/community-i686/migrate-from-SSLv3.patch
(from rev 180313, proxytunnel/trunk/migrate-from-SSLv3.patch)
proxytunnel/repos/community-x86_64/PKGBUILD
(from rev 180313, proxytunnel/trunk/PKGBUILD)
proxytunnel/repos/community-x86_64/fix-Makefile-ssl-FTBFS.patch
(from rev 180313, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
proxytunnel/repos/community-x86_64/migrate-from-SSLv3.patch
(from rev 180313, proxytunnel/trunk/migrate-from-SSLv3.patch)
Deleted:
proxytunnel/repos/community-i686/PKGBUILD
proxytunnel/repos/community-i686/fix-Makefile-ssl-FTBFS.patch
proxytunnel/repos/community-i686/migrate-from-SSLv3.patch
proxytunnel/repos/community-x86_64/PKGBUILD
proxytunnel/repos/community-x86_64/fix-Makefile-ssl-FTBFS.patch
proxytunnel/repos/community-x86_64/migrate-from-SSLv3.patch
-----------------------------------------------+
/PKGBUILD | 72 ++++++++++++++++++++++++
/fix-Makefile-ssl-FTBFS.patch | 22 +++++++
/migrate-from-SSLv3.patch | 24 ++++++++
community-i686/PKGBUILD | 35 -----------
community-i686/fix-Makefile-ssl-FTBFS.patch | 17 -----
community-i686/migrate-from-SSLv3.patch | 12 ----
community-x86_64/PKGBUILD | 35 -----------
community-x86_64/fix-Makefile-ssl-FTBFS.patch | 17 -----
community-x86_64/migrate-from-SSLv3.patch | 12 ----
9 files changed, 118 insertions(+), 128 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-i686/PKGBUILD 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,35 +0,0 @@
-# $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-i686/PKGBUILD (from rev 180313, proxytunnel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-06-16 10:39:59 UTC (rev 180314)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Georg Grabler (STiAT) <ggrabler at gmail.com>
+
+pkgname=proxytunnel
+pkgver=1.9.0.253
+pkgrel=1
+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')
+makedepends=('subversion' 'asciidoc' 'xmlto')
+#source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
+source=("svn://svn.code.sf.net/p/proxytunnel/code/trunk/proxytunnel#revision=${pkgver##*.}"
+ fix-Makefile-ssl-FTBFS.patch
+ migrate-from-SSLv3.patch)
+md5sums=('SKIP'
+ 'facacbf723512e7c94a4d7e6a0d12eeb'
+ '71c403c2bd6fb332bc5839894bcafe76')
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch
+ patch -Np1 -i ../migrate-from-SSLv3.patch
+}
+
+build() {
+ cd $pkgname
+ make prefix=/usr
+}
+
+package() {
+ cd $pkgname
+ make prefix=/usr DESTDIR=$pkgdir install
+}
Deleted: community-i686/fix-Makefile-ssl-FTBFS.patch
===================================================================
--- community-i686/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-i686/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,17 +0,0 @@
---- 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-i686/fix-Makefile-ssl-FTBFS.patch (from rev 180313, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
===================================================================
--- community-i686/fix-Makefile-ssl-FTBFS.patch (rev 0)
+++ community-i686/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@
+
+ # END system dependant block
+
+-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
++#SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
+ ifeq ($(SSL_LIBS),)
+ SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
+ endif
Deleted: community-i686/migrate-from-SSLv3.patch
===================================================================
--- community-i686/migrate-from-SSLv3.patch 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-i686/migrate-from-SSLv3.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,12 +0,0 @@
-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-i686/migrate-from-SSLv3.patch (from rev 180313, proxytunnel/trunk/migrate-from-SSLv3.patch)
===================================================================
--- community-i686/migrate-from-SSLv3.patch (rev 0)
+++ community-i686/migrate-from-SSLv3.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -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
+@@ -167,7 +167,7 @@
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
+
+- ctx = SSL_CTX_new (SSLv3_client_method());
++ ctx = SSL_CTX_new (SSLv23_client_method());
+ ssl = SSL_new (ctx);
+
+ if (args_info.verbose_flag) {
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-x86_64/PKGBUILD 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,35 +0,0 @@
-# $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-x86_64/PKGBUILD (from rev 180313, proxytunnel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-06-16 10:39:59 UTC (rev 180314)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Georg Grabler (STiAT) <ggrabler at gmail.com>
+
+pkgname=proxytunnel
+pkgver=1.9.0.253
+pkgrel=1
+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')
+makedepends=('subversion' 'asciidoc' 'xmlto')
+#source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
+source=("svn://svn.code.sf.net/p/proxytunnel/code/trunk/proxytunnel#revision=${pkgver##*.}"
+ fix-Makefile-ssl-FTBFS.patch
+ migrate-from-SSLv3.patch)
+md5sums=('SKIP'
+ 'facacbf723512e7c94a4d7e6a0d12eeb'
+ '71c403c2bd6fb332bc5839894bcafe76')
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch
+ patch -Np1 -i ../migrate-from-SSLv3.patch
+}
+
+build() {
+ cd $pkgname
+ make prefix=/usr
+}
+
+package() {
+ cd $pkgname
+ make prefix=/usr DESTDIR=$pkgdir install
+}
Deleted: community-x86_64/fix-Makefile-ssl-FTBFS.patch
===================================================================
--- community-x86_64/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-x86_64/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,17 +0,0 @@
---- 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-x86_64/fix-Makefile-ssl-FTBFS.patch (from rev 180313, proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch)
===================================================================
--- community-x86_64/fix-Makefile-ssl-FTBFS.patch (rev 0)
+++ community-x86_64/fix-Makefile-ssl-FTBFS.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@
+
+ # END system dependant block
+
+-SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
++#SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
+ ifeq ($(SSL_LIBS),)
+ SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
+ endif
Deleted: community-x86_64/migrate-from-SSLv3.patch
===================================================================
--- community-x86_64/migrate-from-SSLv3.patch 2016-06-16 10:39:13 UTC (rev 180313)
+++ community-x86_64/migrate-from-SSLv3.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -1,12 +0,0 @@
-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-x86_64/migrate-from-SSLv3.patch (from rev 180313, proxytunnel/trunk/migrate-from-SSLv3.patch)
===================================================================
--- community-x86_64/migrate-from-SSLv3.patch (rev 0)
+++ community-x86_64/migrate-from-SSLv3.patch 2016-06-16 10:39:59 UTC (rev 180314)
@@ -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
+@@ -167,7 +167,7 @@
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
+
+- ctx = SSL_CTX_new (SSLv3_client_method());
++ ctx = SSL_CTX_new (SSLv23_client_method());
+ ssl = SSL_new (ctx);
+
+ if (args_info.verbose_flag) {
More information about the arch-commits
mailing list