From 7d82feea3cd52b87634c32adfc2df8d0f23c2548 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Apr 2020 03:31:38 +0200 Subject: [PATCH] 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 --- app-mobilephone/smssend/Manifest | 2 +- ...erizon.patch => smssend-3.5-verizon.patch} | 0 ...ssend-3.4-r2.ebuild => smssend-3.5.ebuild} | 10 ++++++++-- dev-libs/skyutils/Manifest | 2 +- ...2.8-libs.patch => skyutils-2.9-libs.patch} | 0 dev-libs/skyutils/files/without-ssl3.patch | 14 ++++++++++++++ ...tils-2.8-r5.ebuild => skyutils-2.9.ebuild} | 19 +++++++++++++------ 7 files changed, 37 insertions(+), 10 deletions(-) rename app-mobilephone/smssend/files/{smssend-3.4-verizon.patch => smssend-3.5-verizon.patch} (100%) rename app-mobilephone/smssend/{smssend-3.4-r2.ebuild => smssend-3.5.ebuild} (70%) rename dev-libs/skyutils/files/{skyutils-2.8-libs.patch => skyutils-2.9-libs.patch} (100%) create mode 100644 dev-libs/skyutils/files/without-ssl3.patch rename dev-libs/skyutils/{skyutils-2.8-r5.ebuild => skyutils-2.9.ebuild} (63%) diff --git a/app-mobilephone/smssend/Manifest b/app-mobilephone/smssend/Manifest index 81cf96eb..0b3d507c 100644 --- a/app-mobilephone/smssend/Manifest +++ b/app-mobilephone/smssend/Manifest @@ -1 +1 @@ -DIST smssend-3.4.tar.gz 407556 SHA256 1f402c34fb61c409488a7806e53aac349038758eef431376714d206de9bf13d0 SHA512 028826fdaff932a8c384d510155af4e868665e1c6989cd6856067128a445a850ef35d6701b8daa73d0ed41ee193e26a2034c0b4a03ea2a35113973ee00d71d8d WHIRLPOOL 14862a733aafd18e6ba0a9d122749e8867216ecbdae150ba8da2df139cdb9914697eba92d93de51083554e5d12bd23a60cb1dd20648a1df42ad009bd8d9061ee +DIST smssend-3.5.tar.gz 397577 BLAKE2B 504aec3d15b3d23eed9d89688636a937d02932715420492aaa29b428490f8b2f6c1c9603b836abc01485f4d038906949336ed85f130ab1cbb05235666137732f SHA512 c3f7c958cafecb2d6cec399d8a5f0c1a0a66e637e53ed5fb253dd3bbf669ff1c580e09643fe26982da46e073168ea6f0a84666045ee8763e4a82abfe0f7729d6 diff --git a/app-mobilephone/smssend/files/smssend-3.4-verizon.patch b/app-mobilephone/smssend/files/smssend-3.5-verizon.patch similarity index 100% rename from app-mobilephone/smssend/files/smssend-3.4-verizon.patch rename to app-mobilephone/smssend/files/smssend-3.5-verizon.patch diff --git a/app-mobilephone/smssend/smssend-3.4-r2.ebuild b/app-mobilephone/smssend/smssend-3.5.ebuild similarity index 70% rename from app-mobilephone/smssend/smssend-3.4-r2.ebuild rename to app-mobilephone/smssend/smssend-3.5.ebuild index 742e9478..50cfb1ef 100644 --- a/app-mobilephone/smssend/smssend-3.4-r2.ebuild +++ b/app-mobilephone/smssend/smssend-3.5.ebuild @@ -6,9 +6,12 @@ EAPI="7" inherit autotools +# Don't use Gentoo mirrors +RESTRICT="mirror" + DESCRIPTION="Universal SMS sender" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://mirror.amdmi3.ru/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -20,10 +23,13 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-verizon.patch" ) +S="${WORKDIR}/${PN}" + src_prepare() { default - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in \ + 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 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.9-libs.patch similarity index 100% rename from dev-libs/skyutils/files/skyutils-2.8-libs.patch rename to dev-libs/skyutils/files/skyutils-2.9-libs.patch 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.9.ebuild similarity index 63% rename from dev-libs/skyutils/skyutils-2.8-r5.ebuild rename to dev-libs/skyutils/skyutils-2.9.ebuild index adcce570..4134169d 100644 --- a/dev-libs/skyutils/skyutils-2.8-r5.ebuild +++ b/dev-libs/skyutils/skyutils-2.9.ebuild @@ -6,9 +6,12 @@ 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="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://mirror.amdmi3.ru/distfiles/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" @@ -16,25 +19,29 @@ KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="ssl libressl" DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:=[sslv3] ) - libressl? ( dev-libs/libressl:=[sslv3] ) - )" + !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 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in \ + 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-flags -D_GNU_SOURCE + append-cppflags -D_GNU_SOURCE econf $(use_enable ssl) }