From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- net-libs/axtls/Manifest | 2 +- net-libs/axtls/axtls-2.1.5-r100.ebuild | 185 --------------------------------- net-libs/axtls/axtls-2.1.5-r101.ebuild | 178 +++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 186 deletions(-) delete mode 100644 net-libs/axtls/axtls-2.1.5-r100.ebuild create mode 100644 net-libs/axtls/axtls-2.1.5-r101.ebuild (limited to 'net-libs/axtls') diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest index 311871f03bb3..317d7d74e150 100644 --- a/net-libs/axtls/Manifest +++ b/net-libs/axtls/Manifest @@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18 -EBUILD axtls-2.1.5-r100.ebuild 4851 BLAKE2B 654527168c497fcfa02adf84c9445dd3d6ba4916fac602bad198f4a5043824e72d32eca8c8ec54ed28139a0fffe894d75ae7d00abe5e590b377976ffb95c0f95 SHA512 54828ed8e13f1f17a51b40369a19488d48e72de03b08fe1623ffdd3b578d6327e7f943d6e42d561c9209971311e1c2f901551e7ed14d711cbb47dc868390e8a3 +EBUILD axtls-2.1.5-r101.ebuild 4706 BLAKE2B a159b0b0e2714cfcd544973708a2cc55027bfdde1d13f3c485beebe253713e20e3cd4c3385fe1e92d146f82fbef21047de59e34de8c60fdcbe68ebaf8f0c65bd SHA512 c11a0b60ac84687d84da047a3ec422a78713b98322cada28a67d0241853a2ef6534da68fef35338a9a27fa2490aac8e340cd1386f18b17c6af18262a13b8e52e MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0 diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild deleted file mode 100644 index d9a47694270d..000000000000 --- a/net-libs/axtls/axtls-2.1.5-r100.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit lua-single multilib-minimal savedconfig toolchain-funcs user - -################################################################################ -# axtls CONFIG MINI-HOWTO -# -# Note: axtls is highly configurable and uses mconf, like the linux kernel. -# You can configure it in a couple of ways: -# -# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features -# you want, and possibly a lot more. -# -# 2) You can create your own configuration file by doing -# -# FEATURES="keepwork" USE="savedconfig -*" emerge axtls -# cd /var/tmp/portage/net-libs/axtls*/work/axTLS -# make menuconfig -# -# Now configure axtls as you want. Finally save your config file: -# -# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV} -# -# where ${PV} is the current version. You can then run emerge again with -# your configuration by doing -# -# USE="savedconfig" emerge axtls -# -################################################################################ - -MY_PN=${PN/tls/TLS} - -DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server" -HOMEPAGE="http://axtls.sourceforge.net/" -SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz" -S="${WORKDIR}/${PN}-code" - -LICENSE="BSD GPL-2" -SLOT="0/1" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" - -IUSE="httpd cgi-lua cgi-php static static-libs doc" - -# TODO: add ipv6, and c#, java, lua, perl bindings -# Currently these all have some issue -BDEPEND="doc? ( app-doc/doxygen )" -RDEPEND=" - httpd? ( - cgi-lua? ( ${LUA_DEPS} ) - cgi-php? ( dev-lang/php[cgi] ) - )" - -#Note1: static, cgi-* makes no sense if httpd is not given -REQUIRED_USE=" - static? ( httpd ) - cgi-lua? ( httpd ${LUA_REQUIRED_USE} ) - cgi-php? ( httpd )" - -AXTLS_GROUP="axtls" -AXTLS_USER="axtls" - -pkg_setup() { - use cgi-lua && lua-single_pkg_setup - - use httpd && { - ebegin "Creating axtls user and group" - enewgroup ${AXTLS_GROUP} - enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP} - } -} - -src_prepare() { - tc-export AR CC - - eapply "${FILESDIR}/explicit-libdir-r1.patch" - - #We want CONFIG_DEBUG to avoid stripping - #but not for debugging info - sed -i -e 's: -g::' config/Rules.mak || die - sed -i -e 's: -g::' config/makefile.conf || die - - eapply_user - - multilib_copy_sources -} - -use_flag_config() { - cp "${FILESDIR}"/config config/.config || die - - #Respect CFLAGS/LDFLAGS - sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \ - config/.config || die - sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \ - config/.config || die - - #The logic is that the default config file enables everything and we disable - #here with sed unless a USE flags says to keep it - if use httpd; then - if ! use static; then - sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \ - config/.config || die - fi - if ! use cgi-php && ! use cgi-lua; then - sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \ - config/.config || die - fi - if ! use cgi-php; then - sed -i -e 's:,.php::' config/.config || die - fi - if ! use cgi-lua; then - sed -i -e 's:\.lua,::' \ - -e 's:lua:php:' \ - -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \ - config/.config || die - fi - if use cgi-lua; then - sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die - fi - else - sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \ - config/.config || die - fi - - emake -j1 oldconfig < <(yes n) > /dev/null -} - -multilib_src_configure() { - #Per-ABI substitutions. - sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \ - Makefile || die - - #Use CC as the host compiler for mconf - sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ - config/Rules.mak || die - - if use savedconfig; then - restore_config config/.config - if [[ -f config/.config ]]; then - ewarn "Using saved config, all other USE flags ignored" - else - ewarn "No saved config, seeding with the default" - cp "${FILESDIR}"/config config/.config || die - fi - emake -j1 oldconfig < <(yes '') > /dev/null - else - use_flag_config - fi -} - -multilib_src_install() { - if multilib_is_native_abi && use savedconfig; then - save_config config/.config - fi - - emake PREFIX="${ED}/usr" install - - if ! use static-libs; then - rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die - fi - - # The build system needs to install before it builds docs - if multilib_is_native_abi && use doc; then - emake docs - dodoc -r docsrc/html - fi -} - -multilib_src_install_all() { - if [[ -f "${ED}"/usr/bin/htpasswd ]]; then - mv "${ED}"/usr/bin/{,ax}htpasswd || die - fi - - if use httpd; then - newinitd "${FILESDIR}"/axhttpd.initd axhttpd - newconfd "${FILESDIR}"/axhttpd.confd axhttpd - fi - - docompress -x /usr/share/doc/${PF}/README - dodoc README -} diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r101.ebuild new file mode 100644 index 000000000000..5f09e2c9f169 --- /dev/null +++ b/net-libs/axtls/axtls-2.1.5-r101.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single multilib-minimal savedconfig toolchain-funcs + +################################################################################ +# axtls CONFIG MINI-HOWTO +# +# Note: axtls is highly configurable and uses mconf, like the linux kernel. +# You can configure it in a couple of ways: +# +# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features +# you want, and possibly a lot more. +# +# 2) You can create your own configuration file by doing +# +# FEATURES="keepwork" USE="savedconfig -*" emerge axtls +# cd /var/tmp/portage/net-libs/axtls*/work/axTLS +# make menuconfig +# +# Now configure axtls as you want. Finally save your config file: +# +# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV} +# +# where ${PV} is the current version. You can then run emerge again with +# your configuration by doing +# +# USE="savedconfig" emerge axtls +# +################################################################################ + +MY_PN=${PN/tls/TLS} + +DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server" +HOMEPAGE="http://axtls.sourceforge.net/" +SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${PN}-code" + +LICENSE="BSD GPL-2" +SLOT="0/1" +KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" + +IUSE="httpd cgi-lua cgi-php static static-libs doc" + +# TODO: add ipv6, and c#, java, lua, perl bindings +# Currently these all have some issue +BDEPEND="doc? ( app-doc/doxygen )" +RDEPEND=" + httpd? ( + acct-group/axtls + acct-user/axtls + cgi-lua? ( ${LUA_DEPS} ) + cgi-php? ( dev-lang/php[cgi] ) + )" + +#Note1: static, cgi-* makes no sense if httpd is not given +REQUIRED_USE=" + static? ( httpd ) + cgi-lua? ( httpd ${LUA_REQUIRED_USE} ) + cgi-php? ( httpd )" + +pkg_setup() { + use cgi-lua && lua-single_pkg_setup +} + +src_prepare() { + tc-export AR CC + + eapply "${FILESDIR}/explicit-libdir-r1.patch" + + #We want CONFIG_DEBUG to avoid stripping + #but not for debugging info + sed -i -e 's: -g::' config/Rules.mak || die + sed -i -e 's: -g::' config/makefile.conf || die + + eapply_user + + multilib_copy_sources +} + +use_flag_config() { + cp "${FILESDIR}"/config config/.config || die + + #Respect CFLAGS/LDFLAGS + sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \ + config/.config || die + sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \ + config/.config || die + + #The logic is that the default config file enables everything and we disable + #here with sed unless a USE flags says to keep it + if use httpd; then + if ! use static; then + sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \ + config/.config || die + fi + if ! use cgi-php && ! use cgi-lua; then + sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \ + config/.config || die + fi + if ! use cgi-php; then + sed -i -e 's:,.php::' config/.config || die + fi + if ! use cgi-lua; then + sed -i -e 's:\.lua,::' \ + -e 's:lua:php:' \ + -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \ + config/.config || die + fi + if use cgi-lua; then + sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die + fi + else + sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \ + config/.config || die + fi + + emake -j1 oldconfig < <(yes n) > /dev/null +} + +multilib_src_configure() { + #Per-ABI substitutions. + sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \ + Makefile || die + + #Use CC as the host compiler for mconf + sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ + config/Rules.mak || die + + if use savedconfig; then + restore_config config/.config + if [[ -f config/.config ]]; then + ewarn "Using saved config, all other USE flags ignored" + else + ewarn "No saved config, seeding with the default" + cp "${FILESDIR}"/config config/.config || die + fi + emake -j1 oldconfig < <(yes '') > /dev/null + else + use_flag_config + fi +} + +multilib_src_install() { + if multilib_is_native_abi && use savedconfig; then + save_config config/.config + fi + + emake PREFIX="${ED}/usr" install + + if ! use static-libs; then + rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die + fi + + # The build system needs to install before it builds docs + if multilib_is_native_abi && use doc; then + emake docs + dodoc -r docsrc/html + fi +} + +multilib_src_install_all() { + if [[ -f "${ED}"/usr/bin/htpasswd ]]; then + mv "${ED}"/usr/bin/{,ax}htpasswd || die + fi + + if use httpd; then + newinitd "${FILESDIR}"/axhttpd.initd axhttpd + newconfd "${FILESDIR}"/axhttpd.confd axhttpd + fi + + docompress -x /usr/share/doc/${PF}/README + dodoc README +} -- cgit v1.2.3