Commit Graph

24 Commits

Author SHA1 Message Date
Baptiste Daroussin
dad2fb7ece Merge from head 2015-06-15 10:56:01 +00:00
Simon J. Gerraty
ccfb965433 Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision:       D2796
Reviewed by: brooks imp
2015-06-13 19:20:56 +00:00
Simon J. Gerraty
44d314f704 dirdeps.mk now sets DEP_RELDIR 2015-06-08 23:35:17 +00:00
Glen Barber
37a48d408f MFH: r282615-r283655
Sponsored by:	The FreeBSD Foundation
2015-05-28 17:06:50 +00:00
Simon J. Gerraty
98e0ffaefb Merge sync of head 2015-05-27 01:19:58 +00:00
Eitan Adler
6f55e69eb7 ssh-copy-id: Add missing line continuation
PR:		194301
Reported by:	pkubaj@riseup.net
Patch by:	Ross Kilgariff <rosskilgariff@gmail.com>
2015-05-16 06:15:49 +00:00
Baptiste Daroussin
0bd7d22e03 Move ssh into a dedicated package
Flag config files as "to be merged on upgrade"
2015-03-05 20:25:09 +00:00
Simon J. Gerraty
ee7b0571c2 Merge head from 7/28 2014-08-19 06:50:54 +00:00
Baptiste Daroussin
2b7af31cf5 use .Mt to mark up email addresses consistently (part3)
PR:		191174
Submitted by:	Franco Fichtner  <franco at lastsummer.de>
2014-06-23 08:23:05 +00:00
Joel Dahl
0d7fff32d4 Fix date. 2014-06-15 10:18:57 +00:00
Simon J. Gerraty
cc3f4b9965 Merge from head 2014-05-08 23:54:15 +00:00
Eitan Adler
377d232d9c Fix syntax error with modern shells
Submitted by:	multiple
2014-05-03 08:52:52 +00:00
Simon J. Gerraty
3b8f084595 Merge head 2014-04-28 07:50:45 +00:00
Eitan Adler
0f4d097284 ssh-copy-id: add restorecon call
In certain situations when creating an authorized_key file on a Linux machine
restorecon(1) may need to be called.  Therefore, attempt to run it if it exists.

MFC After:	1 week
Idea from:	https://bugzilla.redhat.com/show_bug.cgi?id=739989
2014-03-01 03:36:46 +00:00
Eitan Adler
df54ea8001 ssh-copy-id: avoid sending private keys; add -v option
To help avoid confusion: when attempting to send a key file check to see if a
file of the same name exists with a '.pub' suffix and send that instead.  This
mimics the behavior of other ssh-copy-id scripts.

Add -v passthrough.

Reported by:	dweimer <dweimer@dweimer.net>
Reported by:	feld
MFC After:	1 week
2014-03-01 03:17:46 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
David E. O'Brien
d9a447559b Sync with HEAD. 2013-02-08 16:10:16 +00:00
Eitan Adler
843ab1e81f Add examples to the ssh-copy-id script.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-13 13:06:57 +00:00
Eitan Adler
a018185aeb Clarify where the authorized_key file lives.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-12 14:16:39 +00:00
Eitan Adler
a0f63581ce Add the standard exit status to the ssh-copy-id man page.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-11 15:34:58 +00:00
Eitan Adler
076ea53ee5 Be a bit more paranoid.
Use more portable constructs in order to allow upstream adoption
Add per-file error messages

Reviewed by:	jilles
Approved by:	cperciva
MFC after:	1 week
2012-11-10 03:44:08 +00:00
Simon J. Gerraty
7cd2dcf076 Updated/new Makefile.depend 2012-11-08 21:24:17 +00:00
Eitan Adler
25c1da1567 Somehow this got replicated too many times
Approved by: cperciva (implicit)
2012-10-22 12:05:14 +00:00
Eitan Adler
2beb708522 Add a clean-room reimplementation of a script originally
found in openssh's contrib directory.

This version has more features and is better written.
I intend to submit this upstream as well.

Reviewed by:	bapt
Reviewed by:	des
Approved by:	cperciva
MFC after:	1 week
2012-10-22 03:57:00 +00:00