diff options
| -rw-r--r-- | main/halberd/APKBUILD | 57 | ||||
| -rw-r--r-- | main/halberd/fix-script-include.patch | 16 | ||||
| -rw-r--r-- | main/halberd/halberd-sslwrap.patch | 30 |
3 files changed, 0 insertions, 103 deletions
diff --git a/main/halberd/APKBUILD b/main/halberd/APKBUILD deleted file mode 100644 index 1456fc9980b..00000000000 --- a/main/halberd/APKBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> -pkgname=halberd -pkgver=0.2.4 -pkgrel=1 -pkgdesc="Tool to discover HTTP load balancers" -url="http://halberd.superadditive.com" -arch="noarch" -license="GPL-2.0-or-later" -depends="python2" -depends_dev="" -makedepends="python2-dev help2man" -install="" -subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/jmbr/$pkgname/archive/$pkgver.tar.gz - $pkgname-sslwrap.patch - fix-script-include.patch" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p0 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - python2 setup.py build || return 1 - mkdir -p $_builddir/man/man1 - help2man --include $_builddir/help2man.cfg --no-info $_builddir/scripts/halberd --output $_builddir/man/man1/halberd.1 - -} - -package() { - cd "$_builddir" - python2 setup.py bdist_dumb --keep-temp --bdist-dir "$pkgdir" || return 1 -} - -doc() { - # The man page is not picked-up automatically - mkdir -p "$subpkgdir"/usr/share/man || return 1 - mv "$_builddir"/man/ "$subpkgdir"/usr/share/ || return 1 - default_doc -} -md5sums="8cd4e14ce84e5fb9f9f435145792c601 halberd-0.2.4.tar.gz -a46227da33465e246017c8ec4650d76f halberd-sslwrap.patch -71e41dc35b55ef7ec60befe465e150c1 fix-script-include.patch" -sha256sums="744a9efb1acddb3aedb3e2889a2a4c6461ffbf57adf84421022b7ab47ef12fa6 halberd-0.2.4.tar.gz -6541afcd3d5bd1f7eb37683f81242986ea8e1db73f5a7dc732bfe89373fa3249 halberd-sslwrap.patch -3627f2b5a1384fa797ce2cca4b6935353b6bf211fe06928c139fe4bf088f2650 fix-script-include.patch" -sha512sums="133eb683f46a078b45023198746c583ae96cd54b75eedbc46a3d49675307927a7d9f05383e312b589fa5efe79e68c75fcd1d31649df2852ca27cc5d30c307672 halberd-0.2.4.tar.gz -8ee49b553301f36fb22c88b07b0c6306d12fabb3074382cdac5b7203a58c21a225330a40b11eba518fbd1377f4a6370285736aeaf6c8807f84e77086c5b1754a halberd-sslwrap.patch -24288ba822b33a55cd2a69ca1cfa18241f6bf937fd73e5edc0f9f78b6f49c137869bf064ab6574b1c9a17cf32edf1b8e04abc58f1c5610e0cdf534118c13f5b8 fix-script-include.patch" diff --git a/main/halberd/fix-script-include.patch b/main/halberd/fix-script-include.patch deleted file mode 100644 index a4fc3d5bcdd..00000000000 --- a/main/halberd/fix-script-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git scripts/halberd scripts/halberd -index cf01b1e..2b5c218 100755 ---- scripts/halberd -+++ scripts/halberd -@@ -20,8 +20,9 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -- --import sys -+import sys, os -+if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"): -+ sys.path.insert(0, "./") - - import Halberd.shell - import Halberd.logger diff --git a/main/halberd/halberd-sslwrap.patch b/main/halberd/halberd-sslwrap.patch deleted file mode 100644 index fc172e0349b..00000000000 --- a/main/halberd/halberd-sslwrap.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Halberd/clientlib.py.orig -+++ Halberd/clientlib.py -@@ -31,6 +31,7 @@ - - import time - import socket -+import ssl - import urlparse - - from itertools import takewhile -@@ -310,7 +311,7 @@ - - self._recv = None - self._sslsock = None -- self._timeout_exceptions.append(socket.sslerror) -+ self._timeout_exceptions.append(ssl.SSLError) - - # Path to an SSL key file and certificate. - self.keyfile = None -@@ -327,8 +328,8 @@ - """ - HTTPClient._connect(self, addr) - try: -- self._sslsock = socket.ssl(self._sock, self.keyfile, self.certfile) -- except socket.sslerror, msg: -+ self._sslsock = ssl.wrap_socket(self._sock, self.keyfile, self.certfile) -+ except ssl.SSLError, msg: - raise HTTPSError, msg - - self._recv = self._sslsock.read |