Make it co-installable with socat

3 files changed, 74 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0647f7a84e1..35d04457c981 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat May  7 07:08:57 UTC 2016
 pkgbase = socat2-git
 	pkgdesc = Multipurpose relay (development version)
-	pkgver = 2.0.0.b6.120.g2dee720
+	pkgver = 2.0.0.b9.0.g7beb9b3
 	pkgrel = 1
 	url = http://www.dest-unreach.org/socat/socat-version2.html
 	arch = i686
@@ -9,10 +11,10 @@ pkgbase = socat2-git
 	makedepends = yodl
 	depends = readline
 	depends = openssl
-	provides = socat
-	conflicts = socat
 	source = socat2::git+http://repo.or.cz/socat.git#branch=socat2
+	source = sslv3.patch
 	sha256sums = SKIP
+	sha256sums = 3744575806f489ad0d3673e6a397badd4b61ecbd6e474ece67b347e13c5076b5
 
 pkgname = socat2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f2cfdbfbec89..1607848e6274 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 _pkgname=socat2
 pkgname=${_pkgname}-git
-pkgver=2.0.0.b6.120.g2dee720
+pkgver=2.0.0.b9.0.g7beb9b3
 pkgrel=1
 pkgdesc='Multipurpose relay (development version)'
 url='http://www.dest-unreach.org/socat/socat-version2.html'
@@ -18,10 +18,14 @@ license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('readline' 'openssl')
 makedepends=('yodl')
-source=("$_pkgname"::"git+http://repo.or.cz/socat.git#branch=socat2")
-sha256sums=('SKIP')
-provides=('socat')
-conflicts=('socat')
+source=(
+    "$_pkgname"::"git+http://repo.or.cz/socat.git#branch=socat2"
+    sslv3.patch
+)
+sha256sums=(
+    'SKIP'
+    '3744575806f489ad0d3673e6a397badd4b61ecbd6e474ece67b347e13c5076b5'
+)
 
 pkgver() {
     cd "${srcdir}/${_pkgname}"
@@ -29,6 +33,12 @@ pkgver() {
     git describe --long --tags | sed 's/^tag-//;s/-/./g'
 }
 
+prepare() {
+    cd "${srcdir}/${_pkgname}"
+
+    patch -Np1 -i ../sslv3.patch
+}
+
 build() {
     cd "${srcdir}/${_pkgname}"
 
@@ -46,4 +56,11 @@ package() {
     cd "${srcdir}/${_pkgname}"
 
     make DESTDIR="${pkgdir}" install
+
+    # Make it co-installable with socat
+    find "${pkgdir}/usr/bin/" -type f -executable -exec mv {} {}2 \;
+    find "${pkgdir}/usr/share/man" -type f | while read manfile
+    do
+        mv $manfile ${manfile%.*}2.${manfile##*.}
+    done
 }
diff --git a/sslv3.patch b/sslv3.patch
new file mode 100644
index 000000000000..87b67839a8b1
--- /dev/null
+++ b/sslv3.patch
@@ -0,0 +1,47 @@
+diff --git a/sslcls.c b/sslcls.c
+index ea4c303..38b4cdc 100644
+--- a/sslcls.c
++++ b/sslcls.c
+@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
+ }
+ #endif
+ 
++#if HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_client_method()");
+@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
+    Debug1("SSLv3_client_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
++#if HAVE_SSLv3_server_method
+ const SSL_METHOD *sycSSLv3_server_method(void) {
+    const SSL_METHOD *result;
+    Debug("SSLv3_server_method()");
+@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
+    Debug1("SSLv3_server_method() -> %p", result);
+    return result;
+ }
++#endif
+ 
+ const SSL_METHOD *sycSSLv23_client_method(void) {
+    const SSL_METHOD *result;
+diff --git a/sslcls.h b/sslcls.h
+index 152fe5b..70d05b6 100644
+--- a/sslcls.h
++++ b/sslcls.h
+@@ -12,8 +12,12 @@ void sycSSL_load_error_strings(void);
+ int sycSSL_library_init(void);
+ const SSL_METHOD *sycSSLv2_client_method(void);
+ const SSL_METHOD *sycSSLv2_server_method(void);
++#if HAVE_SSLv3_client_method
+ const SSL_METHOD *sycSSLv3_client_method(void);
++#endif
++#if HAVE_SSLv3_server_method
+ const SSL_METHOD *sycSSLv3_server_method(void);
++#endif
+ const SSL_METHOD *sycSSLv23_client_method(void);
+ const SSL_METHOD *sycSSLv23_server_method(void);
+ const SSL_METHOD *sycTLSv1_client_method(void);