From 7d82feea3cd52b87634c32adfc2df8d0f23c2548 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Apr 2020 03:31:38 +0200 Subject: Skyutils & SMSSend: Update to `2.9` and `3.5`. - Add `MIRROR="restrict"`. - Add patch to build skyutils `without SSL3`. - Modernize to `configure.ac` files. Credits @FreeBSD. Signed-off-by: Chris --- dev-libs/skyutils/Manifest | 2 +- dev-libs/skyutils/files/skyutils-2.8-libs.patch | 12 ------- dev-libs/skyutils/files/skyutils-2.9-libs.patch | 12 +++++++ dev-libs/skyutils/files/without-ssl3.patch | 14 ++++++++ dev-libs/skyutils/skyutils-2.8-r5.ebuild | 40 --------------------- dev-libs/skyutils/skyutils-2.9.ebuild | 47 +++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 53 deletions(-) delete mode 100644 dev-libs/skyutils/files/skyutils-2.8-libs.patch create mode 100644 dev-libs/skyutils/files/skyutils-2.9-libs.patch create mode 100644 dev-libs/skyutils/files/without-ssl3.patch delete mode 100644 dev-libs/skyutils/skyutils-2.8-r5.ebuild create mode 100644 dev-libs/skyutils/skyutils-2.9.ebuild (limited to 'dev-libs') diff --git a/dev-libs/skyutils/Manifest b/dev-libs/skyutils/Manifest index c7dbe942..54350da7 100644 --- a/dev-libs/skyutils/Manifest +++ b/dev-libs/skyutils/Manifest @@ -1 +1 @@ -DIST skyutils-2.8.tar.gz 357571 SHA256 724c23673f060ec14e452ff8d28a9592993d22328eac5213c780ac674d2a8518 SHA512 65073067f8cd3c81587e6a3b718cd4903004d681f6852afb7de8cb91249fc655afe8234aa780409843649dd0996d877892a97cc5073445ad687c7c2eb6619a01 WHIRLPOOL 1a223fce1fff2f37a0f9cbc20314e19018f4cd7ab50a6b0a12a13ad428442ed9cb58eef586d9e5ca96f7a2d0c76aca3388702a80986c9686ef5ff38d7b3cf64f +DIST skyutils-2.9.tar.gz 394187 BLAKE2B c460f1de20e06615bfa0571cdc4332a701bcd357277e442f68a63be5047ab377b50f0bbdda7114592f3a479714bcfbdef4e978a1299e0f48a4d655b8707a080e SHA512 c6e2e1c5f96d8edb3e3fc148bd1c670621fc58c93b67194a56e5776af44d205b200dce5dd796f3760c8b58480c3e98a93621f4e87a48e747df1e54c61e473262 diff --git a/dev-libs/skyutils/files/skyutils-2.8-libs.patch b/dev-libs/skyutils/files/skyutils-2.8-libs.patch deleted file mode 100644 index 990b5faf..00000000 --- a/dev-libs/skyutils/files/skyutils-2.8-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur skyutils-2.8.orig/configure.in skyutils-2.8/configure.in ---- skyutils-2.8.orig/configure.in 2005-05-09 08:16:44.000000000 +0000 -+++ skyutils-2.8/configure.in 2008-07-18 05:38:13.000000000 +0000 -@@ -208,6 +208,8 @@ - AC_SUBST(SU_ARCH_LIB) - AC_SUBST(SU_ARCH_CFLAGS) - AC_SUBST(SU_ANSI_CFLAGS) -+LIBS="$SU_PTHREAD_LIB $SU_DL_LIB $SU_SSL_LIB $SU_ARCH_LIB" -+AC_SUBST(LIBS) - - AC_OUTPUT([ - Makefile diff --git a/dev-libs/skyutils/files/skyutils-2.9-libs.patch b/dev-libs/skyutils/files/skyutils-2.9-libs.patch new file mode 100644 index 00000000..990b5faf --- /dev/null +++ b/dev-libs/skyutils/files/skyutils-2.9-libs.patch @@ -0,0 +1,12 @@ +diff -ur skyutils-2.8.orig/configure.in skyutils-2.8/configure.in +--- skyutils-2.8.orig/configure.in 2005-05-09 08:16:44.000000000 +0000 ++++ skyutils-2.8/configure.in 2008-07-18 05:38:13.000000000 +0000 +@@ -208,6 +208,8 @@ + AC_SUBST(SU_ARCH_LIB) + AC_SUBST(SU_ARCH_CFLAGS) + AC_SUBST(SU_ANSI_CFLAGS) ++LIBS="$SU_PTHREAD_LIB $SU_DL_LIB $SU_SSL_LIB $SU_ARCH_LIB" ++AC_SUBST(LIBS) + + AC_OUTPUT([ + Makefile diff --git a/dev-libs/skyutils/files/without-ssl3.patch b/dev-libs/skyutils/files/without-ssl3.patch new file mode 100644 index 00000000..7cd824a6 --- /dev/null +++ b/dev-libs/skyutils/files/without-ssl3.patch @@ -0,0 +1,14 @@ +--- a/src/web.c.orig 2006-04-24 08:44:09 UTC ++++ b/src/web.c +@@ -123,7 +123,11 @@ SSL_CTX *SU_SSL_InitializeCTX(char *pcEr + char errormsg[1024]; + SSL_CTX *sslctx; + ++#ifndef OPENSSL_NO_SSL3 + sslctx = SSL_CTX_new(SSLv3_client_method()); ++#else ++ sslctx = SSL_CTX_new(SSLv23_client_method()); ++#endif + if(sslctx == NULL) + { + ERR_error_string(ERR_get_error(), errormsg); diff --git a/dev-libs/skyutils/skyutils-2.8-r5.ebuild b/dev-libs/skyutils/skyutils-2.8-r5.ebuild deleted file mode 100644 index adcce570..00000000 --- a/dev-libs/skyutils/skyutils-2.8-r5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Copyright 2020 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic autotools - -DESCRIPTION="Library of assorted C utility functions" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="ssl libressl" - -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:=[sslv3] ) - libressl? ( dev-libs/libressl:=[sslv3] ) - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-libs.patch" - "${FILESDIR}/fix-Wformat-security-warnings.patch" -) - -src_prepare() { - default - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in \ - || die 'failed to rename AM_CONFIG_HEADER macro' - - eautoreconf -} - -src_configure() { - append-flags -D_GNU_SOURCE - econf $(use_enable ssl) -} diff --git a/dev-libs/skyutils/skyutils-2.9.ebuild b/dev-libs/skyutils/skyutils-2.9.ebuild new file mode 100644 index 00000000..4134169d --- /dev/null +++ b/dev-libs/skyutils/skyutils-2.9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic autotools + +# Don't use Gentoo mirrors +RESTRICT="mirror" + +DESCRIPTION="Library of assorted C utility functions" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="https://mirror.amdmi3.ru/distfiles/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 sparc x86" +IUSE="ssl libressl" + +DEPEND="ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-libs.patch" + "${FILESDIR}/fix-Wformat-security-warnings.patch" + "${FILESDIR}/without-ssl3.patch" +) + +S="${WORKDIR}/${PN}" + +src_prepare() { + default + mv "${S}"/configure.in "${S}"/configure.ac + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac \ + || die 'failed to rename AM_CONFIG_HEADER macro' + + eautoreconf +} + +src_configure() { + append-cppflags -D_GNU_SOURCE + econf $(use_enable ssl) +} -- cgit v1.2.1