main/tlsdate: rebuild against libressl

2 files changed, 66 insertions, 5 deletions

diff --git a/main/tlsdate/APKBUILD b/main/tlsdate/APKBUILD
index 84cd66ba46..6801aa865c 100644
--- a/main/tlsdate/APKBUILD
+++ b/main/tlsdate/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tlsdate
 pkgver=0.0.13
-pkgrel=0
+pkgrel=1
 pkgdesc="An secure parasitic rdate replacement"
 url="https://github.com/ioerror/tlsdate"
 arch="all"
@@ -10,7 +10,7 @@ depends=""
 depends_dev=""
 pkgusers="tlsdate"
 pkggroups="tlsdate"
-makedepends="autoconf automake libtool openssl-dev linux-headers libevent-dev"
+makedepends="autoconf automake libtool libressl-dev linux-headers libevent-dev"
 install=""
 subpackages="$pkgname-doc"
 source="tlsdate-${pkgver}.tar.gz::https://github.com/ioerror/tlsdate/tarball/tlsdate-${pkgver}
@@ -19,6 +19,7 @@ source="tlsdate-${pkgver}.tar.gz::https://github.com/ioerror/tlsdate/tarball/tls
 	tlsdated.confd
 	tlsdated.initd
 	tlsdate-add-secondary-archs.patch
+	libressl-no-sslv3.patch
 	"
 
 builddir="$srcdir"/ioerror-tlsdate-ae33169
@@ -52,16 +53,19 @@ md5sums="0c854eb5d54535540e7e953aed9589c6  tlsdate-0.0.13.tar.gz
 ee0e2f5ba3d5aa1ed12995c9af61022f  tlsdate.initd
 53e956dbaf6b67c408c080e6b9f2f3a5  tlsdated.confd
 e636192886e247c9144df9a747902a59  tlsdated.initd
-f2296ce3b0f7baae19d25009ebe7233a  tlsdate-add-secondary-archs.patch"
+f2296ce3b0f7baae19d25009ebe7233a  tlsdate-add-secondary-archs.patch
+eaccd6fa99c0d7349c6f950a7ea444b1  libressl-no-sslv3.patch"
 sha256sums="482640a5efb8489f287da1018176fb1196adf7cb1b81ac0c7f2b419b43d44258  tlsdate-0.0.13.tar.gz
 d3e4f1ca2941813cdee93ef039a5156db410cea2dc4b0e1a738a9bae89835d63  tlsdate.confd
 4652276edc4c4cec8b26735c81ee34c35aa887e8a5ddcfe78170360092c7f5fe  tlsdate.initd
 1c52ff7bc7ce0fbd876a4f594948a70e30e6197bae2b9bc1b55cc6d398091131  tlsdated.confd
 2a39cde73cf628ff168a156cd1ce14c324be5bcd0384f9979a89d79ef1d60325  tlsdated.initd
-bbf3658def6f253fa8ca2ab40a0814a68eeb43c398f8fc179173e304555e4dd7  tlsdate-add-secondary-archs.patch"
+bbf3658def6f253fa8ca2ab40a0814a68eeb43c398f8fc179173e304555e4dd7  tlsdate-add-secondary-archs.patch
+19c77ad3029fae65054191734c1c2181d9c994a6fe0553cf8aca488093714e6b  libressl-no-sslv3.patch"
 sha512sums="9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789  tlsdate-0.0.13.tar.gz
 62149e3a9f26a71624bd851780f92a41c9aaf138793b5da762aa3002bcc5a409686d1bbe687b4abf1fc2e12205720a3825d9603cab0b0d978c2d0fd41422efe7  tlsdate.confd
 c54d11ead7ee5035e4829df92b23cd54a71535199844b4f64ecfa715d9838ef954e7c2434df0767bb32c8226448d2fa080180be76ed8e417d5fa6dfc9c08dce6  tlsdate.initd
 38bd7d64473ab487eea2539b11a7acadfc3fa5a627fb12e78931b62c46d3ebedab4c75d56839b0dee9fd8f42d4b7ae9ace08ea3f58941b8e2d183828c6a4fef2  tlsdated.confd
 9601ab4f9bd8870ed0c8e4f9dcbc32df902a5998ea6eeb8c40b8a8286515f35bf2d755784d267f78d53ac9baaf2d20051e99c35ceabe9d846d9a2a40cf135760  tlsdated.initd
