Bug#1117999: dpkg-buildflags: enable ELF package note metadata

--=-QEiebzZFA4DnzzMvajMX
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

here is a refreshed patch against the dpkg main branch.

--=20
Benjamin Drung
Debian & Ubuntu Developer

--=-QEiebzZFA4DnzzMvajMX
Content-Disposition: attachment;
	filename="0001-dpkg-buildflags-enable-ELF-package-note-metadata.patch"
Content-Type: text/x-patch;
	name="0001-dpkg-buildflags-enable-ELF-package-note-metadata.patch";
	charset="ISO-8859-1"
Content-Transfer-Encoding: base64

RnJvbSBmN2I3NGU4YzNjNThlODY1MTk3ZTM1OTNjMDQ2YjBlNWU4Y2EzN2JiIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5qYW1pbiBEcnVuZyA8YmVuamFtaW4uZHJ1bmdAY2Fub25p
Y2FsLmNvbT4KRGF0ZTogV2VkLCAxIEp1bCAyMDI2IDEyOjExOjIwICswMjAwClN1YmplY3Q6IFtQ
QVRDSF0gZHBrZy1idWlsZGZsYWdzOiBlbmFibGUgRUxGIHBhY2thZ2Ugbm90ZSBtZXRhZGF0YQoK
Rm9sbG93aW5nIHRoZSBodHRwczovL3N5c3RlbWQuaW8vRUxGX1BBQ0tBR0VfTUVUQURBVEEvIGFk
ZCBhIG5ldyBxYQpmbGFnLCBlbmFibGUgYnkgZGVmYXVsdCwgdGhhdCBhZGRzIHRoaXMgcGFja2Fn
ZSBtZXRhZGF0YSBFTEYgbm90ZSB0bwpldmVyeSBiaW5hcnkgYmVpbmcgYnVpbHQsIHRvIGVhc2Ug
aWRlbnRpZmljYXRpb24sIGVzcGVjaWFsbHkgaW4gdGhlCmNhc2Ugb2YgYSBjb3JlZHVtcC4KClNp
bmNlIHRoZSBFTEYgcGFja2FnZSBub3RlIG1ldGFkYXRhIGNoYW5nZXMgdGhlIGJ1aWxkIElELCBp
bmNsdWRlIG9ubHkKInN0YXRpYyIgZGF0YSBhbmQgZXhjbHVkZSB0aGUgcGFja2FnZSB2ZXJzaW9u
IChhcyBhZ3JlZWQgYXQgRGViQ29uZiAyNSkuCgpDbG9zZXM6ICMxMTE3OTk5CkxQOiAjMjA3MTQ2
OAotLS0KIG1hbi9kcGtnLWJ1aWxkZmxhZ3MucG9kICAgICAgIHwgMTEgKysrKysrCiBzY3JpcHRz
L0Rwa2cvVmVuZG9yL0RlYmlhbi5wbSB8IDY0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrCiBzY3JpcHRzL3QvRHBrZ19CdWlsZEZsYWdzLnQgICB8IDEyICsrKysrKy0KIHNjcmlw
dHMvdC9tay50ICAgICAgICAgICAgICAgIHwgIDQgKystCiA0IGZpbGVzIGNoYW5nZWQsIDg5IGlu
c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWFuL2Rwa2ctYnVpbGRm
bGFncy5wb2QgYi9tYW4vZHBrZy1idWlsZGZsYWdzLnBvZAppbmRleCBhN2U5MzZmOGQuLjNlOGMy
ZDZhZiAxMDA2NDQKLS0tIGEvbWFuL2Rwa2ctYnVpbGRmbGFncy5wb2QKKysrIGIvbWFuL2Rwa2ct
YnVpbGRmbGFncy5wb2QKQEAgLTYxMSw2ICs2MTEsMTcgQEAgRGlzYWJsZWQgYnkgZGVmYXVsdC4K
IAogU3VwcG9ydGVkIHNpbmNlIGRwa2cgMS4xNy4xNC4KIAorPWl0ZW0gQjxlbGZwYWNrYWdlbWV0
YWRhdGE+CisKK1RoaXMgc2V0dGluZyBhZGRzIGFuIEVMRiBub3RlIGNvbnRhaW5pbmcgcGFja2Fn
ZSBtZXRhZGF0YSB0byBldmVyeSBFTEYgYmluYXJ5CitiZWluZyBidWlsdC4gSWYgdGhlICRERUJf
QlVJTERfREVCVUdfSU5GT19VUkwgZW52aXJvbm1lbnQgdmFyaWFibGUgaXMgZGVmaW5lZCwKK2l0
IHdpbGwgYmUgdXNlZCB0byBpbmNsdWRlIHRoZSB2YWx1ZSBhcyBhIGRlYnVnaW5mb2QgVVJMLiBU
aGlzIGZvbGxvd3MgdGhlCitzcGVjaWZpY2F0aW9uIGRlZmluZWQgYXQ6IGh0dHBzOi8vc3lzdGVt
ZC5pby9FTEZfUEFDS0FHRV9NRVRBREFUQS8KKworRW5hYmxlZCBieSBkZWZhdWx0LgorCitTdXBw
b3J0ZWQgc2luY2UgZHBrZyAxLjIyLjIwLgorCiA9YmFjawogCiA9aGVhZDIgb3B0aW1pemUKZGlm
ZiAtLWdpdCBhL3NjcmlwdHMvRHBrZy9WZW5kb3IvRGViaWFuLnBtIGIvc2NyaXB0cy9EcGtnL1Zl
bmRvci9EZWJpYW4ucG0KaW5kZXggMDI4ZWQyNzJhLi5hMTY5N2U3ZGMgMTAwNjQ0Ci0tLSBhL3Nj
cmlwdHMvRHBrZy9WZW5kb3IvRGViaWFuLnBtCisrKyBiL3NjcmlwdHMvRHBrZy9WZW5kb3IvRGVi
aWFuLnBtCkBAIC0xMzYsNiArMTM2LDcgQEAgc3ViIHNldF9idWlsZF9mZWF0dXJlcyB7CiAgICAg
ICAgICAgICBidWcgPT4gdW5kZWYsCiAgICAgICAgICAgICAnYnVnLWltcGxpY2l0LWZ1bmMnID0+
IHVuZGVmLAogICAgICAgICAgICAgY2FuYXJ5ID0+IDAsCisgICAgICAgICAgICBlbGZwYWNrYWdl
bWV0YWRhdGEgPT4gMSwKICAgICAgICAgfSwKICAgICAgICAgcmVwcm9kdWNpYmxlID0+IHsKICAg
ICAgICAgICAgIHRpbWVsZXNzID0+IDEsCkBAIC01MTYsNiArNTE3LDEwIEBAIHN1YiBhZGRfYnVp
bGRfZmxhZ3MgewogICAgICAgICAkZmxhZ3MtPmFwcGVuZCgnTERGTEFHUycsICItV2wsLXosZGVi
LWNhbmFyeS0ke2lkfSIpOwogICAgIH0KIAorICAgIGlmICgkZmxhZ3MtPnVzZV9mZWF0dXJlKCdx
YScsICdlbGZwYWNrYWdlbWV0YWRhdGEnKSkgeworICAgICAgICBhZGRfZWxmX3BhY2thZ2VfbWV0
YWRhdGEoJGZsYWdzKTsKKyAgICB9CisKICAgICAjIyBBcmVhOiByZXByb2R1Y2libGUKIAogICAg
ICMgV2FybiB3aGVuIHRoZSBfX1RJTUVfXywgX19EQVRFX18gYW5kIF9fVElNRVNUQU1QX18gbWFj
cm9zIGFyZSB1c2VkLgpAQCAtNjgwLDYgKzY4NSw2NSBAQCBzdWIgYWRkX2J1aWxkX2ZsYWdzIHsK
ICAgICB9CiB9CiAKK3N1YiBhZGRfZWxmX3BhY2thZ2VfbWV0YWRhdGEgeworICAgIG15ICgkZmxh
Z3MpID0gQF87CisgICAgbXkgJGFyY2g7CisgICAgbXkgJHBrZ3NyYzsKKworICAgIGlmICghZGVm
aW5lZCAkRU5We0RFQl9IT1NUX0FSQ0h9KSB7CisgICAgICAgIHJlcXVpcmUgRHBrZzo6QXJjaDsK
KyAgICAgICAgJGFyY2ggPSBEcGtnOjpBcmNoOjpnZXRfaG9zdF9hcmNoKCk7CisgICAgfSBlbHNl
IHsKKyAgICAgICAgJGFyY2ggPSAkRU5We0RFQl9IT1NUX0FSQ0h9OworICAgIH0KKworICAgIGlm
ICghZGVmaW5lZCAkRU5We0RFQl9TT1VSQ0V9KSB7CisgICAgICAgIGlmICghIC1yICdkZWJpYW4v
Y2hhbmdlbG9nJykgeworICAgICAgICAgICAgd2FybmluZyhnXygnZGViaWFuL2NoYW5nZWxvZyBu
b3QgZm91bmQuIE5vdCBzZXR0aW5nIEVMRiBwYWNrYWdlIG1ldGFkYXRhIHBhcmFtZXRlci4nKSk7
CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICByZXF1aXJlIERwa2c6
OkNoYW5nZWxvZzo6RGViaWFuOworICAgICAgICBteSAkcGtnY2hhbmdlbG9nID0gRHBrZzo6Q2hh
bmdlbG9nOjpEZWJpYW4tPm5ldyhyYW5nZSA9PiB7ICJjb3VudCIgPT4gMSB9KTsKKyAgICAgICAg
JHBrZ2NoYW5nZWxvZy0+bG9hZCgnZGViaWFuL2NoYW5nZWxvZycpOworICAgICAgICBteSAkY2hn
ZW50cnkgPSBAeyRwa2djaGFuZ2Vsb2d9WzBdOworICAgICAgICAkcGtnc3JjID0gJGNoZ2VudHJ5
LT5nZXRfc291cmNlKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHBrZ3NyYyA9ICRFTlZ7REVC
X1NPVVJDRX07CisgICAgfQorCisgICAgaWYgKCEgLWYgJy91c3IvbGliL29zLXJlbGVhc2UnKSB7
CisgICAgICAgIHdhcm5pbmcoZ18oJy91c3IvbGliL29zLXJlbGVhc2Ugbm90IGZvdW5kLiBOb3Qg
c2V0dGluZyBFTEYgcGFja2FnZSBtZXRhZGF0YSBwYXJhbWV0ZXIuJykpOworICAgICAgICByZXR1
cm47CisgICAgfQorICAgIG15ICRvc19pZCA9ICcnOworICAgIG9wZW4gbXkgJG9zX3JlbGVhc2Us
ICc8JywgJy91c3IvbGliL29zLXJlbGVhc2UnCisgICAgICAgIG9yIHN5c2VycihnXygnZmFpbGVk
IHRvIHJlYWQgL3Vzci9saWIvb3MtcmVsZWFzZScpKTsKKyAgICB3aGlsZSAoPCRvc19yZWxlYXNl
PikgeworICAgICAgICBjaG9tcDsKKyAgICAgICAgIyBFbnN1cmUgYW55IHF1b3RlcyBhcmUgcmVt
b3ZlZCwgYXMgd2UgZG9uJ3Qgd2FudCB0byBlbWJlZCB0aGVtIGluIEpTT04KKyAgICAgICAgaWYg
KG0vXklEPSguKikvKSB7CisgICAgICAgICAgICAkb3NfaWQgPSAkMTsKKyAgICAgICAgICAgICRv
c19pZCA9fiB0ci8iLy9kOworICAgICAgICB9CisgICAgfQorICAgIGNsb3NlICRvc19yZWxlYXNl
IG9yIHN5c2VycihnXygnZmFpbGVkIHRvIGNsb3NlIC91c3IvbGliL29zLXJlbGVhc2UnKSk7Cisg
ICAgaWYgKCRvc19pZCBlcSAnJykgeworICAgICAgICB3YXJuaW5nKGdfKCcvdXNyL2xpYi9vcy1y
ZWxlYXNlIGRvZXMgbm90IHNldCBJRC4gTm90IHNldHRpbmcgRUxGIHBhY2thZ2UgbWV0YWRhdGEg
cGFyYW1ldGVyLicpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgICMgUGVyIGh0dHBz
Oi8vc3lzdGVtZC5pby9FTEZfUEFDS0FHRV9NRVRBREFUQS8KKyAgICBteSAkcGFja2FnZV9tZXRh
ZGF0YSA9ICJ7JTIydHlwZSUyMjolMjJkZWIlMjIlMkMlMjJvcyUyMjolMjIkb3NfaWQlMjIlMkMl
MjJuYW1lJTIyOiUyMiRwa2dzcmMlMjIlMkMlMjJhcmNoaXRlY3R1cmUlMjI6JTIyJGFyY2glMjIi
OworICAgICMgVGhlIGRlYnVnaW5mb2QgVVJMIGlzIG9wdGlvbmFsLCBza2lwIGl0IGlmIG5vdCBh
dmFpbGFibGUuCisgICAgaWYgKCRFTlZ7REVCX0JVSUxEX0RFQlVHX0lORk9fVVJMfSkgeworICAg
ICAgICAkcGFja2FnZV9tZXRhZGF0YSAuPSAiJTJDJTIyZGVidWdJbmZvVXJsJTIyOiUyMiRFTlZ7
REVCX0JVSUxEX0RFQlVHX0lORk9fVVJMfSUyMiI7CisgICAgfQorICAgICRwYWNrYWdlX21ldGFk
YXRhIC49ICJ9IjsKKyAgICAkZmxhZ3MtPmFwcGVuZCgnTERGTEFHUycsICItV2wsLS1wYWNrYWdl
LW1ldGFkYXRhPSRwYWNrYWdlX21ldGFkYXRhIik7CisgICAgcmV0dXJuOworfQorCiBzdWIgX2J1
aWxkX3RhaW50ZWRfYnkgewogICAgIG15ICRzZWxmID0gc2hpZnQ7CiAgICAgbXkgJXRhaW50ZWQ7
CmRpZmYgLS1naXQgYS9zY3JpcHRzL3QvRHBrZ19CdWlsZEZsYWdzLnQgYi9zY3JpcHRzL3QvRHBr
Z19CdWlsZEZsYWdzLnQKaW5kZXggMDExYTUwNzE3Li4wN2Q4YTE1ZDIgMTAwNjQ0Ci0tLSBhL3Nj
cmlwdHMvdC9EcGtnX0J1aWxkRmxhZ3MudAorKysgYi9zY3JpcHRzL3QvRHBrZ19CdWlsZEZsYWdz
LnQKQEAgLTE1LDcgKzE1LDcgQEAKIAogdXNlIHY1LjM2OwogCi11c2UgVGVzdDo6TW9yZSB0ZXN0
cyA9PiAxMTg7Cit1c2UgVGVzdDo6TW9yZSB0ZXN0cyA9PiAxMTk7CiAKIEJFR0lOIHsKICAgICAk
RU5We0RFQl9CVUlMRF9BUkNIfSA9ICdhbWQ2NCc7CkBAIC0xMjEsNiArMTIxLDcgQEAgbXkgJWtu
b3duX2ZlYXR1cmVzID0gKAogICAgICAgICBidWcKICAgICAgICAgYnVnLWltcGxpY2l0LWZ1bmMK
ICAgICAgICAgY2FuYXJ5CisgICAgICAgIGVsZnBhY2thZ2VtZXRhZGF0YQogICAgICkgXSwKICAg
ICByZXByb2R1Y2libGUgPT4gWyBxdygKICAgICAgICAgZml4ZGVidWdwYXRoCkBAIC0zMTYsNCAr
MzE3LDEzIEBAIHRlc3RfaGFzX25vZmxhZygkYmYsICdDUFBGTEFHUycsICctRF9USU1FX0JJVFM9
NjQnKTsKIHRlc3RfaGFzX25vZmxhZygkYmYsICdDUFBGTEFHUycsICctVV9USU1FX0JJVFMnKTsK
IHRlc3RfaGFzX2ZsYWcoJGJmLCAnQ0ZMQUdTJywgJy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24t
ZGVjbGFyYXRpb24nKTsKIAorIyBFTEYgcGFja2FnZSBtZXRhZGF0YQorJGJmID0gRHBrZzo6QnVp
bGRGbGFncy0+bmV3KCk7CitteSAlcWFfZmVhdHVyZXMgPSAkYmYtPmdldF9mZWF0dXJlcygncWEn
KTsKK2lmICgkcWFfZmVhdHVyZXN7J2VsZnBhY2thZ2VtZXRhZGF0YSd9ICYmIC1yICdkZWJpYW4v
Y2hhbmdlbG9nJykgeworICAgIHRlc3RfaGFzX2ZsYWcoJGJmLCAnTERGTEFHUycsICctV2wsLS1w
YWNrYWdlLW1ldGFkYXRhPVx7KicpOworfSBlbHNlIHsKKyAgICB0ZXN0X2hhc19ub2ZsYWcoJGJm
LCAnTERGTEFHUycsICctV2wsLS1wYWNrYWdlLW1ldGFkYXRhKicpOworfQorCiAjIFRPRE86IEFk
ZCBtb3JlIHRlc3QgY2FzZXMuCmRpZmYgLS1naXQgYS9zY3JpcHRzL3QvbWsudCBiL3NjcmlwdHMv
dC9tay50CmluZGV4IDgxMWI3YmU3ZS4uZDc3YTVhZGJhIDEwMDY0NAotLS0gYS9zY3JpcHRzL3Qv
bWsudAorKysgYi9zY3JpcHRzL3QvbWsudApAQCAtMjYsNyArMjYsNyBAQCB1c2UgRHBrZzo6SVBD
OwogdXNlIERwa2c6OlZlbmRvcjsKIAogbXkgJHNyY2RpciA9IHJlbDJhYnMoJEVOVntzcmNkaXJ9
IHx8ICcuJyk7Ci1teSAkZGF0YWRpciA9IHRlc3RfZ2V0X2RhdGFfcGF0aCgpOworbXkgJGRhdGFk
aXIgPSByZWwyYWJzKHRlc3RfZ2V0X2RhdGFfcGF0aCgpKTsKIAogIyBUdXJuIHRoZXNlIGludG8g
YWJzb2x1dGUgbmFtZXMgc28gdGhhdCB3ZSBjYW4gc2FmZWx5IHN3aXRjaCB0byB0aGUgdGVzdAog
IyBkaXJlY3Rvcnkgd2l0aCDCq21ha2UgLUPCuy4KQEAgLTc0LDYgKzc0LDggQEAgc3ViIGNtZF9n
ZXRfdmFycyB7CiAKICMgVGVzdCBtYWtlZmlsZXMuCiAKK2NoZGlyKCRFTlZ7REVCX0JVSUxEX1BB
VEh9KTsKKwogbXkgJWFyY2ggPSBjbWRfZ2V0X3ZhcnMoJEVOVntQRVJMfSwgIiRzcmNkaXIvZHBr
Zy1hcmNoaXRlY3R1cmUucGwiLCAnLWYnKTsKIAogd2hpbGUgKG15ICgkaywgJHYpID0gZWFjaCAl
YXJjaCkgewotLSAKMi41My4wCgo=


--=-QEiebzZFA4DnzzMvajMX--