From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <1485698423.24562.7.camel@researchut.com> Subject: squashfs-tools: Add -offset option to skip n bytes at the start of the file From: Ritesh Raj Sarraf Reply-To: rrs@researchut.com To: Phillip Lougher , linux-fsdevel@vger.kernel.org, "linux-kernel@vger.kernel.org" , probono@puredarwin.org Cc: Mention , probonopd/AppImageKit , probonopd/AppImageKit Date: Sun, 29 Jan 2017 19:30:23 +0530 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-O9O7lFQ/cF/8VIpdtw6w" Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: --=-O9O7lFQ/cF/8VIpdtw6w Content-Type: multipart/mixed; boundary="=-KCucLj4CITX6vBVBznV/" --=-KCucLj4CITX6vBVBznV/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, 2017-01-29 at 03:33 -0800, probonopd wrote: > Yes, I am not happy about that. > You could either push your change to the squashfs folks > Sent a PR half a year ago but no reaction: plougher/squashfs-tools#13 - i= s > something wrong with it? That repo seems inactive. So does the git repo at kernel.org. but I would r= ely on that one. Let's try fresh now. Given there's been not much development in the upstrea= m repo, I've just taken your patch, as is, for submission. > Or you could just carry the delta and ask the user to fetch the squashfs-= tools=20 > source themselves > Do you mean "carry the delta" as in "provide a diff"? Doing now. Dear Squashfs Team, Can you please review/include the attached patch into squashfs-tools ? The mentioned changes are needed by AppImageKit. What is AppImage The AppImage format is a format for packaging applications in a way that al= lows them to run on a variety of different target systems (base operating system= s, distributions) without further modification. https://en.wikipedia.org/wiki/AppImage AppImageKit is a concrete implementation of the AppImage format and provide= s tools such as appimagetool and appimaged for conveniently handling AppImage= s. https://github.com/probonopd/AppImageKit --=20 Ritesh Raj Sarraf RESEARCHUT - http://www.researchut.com "Necessity is the mother of invention." --=-KCucLj4CITX6vBVBznV/ Content-Disposition: attachment; filename="squashfs-appimage-support.patch" Content-Type: text/x-patch; name="squashfs-appimage-support.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBmNzJmMzJiMGZlNzkyOWU3MWVkZDllNjU4OWZhMWZjZWMxZDg2YWRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBwcm9ib25vcGQgPHByb2Jvbm9wZEB1c2Vycy5ub3JlcGx5Lmdp dGh1Yi5jb20+CkRhdGU6IFRodSwgMTUgU2VwIDIwMTYgMTg6MjQ6MTAgKzAyMDAKU3ViamVjdDog W1BBVENIIDEvMl0gQWRkIC1vZmZzZXQgb3B0aW9uIHRvIHNraXAgbiBieXRlcyBhdCB0aGUgc3Rh cnQgb2YgdGhlCiBpbnB1dCBmaWxlCgotLS0KIHNxdWFzaGZzLXRvb2xzL3Vuc3F1YXNoZnMuYyB8 IDEzICsrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxIGRl bGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvc3F1YXNoZnMtdG9vbHMvdW5zcXVhc2hmcy5jIGIvc3F1 YXNoZnMtdG9vbHMvdW5zcXVhc2hmcy5jCmluZGV4IDEzMjNkZDYuLmI2YmE0NTIgMTAwNjQ0Ci0t LSBhL3NxdWFzaGZzLXRvb2xzL3Vuc3F1YXNoZnMuYworKysgYi9zcXVhc2hmcy10b29scy91bnNx dWFzaGZzLmMKQEAgLTQyLDYgKzQyLDcgQEAgc3RydWN0IGNhY2hlICpmcmFnbWVudF9jYWNoZSwg KmRhdGFfY2FjaGU7CiBzdHJ1Y3QgcXVldWUgKnRvX3JlYWRlciwgKnRvX2luZmxhdGUsICp0b193 cml0ZXIsICpmcm9tX3dyaXRlcjsKIHB0aHJlYWRfdCAqdGhyZWFkLCAqaW5mbGF0b3JfdGhyZWFk OwogcHRocmVhZF9tdXRleF90CWZyYWdtZW50X211dGV4Oworc3RhdGljIG9mZl90IHNxdWFzaGZz X3N0YXJ0X29mZnNldCA9IDA7CiAKIC8qIHVzZXIgb3B0aW9ucyB0aGF0IGNvbnRyb2wgcGFyYWxs ZWxpc2F0aW9uICovCiBpbnQgcHJvY2Vzc29ycyA9IC0xOwpAQCAtNjMxLDcgKzYzMiw3IEBAIGlu dCByZWFkX2ZzX2J5dGVzKGludCBmZCwgbG9uZyBsb25nIGJ5dGUsIGludCBieXRlcywgdm9pZCAq YnVmZikKIAlUUkFDRSgicmVhZF9ieXRlczogcmVhZGluZyBmcm9tIHBvc2l0aW9uIDB4JWxseCwg Ynl0ZXMgJWRcbiIsIGJ5dGUsCiAJCWJ5dGVzKTsKIAotCWlmKGxzZWVrKGZkLCBvZmYsIFNFRUtf U0VUKSA9PSAtMSkgeworCWlmKGxzZWVrKGZkLCBvZmYgKyBzcXVhc2hmc19zdGFydF9vZmZzZXQs IFNFRUtfU0VUKSA9PSAtMSkgewogCQlFUlJPUigiTHNlZWsgZmFpbGVkIGJlY2F1c2UgJXNcbiIs IHN0cmVycm9yKGVycm5vKSk7CiAJCXJldHVybiBGQUxTRTsKIAl9CkBAIC0yNTQ0LDYgKzI1NDUs MTQgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJCQlleGl0KDEpOwogCQkJ fQogCQkJZGVzdCA9IGFyZ3ZbaV07CisgICAgICAgIAkJfSBlbHNlIGlmIChzdHJjbXAoYXJndltp XSwgIi1vZmZzZXQiKSA9PSAwIHx8CisJCQkJc3RyY21wKGFyZ3ZbaV0sICItbyIpID09IDApIHsK KwkJCWlmKCsraSA9PSBhcmdjKSB7CisJCQkJZnByaW50ZihzdGRlcnIsICIlczogLW9mZnNldCBt aXNzaW5nIGFyZ3VtZW50XG4iLAorCQkJCQlhcmd2WzBdKTsKKwkJCQlleGl0KDEpOworCQkJfQor CQkJc3F1YXNoZnNfc3RhcnRfb2Zmc2V0ID0gKG9mZl90KWF0b2woYXJndltpXSk7CiAJCX0gZWxz ZSBpZihzdHJjbXAoYXJndltpXSwgIi1wcm9jZXNzb3JzIikgPT0gMCB8fAogCQkJCXN0cmNtcChh cmd2W2ldLCAiLXAiKSA9PSAwKSB7CiAJCQlpZigoKytpID09IGFyZ2MpIHx8IApAQCAtMjYzNiw2 ICsyNjQ1LDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJCQkiY29weXJp Z2h0IGluZm9ybWF0aW9uXG4iKTsKIAkJCUVSUk9SKCJcdC1kW2VzdF0gPHBhdGhuYW1lPlx0dW5z cXVhc2ggdG8gPHBhdGhuYW1lPiwgIgogCQkJCSJkZWZhdWx0IFwic3F1YXNoZnMtcm9vdFwiXG4i KTsKKwkJCUVSUk9SKCJcdC1vW2Zmc2V0XSA8Ynl0ZXM+XHRza2lwIDxieXRlcz4gYXQgc3RhcnQg b2YgaW5wdXQgZmlsZSwgIgorCQkJCSJkZWZhdWx0IFwiMFwiXG4iKTsKIAkJCUVSUk9SKCJcdC1u W28tcHJvZ3Jlc3NdXHRcdGRvbid0IGRpc3BsYXkgdGhlIHByb2dyZXNzICIKIAkJCQkiYmFyXG4i KTsKIAkJCUVSUk9SKCJcdC1ub1steGF0dHJzXVx0XHRkb24ndCBleHRyYWN0IHhhdHRycyBpbiBm aWxlIHN5c3RlbSIKCkZyb20gNWE0OThhZDI0ZGNmZWFjOWYzZDc0N2U4OTRmMjI5MDFmM2FjMTBl ZiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogcHJvYm9ub3BkIDxwcm9ib25vcGRAdXNl cnMubm9yZXBseS5naXRodWIuY29tPgpEYXRlOiBUaHUsIDE1IFNlcCAyMDE2IDIxOjA5OjUyICsw MjAwClN1YmplY3Q6IFtQQVRDSCAyLzJdIEFkZCAtb2Zmc2V0IGZ1bmN0aW9uIHRvIHNraXAgbiBi eXRlcyBhdCB0aGUgYmVnaW5uaW5nIG9mCiB0aGUgc3F1YXNoZnMgZmlsZQoKLS0tCiBzcXVhc2hm cy10b29scy9ta3NxdWFzaGZzLmMgfCAyNSArKysrKysrKysrKysrKysrKysrLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9zcXVhc2hmcy10b29scy9ta3NxdWFzaGZzLmMgYi9zcXVhc2hmcy10b29scy9ta3NxdWFzaGZz LmMKaW5kZXggZDIyMWMzNS4uOTJiNmEzMSAxMDA2NDQKLS0tIGEvc3F1YXNoZnMtdG9vbHMvbWtz cXVhc2hmcy5jCisrKyBiL3NxdWFzaGZzLXRvb2xzL21rc3F1YXNoZnMuYwpAQCAtOTgsNiArOTgs NyBAQCBpbnQgb2xkX2V4Y2x1ZGUgPSBUUlVFOwogaW50IHVzZV9yZWdleCA9IEZBTFNFOwogaW50 IG5vcGFkID0gRkFMU0U7CiBpbnQgZXhpdF9vbl9lcnJvciA9IEZBTFNFOworc3RhdGljIG9mZl90 IHNxdWFzaGZzX3N0YXJ0X29mZnNldCA9IDA7CiAKIGxvbmcgbG9uZyBnbG9iYWxfdWlkID0gLTEs IGdsb2JhbF9naWQgPSAtMTsKIApAQCAtNTE2LDkgKzUxNyw5IEBAIGludCByZWFkX2ZzX2J5dGVz KGludCBmZCwgbG9uZyBsb25nIGJ5dGUsIGludCBieXRlcywgdm9pZCAqYnVmZikKIAogCXB0aHJl YWRfY2xlYW51cF9wdXNoKCh2b2lkICopIHB0aHJlYWRfbXV0ZXhfdW5sb2NrLCAmcG9zX211dGV4 KTsKIAlwdGhyZWFkX211dGV4X2xvY2soJnBvc19tdXRleCk7Ci0JaWYobHNlZWsoZmQsIG9mZiwg U0VFS19TRVQpID09IC0xKSB7CisJaWYobHNlZWsoZmQsIG9mZitzcXVhc2hmc19zdGFydF9vZmZz ZXQsIFNFRUtfU0VUKSA9PSAtMSkgewogCQlFUlJPUigicmVhZF9mc19ieXRlczogTHNlZWsgb24g ZGVzdGluYXRpb24gZmFpbGVkIGJlY2F1c2UgJXMsICIKLQkJCSJvZmZzZXQ9MHglbGx4XG4iLCBz dHJlcnJvcihlcnJubyksIG9mZik7CisJCQkib2Zmc2V0PTB4JWxseFxuIiwgc3RyZXJyb3IoZXJy bm8pLCBvZmYrc3F1YXNoZnNfc3RhcnRfb2Zmc2V0KTsKIAkJcmVzID0gMDsKIAl9IGVsc2UgaWYo cmVhZF9ieXRlcyhmZCwgYnVmZiwgYnl0ZXMpIDwgYnl0ZXMpIHsKIAkJRVJST1IoIlJlYWQgb24g ZGVzdGluYXRpb24gZmFpbGVkXG4iKTsKQEAgLTU1NywxMCArNTU4LDEwIEBAIHZvaWQgd3JpdGVf ZGVzdGluYXRpb24oaW50IGZkLCBsb25nIGxvbmcgYnl0ZSwgaW50IGJ5dGVzLCB2b2lkICpidWZm KQogCXB0aHJlYWRfY2xlYW51cF9wdXNoKCh2b2lkICopIHB0aHJlYWRfbXV0ZXhfdW5sb2NrLCAm cG9zX211dGV4KTsKIAlwdGhyZWFkX211dGV4X2xvY2soJnBvc19tdXRleCk7CiAKLQlpZihsc2Vl ayhmZCwgb2ZmLCBTRUVLX1NFVCkgPT0gLTEpIHsKKwlpZihsc2VlayhmZCwgb2ZmK3NxdWFzaGZz X3N0YXJ0X29mZnNldCwgU0VFS19TRVQpID09IC0xKSB7CiAJCUVSUk9SKCJ3cml0ZV9kZXN0aW5h dGlvbjogTHNlZWsgb24gZGVzdGluYXRpb24gIgogCQkJImZhaWxlZCBiZWNhdXNlICVzLCBvZmZz ZXQ9MHglbGx4XG4iLCBzdHJlcnJvcihlcnJubyksCi0JCQlvZmYpOworCQkJb2ZmK3NxdWFzaGZz X3N0YXJ0X29mZnNldCk7CiAJCUJBRF9FUlJPUigiUHJvYmFibHkgb3V0IG9mIHNwYWNlIG9uIG91 dHB1dCAlc1xuIiwKIAkJCWJsb2NrX2RldmljZSA/ICJibG9jayBkZXZpY2UiIDogImZpbGVzeXN0 ZW0iKTsKIAl9CkBAIC0yMzE1LDkgKzIzMTYsOSBAQCB2b2lkICp3cml0ZXIodm9pZCAqYXJnKQog CQlwdGhyZWFkX2NsZWFudXBfcHVzaCgodm9pZCAqKSBwdGhyZWFkX211dGV4X3VubG9jaywgJnBv c19tdXRleCk7CiAJCXB0aHJlYWRfbXV0ZXhfbG9jaygmcG9zX211dGV4KTsKIAotCQlpZihsc2Vl ayhmZCwgb2ZmLCBTRUVLX1NFVCkgPT0gLTEpIHsKKwkJaWYobHNlZWsoZmQsIG9mZitzcXVhc2hm c19zdGFydF9vZmZzZXQsIFNFRUtfU0VUKSA9PSAtMSkgewogCQkJRVJST1IoIndyaXRlcjogTHNl ZWsgb24gZGVzdGluYXRpb24gZmFpbGVkIGJlY2F1c2UgIgotCQkJCSIlcywgb2Zmc2V0PTB4JWxs eFxuIiwgc3RyZXJyb3IoZXJybm8pLCBvZmYpOworCQkJCSIlcywgb2Zmc2V0PTB4JWxseFxuIiwg c3RyZXJyb3IoZXJybm8pLCBvZmYrc3F1YXNoZnNfc3RhcnRfb2Zmc2V0KTsKIAkJCUJBRF9FUlJP UigiUHJvYmFibHkgb3V0IG9mIHNwYWNlIG9uIG91dHB1dCAiCiAJCQkJIiVzXG4iLCBibG9ja19k ZXZpY2UgPyAiYmxvY2sgZGV2aWNlIiA6CiAJCQkJImZpbGVzeXN0ZW0iKTsKQEAgLTUzNDEsNiAr NTM0MiwxNSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQkJZm9yY2VfcHJv Z3Jlc3MgPSBUUlVFOwogCQllbHNlIGlmKHN0cmNtcChhcmd2W2ldLCAiLW5vLWV4cG9ydHMiKSA9 PSAwKQogCQkJZXhwb3J0YWJsZSA9IEZBTFNFOworICAgICAgICBlbHNlIGlmKHN0cmNtcChhcmd2 W2ldLCAiLW9mZnNldCIpID09IDAgfHwKKwkJCQlzdHJjbXAoYXJndltpXSwgIi1vIikgPT0wKSB7 CisJCQlpZigrK2kgPT0gYXJnYykgeworCQkJCUVSUk9SKCIlczogJXMgb2Zmc2V0IG1pc3Npbmcg YXJndW1lbnRcbiIsIGFyZ3ZbMF0sCisJCQkJCQkJYXJndltpIC0gMV0pOworCQkJCWV4aXQoMSk7 CisJCQl9CisJCQlzcXVhc2hmc19zdGFydF9vZmZzZXQgPSAob2ZmX3QpYXRvbChhcmd2W2ldKTsK KyAgICAgICAgfSAgICAgICAgCiAJCWVsc2UgaWYoc3RyY21wKGFyZ3ZbaV0sICItcHJvY2Vzc29y cyIpID09IDApIHsKIAkJCWlmKCgrK2kgPT0gYXJnYykgfHwgIXBhcnNlX251bShhcmd2W2ldLCAm cHJvY2Vzc29ycykpIHsKIAkJCQlFUlJPUigiJXM6IC1wcm9jZXNzb3JzIG1pc3Npbmcgb3IgaW52 YWxpZCAiCkBAIC01NjQxLDYgKzU2NTEsOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJn dltdKQogCQkJRVJST1IoIlxuTWlzY2VsbGFuZW91cyBvcHRpb25zOlxuIik7CiAJCQlFUlJPUigi LXJvb3Qtb3duZWRcdFx0YWx0ZXJuYXRpdmUgbmFtZSBmb3IgLWFsbC1yb290IgogCQkJCSJcbiIp OworCQkJRVJST1IoIi1vIDxvZmZzZXQ+XHRcdFNraXAgPG9mZnNldD4gYnl0ZXMgYXQgdGhlICIK KwkJCQkiYmVnaW5uaW5nIG9mIHRoZSBmaWxlLlxuXHRcdFx0IgorCQkJCSJEZWZhdWx0IDAgYnl0 ZXNcbiIpOyAgICAgICAgICAgIAogCQkJRVJST1IoIi1ub0lub2RlQ29tcHJlc3Npb25cdGFsdGVy bmF0aXZlIG5hbWUgZm9yIC1ub0kiCiAJCQkJIlxuIik7CiAJCQlFUlJPUigiLW5vRGF0YUNvbXBy ZXNzaW9uXHRhbHRlcm5hdGl2ZSBuYW1lIGZvciAtbm9EIgo= --=-KCucLj4CITX6vBVBznV/-- --=-O9O7lFQ/cF/8VIpdtw6w Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEQCVDstmIVAB/Yn02pjpYo/LhdWkFAliN9XcACgkQpjpYo/Lh dWlQBhAAkKGW06Eq33pLAoPyCGjiNpYGfaFJhFvmCnqTfTmceUa1xPapsx1XjIiT OaAEU5pSuN7RVlM+ZbvngDFdZ21XgBYljE8HEjw0Qgs6Bjjad2UVNhvuicvr3oNF BsMUeUsU49XGaeCGA+65SYDCN9CirmJDuapT9Ezy6ZScIsT9eIrdJLKIrM3LYI8L aMJs0B4yR148DU5CSoTVbg3WA7I4vgJ9D6SpVQ5ROAlWq7R7POg+usuo8ic97vwF WDu12tcLwjePFKrSdEtq2z1yasiMs3cLuRF9TW9EtKLAuptUpNvod3S7hqupfTib QUk6VubopGutAMI0qKblo8jJbnxzFc+3qNVnN2cFiV+pgb8Mhn6uhSU9EWGGrHa9 qUqHOfU7w681R4MWeKBU+bviQDIGcLo6rioUMDTnxAwKHtCNgEa0/YcW78+yHtzg NgyDOznFNpczFwMVzMtf+oKqs8JZr8voUuOfcMYu6j9sN0yseKX4EWWIay7tqfcG QoNSUU5l7CWC8CK2NSNqDSdJRvAPDt0vCXdh/fAPWvZDLpxe2dh8WS4buAS7zjQE eeu0hQ8lSKYlpPC6YsXy32Vz9swJYmnG7BGcZkSuspJwQo9uLVGWXtnhwNq9WHuM 0m76oUyWDgRYYVrGwtct5WxTUis9gPIwsOfmGzC00aDmnvVj0Vs= =N3Rg -----END PGP SIGNATURE----- --=-O9O7lFQ/cF/8VIpdtw6w--