diff options
| author |   sthen <sthen@openbsd.org> | 2015-09-13 13:49:49 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2015-09-13 13:49:49 +0000 |
| commit | 575b996c3d5ee902ee88ead80eeadb0b54a0b49b (patch) | |
| tree | 1080d9feb4e9f6b27d024d9b0c4992c1551370a5 | |
| parent | When adding keys to the agent, don't ignore the comment of keys for which the (diff) | |
| download | wireguard-openbsd-575b996c3d5ee902ee88ead80eeadb0b54a0b49b.tar.xz wireguard-openbsd-575b996c3d5ee902ee88ead80eeadb0b54a0b49b.zip | |
Move /etc/ssl/cert.pem from base to etc. Previously this was updated every
upgrade when untarring base sets; now it is done when sysmerge is run; if
there are no local changes the update is seamless, otherwise with local
changes (adding your own CAs, or removing ones which you don't want to
trust) sysmerge will ask to diff as usual. ok miod deraadt
| -rw-r--r-- | distrib/sets/lists/base/mi | 1 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 95aba8d646c..735bb5b4e04 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -224,7 +224,6 @@ ./etc/skel/.ssh ./etc/ssh ./etc/ssl -./etc/ssl/cert.pem ./etc/ssl/lib ./etc/ssl/private ./etc/systrace diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 04da2ec5ea9..12e8aca55f5 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -42,6 +42,7 @@ ./etc/spwd.db ./etc/ssh/ssh_config ./etc/ssh/sshd_config +./etc/ssl/cert.pem ./etc/ssl/openssl.cnf ./etc/ssl/x509v3.cnf ./etc/syslog.conf |