new package, replacing socat2-git

3 files changed, 118 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..cb6c90a9980d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,19 @@
+pkgbase = socat2
+	pkgdesc = Multipurpose relay, version 2 (development version)
+	pkgver = 2.0.0_b9
+	pkgrel = 1
+	url = http://www.dest-unreach.org/socat/socat-version2.html
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	makedepends = yodl
+	makedepends = git
+	depends = readline
+	depends = openssl-1.0
+	source = http://www.dest-unreach.org/socat/download/socat-2.0.0-b9.tar.bz2
+	source = sslv3.patch
+	sha256sums = 49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2
+	sha256sums = 3744575806f489ad0d3673e6a397badd4b61ecbd6e474ece67b347e13c5076b5
+
+pkgname = socat2
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..17acc05528cc
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Chih-Hsuan Yen <yan12125@gmail.com>
+#
+# This is based on AUR packages socat2. The original maintainer is:
+# Maintainer: Stefan Haller <haliner@googlemail.com>
+#
+# The original PKGBUILD for socat in the official repository was written by:
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+
+pkgname=socat2
+_pkgname=socat
+pkgver=2.0.0_b9
+pkgrel=1
+pkgdesc='Multipurpose relay, version 2 (development version)'
+url='http://www.dest-unreach.org/socat/socat-version2.html'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('readline' 'openssl-1.0')
+makedepends=('yodl' 'git')
+source=(
+  http://www.dest-unreach.org/socat/download/socat-2.0.0-b9.tar.bz2
+  sslv3.patch
+)
+sha256sums=('49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2'
+            '3744575806f489ad0d3673e6a397badd4b61ecbd6e474ece67b347e13c5076b5')
+
+prepare() {
+  cd $_pkgname-${pkgver/_/-}
+
+  patch -Np1 -i ../sslv3.patch
+}
+
+build() {
+  cd $_pkgname-${pkgver/_/-}
+
+  CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0" \
+  LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0" \
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd $_pkgname-${pkgver/_/-}
+
+  make DESTDIR="$pkgdir" install
+
+  # Make it co-installable with socat
+  find "${pkgdir}/usr/bin/" -type f -executable -exec mv {} {}2 \;
+  mv "$pkgdir"/usr/share/man/man1/socat{,2}.1
+}
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);