diff options
| author |   Vikraman Choudhury <vikraman@gentoo.org> | 2014-01-26 17:46:37 +0000 |
|---|---|---|
| committer | Vikraman Choudhury <vikraman@gentoo.org> | 2014-01-26 17:46:37 +0000 |
| commit | d9193617ca37085577acbf33ecf2b28100b91eb7 (patch) | |
| tree | 4646766c351573493a927535b26264bca6d7ef47 /net-misc/proxytunnel | |
| parent | Cleanup. (diff) | |
| download | gentoo-2-d9193617ca37085577acbf33ecf2b28100b91eb7.tar.gz gentoo-2-d9193617ca37085577acbf33ecf2b28100b91eb7.tar.bz2 gentoo-2-d9193617ca37085577acbf33ecf2b28100b91eb7.zip | |
Fix missing -lcrypto flag
Cleanup old patch, fixes bug #496912
(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key B0A72FD2)
Diffstat (limited to 'net-misc/proxytunnel')
| -rw-r--r-- | net-misc/proxytunnel/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch | 26 | ||||
| -rw-r--r-- | net-misc/proxytunnel/proxytunnel-1.9.0.ebuild | 10 |
3 files changed, 14 insertions, 30 deletions
diff --git a/net-misc/proxytunnel/ChangeLog b/net-misc/proxytunnel/ChangeLog index 9f2fddc75696..7dd3af1d09cf 100644 --- a/net-misc/proxytunnel/ChangeLog +++ b/net-misc/proxytunnel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/proxytunnel -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.24 2013/11/06 03:08:03 patrick Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.25 2014/01/26 17:46:37 vikraman Exp $ + + 26 Jan 2014; Vikraman Choudhury <vikraman@gentoo.org> + -files/proxytunnel-1.6.0-build.patch, proxytunnel-1.9.0.ebuild: + Fix missing -lcrypto flag Cleanup old patch, fixes bug #496912 06 Nov 2013; Patrick Lauer <patrick@gentoo.org> proxytunnel-1.9.0.ebuild: Shorten description, make repoman happier diff --git a/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch b/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch deleted file mode 100644 index 3daf96ae84e9..000000000000 --- a/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile -+++ Makefile -@@ -6,7 +6,7 @@ - CFLAGS ?= -Wall -O2 -g - CFLAGS += -DHAVE_GETOPT_LONG -DUSE_SSL - CFLAGS += -DSETPROCTITLE -DSPT_TYPE=1 --LDFLAGS += -lssl -lcrypto -+LDFLAGS += -lssl $(shell pkg-config libcrypto --libs) - - PREFIX =/usr/local - BINDIR = $(PREFIX)/bin -@@ -27,7 +27,7 @@ - ntlm.o - - proxytunnel: $(OBJ) -- $(CC) -o $(PROGNAME) $(CFLAGS) $(LDFLAGS) $(OBJ) -+ $(CC) -o $(PROGNAME) $(CFLAGS) $(OBJ) $(LDFLAGS) - - clean: - @rm -f $(PROGNAME) $(OBJ) -@@ -34,4 +34,4 @@ - - install: - install -D -m755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -- install -D -m644 debian/$(PROGNAME).1 $(DESTDIR)$(MANDIR))/$(PROGNAME).1 -+ install -D -m644 debian/$(PROGNAME).1 $(DESTDIR)$(MANDIR)/man1/$(PROGNAME).1 diff --git a/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild index 298a1c10703e..c0161d0072d4 100644 --- a/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild,v 1.3 2013/11/06 03:08:03 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild,v 1.4 2014/01/26 17:46:37 vikraman Exp $ + +EAPI="5" inherit flag-o-matic toolchain-funcs @@ -17,6 +19,10 @@ RDEPEND="dev-libs/openssl" DEPEND="${RDEPEND} virtual/pkgconfig" +src_prepare() { + sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!" +} + src_compile() { use static && append-ldflags -static emake CC="$(tc-getCC)" || die |