From owner-freebsd-stable@FreeBSD.ORG Wed Nov 5 14:30:40 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 002C3F5E for ; Wed, 5 Nov 2014 14:30:39 +0000 (UTC) Received: from system.jails.se (unknown [IPv6:2001:16d8:cc1e:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97D5E26C for ; Wed, 5 Nov 2014 14:30:39 +0000 (UTC) Received: from localhost (system.jails.se [91.205.63.85]) by system.jails.se (Postfix) with SMTP id 809F71B77C5 for ; Wed, 5 Nov 2014 15:30:35 +0100 (CET) Received: from nyx.uppmax.uu.se (nyx.uppmax.uu.se [130.238.137.40]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by system.jails.se (Postfix) with ESMTPSA id 878931B77C1 for ; Wed, 5 Nov 2014 15:30:34 +0100 (CET) Message-ID: <545A348A.4000908@pean.org> Date: Wed, 05 Nov 2014 15:30:34 +0100 From: =?UTF-8?B?UGV0ZXIgQW5rZXJzdMOlbA==?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.8.0 MIME-Version: 1.0 To: freebsd-stable@freebsd.org Subject: freebsd-udapte upgrade. Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms050702050004030804020906" X-DSPAM-Result: Innocent X-DSPAM-Processed: Wed Nov 5 15:30:35 2014 X-DSPAM-Confidence: 1.0000 X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 545a348b64465990814513 X-DSPAM-Factors: 27, mail/freebsd+submit+cf+<<<<<<<, 0.40000, mail/freebsd+submit+cf+<<<<<<<, 0.40000, version+#+passwd+<<<<<<<+current, 0.40000, be+#+that+#+should, 0.40000, this+case+#+typed+q, 0.40000, submit+cf+#+current, 0.40000, submit+cf+#+current, 0.40000, "<<+#+crontab+<<<<<<<+current, 0.40000, current+#+mail/freebsd+cf, 0.40000, current+#+mail/freebsd+cf, 0.40000, <<<<<<<+#+version+mail/freebsd+submit, 0.40000, <<<<<<<+#+version+mail/freebsd+submit, 0.40000, right, 0.40000, explain+how+to+#+freebsd, 0.40000, of+the+files+has, 0.40000, current+#+group, 0.40000, <<<<<<<+#+#+ssh/sshd_config, 0.40000, <<<<<<<+#+#+ssh/sshd_config, 0.40000, Notice+#+a+#+of, 0.40000, mail/freebsd+submit+cf+<<<<<<<+current, 0.40000, mail/freebsd+submit+cf+<<<<<<<+current, 0.40000, and+look+for+%e2%80%9ccurrent, 0.40000, syslog+#+#+current, 0.40000, syslog+#+#+current, 0.40000, version+syslog+#+#+current, 0.40000, version+syslog+#+#+current, 0.40000, current+version+#+#+"<<, 0.40000 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 14:30:40 -0000 This is a cryptographically signed message in MIME format. --------------ms050702050004030804020906 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Could someone please explain how to use freebsd-update upgrade without=20 destroying all of your configuration files? I really don=E2=80=99t understand how to use the merge function.. In this= case i=20 typed :q for all files it asked about. :wq seem to do about the same thing. Notice that a few of the files has this shit in = multiple places. I can=E2=80=99t be right that I should edit every file m= anually=20 and look for =E2=80=9Ccurrent version=E2=80=9D and so on? # grep "<< current" * crontab:<<<<<<< current version dhclient.conf:<<<<<<< current version group:<<<<<<< current version hosts:<<<<<<< current version inetd.conf:<<<<<<< current version master.passwd:<<<<<<< current version motd:<<<<<<< current version ntp.conf:<<<<<<< current version passwd:<<<<<<< current version services:<<<<<<< current version shells:<<<<<<< current version snmpd.config:<<<<<<< current version syslog.conf:<<<<<<< current version syslog.conf:<<<<<<< current version ttys:<<<<<<< current version ttys:<<<<<<< current version # grep "<< current" */* mail/freebsd.cf:<<<<<<< current version mail/freebsd.cf:<<<<<<< current version mail/freebsd.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/freebsd.submit.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/sendmail.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version mail/submit.cf:<<<<<<< current version ssh/sshd_config:<<<<<<< current version ssh/sshd_config:<<<<<<< current version --------------ms050702050004030804020906 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIKQDCC BRowggQCoAMCAQICEG0Z6qcZT2ozIuYiMnqqcd4wDQYJKoZIhvcNAQEFBQAwga4xCzAJBgNV BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAcBgNVBAoT FVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2VydHJ1c3Qu Y29tMTYwNAYDVQQDEy1VVE4tVVNFUkZpcnN0LUNsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQg RW1haWwwHhcNMTEwNDI4MDAwMDAwWhcNMjAwNTMwMTA0ODM4WjCBkzELMAkGA1UEBhMCR0Ix GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE ChMRQ09NT0RPIENBIExpbWl0ZWQxOTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGlj YXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC ggEBAJKEhFtLV5jUXi+LpOFAyKNTWF9mZfEyTvefMn1V0HhMVbdClOD5J3EHxcZppLkyxPFA GpDMJ1Zifxe1cWmu5SAb5MtjXmDKokH2auGj/7jfH0htZUOMKi4rYzh337EXrMLaggLW1DJq 1GdvIBOPXDX65VSAr9hxCh03CgJQU2yVHakQFLSZlVkSMf8JotJM3FLb3uJAAVtIaN3FSrTg 7SQfOq9xXwfjrL8UO7AlcWg99A/WF1hGFYE8aIuLgw9teiFX5jSw2zJ+40rhpVJyZCaRTqWS D//gsWD9Gm9oUZljjRqLpcxCm5t9ImPTqaD8zp6Q30QZ9FxbNboW86eb/8ECAwEAAaOCAUsw ggFHMB8GA1UdIwQYMBaAFImCZ33EnSZwAEu0UEh83j2uBG59MB0GA1UdDgQWBBR6E04AdFvG eGNkJ8Ev4qBbvHnFezAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADARBgNV HSAECjAIMAYGBFUdIAAwWAYDVR0fBFEwTzBNoEugSYZHaHR0cDovL2NybC51c2VydHJ1c3Qu Y29tL1VUTi1VU0VSRmlyc3QtQ2xpZW50QXV0aGVudGljYXRpb25hbmRFbWFpbC5jcmwwdAYI KwYBBQUHAQEEaDBmMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVRO QWRkVHJ1c3RDbGllbnRfQ0EuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1 c3QuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQCF1r54V1VtM39EUv5C1QaoAQOAivsNsv1Kv/av QUn1G1rF0q0bc24+6SZ85kyYwTAo38v7QjyhJT4KddbQPTmGZtGhm7VNm2+vKGwdr+XqdFqo 2rHA8XV6L566k3nK/uKRHlZ0sviN0+BDchvtj/1gOSBH+4uvOmVIPJg9pSW/ve9g4EnlFsjr P0OD8ODuDcHTzTNfm9C9YGqzO/761Mk6PB/tm/+bSTO+Qik5g+4zaS6CnUVNqGnagBsePdIa XXxHmaWbCG0SmYbWXVcHG6cwvktJRLiQfsrReTjrtDP6oDpdJlieYVUYtCHVmdXgQ0BCML7q peeU0rD+83X5f27nMIIFHjCCBAagAwIBAgIRAMFvE3qCNYFbXz8lkfxnvZgwDQYJKoZIhvcN AQEFBQAwgZMxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTkwNwYDVQQDEzBD T01PRE8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EwHhcNMTQw MTE3MDAwMDAwWhcNMTUwMTE3MjM1OTU5WjAfMR0wGwYJKoZIhvcNAQkBFg5wZXRlckBwZWFu Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtXJzxk2+Tt/OsnAPvgIK/M pmd1DFYdqWGl8+/y9YbJbRCDAsFC48xjvwMrO55WSg1j44h2NC7I1w7J/+Y4qYZEwC+P/0cb I2GQY4WzkB8Plpc0HrDpOS6SPKfIIgGuS+tAURMHcLHlDBivtrsWqYg+wJ6ypOcvMBikpFcT ASga4Rb3zMpnE8z198dwRnyDoOJKF9iGBVDZ93613CdC/Fp+H2qve2AA577abiO3xIlamMkb /3IM6MC976rcR7Pnf3sp2ompPGn7m7yhhkut5OxnC83LnrzUVEJM1f3J8mtAWQ0AL5hEPDln OTT6P1Opv6C8eDB9xYQ3zqz0v7PoNjMCAwEAAaOCAd4wggHaMB8GA1UdIwQYMBaAFHoTTgB0 W8Z4Y2QnwS/ioFu8ecV7MB0GA1UdDgQWBBR7JyIkDGIYyCTbDgf48nC5UOPMRzAOBgNVHQ8B Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAgBgNVHSUEGTAXBggrBgEFBQcDBAYLKwYBBAGyMQED BQIwEQYJYIZIAYb4QgEBBAQDAgUgMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQEBMCswKQYI KwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5uZXQvQ1BTMFcGA1UdHwRQME4wTKBK oEiGRmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0NsaWVudEF1dGhlbnRpY2F0aW9u YW5kU2VjdXJlRW1haWxDQS5jcmwwgYgGCCsGAQUFBwEBBHwwejBSBggrBgEFBQcwAoZGaHR0 cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPQ2xpZW50QXV0aGVudGljYXRpb25hbmRTZWN1 cmVFbWFpbENBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMBkG A1UdEQQSMBCBDnBldGVyQHBlYW4ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQB0khzkZuMC8o9s 3xvoUbfr/4BcndibN6aDFbOIfwccWqIPMTOqmTakBjtc/N/bzYvFPlk2CmsjFbofuzuuVlKW G+bEjeq4xOsbjWKAmznV1Uw6DtyanWfs8YEU2sdKsHu657A5UZP8CCSpWxpnXAgFNdWszGSC jPw8uzcnKawBUbDHPT/ob/nAnNSYtGyLLqg5zb2qMbcerzHk4Gr1LZKApY122H0NguIPvQTi IF/+oeyhXl8KuBaPFU3kMr4UxIv9sX0KFp1iRjR6eOPAVTqC7TSttB1lhgRImKwU0tXNes1L XuWhgnB3Zr4atHizY+4kw9A0enFL8HNv2ampeTWEMYIEHDCCBBgCAQEwgakwgZMxCzAJBgNV BAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQx GjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTkwNwYDVQQDEzBDT01PRE8gQ2xpZW50IEF1 dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0ECEQDBbxN6gjWBW18/JZH8Z72YMAkG BSsOAwIaBQCgggJHMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8X DTE0MTEwNTE0MzAzNFowIwYJKoZIhvcNAQkEMRYEFIQsw7+TPSF4oFgQtlVo/g/rHXVxMGwG CSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAO BggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgw gboGCSsGAQQBgjcQBDGBrDCBqTCBkzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIg TWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0 ZWQxOTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBF bWFpbCBDQQIRAMFvE3qCNYFbXz8lkfxnvZgwgbwGCyqGSIb3DQEJEAILMYGsoIGpMIGTMQsw CQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxm b3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE5MDcGA1UEAxMwQ09NT0RPIENsaWVu dCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENBAhEAwW8TeoI1gVtfPyWR/Ge9 mDANBgkqhkiG9w0BAQEFAASCAQCB4A9JtlP+v8acp16hb6h59kzfDUYg4iYufTT8c++4o+Fg OYdQNp3NCaIPxjFIKsq/8mmRhy+9jBFvU/uILe7WI4b78QWGKfCUqVgupnOSAMliz9nzuH7k gf64gNyhSR47BQM+YgckhzPTs2V2sb7icGLF1o1IHDy0Tp+5nD/SYyWuneE3wqTrBeZvZYZW KWHoXf3CPKB4nUnSQ2tG2d2ZclBxGB3IJAFW8pxvjj1pf4kweUis/ju2Rl/neji6v/FUbthw cIqf66xvIWXr22HJRplihge1Agf8hGo7+Ih5f4WQ0jlh2FwCizf3CZNw9njaX+59Kng6QMSs S7jeKDnHAAAAAAAA --------------ms050702050004030804020906--