Browse Source

dropbear: changed to patch Makefile instead of INSTALL_WRAPPER_FILTER to avoid side effects

karasz/new-early
Alejandro Mery 16 years ago
parent
commit
81375d7088
  1. 2
      security/dropbear/dropbear.conf
  2. 32
      security/dropbear/inst_scp.patch

2
security/dropbear/dropbear.conf

@ -24,5 +24,3 @@ var_append makeinstopt " " "PROGRAMS=$PROGRAMS"
var_append makeopt " " "LD=${archprefix}gcc"
hook_add postmake 5 "cp -fv drop*.8 $root/$mandir/man8/"
var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,scp,dbscp,'"

32
security/dropbear/inst_scp.patch

@ -0,0 +1,32 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../dropbear/inst_scp.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.in.orig 2009-08-06 08:27:24.000000000 -0400
+++ ./Makefile.in 2009-08-06 08:31:49.000000000 -0400
@@ -140,6 +140,13 @@
-chown root $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
-chgrp 0 $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
+# scp installs as dbscp, so it needs a seperate rule too
+inst_scp: scp
+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 scp$(EXEEXT) $(DESTDIR)$(bindir)/dbscp$(EXEEXT)
+ -chown root $(DESTDIR)$(bindir)/dbscp$(EXEEXT)
+ -chgrp 0 $(DESTDIR)$(bindir)/dbscp$(EXEEXT)
+
inst_%: $*
$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
$(INSTALL) -m 755 $*$(EXEEXT) $(DESTDIR)$(bindir)
Loading…
Cancel
Save