diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-31 09:30:29 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-31 09:30:29 +0000 |
| commit | 0cc655d7411b6b3743e699743a298165828a5cdf (patch) | |
| tree | da0824a509748eb85e6a15628b5f119810c356d5 /testing/hiawatha | |
| parent | 8fe83f980fdd53744e7f433f7fbfe5746ff88f16 (diff) | |
| download | aports-0cc655d7411b6b3743e699743a298165828a5cdf.tar.bz2 aports-0cc655d7411b6b3743e699743a298165828a5cdf.tar.xz | |
testing/hiawatha: upgrade to 9.14
Diffstat (limited to 'testing/hiawatha')
| -rw-r--r-- | testing/hiawatha/APKBUILD | 23 | ||||
| -rw-r--r-- | testing/hiawatha/fix-mbedtls-underlinking.patch | 22 |
2 files changed, 40 insertions, 5 deletions
diff --git a/testing/hiawatha/APKBUILD b/testing/hiawatha/APKBUILD index c526cf709a..77509a5f8d 100644 --- a/testing/hiawatha/APKBUILD +++ b/testing/hiawatha/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Pascal Ernster <aur at hardfalcon dot net> pkgname=hiawatha -pkgver=9.13 -pkgrel=1 +pkgver=9.14 +pkgrel=0 pkgdesc='Secure and advanced webserver' url='https://www.hiawatha-webserver.org/' arch=all @@ -12,9 +12,19 @@ options="suid" subpackages="$pkgname-doc" makedepends="cmake libxml2-dev libxslt-dev mbedtls-dev" source="https://hiawatha-webserver.org/files/$pkgname-$pkgver.tar.gz + fix-mbedtls-underlinking.patch hiawatha.initd hiawatha.conf.sample" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$srcdir"/$pkgname-$pkgver @@ -50,12 +60,15 @@ package() { "$pkgdir"/usr/share/doc/hiawatha/hiawatha.conf.sample || return 1 } -md5sums="b0973e8d9090365e2419b6db862e35ce hiawatha-9.13.tar.gz +md5sums="400aaf5af8b0060a91aaae7a462450ba hiawatha-9.14.tar.gz +5028571283cb8eb87d2989a44daf01e8 fix-mbedtls-underlinking.patch 3bf112b794aa10debb93b5d892dfa425 hiawatha.initd fb24fcbfa820a5b85f6c4c8a520a6920 hiawatha.conf.sample" -sha256sums="6ae204199849340f8ec5a1becbc3f3d80f8d5280f1feff8a12a25f8bc40dc225 hiawatha-9.13.tar.gz +sha256sums="79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa hiawatha-9.14.tar.gz +fedcc9ce2ee104ec84c16b9f15f43e1ae91298f5418cb99bb19d7bd92ce4d5fa fix-mbedtls-underlinking.patch c229c23712d71cf830a46f152f78a1aa726cf7c7cf9129ef7acfefb73483ae4c hiawatha.initd 4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7 hiawatha.conf.sample" -sha512sums="6dd3e69998a75bc3900c372c2217321b159761168582235917b095318356dcc86e72e0ad185326ca69ad25ea9b1d9ffb2e520b9310fe94e2b20f39b79afcd3de hiawatha-9.13.tar.gz +sha512sums="66ad77c132d34daa5eb597ce67d7b26581c59534e5cf83dd65f78567a9a1798030cd42fef2d612bd1935243db979a2ef1df873f01b0d0a009395ef3da1dca6e6 hiawatha-9.14.tar.gz +8d074cd5ddb224a486f5429ecdd32ee46d1afa16c65dfb1254ed5cff1dd20e90857dabdd80f266d7f3938158ac41f446e6bb6a80524a69da9d270de24116d950 fix-mbedtls-underlinking.patch 412ba77b765015dccf6804d0ef06c55590b7dbec0bf3beb18652e05ae0efc364061bb8892e9727d2a7ac5df93656b62bcb89448dfa4272ae6ae26c633523b17a hiawatha.initd b2aad6d02e03a3e25dc6dc30deab4637a7de5448255b6b707363e8c71ae1029e669bacdb6b88889ec1aa804fe717560e872dc44d049127af9aa155a8895c8a60 hiawatha.conf.sample" diff --git a/testing/hiawatha/fix-mbedtls-underlinking.patch b/testing/hiawatha/fix-mbedtls-underlinking.patch new file mode 100644 index 0000000000..bd2ec2f3c4 --- /dev/null +++ b/testing/hiawatha/fix-mbedtls-underlinking.patch @@ -0,0 +1,22 @@ +--- ./CMakeLists.txt.orig ++++ ./CMakeLists.txt +@@ -114,7 +114,7 @@ + #add_definitions(-DMBEDTLS_THREADING_PTHREAD -DMBEDTLS_THREADING_C) + add_subdirectory(mbedtls) + endif() +- set(MBEDTLS_LIBRARY "mbedtls") ++ set(MBEDTLS_LIBRARIES "mbedtls" "mbedx509" "mbedcrypto") + endif() + + # Hiawatha +@@ -144,8 +144,8 @@ + target_link_libraries(wigwam ${CRYPT_LIBRARY}) + target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) + if(ENABLE_TLS) +- target_link_libraries(hiawatha ${MBEDTLS_LIBRARY}) +- target_link_libraries(wigwam ${MBEDTLS_LIBRARY}) ++ target_link_libraries(hiawatha ${MBEDTLS_LIBRARIES}) ++ target_link_libraries(wigwam ${MBEDTLS_LIBRARIES}) + if(NOT USE_SYSTEM_MBEDTLS) + set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) + set_target_properties(wigwam PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) |