diff options
author | Jeroen Roovers <jer@gentoo.org> | 2010-09-20 19:05:16 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-20 19:05:16 +0000 |
commit | 8db81b4106c6151f0d0fb06961d300b046e026d7 (patch) | |
tree | 949752e3beb29fd8206e9f38fd0a5311efb28a8b /net-misc | |
parent | Stable on amd64 wrt bug #338059 (diff) | |
download | gentoo-2-8db81b4106c6151f0d0fb06961d300b046e026d7.tar.gz gentoo-2-8db81b4106c6151f0d0fb06961d300b046e026d7.tar.bz2 gentoo-2-8db81b4106c6151f0d0fb06961d300b046e026d7.zip |
Fix quoting in cp command and have it die for good measure. Respect LDFLAGS (bug #335001), CC. Do not hard-wire CFLAGS. Make sed die. Update HOMEPAGE, SRC_URI.
(Portage version: 2.2_rc84/cvs/Linux i686)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/sslwrap/ChangeLog | 12 | ||||
-rw-r--r-- | net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild | 49 | ||||
-rw-r--r-- | net-misc/sslwrap/sslwrap-2.0.6.ebuild | 42 |
3 files changed, 59 insertions, 44 deletions
diff --git a/net-misc/sslwrap/ChangeLog b/net-misc/sslwrap/ChangeLog index a6e80f8a59bb..5d589f7f00da 100644 --- a/net-misc/sslwrap/ChangeLog +++ b/net-misc/sslwrap/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/sslwrap -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.20 2009/03/22 13:27:00 jmbsvicetto Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.21 2010/09/20 19:05:15 jer Exp $ + +*sslwrap-2.0.6-r2 (20 Sep 2010) + + 20 Sep 2010; Jeroen Roovers <jer@gentoo.org> -sslwrap-2.0.6.ebuild, + +sslwrap-2.0.6-r2.ebuild: + Fix quoting in cp command and have it die for good measure. Respect + LDFLAGS (bug #335001), CC. Do not hard-wire CFLAGS. Make sed die. Update + HOMEPAGE, SRC_URI. 22 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> metadata.xml, sslwrap-2.0.6.ebuild, sslwrap-2.0.6-r1.ebuild: diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild new file mode 100644 index 000000000000..3f4ee128a36c --- /dev/null +++ b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v 1.1 2010/09/20 19:05:16 jer Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="TSL/SSL - Port Wrapper" +HOMEPAGE="http://www.rickk.com/sslwrap/index.htm" +SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz + mirror://gentoo/${PN}-gentoo.tar.bz2" + +LICENSE="sslwrap" +SLOT="0" +KEYWORDS="~sparc ~x86" +IUSE="" + +DEPEND=">=dev-libs/openssl-0.9.6" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${PN}${PV//.} + +src_prepare() { + sed -i Makefile \ + -e 's:gcc:$(CC):' \ + -e 's:/usr/local/ssl/include:/usr/include/openssl:' \ + || die "sed Makefile" + + cp -v "${WORKDIR}"/${PN}-gentoo/*.c . || die "cp" + + has_version '=dev-libs/openssl-0.9.7*' \ + && epatch "${FILESDIR}/${PV}-openssl-0.9.7.patch" + + sed -i *.h *.c \ + -e 's:OPENSSL":"openssl\/:g' \ + -e 's:SSL_OP_NON_EXPORT_FIRST:SSL_OP_CIPHER_SERVER_PREFERENCE:g' \ + || die "sed *.h *.c" +} + +src_compile() { + emake CC=$(tc-getCC) OPT="${CFLAGS} ${LDFLAGS}" || die "emake" +} + +src_install() { + dosbin sslwrap + dodoc README + dohtml -r ./ +} diff --git a/net-misc/sslwrap/sslwrap-2.0.6.ebuild b/net-misc/sslwrap/sslwrap-2.0.6.ebuild deleted file mode 100644 index 18e5005380cb..000000000000 --- a/net-misc/sslwrap/sslwrap-2.0.6.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.13 2009/03/22 13:27:00 jmbsvicetto Exp $ - -inherit eutils - -DESCRIPTION="TSL/SSL - Port Wrapper" -HOMEPAGE="http://quiltaholic.com/rickk/sslwrap/" -SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz - mirror://gentoo/${PN}-gentoo.tar.bz2" - -LICENSE="sslwrap" -SLOT="0" -KEYWORDS="x86 sparc" -IUSE="" - -DEPEND=">=dev-libs/openssl-0.9.6" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN}${PV//.} - -src_unpack () { - unpack ${A} - cd "${S}" - sed -i \ - -e "s:-O2:${CFLAGS}:" \ - -e "s:/usr/local/ssl/include:/usr/include/openssl:" \ - Makefile - - cp "${WORKDIR}/${PN}-gentoo/*.c" "${S}" - has_version '=dev-libs/openssl-0.9.7*' \ - && epatch "${FILESDIR}/${PV}"-openssl-0.9.7.patch - sed -i \ - -e "s:OPENSSL\":\"openssl\/:g" \ - *.h *.c -} - -src_install() { - dosbin sslwrap - dodoc README - dohtml -r ./ -} |