-03ebe29088f91eb45a13a467797c4f5a88233e2ebea957ca72012fe892dea1377b652f8aadaab865352a37d255df674f1abba09f6670bf8a9015aebfce89cf77  tlsdate-add-secondary-archs.patch"
+03ebe29088f91eb45a13a467797c4f5a88233e2ebea957ca72012fe892dea1377b652f8aadaab865352a37d255df674f1abba09f6670bf8a9015aebfce89cf77  tlsdate-add-secondary-archs.patch
+513ccff7056c0764a5d821a90819a0e293921fafc3d0f9ba93e42564bac2b6d041599eb075dfe43cb5d760e67e3ae9f5a46d3359080284c3df1adb845463478b  libressl-no-sslv3.patch"
diff --git a/main/tlsdate/libressl-no-sslv3.patch b/main/tlsdate/libressl-no-sslv3.patch
new file mode 100644
index 0000000000..f4d7ffbb57
--- /dev/null
+++ b/main/tlsdate/libressl-no-sslv3.patch
@@ -0,0 +1,57 @@
+--- a/src/tlsdate.c.orig	2016-03-30 23:41:39.121031885 +0200
++++ b/src/tlsdate.c	2016-03-30 23:41:49.442032351 +0200
+@@ -88,7 +88,7 @@
+            " [-n|--dont-set-clock]\n"
+            " [-H|--host] [hostname|ip]\n"
+            " [-p|--port] [port number]\n"
+-           " [-P|--protocol] [sslv23|sslv3|tlsv1]\n"
++           " [-P|--protocol] [sslv23|tlsv1]\n"
+            " [-C|--certcontainer] [dirname|filename]\n"
+            " [-v|--verbose]\n"
+            " [-V|--showtime] [human|raw]\n"
+--- a/man/tlsdate.1.orig	2016-03-30 23:42:18.100033647 +0200
++++ b/man/tlsdate.1	2016-03-30 23:42:35.659034441 +0200
+@@ -5,7 +5,7 @@
+ .SH NAME
+ tlsdate \- secure parasitic rdate replacement
+ .SH SYNOPSIS
+-.B tlsdate [\-hnvVstlw] [\-H [hostname]] [\-p [port]] [\-P [sslv23|sslv3|tlsv1]] \
++.B tlsdate [\-hnvVstlw] [\-H [hostname]] [\-p [port]] [\-P [sslv23|tlsv1]] \
+ [\-\-certdir [dirname]] [\-x [\-\-proxy] proxy\-type://proxyhost:proxyport]
+ .SH DESCRIPTION
+ .B tlsdate
+@@ -30,7 +30,7 @@
+ Do not set the system clock to the time of the remote server
+ .IP "\-p | \-\-port [port]"
+ Set remote port (default: '443')
+-.IP "\-P | \-\-protocol [sslv23|sslv3|tlsv1]"
++.IP "\-P | \-\-protocol [sslv23|tlsv1]"
+ Set protocol to use when communicating with server (default: 'tlsv1')
+ .IP "\-C | \-\-certdir [dirname]"
+ Set the local directory where certificates are located
+--- a/src/tlsdate-helper-plan9.c.orig	2016-03-30 23:43:12.577036110 +0200
++++ b/src/tlsdate-helper-plan9.c	2016-03-30 23:43:32.403037006 +0200
+@@ -978,10 +978,6 @@
+   {
+     verb ("V: using SSLv23_client_method()\n");
+     ctx = SSL_CTX_new(SSLv23_client_method());
+-  } else if (0 == strcmp("sslv3", protocol))
+-  {
+-    verb ("V: using SSLv3_client_method()\n");
+-    ctx = SSL_CTX_new(SSLv3_client_method());
+   } else if (0 == strcmp("tlsv1", protocol))
+   {
+     verb ("V: using TLSv1_client_method()\n");
+--- a/src/tlsdate-helper.c.orig	2016-03-30 23:33:02.056008510 +0200
++++ b/src/tlsdate-helper.c	2016-03-30 23:34:46.400013227 +0200
+@@ -1133,10 +1133,6 @@
+   {
+     verb ("V: using SSLv23_client_method()");
+     ctx = SSL_CTX_new(SSLv23_client_method());
+-  } else if (0 == strcmp("sslv3", protocol))
+-  {
+-    verb ("V: using SSLv3_client_method()");
+-    ctx = SSL_CTX_new(SSLv3_client_method());
+   } else if (0 == strcmp("tlsv1", protocol))
+   {
+     verb ("V: using TLSv1_client_method()");