Date: Sun, 18 Mar 2001 21:26:43 +0100 (CET) From: Martin Blapp <mb@imp.ch> To: dougb@freebsd.org Cc: current@freebsd.org Subject: MD5 mergemaster Message-ID: <Pine.BSF.4.21.0103182104360.7913-200000@levais.imp.ch>
next in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-350026916-984947203=:7913 Content-Type: TEXT/PLAIN; charset=US-ASCII Hi Doug and all others. here is a first version of the MD5 mergemaster. It works like this: No checksum in existing /etc file --------------------------------- - If a installed version of a /etc file is the same as the temproot version, we add a md5 checksum to the cvs-header of the file and install it again. - If it differs from from the temproot version, we show as usual the merge/install page, and when we do the install, we add the md5 checksum. Checksum already in /etc file: ------------------------------ - If the checksum of the /etc file is the as the fresh file, we do nothing and skip. - If the checksum of header of the /etc file is the same as the generated from /etc, we let it install the new version, if there is any, else we skip. - If these checks are unsucessfull, we just hand it to the diff routine and let diplay the changes you made in the /etc files. I think there may be some things to change, but it works for me at the moment. Fixes are welcome. Maybe it's also a good thing to add a flag for these checks, so you can turn off and on the new behaviour. Martin Martin Blapp, mb@imp.ch ------------------------------------------------ Improware AG, UNIX solution and service provider Zurlindenstrasse 29, 4133 Pratteln, Switzerland Phone: +41 79 370 26 05, Fax: +41 61 826 93 01 ------------------------------------------------ --0-350026916-984947203=:7913 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="mergemaster.diff" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.BSF.4.21.0103182126430.7913@levais.imp.ch> Content-Description: Content-Disposition: attachment; filename="mergemaster.diff" LS0tIC91c3Ivc2Jpbi9tZXJnZW1hc3RlcglGcmkgTWFyIDE2IDA4OjAxOjIw IDIwMDENCisrKyBtZXJnZW1hc3RlcglTdW4gTWFyIDE4IDIwOjI1OjExIDIw MDENCkBAIC04LDcgKzgsNyBAQA0KICMgQ29weXJpZ2h0IDE5OTgtMjAwMSBE b3VnbGFzIEJhcnRvbg0KICMgRG91Z0JARnJlZUJTRC5vcmcNCiANCi0jICRG cmVlQlNEOiBzcmMvdXNyLnNiaW4vbWVyZ2VtYXN0ZXIvbWVyZ2VtYXN0ZXIu c2gsdiAxLjE3IDIwMDEvMDMvMDUgMTA6MTM6MjEgZG91Z2IgRXhwICQNCisj ICRGcmVlQlNEOiBzcmMvdXNyLnNiaW4vbWVyZ2VtYXN0ZXIvbWVyZ2VtYXN0 ZXIuc2gsdiAxLjYuMi42IDIwMDEvMDMvMDUgMjA6MzM6MjggZG91Z2IgRXhw ICQNCiANCiBQQVRIPS9iaW46L3Vzci9iaW46L3Vzci9zYmluDQogDQpAQCAt MTEyLDcgKzExMiw5IEBADQogICAgICAgICAgIGVjaG8gJycNCiAgICAgICAg ICAgZWNobyAiICAqKiogRGlzcGxheWluZyBkaWZmZXJlbmNlcyBiZXR3ZWVu ICR7Q09NUEZJTEV9IGFuZCBpbnN0YWxsZWQgdmVyc2lvbjoiDQogICAgICAg ICAgIGVjaG8gJycNCi0gICAgICAgICAgZGlmZiAiJHtESUZGX0ZMQUd9IiAi JHtERVNURElSfSR7Q09NUEZJTEUjLn0iICIke0NPTVBGSUxFfSINCisgICAg ICAgICAgL3Vzci9iaW4vc2VkIC1FIC1lICdzJU1ENT0qLnszMn0gJSUnIDwg IiR7REVTVERJUn0ke0NPTVBGSUxFIy59IiA+ICIke0NPTVBGSUxFfS5vcmln Ig0KKyAgICAgICAgICBkaWZmICIke0RJRkZfRkxBR30iICIke0NPTVBGSUxF fS5vcmlnIiAke0NPTVBGSUxFfQ0KKwkgIHJtICIke0NPTVBGSUxFfS5vcmln Ig0KICAgICAgICAgKSB8ICR7UEFHRVJ9DQogICAgICAgICBlY2hvICcnDQog ICAgICAgZmkNCkBAIC00OTAsMTEgKzQ5Miw2IEBADQogICAgICA7Ow0KICAg ZXNhYw0KIA0KLSAgIyBBdm9pZCB0cnlpbmcgdG8gdXBkYXRlIE1BS0VERVYg aWYgL2RldiBpcyBvbiBhIGRldmZzDQotICBpZiAvc2Jpbi9zeXNjdGwgdmZz LmRldmZzLmdlbmVyYXRpb24gPiAvZGV2L251bGwgMj4mMSA7IHRoZW4NCi0g ICAgcm0gJHtURU1QUk9PVH0vZGV2L01BS0VERVYgJHtURU1QUk9PVH0vZGV2 L01BS0VERVYubG9jYWwNCi0gIGZpDQotDQogICA7OyAjIEVuZCBvZiB0aGUg IlJFUlVOIiB0ZXN0DQogZXNhYw0KIA0KQEAgLTY0Myw3ICs2NDAsMTIgQEAN CiANCiAgICAgY2FzZSAiJHtET05UX0lOU1RBTEx9IiBpbg0KICAgICAnJykN CisgICAgICAvYmluL2NwICR7MX0gJHsxfS5vcmlnDQorICAgICAgR0VOTUQ1 PWAvdXNyL2Jpbi9ncmVwIC12ICJbJF0ke0NWU19JRF9UQUd9OiIgIiR7MX0i IHwgL3NiaW4vbWQ1YA0KKyAgICAgIFNFRFNUUklORz0iJ3MlRXhwIFxcXCRc JCVFeHAgTUQ1PSR7R0VOTUQ1fSBcXFwkJSciDQorICAgICAgZXZhbCAiL3Vz ci9iaW4vc2VkIC1FIC1lICR7U0VEU1RSSU5HfSA8IFwiJHsxfS5vcmlnXCIg PiBcIiR7MX1cIiINCiAgICAgICBpbnN0YWxsIC1tICIke0ZJTEVfTU9ERX0i ICIkezF9IiAiJHtERVNURElSfSR7SU5TVEFMTF9ESVJ9Ig0KKyAgICAgIHJt ICR7MX0ub3JpZw0KICAgICAgIDs7DQogICAgICopDQogICAgICAgdW5zZXQg RE9OVF9JTlNUQUxMDQpAQCAtNjc2LDYgKzY3OCw2OSBAQA0KICMNCiBmb3Ig Q09NUEZJTEUgaW4gYGZpbmQgLiAtdHlwZSBmIC1zaXplICswYDsgZG8NCiAN CisgICMgZ2V0IHRoZSBNRDUgY2hlY2tzdW0gb2YgdGhlIENWUyBoZWFkZXIg b2YgJHtERVNURElSfSR7Q09NUEZJTEUjLn0NCisgIE1ENUlEX09MRD1gL3Vz ci9iaW4vZ3JlcCAiWyRdJHtDVlNfSURfVEFHfToiICR7REVTVERJUn0ke0NP TVBGSUxFIy59IDI+JjEgfCAvdXNyL2Jpbi9zZWQgLUUgLWUgJ3MlXi4qTUQ1 PSguezMyfSkuKiQlXDElJyAyPiYxYA0KKw0KKyAgIyBHZW5lcmF0ZSB0aGUg TUQ1IGNoZWNrc3VtIG9mIHRoZSBpbnN0YWxsZWQgZmlsZQ0KKyAgR0VOTUQ1 X09MRD1gL3Vzci9iaW4vZ3JlcCAtdiAiWyRdJHtDVlNfSURfVEFHfToiICR7 REVTVERJUn0ke0NPTVBGSUxFIy59IHwgL3NiaW4vbWQ1YA0KKw0KKyAgIyBH ZW5lcmF0ZSB0aGUgTUQ1IGNoZWNrc3VtIG9mICR7Q09NUEZJTEV9DQorICBH RU5NRDVfTkVXPWAvdXNyL2Jpbi9ncmVwIC12ICJbJF0ke0NWU19JRF9UQUd9 OiIgJHtDT01QRklMRX0gfCAvc2Jpbi9tZDVgDQorDQorICAjIEdldCB0aGUg Q1ZTX0lEIGxpbmVzIHdpdGhvdXQgTUQ1IGNoZWNrc3VtDQorICBDVlNJRF9P TEQ9YC91c3IvYmluL2dyZXAgIlskXSR7Q1ZTX0lEX1RBR306IiAke0RFU1RE SVJ9JHtDT01QRklMRSMufSB8IC91c3IvYmluL3NlZCAtRSAtZSAncyVNRDU9 LnszMn0lJScgMj4vZGV2L251bGxgDQorICBDVlNJRF9ORVc9YC91c3IvYmlu L2dyZXAgIlskXSR7Q1ZTX0lEX1RBR306IiAke0NPTVBGSUxFfSAyPi9kZXYv bnVsbCB8IC91c3IvYmluL3NlZCAtRSAtZSAncyVNRDU9LnszMn0lJScgMj4v ZGV2L251bGxgDQorDQorICAjDQorICAjIENoZWNrIGlmIG5vIE1ENSBjaGVj a3N1bSBleGl0cyBpbiB0aGUgaW5zdGFsbGVkIHZlcnNpb24uDQorICAjDQor ICBjYXNlICIke01ENUlEX09MRH0iIGluDQorICAiJHtDVlNJRF9ORVd9IikN CisJIw0KKwkjIE5vIE1ENSBjaGVja3N1bSBhdmFpbGFibGUsIGlmIHRoZSBm aWxlcyBhcmUgZXhhY3RseSB0aGUNCisJIyBzYW1lIHdlIGNhbiBhZGQgYSBN RDUgY2hlY2tzdW0gdG8gdGhlIGN2cyBoZWFkZXIuDQorCSMNCisJY2FzZSAi JHtHRU5NRDVfT0xEfSIgaW4NCisJIiR7R0VOTUQ1X05FV30iKQ0KKwkJIw0K KwkJIyBOZXcgRmlsZSBpcyB0aGUgc2FtZSBhcyB0aGUgaW5zdGFsbGVkIHZl cnNpb24NCisJCSMgc28gd2UgY2FuIHNhdmx5IGluc3RhbGwgdGhlIG5ldyB2 ZXJzaW9uIHdpdGgNCisJCSMgZ2VuZXJhdGVkIG1kNSBjaGVja3N1bS4NCisJ CSMNCisJCW1tX2luc3RhbGwgIiR7Q09NUEZJTEV9Ig0KKwkJY29udGludWUN CisJCTs7DQorCWVzYWMNCisJOzsNCisgICopDQorCSMNCisJIyBNRDUgY2hl Y2tzdW0gYXZhaWxhYmxlDQorCSMNCisJY2FzZSAiJHtNRDVJRF9PTER9IiBp bg0KKwkiJHtHRU5NRDVfTkVXfSIpDQorCQkjDQorCQkjIE5ldyBhbmQgb2xk IGZpbGUgYXJlIGV4YWN0bHkgdGhlIHNhbWUsIE1ENSBjaGVja3N1bQ0KKwkJ IyBpcyBhdmFpbGFibGUsIHNvIHNraXAgdGhlIGZpbGUuDQorCQkjDQorCQlj b250aW51ZQ0KKwkJOzsNCisJKikNCisJCWNhc2UgIiR7R0VOTUQ1X09MRH0i IGluDQorCQkiJHtNRDVJRF9PTER9IikNCisJCQkjDQorCQkJIyBOZXcgYW5k IG9sZCBmaWxlIGFyZSBkaWZmZXJlbnQgYW5kIHRoZSBpbnN0YWxsZWQNCisJ CQkjIHZlcnNpb24gaGFzIG5vdCBiZWVuIGNoYW5nZWQgaW4gYW55IHdheSwg c28gd2UNCisJCQkjIGNhbiBpbnN0YWxsIGEgbmV3IHZlcnNpb24gd2l0aG91 dCBwcm9ibGVtcy4NCisJCQkjDQorCQkJbW1faW5zdGFsbCAiJHtDT01QRklM RX0iDQorCQkJY29udGludWUNCisJCQk7Ow0KKwkJZXNhYw0KKwkJOzsNCisJ ZXNhYw0KKwk7Ow0KKyAgZXNhYw0KKw0KICAgIyBGaXJzdCwgY2hlY2sgdG8g c2VlIGlmIHRoZSBmaWxlIGV4aXN0cyBpbiBERVNURElSLiAgSWYgbm90LCB0 aGUNCiAgICMgZGlmZl9sb29wIGZ1bmN0aW9uIGtub3dzIGhvdyB0byBoYW5k bGUgaXQuDQogICAjDQpAQCAtNjkxLDExICs3NTYsOSBAQA0KICAgICAjIElm IHRoZSBmaWxlcyBoYXZlIHRoZSBzYW1lICRJZCwgZGVsZXRlIHRoZSBvbmUg aW4gdGVtcHJvb3Qgc28gdGhlDQogICAgICMgdXNlciB3aWxsIGhhdmUgbGVz cyB0byB3YWRlIHRocm91Z2ggaWYgZmlsZXMgYXJlIGxlZnQgdG8gbWVyZ2Ug YnkgaGFuZC4NCiAgICAgIw0KLSAgICBDVlNJRDE9YGdyZXAgIlskXSR7Q1ZT X0lEX1RBR306IiAke0RFU1RESVJ9JHtDT01QRklMRSMufSAyPi9kZXYvbnVs bGANCi0gICAgQ1ZTSUQyPWBncmVwICJbJF0ke0NWU19JRF9UQUd9OiIgJHtD T01QRklMRX0gMj4vZGV2L251bGxgDQogDQotICAgIGNhc2UgIiR7Q1ZTSUQy fSIgaW4NCi0gICAgIiR7Q1ZTSUQxfSIpDQorICAgIGNhc2UgIiR7Q1ZTSURf T0xEfSIgaW4NCisgICAgIiR7Q1ZTSURfTkVXfSIpDQogICAgICAgZWNobyAi ICoqKiBUZW1wICR7Q09NUEZJTEV9IGFuZCBpbnN0YWxsZWQgaGF2ZSB0aGUg c2FtZSBDVlMgSWQsIGRlbGV0aW5nIg0KICAgICAgIHJtICIke0NPTVBGSUxF fSINCiAgICAgICA7Ow0K --0-350026916-984947203=:7913-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0103182104360.7913-200000>