aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <bpiotrowski@alpinelinux.org>2015-03-19 13:13:01 +0100
committerBartłomiej Piotrowski <bpiotrowski@alpinelinux.org>2015-03-19 13:13:01 +0100
commit3f8195e45a7f63c342dd7541af2008af9d20ef52 (patch)
treea5d59c5bca96630cfe65a2ec8117ff54881c992b
parent9b446dd7bf9a5a741b7c32028da0ef54315c89ae (diff)
parentf1a6fa57354e563a43f784802fde99fef0d5d3db (diff)
downloadaports-3f8195e45a7f63c342dd7541af2008af9d20ef52.tar.bz2
aports-3f8195e45a7f63c342dd7541af2008af9d20ef52.tar.xz
Merge remote-tracking branch 'scadu/master'
-rw-r--r--main/mbedtls/APKBUILD (renamed from main/polarssl/APKBUILD)16
-rw-r--r--main/mbedtls/programs.makefile.patch (renamed from main/polarssl/programs.makefile.patch)0
-rw-r--r--main/umurmur/APKBUILD2
-rw-r--r--testing/monkey/APKBUILD11
4 files changed, 15 insertions, 14 deletions
diff --git a/main/polarssl/APKBUILD b/main/mbedtls/APKBUILD
index 85e7dbe9b8..234053c4d8 100644
--- a/main/polarssl/APKBUILD
+++ b/main/mbedtls/APKBUILD
@@ -1,15 +1,15 @@
# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-pkgname=polarssl
-pkgver=1.3.9
+pkgname=mbedtls
+pkgver=1.3.10
pkgrel=0
pkgdesc='Portable cryptographic and SSL/TLS library'
arch=all
-url='https://www.polarssl.org/'
+url='https://www.tls.mbed.org/'
license='GPL2'
subpackages="$pkgname-dev $pkgname-utils"
-source="https://polarssl.org/code/releases/polarssl-$pkgver-gpl.tgz
+source="https://tls.mbed.org/download/$pkgname-$pkgver-gpl.tgz
programs.makefile.patch"
prepare() {
@@ -42,12 +42,12 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
install -Dm755 "$srcdir"/$pkgname-$pkgver/programs/x509/cert_write \
- "$subpkgdir"/usr/bin/polarssl_cert_write
+ "$subpkgdir"/usr/bin/mbedtls_cert_write
}
-md5sums="48af7d1f0d5de512cbd6dacf5407884c polarssl-1.3.9-gpl.tgz
+md5sums="19ebbc96feceb430ad958dfe89cb633f mbedtls-1.3.10-gpl.tgz
b4c7ae55bd3c32cdcb067fd71faf8577 programs.makefile.patch"
-sha256sums="d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 polarssl-1.3.9-gpl.tgz
+sha256sums="746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e mbedtls-1.3.10-gpl.tgz
c1341f041cedcb0a321f23851c1d2756fe3c2340e76e2604fdb6af824344f034 programs.makefile.patch"
-sha512sums="e8958f834fd80ac996ac58152a0a5d4e31449e8b7b79ee6daac6f45bed60c5c5ad31f84b211d5e36ad0d6c82a742841e986a738735af048c286bce0e8fe4d62d polarssl-1.3.9-gpl.tgz
+sha512sums="9c29b308ddfa37705e1a00130f59fe6a7b7b155a3e125aa2e277fc9b4f32b8d73eb771db4800d3bb33f7633c38f653f4004a3aa748f77849a44bd39d1f55c776 mbedtls-1.3.10-gpl.tgz
32570b0f5f1e92ea0ac1c12e79a888289f35b03b4350935c585738c1d3875768b048c9b830b0286ea99be3c96b72cb62c079bc0b4106fab93a39a6590861c251 programs.makefile.patch"
diff --git a/main/polarssl/programs.makefile.patch b/main/mbedtls/programs.makefile.patch
index 421f39cfcb..421f39cfcb 100644
--- a/main/polarssl/programs.makefile.patch
+++ b/main/mbedtls/programs.makefile.patch
diff --git a/main/umurmur/APKBUILD b/main/umurmur/APKBUILD
index ed3bb148c7..a4c703ba74 100644
--- a/main/umurmur/APKBUILD
+++ b/main/umurmur/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
license="Custom"
depends=
depends_dev=
-makedepends="$depends_dev libconfig-dev polarssl-dev protobuf-c-dev autoconf
+makedepends="$depends_dev libconfig-dev mbedtls-dev protobuf-c-dev autoconf
automake libtool"
install="$pkgname.post-install $pkgname.post-deinstall"
subpackages="$pkgname-doc"
diff --git a/testing/monkey/APKBUILD b/testing/monkey/APKBUILD
index d9be9d9935..ef1cce07a5 100644
--- a/testing/monkey/APKBUILD
+++ b/testing/monkey/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Maintainer: ScrumpyJack <scrumpyjack@me.com>
pkgname=monkey
-pkgver=1.5.5
+pkgver=1.5.6
pkgrel=0
pkgdesc="Monkey is a lightweight and powerful web server "
url="http://monkey-project.com/"
@@ -9,7 +10,7 @@ arch="all"
license="ASL 2.0"
depends=""
depends_dev=""
-makedepends="bash polarssl-dev findutils"
+makedepends="bash mbedtls-dev findutils"
install=""
subpackages="$pkgname-doc"
source="http://monkey-project.com/releases/1.5/${pkgname}-${pkgver}.tar.gz"
@@ -47,6 +48,6 @@ package() {
install -Dm 755 "$pkgdir/usr/bin/banana" "$pkgdir/etc/init.d/banana"
}
-md5sums="bd2410f6612ec4a9076c3921145e4b75 monkey-1.5.5.tar.gz"
-sha256sums="5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 monkey-1.5.5.tar.gz"
-sha512sums="faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 monkey-1.5.5.tar.gz"
+md5sums="9699e4c9ea6ce6b989907c252ae80254 monkey-1.5.6.tar.gz"
+sha256sums="7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 monkey-1.5.6.tar.gz"
+sha512sums="4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c monkey-1.5.6.tar.gz"