summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChocobo12019-02-12 14:12:43 +0800
committerChocobo12019-02-12 14:13:03 +0800
commit45bcbaa2ac05d45f5cb495252b01e3d36eb1af3f (patch)
tree84cd7d3f1b75eb59ad05e15e26dbc7d86005ed78
parentf51e3599a9a559a4a3b9fd30b54d09d0b85c004e (diff)
downloadaur-httperf-git.tar.gz
upgpkg: httperf-git r194.g00bf5da-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD27
-rw-r--r--openssl-1.0.patch11
3 files changed, 11 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f0280a25dd..d65e6d0f2ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
pkgbase = httperf-git
pkgdesc = The HTTP load generator
- pkgver = r167.g0c7d127
+ pkgver = r194.g00bf5da
pkgrel = 1
url = https://github.com/httperf/httperf
arch = i686
arch = x86_64
license = GPL
makedepends = git
- makedepends = openssl-1.0
+ depends = openssl
provides = httperf
conflicts = httperf
source = git+https://github.com/httperf/httperf.git
- source = openssl-1.0.patch
sha256sums = SKIP
- sha256sums = 14e17f66425dc8433255b6ba893e933dce3fabb37e860290f4cfaf3a24c36ac0
pkgname = httperf-git
diff --git a/PKGBUILD b/PKGBUILD
index 125056ad372..fa515176cd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,20 @@
# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
pkgname=httperf-git
-pkgver=r167.g0c7d127
+pkgver=r194.g00bf5da
pkgrel=1
pkgdesc="The HTTP load generator"
arch=('i686' 'x86_64')
url="https://github.com/httperf/httperf"
license=('GPL')
-makedepends=('git' 'openssl-1.0')
+depends=('openssl')
+makedepends=('git')
provides=('httperf')
conflicts=('httperf')
-source=("git+https://github.com/httperf/httperf.git"
- "openssl-1.0.patch")
-sha256sums=('SKIP'
- '14e17f66425dc8433255b6ba893e933dce3fabb37e860290f4cfaf3a24c36ac0')
+source=("git+https://github.com/httperf/httperf.git")
+sha256sums=('SKIP')
-prepare() {
- cd "httperf"
-
- patch -Np1 -i "$srcdir/openssl-1.0.patch"
-
- autoreconf -i
- mkdir -p "_build"
-}
-
pkgver() {
cd "httperf"
@@ -34,14 +24,15 @@ pkgver() {
}
build() {
- cd "httperf/_build"
+ cd "httperf"
- ../configure --prefix=/usr
+ autoreconf -fi
+ ./configure --prefix="/usr"
make
}
package() {
- cd "httperf/_build"
+ cd "httperf"
make DESTDIR="$pkgdir" install
}
diff --git a/openssl-1.0.patch b/openssl-1.0.patch
deleted file mode 100644
index fde62d5f749..00000000000
--- a/openssl-1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- httperf/configure-orig.ac 2017-05-31 12:08:20.317656668 +0800
-+++ httperf/configure.ac 2017-05-31 12:12:00.217551666 +0800
-@@ -51,7 +51,7 @@
- # Checks for header files.
- AC_FUNC_ALLOCA
- AC_HEADER_TIME
--AC_CHECK_HEADERS([openssl/ssl.h getopt.h])
-+AC_CHECK_HEADERS([openssl-1.0/ssl.h getopt.h])
-
- if test "$ac_cv_header_openssl_ssl_h" = "yes" \
- -a "$ac_cv_lib_ssl_SSL_version" = "yes" \