16103 2008-06-20 02:21:49 +0400 Patched original tarball packaged in gnutls-2.0.4-alt2.src.rpm 2012-03-16 13:59:13 +0400 1 1 4 Development Sisyphus libgnutls unstable all Linux CLOSED FIXED P2 blocker --- 1 aris nobody ender ldv qa-sisyphus oldest_to_newest 72812 0 aris 2008-06-20 02:21:49 +0400 Поправьте меня, если я пропустил важный этап в развитии технологий сборки пакетов в ALT, но мне кажется такого быть не должно -- вместо оригинальных исходников и патчей, соответствующих changelog'у, в пакете находится патченный тарбол. 72813 1 thresh 2008-06-20 02:26:41 +0400 Это действительно так, тарбол данной версии собирается из git'a http://git.altlinux.org/people/thresh/packages/gnutls.git?p=gnutls.git;a=shortlog;h=refs/heads/master--secfixes Возможно, мне стоит паковать тарбол как gnutls-$version-$release.tar.bz2. 72814 2 2678 aris 2008-06-20 02:28:37 +0400 Created attachment 2678 diff from original tarball and 2.0.4-alt2 72982 3 ldv 2008-06-22 03:39:49 +0400 (In reply to comment #1) > Это действительно так, тарбол данной версии собирается из git'a > http://git.altlinux.org/people/thresh/packages/gnutls.git?p=gnutls.git;a=shortlog;h=refs/heads/master--secfixes > > Возможно, мне стоит паковать тарбол как gnutls-$version-$release.tar.bz2. > Да, либо паковать изменённый тарболл с соответствующим именем: tar: gnutls name=@name@-@version@-@release@ либо паковать ванильный тарболл и diff: tar: v@version@:gnutls diff: v@version@:gnutls gnutls 72986 4 aris 2008-06-22 04:59:28 +0400 > > Да, либо паковать изменённый тарболл с соответствующим именем: > tar: gnutls name=@name@-@version@-@release@ > > либо паковать ванильный тарболл и diff: > tar: v@version@:gnutls > diff: v@version@:gnutls gnutls > Полагаю, второй вариант предпочтительнее. Еще более предпочтительным было бы паковать оригинальный тарболл и набор соответствующих changelog'у диффов. 72987 5 raorn 2008-06-22 09:02:18 +0400 Юр, ты немного поотстал от жизни. При сборке из git паковать совсем-совсем оригинальный тарбол не представляется возможным, если исходники импортированы. Максимум можно паковать "тарбол с нулевым diff", решили что этого достаточно. 82092 6 ender 2008-12-02 15:21:27 +0300 fixed in 2.6.2-alt3 2678 2008-06-20 02:28:37 +0400 2008-06-20 02:29:55 +0400 diff from original tarball and 2.0.4-alt2 gnutls-2.0.4-alt2.diff text/plain 6170 aris ZGlmZiAtZHVyTiBnbnV0bHMtMi4wLjQvbGliL2V4dF9zZXJ2ZXJfbmFtZS5jIGdudXRscy0yLjAu NC1hbHQyL2xpYi9leHRfc2VydmVyX25hbWUuYwotLS0gZ251dGxzLTIuMC40L2xpYi9leHRfc2Vy dmVyX25hbWUuYwkyMDA3LTExLTE1IDE4OjI0OjU2ICswMzAwCisrKyBnbnV0bHMtMi4wLjQtYWx0 Mi9saWIvZXh0X3NlcnZlcl9uYW1lLmMJMjAwOC0wNS0yMSAxODoxODoyNSArMDQwMApAQCAtNzQs MTAgKzc0LDI3IEBACiAJICBsZW4gPSBfZ251dGxzX3JlYWRfdWludDE2IChwKTsKIAkgIHAgKz0g MjsKIAotCSAgREVDUl9MRU5HVEhfUkVUIChkYXRhX3NpemUsIGxlbiwgMCk7Ci0JICBzZXJ2ZXJf bmFtZXMrKzsKKwkgIGlmIChsZW4gPiAwKQorCSAgICB7CisJICAgICAgREVDUl9MRU5HVEhfUkVU IChkYXRhX3NpemUsIGxlbiwgMCk7CisJICAgICAgc2VydmVyX25hbWVzKys7CisJICAgICAgcCAr PSBsZW47CisJICAgIH0KKwkgIGVsc2UKKwkgICAgX2dudXRsc19oYW5kc2hha2VfbG9nCisJICAg ICAgKCJIU0tbJXhdOiBSZWNlaXZlZCB6ZXJvIHNpemUgc2VydmVyIG5hbWUgKHVuZGVyIGF0dGFj az8pXG4iLAorCSAgICAgICBzZXNzaW9uKTsKIAotCSAgcCArPSBsZW47CisJfQorCisgICAgICAv KiB3ZSBjYW5ub3QgYWNjZXB0IG1vcmUgc2VydmVyIG5hbWVzLgorICAgICAgICovCisgICAgICBp ZiAoc2VydmVyX25hbWVzID4gTUFYX1NFUlZFUl9OQU1FX0VYVEVOU0lPTlMpCisJeworCSAgX2du dXRsc19oYW5kc2hha2VfbG9nCisJICAgICgiSFNLWyV4XTogVG9vIG1hbnkgc2VydmVyIG5hbWVz IHJlY2VpdmVkICh1bmRlciBhdHRhY2s/KVxuIiwKKwkgICAgIHNlc3Npb24pOworCSAgc2VydmVy X25hbWVzID0gTUFYX1NFUlZFUl9OQU1FX0VYVEVOU0lPTlM7CiAJfQogCiAgICAgICBzZXNzaW9u LT5zZWN1cml0eV9wYXJhbWV0ZXJzLmV4dGVuc2lvbnMuc2VydmVyX25hbWVzX3NpemUgPQpAQCAt ODUsMTAgKzEwMiw2IEBACiAgICAgICBpZiAoc2VydmVyX25hbWVzID09IDApCiAJcmV0dXJuIDA7 CQkvKiBubyBuYW1lcyBmb3VuZCAqLwogCi0gICAgICAvKiB3ZSBjYW5ub3QgYWNjZXB0IG1vcmUg c2VydmVyIG5hbWVzLgotICAgICAgICovCi0gICAgICBpZiAoc2VydmVyX25hbWVzID4gTUFYX1NF UlZFUl9OQU1FX0VYVEVOU0lPTlMpCi0Jc2VydmVyX25hbWVzID0gTUFYX1NFUlZFUl9OQU1FX0VY VEVOU0lPTlM7CiAKICAgICAgIHAgPSBkYXRhICsgMjsKICAgICAgIGZvciAoaSA9IDA7IGkgPCBz ZXJ2ZXJfbmFtZXM7IGkrKykKZGlmZiAtZHVyTiBnbnV0bHMtMi4wLjQvbGliL2dudXRsc19jaXBo ZXIuYyBnbnV0bHMtMi4wLjQtYWx0Mi9saWIvZ251dGxzX2NpcGhlci5jCi0tLSBnbnV0bHMtMi4w LjQvbGliL2dudXRsc19jaXBoZXIuYwkyMDA3LTExLTE1IDE4OjI0OjU2ICswMzAwCisrKyBnbnV0 bHMtMi4wLjQtYWx0Mi9saWIvZ251dGxzX2NpcGhlci5jCTIwMDgtMDUtMjEgMTg6MTg6MjUgKzA0 MDAKQEAgLTQ0Nyw2ICs0NDcsMTQgQEAKICAgICAgIHJldHVybiBHTlVUTFNfRV9JTlRFUk5BTF9F UlJPUjsKICAgICB9CiAKKyAgaWYgKGNpcGhlcnRleHQuc2l6ZSA8ICh1bnNpZ25lZCkgYmxvY2tz aXplICsgaGFzaF9zaXplKQorICAgIHsKKyAgICAgIF9nbnV0bHNfcmVjb3JkX2xvZworCSgiUkVD WyV4XTogU2hvcnQgcmVjb3JkIGxlbmd0aCAlZCA8ICVkICsgJWQgKHVuZGVyIGF0dGFjaz8pXG4i LAorCSBzZXNzaW9uLCBjaXBoZXJ0ZXh0LnNpemUsIGJsb2Nrc2l6ZSwgaGFzaF9zaXplKTsKKyAg ICAgIGdudXRsc19hc3NlcnQgKCk7CisgICAgICByZXR1cm4gR05VVExTX0VfREVDUllQVElPTl9G QUlMRUQ7CisgICAgfQogCiAgIC8qIGFjdHVhbCBkZWNyeXB0aW9uIChpbnBsYWNlKQogICAgKi8K QEAgLTQ5OCw5ICs1MDYsNyBAQAogCiAgICAgICBwYWQgPSBjaXBoZXJ0ZXh0LmRhdGFbY2lwaGVy dGV4dC5zaXplIC0gMV0gKyAxOwkvKiBwYWQgKi8KIAotICAgICAgbGVuZ3RoID0gY2lwaGVydGV4 dC5zaXplIC0gaGFzaF9zaXplIC0gcGFkOwotCi0gICAgICBpZiAocGFkID4gY2lwaGVydGV4dC5z aXplIC0gaGFzaF9zaXplKQorICAgICAgaWYgKChpbnQpcGFkID4gKGludCljaXBoZXJ0ZXh0LnNp emUgLSBoYXNoX3NpemUpCiAJewogCSAgZ251dGxzX2Fzc2VydCAoKTsKIAkgIC8qIFdlIGRvIG5v dCBmYWlsIGhlcmUuIFdlIGNoZWNrIGJlbG93IGZvciB0aGUKQEAgLTUwOSw2ICs1MTUsOCBAQAog CSAgcGFkX2ZhaWxlZCA9IEdOVVRMU19FX0RFQ1JZUFRJT05fRkFJTEVEOwogCX0KIAorICAgICAg bGVuZ3RoID0gY2lwaGVydGV4dC5zaXplIC0gaGFzaF9zaXplIC0gcGFkOworCiAgICAgICAvKiBD aGVjayB0aGUgcGFkaW5nIGJ5dGVzIChUTFMgMS54KQogICAgICAgICovCiAgICAgICBpZiAodmVy ID49IEdOVVRMU19UTFMxICYmIHBhZF9mYWlsZWQgPT0gMCkKZGlmZiAtZHVyTiBnbnV0bHMtMi4w LjQvbGliL2dudXRsc19oYW5kc2hha2UuYyBnbnV0bHMtMi4wLjQtYWx0Mi9saWIvZ251dGxzX2hh bmRzaGFrZS5jCi0tLSBnbnV0bHMtMi4wLjQvbGliL2dudXRsc19oYW5kc2hha2UuYwkyMDA3LTEx LTE1IDE4OjI0OjU2ICswMzAwCisrKyBnbnV0bHMtMi4wLjQtYWx0Mi9saWIvZ251dGxzX2hhbmRz aGFrZS5jCTIwMDgtMDUtMjEgMTg6MTg6MjUgKzA0MDAKQEAgLTk0Miw2ICs5NDIsMTQgQEAKIAog ICAgICAgKnJlY3ZfdHlwZSA9IHNlc3Npb24tPmludGVybmFscy5oYW5kc2hha2VfaGVhZGVyX2J1 ZmZlci5yZWN2X3R5cGU7CiAKKyAgICAgIGlmICgqcmVjdl90eXBlICE9IHR5cGUpCisJeworCSAg Z251dGxzX2Fzc2VydCAoKTsKKwkgIF9nbnV0bHNfaGFuZHNoYWtlX2xvZworCSAgICAoIkhTS1sl eF06IEhhbmRzaGFrZSB0eXBlIG1pc21hdGNoICh1bmRlciBhdHRhY2s/KVxuIiwgc2Vzc2lvbik7 CisJICByZXR1cm4gR05VVExTX0VfVU5FWFBFQ1RFRF9IQU5EU0hBS0VfUEFDS0VUOworCX0KKwog ICAgICAgcmV0dXJuIHNlc3Npb24tPmludGVybmFscy5oYW5kc2hha2VfaGVhZGVyX2J1ZmZlci5w YWNrZXRfbGVuZ3RoOwogICAgIH0KIApkaWZmIC1kdXJOIGdudXRscy0yLjAuNC9saWIvZ251dGxz LnBjLmluIGdudXRscy0yLjAuNC1hbHQyL2xpYi9nbnV0bHMucGMuaW4KLS0tIGdudXRscy0yLjAu NC9saWIvZ251dGxzLnBjLmluCTIwMDctMTEtMTUgMTg6MjE6NDYgKzAzMDAKKysrIGdudXRscy0y LjAuNC1hbHQyL2xpYi9nbnV0bHMucGMuaW4JMjAwOC0wNS0yMSAxODoxODoyNSArMDQwMApAQCAt MTgsNiArMTgsNyBAQAogTmFtZTogR251VExTCiBEZXNjcmlwdGlvbjogVHJhbnNwb3J0IFNlY3Vy aXR5IExheWVyIGltcGxlbWVudGF0aW9uIGZvciB0aGUgR05VIHN5c3RlbQogVmVyc2lvbjogQFZF UlNJT05ACitSZXF1aXJlczogbGlidGFzbjEKIExpYnM6IC1MJHtsaWJkaXJ9IC1sZ251dGxzCi1M aWJzLnByaXZhdGU6IEBMSUJHTlVUTFNfTElCU0AgCitMaWJzLnByaXZhdGU6IEBMSUJHTlVUTFNf TElCU0AKIENmbGFnczogLUkke2luY2x1ZGVkaXJ9CmRpZmYgLWR1ck4gZ251dGxzLTIuMC40L2xp Yi9nbnV0bHN4eC5jcHAgZ251dGxzLTIuMC40LWFsdDIvbGliL2dudXRsc3h4LmNwcAotLS0gZ251 dGxzLTIuMC40L2xpYi9nbnV0bHN4eC5jcHAJMjAwNy0xMS0xNSAxODoyNDo1NiArMDMwMAorKysg Z251dGxzLTIuMC40LWFsdDIvbGliL2dudXRsc3h4LmNwcAkyMDA4LTA1LTIxIDE4OjE4OjI1ICsw NDAwCkBAIC04MjksNyArODI5LDkgQEAKIGNyZWRlbnRpYWxzOjpjcmVkZW50aWFscyggY3JlZGVu dGlhbHMmIGMpCiB7CiAgICAgdGhpcy0+dHlwZSA9IGMudHlwZTsKLSAgICB0aGlzLT5zZXRfcHRy KCBjLnB0cigpKTsKKyAgICAvLyBGSVhNRTogVGhlIGZvbGxvd2luZyBkb2Vzbid0IHdvcmssIGJl Y2F1c2Ugc2V0X3B0ciBpcyB2aXJ0dWFsLgorICAgIC8vIFdoYXQgd2FzIHRoZSBpbnRlbnRpb24/ CisgICAgLy8gdGhpcy0+c2V0X3B0ciggYy5wdHIoKSk7CiB9CiAjZW5kaWYKIApkaWZmIC1kdXJO IGdudXRscy0yLjAuNC9saWIvbGliZ251dGxzLnZlcnMgZ251dGxzLTIuMC40LWFsdDIvbGliL2xp YmdudXRscy52ZXJzCi0tLSBnbnV0bHMtMi4wLjQvbGliL2xpYmdudXRscy52ZXJzCTIwMDctMTEt MTUgMTg6MjQ6NTYgKzAzMDAKKysrIGdudXRscy0yLjAuNC1hbHQyL2xpYi9saWJnbnV0bHMudmVy cwkyMDA4LTA2LTIwIDAxOjIyOjUwICswNDAwCkBAIC0xLDcgKzEsOCBAQAogIyBsaWJnbnV0bHMu dmVycyAtLSBWZXJzaW9uaW5nIHNjcmlwdCB0byBjb250cm9sIHdoYXQgc3ltYm9scyB0byBleHBv cnQuCi0jIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNiwgMjAwNyBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb24KKyMgQ29weXJpZ2h0IChDKSAyMDA1IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbgogIwog IyBBdXRob3I6IFNpbW9uIEpvc2Vmc3NvbgorIyBQYXRjaGVkIGJ5OiBQYXZsb3YgS29uc3RhbnRp bgogIwogIyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlVUTFMuCiAjCkBAIC0yMiw2ICsyMyw2MCBA QAogCiBHTlVUTFNfMV8zCiB7Ci0gIGdsb2JhbDogX2dudXRscyo7IGdudXRscyo7Ci0gIGxvY2Fs OiAqOworICBnbG9iYWw6IF9nbnV0bHMqOyBnbnV0bHMqOyBfRV8qOworfTsKKworR05VVExTXzFf Nl8xIHsKKyAgICBnbG9iYWw6CisgICAgICAgIGdudXRsc190cmFuc3BvcnRfc2V0X2Vycm5vOwor ICAgICAgICBnbnV0bHNfdHJhbnNwb3J0X3NldF9nbG9iYWxfZXJybm87Cit9OworCitHTlVUTFNf MV82XzMgeworCWdsb2JhbDoKKwkJZ251dGxzX3g1MDlfY3J0X2dldF9yYXdfZG47CisJCWdudXRs c194NTA5X2NydF9nZXRfcmF3X2lzc3Vlcl9kbjsKK307CisKK0dOVVRMU18yLjAuMCB7CisgICAg Z2xvYmFsOgorICAgICAgICBnbnV0bHNfYXV0aHpfZW5hYmxlOworICAgICAgICBnbnV0bHNfYXV0 aHpfc2VuZF9zYW1sX2Fzc2VydGlvbjsKKyAgICAgICAgZ251dGxzX2F1dGh6X3NlbmRfc2FtbF9h c3NlcnRpb25fdXJsOworICAgICAgICBnbnV0bHNfYXV0aHpfc2VuZF94NTA5X2F0dHJfY2VydDsK KyAgICAgICAgZ251dGxzX2F1dGh6X3NlbmRfeDUwOV9hdHRyX2NlcnRfdXJsOworICAgICAgICBn bnV0bHNfY2VydGlmaWNhdGVfdHlwZV9saXN0OworICAgICAgICBnbnV0bHNfY2lwaGVyX2xpc3Q7 CisgICAgICAgIGdudXRsc19jaXBoZXJfc3VpdGVfaW5mbzsKKyAgICAgICAgZ251dGxzX2NvbXBy ZXNzaW9uX2xpc3Q7CisgICAgICAgIGdudXRsc19reF9saXN0OworICAgICAgICBnbnV0bHNfbWFj X2xpc3Q7CisgICAgICAgIGdudXRsc19wcm90b2NvbF9saXN0OworICAgICAgICBnbnV0bHNfc2ln bl9jYWxsYmFja19nZXQ7CisgICAgICAgIGdudXRsc19zaWduX2NhbGxiYWNrX3NldDsKKyAgICAg ICAgZ251dGxzX3N1cHBsZW1lbnRhbF9nZXRfbmFtZTsKKyAgICAgICAgZ251dGxzX3g1MDlfY3Js X2dldF9zaWduYXR1cmU7CisgICAgICAgIGdudXRsc194NTA5X2NybF9wcmludDsKKyAgICAgICAg Z251dGxzX3g1MDlfY3J0X2dldF9iYXNpY19jb25zdHJhaW50czsKKyAgICAgICAgZ251dGxzX3g1 MDlfY3J0X2dldF9leHRlbnNpb25fZGF0YTsKKyAgICAgICAgZ251dGxzX3g1MDlfY3J0X2dldF9l eHRlbnNpb25faW5mbzsKKyAgICAgICAgZ251dGxzX3g1MDlfY3J0X2dldF9pc3N1ZXI7CisgICAg ICAgIGdudXRsc194NTA5X2NydF9nZXRfcHJveHk7CisgICAgICAgIGdudXRsc194NTA5X2NydF9n ZXRfc2lnbmF0dXJlOworICAgICAgICBnbnV0bHNfeDUwOV9jcnRfZ2V0X3N1YmplY3Q7CisgICAg ICAgIGdudXRsc194NTA5X2NydF9nZXRfc3ViamVjdF9hbHRfb3RoZXJuYW1lX29pZDsKKyAgICAg ICAgZ251dGxzX3g1MDlfY3J0X3ByaW50OworICAgICAgICBnbnV0bHNfeDUwOV9jcnRfc2V0X2Jh c2ljX2NvbnN0cmFpbnRzOworICAgICAgICBnbnV0bHNfeDUwOV9jcnRfc2V0X3Byb3h5OworICAg ICAgICBnbnV0bHNfeDUwOV9jcnRfc2V0X3Byb3h5X2RuOworICAgICAgICBnbnV0bHNfeDUwOV9k bl9nZXRfcmRuX2F2YTsKKyAgICAgICAgZ251dGxzX3g1MDlfcHJpdmtleV9zaWduX2hhc2g7Cit9 OworCitHTlVUTFNfMi4wLjQgeworCWdsb2JhbDoKKwkJZ251dGxzX3JlY29yZF9kaXNhYmxlX3Bh ZGRpbmc7CisJCWdudXRsc19zZXNzaW9uX2VuYWJsZV9jb21wYXRpYmlsaXR5X21vZGU7CisJbG9j YWw6CisJCSo7CiB9Owo=