Date: Thursday, June 10, 2021 @ 09:53:37 Author: grawlinson Revision: 961239
upgpkg: proxytunnel 1.10.20210604-1 * New upstream release * Changed to newer OpenSSL dependency * Removed SVN dependency Modified: proxytunnel/trunk/PKGBUILD Deleted: proxytunnel/trunk/fix-Makefile-ssl-FTBFS.patch proxytunnel/trunk/migrate-from-SSLv3.patch ------------------------------+ PKGBUILD | 30 +++++++++++++----------------- fix-Makefile-ssl-FTBFS.patch | 11 ----------- migrate-from-SSLv3.patch | 12 ------------ 3 files changed, 13 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-10 09:52:17 UTC (rev 961238) +++ PKGBUILD 2021-06-10 09:53:37 UTC (rev 961239) @@ -1,36 +1,32 @@ # Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: George Rawlinson <geo...@archlinux.org> # Contributor: Georg Grabler (STiAT) <ggrab...@gmail.com> pkgname=proxytunnel -pkgver=1.9.0.253 -pkgrel=4 -pkgdesc="a program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy" +pkgver=1.10.20210604 +pkgrel=1 +pkgdesc="Creates tunnels through HTTP(S) proxies for any TCP based protocol" arch=('x86_64') -url="http://proxytunnel.sourceforge.net" +url="https://github.com/proxytunnel/proxytunnel" 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') +makedepends=('asciidoc' 'xmlto') +source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz") +b2sums=('f8e70bd81a541bd3ecf0ed09fedc57396531aeec460eaff125046700d1a9c69f110590a5b81f650fdaba0c5938dd401a2937ee7347a4e33a3b89ac36bb915a7c') prepare() { - cd $pkgname - patch -Np1 -i ../fix-Makefile-ssl-FTBFS.patch - patch -Np1 -i ../migrate-from-SSLv3.patch + cd "$pkgname-$pkgver" + # append -DOPENSSL11 to CFLAGS: See ptstream.c + sed '/^CFLAGS/ s/$/ -DOPENSSL11/' Makefile } build() { - cd $pkgname + cd "$pkgname-$pkgver" CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common make prefix=/usr } package() { - cd $pkgname + cd "$pkgname-$pkgver" make prefix=/usr DESTDIR="$pkgdir" install } Deleted: fix-Makefile-ssl-FTBFS.patch =================================================================== --- fix-Makefile-ssl-FTBFS.patch 2021-06-10 09:52:17 UTC (rev 961238) +++ fix-Makefile-ssl-FTBFS.patch 2021-06-10 09:53:37 UTC (rev 961239) @@ -1,11 +0,0 @@ ---- 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: migrate-from-SSLv3.patch =================================================================== --- migrate-from-SSLv3.patch 2021-06-10 09:52:17 UTC (rev 961238) +++ migrate-from-SSLv3.patch 2021-06-10 09:53:37 UTC (rev 961239) @@ -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 -@@ -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) {