Version bump.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 11 insertions, 88 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 11d18daaf1ff..eccc7acc33f4 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.102 2013/10/12 21:13:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.103 2013/10/16 16:50:41 vapier Exp $
+
+*dropbear-2013.60 (16 Oct 2013)
+
+  16 Oct 2013; Mike Frysinger <vapier@gentoo.org> +dropbear-2013.60.ebuild,
+  -dropbear-2013.59.ebuild, -files/dropbear-2013.59-exec-prefix.patch,
+  -files/dropbear-2013.59-scp-inst.patch:
+  Version bump.
 
 *dropbear-2013.59 (12 Oct 2013)
 
diff --git a/net-misc/dropbear/dropbear-2013.59.ebuild b/net-misc/dropbear/dropbear-2013.60.ebuild
index cbc25746dae3..bf5376723457 100644
--- a/net-misc/dropbear/dropbear-2013.59.ebuild
+++ b/net-misc/dropbear/dropbear-2013.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.59.ebuild,v 1.1 2013/10/12 21:13:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.60.ebuild,v 1.1 2013/10/16 16:50:41 vapier Exp $
 
 EAPI="4"
 
@@ -39,8 +39,6 @@ set_options() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-	epatch "${FILESDIR}"/${P}-exec-prefix.patch
-	epatch "${FILESDIR}"/${P}-scp-inst.patch
 	sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
 	sed -i \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
@@ -49,17 +47,13 @@ src_prepare() {
 	sed -i \
 		-e '/pam_start/s:sshd:dropbear:' \
 		svr-authpam.c || die
-	# patch sent upstream to make configure option work.
-	# XXX: Need to add libtomcrypt to the tree and change this to 0.
-	sed -i \
-		-e '/BUNDLED_LIBTOM=1/s:=1:=1:' \
-		configure || die
 	restore_config options.h
 }
 
 src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
 	econf \
-		--disable-bundled-libtom \
 		$(use_enable zlib) \
 		$(use_enable pam) \
 		$(use_enable !bsdpty openpty) \
diff --git a/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch b/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch
deleted file mode 100644
index 05bc0227d293..000000000000
--- a/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-changeset:   827:4a788a3162a1
-user:        Matt Johnston <matt@ucc.asn.au>
-date:        Wed Oct 09 21:58:07 2013 +0800
-summary:     Add @exec_prefix@ that was missing
-
-diff -r 125012c4d107 -r 4a788a3162a1 Makefile.in
---- a/Makefile.in	Fri Oct 04 22:40:28 2013 +0800
-+++ b/Makefile.in	Wed Oct 09 21:58:07 2013 +0800
-@@ -66,6 +66,7 @@ VPATH=@srcdir@
- srcdir=@srcdir@
- 
- prefix=@prefix@
-+exec_prefix=@exec_prefix@
- datarootdir = @datarootdir@
- bindir=@bindir@
- sbindir=@sbindir@
diff --git a/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch b/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch
deleted file mode 100644
index ee398a54043a..000000000000
--- a/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-changeset:   828:93e04b9ff676
-user:        Matt Johnston <matt@ucc.asn.au>
-date:        Wed Oct 09 22:24:39 2013 +0800
-summary:     - Fix "inst_scp" target since there isn't a manpage
-
-diff -r 4a788a3162a1 -r 93e04b9ff676 MULTI
---- a/MULTI	Wed Oct 09 21:58:07 2013 +0800
-+++ b/MULTI	Wed Oct 09 22:24:39 2013 +0800
-@@ -20,7 +20,3 @@ etc
- then execute as normal:
- 
- ./dropbear <options here>
--
--"make install" doesn't currently work for multi-binary configuration, though
--in most situations where it is being used, the target and build systems will
--differ.
-diff -r 4a788a3162a1 -r 93e04b9ff676 Makefile.in
---- a/Makefile.in	Wed Oct 09 21:58:07 2013 +0800
-+++ b/Makefile.in	Wed Oct 09 22:24:39 2013 +0800
-@@ -122,34 +122,34 @@ strip: $(TARGETS)
- 
- install: $(addprefix inst_, $(TARGETS))
- 
--installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS)) 
--
--insdbmulti: dropbearmulti
--	$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)
--
- insmultidropbear: dropbearmulti
- 	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
- 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
-+	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-+	$(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
- 
- insmulti%: dropbearmulti
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
- 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
-+	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
-+	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
- 
- # dropbear should go in sbin, so it needs a seperate rule
- inst_dropbear: dropbear
- 	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	$(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
--	$(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
-+	$(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
- 
- inst_%: $*
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
--	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
-+	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
-+
-+inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) 
- 
- 
- # for some reason the rule further down doesn't like $($@objs) as a prereq.