Date: Fri, 15 Jun 2001 22:22:05 -0400 From: James <James_Bond_79@yahoo.com> To: freebsd-hackers@freebsd.org Subject: Mergemaster bug + new feature [patch] Message-ID: <01061522220501.06764@Halstead007>
next in thread | raw e-mail | index | archive | help
--------------Boundary-00=_TW30PZ692KW4N44Q4M9R
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
It seems I have found a couple bugs, I noticed that mergemaster was always
saying that the "install failed, the file has to be merged manually" even
thought the install was successful. It would seem that the recent commit is
using "install && test && rm" but the install program will already have
removed the files without the "-c" option. Patch attached (including another
bug I found)
I have also attached a diff file adding a form of md5 checking to
mergemaster. Basically what I did is add use a file "/var/db/mmsums.md5"
containing the checksum of any cleanly installed files. Here is what it
does/doesn't do:
1) every time mm_install is called it removes the checksum for the file being
installed from the database.
2) After the call to mm_install, if the install returned as successful,
mergemaster will generate the checksum for the newly installed file and put
it in the database. This is only done for clean files, not files that were
merged.
3) When doing the comparison, if it is found that the installed file was
unchanged, mergemaster says so and offers the options without showing the
diff, you can still see the diff by pressing v.
4) When the "-I" (capital i) option is specified mergemaster will
automatically install any file where the installed version was unchanged.
5) I take advantage of the code that detects the cvs tag by adding the md5 of
the file in the temproot directory (after "fixing" the output to have the
correct path), this will speed up getting the md5's of clean files into the
database.
Those who felt the need could fairly easily create the initial database,
however after the first mergemaster run any file that has the same $FreeBSD$
or is cleanly installed will be added. That should cover just about all the
files.
it would not be hard to add options to choose a different md5 database, or to
disable the entire thing. As it is now you can specify the database or to use
the new feature by setting 'CHECKSUMFILE' to be the file holding the checksum
database, or unset'ing 'USE_CHECKSUMS' to disable the whole thing in the
~/.mergemasterrc.
The attached files are cumulative. the "mergemaster.sh.diff" is the two
bugfixes I have noticed, and the "mergemastermd5.sh.diff" is my new version
of mergemaster (patch against the bugfixed version)
I just ran my new mergemaster with a hand generated database and it properly
detected unchanged files, I also ran it with no database and just about every
file was regenerated from the tree versions.
Tell me what you think!
sorry, but i have not updated the man pages...
James.
--------------Boundary-00=_TW30PZ692KW4N44Q4M9R
Content-Type: text/plain;
charset="iso-8859-1";
name="mergemastermd5.sh.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="mergemastermd5.sh.diff"
LS0tIG1lcmdlbWFzdGVyLnNoCUZyaSBKdW4gMTUgMDE6MTg6MDUgMjAwMQorKysgbWVyZ2VtYXN0
ZXJtZDUuc2gJU2F0IEp1biAxNiAwMjoxMDoxNiAyMDAxCkBAIC0xNSw3ICsxNSw3IEBACiBkaXNw
bGF5X3VzYWdlICgpIHsKICAgVkVSU0lPTl9OVU1CRVI9YGdyZXAgIlskXUZyZWVCU0Q6IiAkMCB8
IGN1dCAtZCAnICcgLWYgNGAKICAgZWNobyAibWVyZ2VtYXN0ZXIgdmVyc2lvbiAke1ZFUlNJT05f
TlVNQkVSfSIKLSAgZWNobyAnVXNhZ2U6IG1lcmdlbWFzdGVyIFstc2NydmFoaV0gWy1tIC9wYXRo
XScKKyAgZWNobyAnVXNhZ2U6IG1lcmdlbWFzdGVyIFstc2NydmFoaUldIFstbSAvcGF0aF0nCiAg
IGVjaG8gJyAgICAgICAgIFstdCAvcGF0aF0gWy1kXSBbLXUgTl0gWy13IE5dIFstRCAvcGF0aF0n
CiAgIGVjaG8gIk9wdGlvbnM6IgogICBlY2hvICIgIC1zICBTdHJpY3QgY29tcGFyaXNvbiAoZGlm
ZiBldmVyeSBwYWlyIG9mIGZpbGVzKSIKQEAgLTI1LDYgKzI1LDcgQEAKICAgZWNobyAiICAtYSAg
TGVhdmUgYWxsIGZpbGVzIHRoYXQgZGlmZmVyIHRvIG1lcmdlIGJ5IGhhbmQiCiAgIGVjaG8gIiAg
LWggIERpc3BsYXkgbW9yZSBjb21wbGV0ZSBoZWxwIgogICBlY2hvICcgIC1pICBBdXRvbWF0aWNh
bGx5IGluc3RhbGwgZmlsZXMgdGhhdCBkbyBub3QgZXhpc3QgaW4gZGVzdGluYXRpb24gZGlyZWN0
b3J5JworICBlY2hvICcgIC1JICBBdXRvbWF0aWNhbGx5IGluc3RhbGwgd2hlbiB0aGUgZGVzdGlu
YXRpb24gZmlsZSAgaGFzIG5vdCBiZWVuIG1vZGlmaWVkJwogICBlY2hvICIgIC1tIC9wYXRoL2Rp
cmVjdG9yeSAgU3BlY2lmeSBsb2NhdGlvbiBvZiBzb3VyY2UgdG8gZG8gdGhlIG1ha2UgaW4iCiAg
IGVjaG8gIiAgLXQgL3BhdGgvZGlyZWN0b3J5ICBTcGVjaWZ5IHRlbXAgcm9vdCBkaXJlY3Rvcnki
CiAgIGVjaG8gIiAgLWQgIEFkZCBkYXRlIGFuZCB0aW1lIHRvIGRpcmVjdG9yeSBuYW1lIChlLmcu
LCAvdmFyL3RtcC90ZW1wcm9vdC5gZGF0ZSArJW0lZC4lSC4lTWApIgpAQCAtNDAsNiArNDEsOCBA
QAogICBlY2hvICIqIFRoZSAtdyBvcHRpb24gdGFrZXMgYSBudW1iZXIgYXMgYW4gYXJndW1lbnQg
Zm9yIHRoZSBjb2x1bW4gd2lkdGgiCiAgIGVjaG8gIiAgb2YgdGhlIHNjcmVlbi4gIFRoZSBkZWZh
dWx0IGlzIDgwLiIKICAgZWNobyAnKiBUaGUgLWEgb3B0aW9uIGNhdXNlcyBtZXJnZW1hc3RlciB0
byBydW4gd2l0aG91dCBwcm9tcHRpbmcuJworICBlY2hvICcqIFRoZSAtSSBvcHRpb24gdXNlcyBt
ZDUgY2hlY2tzdW1zIGdlbmVyYXRlZCB0aGUgbGFzdCB0aW1lIGEgZmlsZScKKyAgZWNobyAnICB3
YXMgaW5zdGFsbGVkIHRvIGRldGVjdCBjaGFuZ2VzLicKIH0KIAogIyBMb29wIGFsbG93aW5nIHRo
ZSB1c2VyIHRvIHVzZSBzZGlmZiB0byBtZXJnZSBmaWxlcyBhbmQgZGlzcGxheSB0aGUgbWVyZ2Vk
CkBAIC0xMDUsNiArMTA4LDMyIEBACiAKICAgSEFORExFX0NPTVBGSUxFPXYKIAorICAjIElmIHdl
IGFyZSB1c2luZyBjaGVja3N1bXMsIHRoZW4gY2hlY2sgdG8gc2VlIGlmIHRoZSBsb2NhbCB2ZXJz
aW9uIGhhcyBiZWVuIG1vZGlmaWVkCisgIGlmIFsgLWYgIiR7REVTVERJUn0ke0NPTVBGSUxFIy59
IiAtYSAtZiAiJHtDT01QRklMRX0iIF07IHRoZW4KKyAgICBjYXNlICIke1VTRV9DSEVDS1NVTVN9
IiBpbgorICAgIFtZeV1bRWVdW1NzXSkKKyAgICAgIGlmIFsgImBncmVwIFwoJHtERVNURElSfSR7
Q09NUEZJTEUjLn1cKSAke0NIRUNLU1VNRklMRX1gIiA9ICJgL3NiaW4vbWQ1ICR7REVTVERJUn0k
e0NPTVBGSUxFIy59YCIgXTsgdGhlbgorICAgICAgICBlY2hvICIgICoqKiBUaGUgaW5zdGFsbGVk
IHZlcnNpb24gb2YgJHtDT01QRklMRX0gaGFzIG5vdCBiZWVuIG1vZGlmaWVkIgorCSNEb24ndCBk
aXNwbGF5IGRpZmYgdGhlIGZpcnN0IHRpbWUgd2hlbiBmaWxlIGlzIG5vdCBtb2RpZmllZC4KKyAg
ICAgICAgSEFORExFX0NPTVBGSUxFPSJOT1QgViIKKyAgICAgICAgY2FzZSAiJHtBVVRPX0lOU1RB
TExfVU5DSEFOR0VEfSIgaW4KKyAgICAgICAgW1l5XVtFZV1bU3NdKQorICAgICAgICAgIGlmIG1t
X2luc3RhbGwgIiR7Q09NUEZJTEV9IjsgdGhlbgorICAgICAgICAgICAgZWNobyAiICAgKioqICR7
Q09NUEZJTEV9IGluc3RhbGxlZCBzdWNjZXNzZnVsbHkiCisgICAgICAgICAgICBBVVRPX0lOU1RB
TExFRF9GSUxFU19NRDU9IiR7QVVUT19JTlNUQUxMRURfRklMRVNfTUQ1fSAgICAgICR7REVTVERJ
Un0ke0NPTVBGSUxFIy59CisiCisgICAgICAgICAgICAvc2Jpbi9tZDUgJHtERVNURElSfSR7Q09N
UEZJTEUjLn0gPj4gJHtDSEVDS1NVTUZJTEV9IDI+L2Rldi9udWxsCisgICAgICAgICAgZWxzZQor
ICAgICAgICAgICAgZWNobyAiICAgKioqIFByb2JsZW0gaW5zdGFsbGluZyAke0NPTVBGSUxFfSwg
aXQgd2lsbCByZW1haW4gdG8gbWVyZ2UgYnkgaGFuZCIKKyAgICAgICAgICBmaQorICAgICAgICAg
IHJldHVybgorICAJICA7OworICAgICAgICBlc2FjCisgICAgICBmaQorICAgICAgOzsKKyAgICBl
c2FjCisgIGZpCisgICAgICAgIAogICB3aGlsZSBbICIke0hBTkRMRV9DT01QRklMRX0iID0gInYi
IC1vICIke0hBTkRMRV9DT01QRklMRX0iID0gIlYiIC1vIFwKICAgICAiJHtIQU5ETEVfQ09NUEZJ
TEV9IiA9ICJOT1QgViIgXTsgZG8KICAgICBpZiBbIC1mICIke0RFU1RESVJ9JHtDT01QRklMRSMu
fSIgLWEgLWYgIiR7Q09NUEZJTEV9IiBdOyB0aGVuCkBAIC0xMjksNiArMTU4LDEyIEBACiAgICAg
ICAgICAgIyBNYWtlIHRoZSBsaXN0IHByaW50IG9uZSBmaWxlIHBlciBsaW5lCiAgICAgICAgICAg
QVVUT19JTlNUQUxMRURfRklMRVM9IiR7QVVUT19JTlNUQUxMRURfRklMRVN9ICAgICAgJHtERVNU
RElSfSR7Q09NUEZJTEUjLn0KICIKKwkgIGNhc2UgIiR7VVNFX0NIRUNLU1VNU30iIGluCisJICBb
WXldW0VlXVtTc10pCisJICAgICMgSW5zdGFsbGVkIGEgY2xlYW4gZmlsZSwgdXBkYXRlIGNoZWNr
dW0gZGF0YS4KKwkgICAgL3NiaW4vbWQ1ICR7REVTVERJUn0ke0NPTVBGSUxFIy59ID4+ICR7Q0hF
Q0tTVU1GSUxFfSAyPi9kZXYvbnVsbAorCSAgICA7OworCSAgZXNhYwogICAgICAgICBlbHNlCiAg
ICAgICAgICAgZWNobyAiICAgKioqIFByb2JsZW0gaW5zdGFsbGluZyAke0NPTVBGSUxFfSwgaXQg
d2lsbCByZW1haW4gdG8gbWVyZ2UgYnkgaGFuZCIKICAgICAgICAgZmkKQEAgLTE2NCw2ICsxOTks
MTIgQEAKICAgICAgIGVjaG8gJycKICAgICAgIGlmIG1tX2luc3RhbGwgIiR7Q09NUEZJTEV9Ijsg
dGhlbgogICAgICAgICBlY2hvICIgICAqKiogJHtDT01QRklMRX0gaW5zdGFsbGVkIHN1Y2Nlc3Nm
dWxseSIKKwljYXNlICIke1VTRV9DSEVDS1NVTVN9IiBpbgorCVtZeV1bRWVdW1NzXSkKKwkgICMg
SW5zdGFsbGVkIGEgY2xlYW4gZmlsZSwgdXBkYXRlIGNoZWNrdW0gZGF0YS4KKwkgIC9zYmluL21k
NSAke0RFU1RESVJ9JHtDT01QRklMRSMufSA+PiAke0NIRUNLU1VNRklMRX0gMj4vZGV2L251bGwK
KwkgIDs7CisJZXNhYwogICAgICAgZWxzZQogICAgICAgICBlY2hvICIgICAqKiogUHJvYmxlbSBp
bnN0YWxsaW5nICR7Q09NUEZJTEV9LCBpdCB3aWxsIHJlbWFpbiB0byBtZXJnZSBieSBoYW5kIgog
ICAgICAgZmkKQEAgLTIxMiw2ICsyNTMsMTAgQEAKICMKIFRFTVBST09UPScvdmFyL3RtcC90ZW1w
cm9vdCcKIAorIyBTZXR1cCB3aGF0IHdlIG5lZWQgdG8gdXNlIG1kNSBjaGVja3N1bXMuCitDSEVD
S1NVTUZJTEU9L3Zhci9kYi9tbXN1bXMubWQ1CitVU0VfQ0hFQ0tTVU1TPXllcworCiAjIFJlYWQg
L2V0Yy9tZXJnZW1hc3Rlci5yYyBmaXJzdCBzbyB0aGUgb25lIGluICRIT01FIGNhbiBvdmVycmlk
ZQogIwogaWYgWyAtciAvZXRjL21lcmdlbWFzdGVyLnJjIF07IHRoZW4KQEAgLTIyNiw3ICsyNzEs
NyBAQAogCiAjIENoZWNrIHRoZSBjb21tYW5kIGxpbmUgb3B0aW9ucwogIwotd2hpbGUgZ2V0b3B0
cyAiOmFzY3J2aGltOnQ6ZHU6dzpEOiIgQ09NTUFORF9MSU5FX0FSR1VNRU5UIDsgZG8KK3doaWxl
IGdldG9wdHMgIjphc2NydmhpSW06dDpkdTp3OkQ6IiBDT01NQU5EX0xJTkVfQVJHVU1FTlQgOyBk
bwogICBjYXNlICIke0NPTU1BTkRfTElORV9BUkdVTUVOVH0iIGluCiAgIHMpCiAgICAgU1RSSUNU
PXllcwpAQCAtMjU0LDYgKzI5OSw5IEBACiAgIGkpCiAgICAgQVVUT19JTlNUQUxMPXllcwogICAg
IDs7CisgIEkpCisgICAgQVVUT19JTlNUQUxMX1VOQ0hBTkdFRD15ZXMKKyAgICA7OwogICBtKQog
ICAgIFNPVVJDRURJUj0ke09QVEFSR30KICAgICA7OwpAQCAtMjgxLDYgKzMyOSwxNyBAQAogCiBl
Y2hvICcnCiAKKyMgQ2hlY2sgaWYgdGhlIGNoZWNrc3VtcyBmaWxlIGV4aXN0cyBhbmQgZm9yY2Ug
aXQncyBtb2RlIHRvIDYwMC4KK2lmIFsgISAtZSAke0NIRUNLU1VNRklMRX0gXTsgdGhlbgorIHRv
dWNoICR7Q0hFQ0tTVU1GSUxFfQorZmkKKworaWYgWyAtZiAke0NIRUNLU1VNRklMRX0gXTsgdGhl
bgorIGNobW9kIDYwMCAke0NIRUNLU1VNRklMRX0KK2Vsc2UKKyB1bnNldCBVU0VfQ0hFQ0tTVU1T
CitmaQorICAKICMgSWYgdGhlIHVzZXIgaGFzIGEgcGFnZXIgZGVmaW5lZCwgbWFrZSBzdXJlIHdl
IGNhbiBydW4gaXQKICMKIGNhc2UgIiR7RE9OVF9DSEVDS19QQUdFUn0iIGluCkBAIC01NzQsNiAr
NjMzLDE1IEBACiAgICAgOzsKICAgZXNhYwogCisgIGNhc2UgIiR7VVNFX0NIRUNLU1VNU30iIGlu
CisgIFtZeV1bRWVdW1NzXSkKKyAgICAjIFJlbW92ZSB0aGUgbWQ1IGVudHJ5IGZvciB0aGlzIGZp
bGUsIGRvbid0IGFkZCBuZXcgb25lIHNpbmNlIHRoaXMgbWF5IGJlIGEKKyAgICAjIG1lcmdlZCBm
aWxlLgorICAgIGdyZXAgLXYgXCgke0RFU1RESVJ9JHtJTlNUQUxMX0RJUn1cKSAke0NIRUNLU1VN
RklMRX0gPiAke0NIRUNLU1VNRklMRX0ubmV3CisgICAgbXYgJHtDSEVDS1NVTUZJTEV9Lm5ldyAk
e0NIRUNLU1VNRklMRX0KKyAgICA7OworICBlc2FjCisKICAgaWYgWyAtbiAiJHtERVNURElSfSR7
SU5TVEFMTF9ESVJ9IiAtYSAhIC1kICIke0RFU1RESVJ9JHtJTlNUQUxMX0RJUn0iIF07IHRoZW4K
ICAgICBESVJfTU9ERT1gcGVybCAtZSAncHJpbnRmICIlMDRvXG4iLCAoKChzdGF0KCIkQVJHVlsw
XSIpKVsyXSAmIDA3Nzc3KSAmfiBcCiAgICAgICBvY3QoIiRBUkdWWzFdIikpJyAiJHtURU1QUk9P
VH0vJHtJTlNUQUxMX0RJUn0iICIke0NPTkZJUk1FRF9VTUFTS30iYApAQCAtNjY2LDcgKzczNCw2
IEBACiAgICAgZXNhYwogICAgIGluc3RhbGwgLWMgLW0gIiR7RklMRV9NT0RFfSIgIiR7MX0iICIk
e0RFU1RESVJ9JHtJTlNUQUxMX0RJUn0iICYmCiAgICAgICBbIC1mICIkezF9IiBdICYmIHJtICIk
ezF9IgotI2VjaG8gImZvdXJ0aCBpbnN0YWxsLCByZXR1cm4gJD8iCiAgIGZpCiAgIHJldHVybiAk
PwogfQpAQCAtNzIzLDYgKzc5MCwyMCBAQAogICAgIGNhc2UgIiR7Q1ZTSUQyfSIgaW4KICAgICAi
JHtDVlNJRDF9IikKICAgICAgIGVjaG8gIiAqKiogVGVtcCAke0NPTVBGSUxFfSBhbmQgaW5zdGFs
bGVkIGhhdmUgdGhlIHNhbWUgQ1ZTIElkLCBkZWxldGluZyIKKyAgICAgICMgU2luY2Ugd2Uga25v
dyB0aGUgdGVtcHJvb3QgdmVyc2lvbiBpcyBjbGVhbiwgbGV0cyBnZW5lcmF0ZSBhIGNoZWNrc3Vt
CisgICAgICAjIGZyb20gaXQsIHRoaXMgd2lsbCBoZWxwIHRoZSBjaGVja3N1bXMgZmlsZSB0byBi
ZSBwb3B1bGF0ZWQgbW9yZSBxdWlja2x5LgorICAgICAgY2FzZSAiJHtVU0VfQ0hFQ0tTVU1TfSIg
aW4KKyAgICAgIFtZeV1bRWVdW1NzXSkKKyAgICAgICAgIyBSZW1vdmUgdGhlIG1kNSBlbnRyeSBm
b3IgdGhpcyBmaWxlIGZpcnN0LCBpZiBpdCBleGlzdHMuCisgICAgICAgIGdyZXAgLXYgXCgke0RF
U1RESVJ9JHtDT01QRklMRSMufVwpICR7Q0hFQ0tTVU1GSUxFfSA+ICR7Q0hFQ0tTVU1GSUxFfS5u
ZXcKKyAgICAgICAgbXYgJHtDSEVDS1NVTUZJTEV9Lm5ldyAke0NIRUNLU1VNRklMRX0KKwkjIElu
c3RhbGxlZCBhIGNsZWFuIGZpbGUsIHVwZGF0ZSBjaGVja3VtIGRhdGEuCisJeyAKKwkgIGVjaG8g
LW4gIk1ENSAoJHtERVNURElSfSR7Q09NUEZJTEUjLn0pID0gIiAKKwkgIC9zYmluL21kNSAtcSAk
e0NPTVBGSUxFfSAKKwl9ID4+ICR7Q0hFQ0tTVU1GSUxFfSAyPi9kZXYvbnVsbAorCTs7CisgICAg
ICBlc2FjCiAgICAgICBybSAiJHtDT01QRklMRX0iCiAgICAgICA7OwogICAgIGVzYWMKQEAgLTgw
OSw2ICs4OTAsMjggQEAKICAgICBlY2hvICcqKiogWW91IGNob3NlIHRoZSBhdXRvbWF0aWMgaW5z
dGFsbCBvcHRpb24gZm9yIGZpbGVzIHRoYXQgZGlkIG5vdCcKICAgICBlY2hvICcgICAgZXhpc3Qg
b24geW91ciBzeXN0ZW0uICBUaGUgZm9sbG93aW5nIHdlcmUgaW5zdGFsbGVkIGZvciB5b3U6Jwog
ICAgIGVjaG8gIiR7QVVUT19JTlNUQUxMRURfRklMRVN9IgorICAgIDs7CisgIGVzYWMKKyAgOzsK
K2VzYWMKKworY2FzZSAiJHtBVVRPX0lOU1RBTExFRF9GSUxFU19NRDV9IiBpbgorJycpIDs7Cisq
KQorICBjYXNlICIke0FVVE9fUlVOfSIgaW4KKyAgJycpCisgICAgKAorICAgICAgZWNobyAnJwor
ICAgICAgZWNobyAnKioqIFlvdSBjaG9zZSB0aGUgYXV0b21hdGljIGluc3RhbGwgb3B0aW9uIGZv
ciBmaWxlcyB0aGF0IHdlcmUgbm90JworICAgICAgZWNobyAnICAgIGNoYW5nZWQgb24geW91ciBz
eXN0ZW0uICBUaGUgZm9sbG93aW5nIHdlcmUgaW5zdGFsbGVkIGZvciB5b3U6JworICAgICAgZWNo
byAiJHtBVVRPX0lOU1RBTExFRF9GSUxFU19NRDV9IgorICAgICkgfCAke1BBR0VSfQorICAgIDs7
CisgICopCisgICAgZWNobyAnJworICAgIGVjaG8gJyoqKiBZb3UgY2hvc2UgdGhlIGF1dG9tYXRp
YyBpbnN0YWxsIG9wdGlvbiBmb3IgZmlsZXMgdGhhdCB3ZXJlIG5vdCcKKyAgICBlY2hvICcgICAg
Y2hhbWdlZCBvbiB5b3VyIHN5c3RlbS4gIFRoZSBmb2xsb3dpbmcgd2VyZSBpbnN0YWxsZWQgZm9y
IHlvdTonCisgICAgZWNobyAiJHtBVVRPX0lOU1RBTExFRF9GSUxFU19NRDV9IgogICAgIDs7CiAg
IGVzYWMKICAgOzsK
--------------Boundary-00=_TW30PZ692KW4N44Q4M9R
Content-Type: text/plain;
charset="iso-8859-1";
name="mergemaster.sh.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="mergemaster.sh.diff"
LS0tIG1lcmdlbWFzdGVyLnNoLm9yaWcJRnJpIEp1biAxNSAwMDo0MTo0NSAyMDAxCisrKyBtZXJn
ZW1hc3Rlci5zaAlGcmkgSnVuIDE1IDAxOjE4OjA1IDIwMDEKQEAgLTQ3MSw3ICs0NzEsNyBAQAog
ICAgIGVjaG8gJyAqKiogUHJlc3MgW0VudGVyXSBvciBbUmV0dXJuXSBrZXkgdG8gY29udGludWUn
CiAgICAgcmVhZCBBTllfS0VZCiAgICAgdW5zZXQgQU5ZX0tFWQotICAgIGRpZmYgLXFyICR7REVT
VERJUn0vZXRjICR7VEVNUFJPT1R9L2V0YyB8IGdyZXAgIl5Pbmx5IGluIC9ldGMiIHwgJHtQQUdF
Un0KKyAgICBkaWZmIC1xciAke0RFU1RESVJ9L2V0YyAke1RFTVBST09UfS9ldGMgfCBncmVwICJe
T25seSBpbiAke0RFU1RESVJ9L2V0YyIgfCAke1BBR0VSfQogICAgIGVjaG8gJycKICAgICBlY2hv
ICcgKioqIFByZXNzIFtFbnRlcl0gb3IgW1JldHVybl0ga2V5IHRvIGNvbnRpbnVlJwogICAgIHJl
YWQgQU5ZX0tFWQpAQCAtNTkyLDcgKzU5Miw3IEBACiAgICAgICBORUVEX0NBUF9NS0RCPXllcwog
ICAgICAgOzsKICAgICAvZXRjL21hc3Rlci5wYXNzd2QpCi0gICAgICBpbnN0YWxsIC1tIDYwMCAi
JHsxfSIgIiR7REVTVERJUn0ke0lOU1RBTExfRElSfSIgJiYKKyAgICAgIGluc3RhbGwgLWMgLW0g
NjAwICIkezF9IiAiJHtERVNURElSfSR7SU5TVEFMTF9ESVJ9IiAmJgogICAgICAgICBbIC1mICIk
ezF9IiBdICYmIHJtICIkezF9IgogICAgICAgTkVFRF9QV0RfTUtEQj15ZXMKICAgICAgIERPTlRf
SU5TVEFMTD15ZXMKQEAgLTY1MSw3ICs2NTEsNyBAQAogCiAgICAgY2FzZSAiJHtET05UX0lOU1RB
TEx9IiBpbgogICAgICcnKQotICAgICAgaW5zdGFsbCAtbSAiJHtGSUxFX01PREV9IiAiJHsxfSIg
IiR7REVTVERJUn0ke0lOU1RBTExfRElSfSIgJiYKKyAgICAgIGluc3RhbGwgLWMgLW0gIiR7RklM
RV9NT0RFfSIgIiR7MX0iICIke0RFU1RESVJ9JHtJTlNUQUxMX0RJUn0iICYmCiAgICAgICAgIFsg
LWYgIiR7MX0iIF0gJiYgcm0gIiR7MX0iCiAgICAgICA7OwogICAgICopCkBAIC02NjQsOCArNjY0
LDkgQEAKICAgICAgIE5FRURfTUFLRURFVj15ZXMKICAgICAgIDs7CiAgICAgZXNhYwotICAgIGlu
c3RhbGwgLW0gIiR7RklMRV9NT0RFfSIgIiR7MX0iICIke0RFU1RESVJ9JHtJTlNUQUxMX0RJUn0i
ICYmCisgICAgaW5zdGFsbCAtYyAtbSAiJHtGSUxFX01PREV9IiAiJHsxfSIgIiR7REVTVERJUn0k
e0lOU1RBTExfRElSfSIgJiYKICAgICAgIFsgLWYgIiR7MX0iIF0gJiYgcm0gIiR7MX0iCisjZWNo
byAiZm91cnRoIGluc3RhbGwsIHJldHVybiAkPyIKICAgZmkKICAgcmV0dXJuICQ/CiB9Cg==
--------------Boundary-00=_TW30PZ692KW4N44Q4M9R--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?01061522220501.06764>