[arch-commits] Commit in proxytunnel/trunk (3 files)

[Sergej Pupykin]

    Date: Thursday, June 16, 2016 @ 10:39:13
  Author: spupykin
Revision: 180313

upgpkg: proxytunnel 1.9.0.253-1

upd

Modified:
  proxytunnel/trunk/PKGBUILD
  proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch
  proxytunnel/trunk/migrate-from-SSLv3.patch

------------------------------+
 PKGBUILD                     |   25 +++++++++++++------------
 fix-Makefile-ssl-FTBFS.patch |   12 +++---------
 migrate-from-SSLv3.patch     |   12 ++++++------
 3 files changed, 22 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-16 05:23:29 UTC (rev 180312)
+++ PKGBUILD	2016-06-16 10:39:13 UTC (rev 180313)
@@ -3,33 +3,34 @@
 # Contributor: Georg Grabler (STiAT) <ggrabler at gmail.com>
 
 pkgname=proxytunnel
-pkgver=1.9.0
-pkgrel=5
+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')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz
+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=('d74472b89c3f3b3b0abf6bd809ae34c2'
-         '2c6c2a4c37cd2f28ee09e92d00274334'
-         '502197e4f4b7530e54933733f02c4112')
+md5sums=('SKIP'
+         'facacbf723512e7c94a4d7e6a0d12eeb'
+         '71c403c2bd6fb332bc5839894bcafe76')
 
 prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's|PREFIX =/usr/local|PREFIX =/usr|g' Makefile
+  cd $pkgname
   patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch
   patch -Np1 -i ../migrate-from-SSLv3.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
-  make
+  cd $pkgname
+  make prefix=/usr
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname
+  make prefix=/usr DESTDIR=$pkgdir install
 }

Modified: fix-Makefile-ssl-FTBFS.patch
===================================================================
--- fix-Makefile-ssl-FTBFS.patch	2016-06-16 05:23:29 UTC (rev 180312)
+++ fix-Makefile-ssl-FTBFS.patch	2016-06-16 10:39:13 UTC (rev 180313)
@@ -1,17 +1,11 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -48,10 +48,11 @@
+@@ -48,7 +48,7 @@
  
  # 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 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

Modified: migrate-from-SSLv3.patch
===================================================================
--- migrate-from-SSLv3.patch	2016-06-16 05:23:29 UTC (rev 180312)
+++ migrate-from-SSLv3.patch	2016-06-16 10:39:13 UTC (rev 180313)
@@ -1,12 +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 */
+@@ -167,7 +167,7 @@
  	SSLeay_add_ssl_algorithms();
--	meth = SSLv3_client_method();
-+	meth = SSLv23_client_method();
  	SSL_load_error_strings();
  
- 	ctx = SSL_CTX_new (meth);
+-	ctx = SSL_CTX_new (SSLv3_client_method());
++	ctx = SSL_CTX_new (SSLv23_client_method());
+ 	ssl = SSL_new (ctx);
+ 
+ 	if (args_info.verbose_flag) {