This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=25f1d74d6d7ec6413962a7adbae81fe8688f67d0 commit 25f1d74d6d7ec6413962a7adbae81fe8688f67d0 Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue Dec 21 23:22:39 2021 +0100 scripts: Expand long word list into one entry per line This makes extending these lists, which is a relatively common thing to expect, easy to review on diffs. It also makes it easier to sort the entries in alphabetical order if required. --- scripts/Dpkg/Build/Info.pm | 88 ++++++-- scripts/Dpkg/Changelog.pm | 8 +- scripts/Dpkg/Control/FieldsCore.pm | 339 ++++++++++++++++++++++++++----- scripts/Dpkg/Shlibs/Symbol.pm | 5 +- scripts/t/Dpkg_Control_Fields.t | 398 ++++++++++++++++++++++++++++++------- 5 files changed, 700 insertions(+), 138 deletions(-) diff --git a/scripts/Dpkg/Build/Info.pm b/scripts/Dpkg/Build/Info.pm index e0f26f9ed..78915343c 100644 --- a/scripts/Dpkg/Build/Info.pm +++ b/scripts/Dpkg/Build/Info.pm @@ -50,32 +50,92 @@ the build, but are still not privacy revealing. my @env_allowed = ( # Toolchain. - qw(CC CPP CXX OBJC OBJCXX PC FC M2C AS LD AR RANLIB MAKE AWK LEX YACC), + qw( + CC + CPP + CXX + OBJC + OBJCXX + PC + FC + M2C + AS + LD + AR + RANLIB + MAKE + AWK + LEX + YACC + ), # Toolchain flags. - qw(ASFLAGS CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS DFLAGS - FFLAGS LDFLAGS ARFLAGS MAKEFLAGS), + qw( + ASFLAGS + CFLAGS + CPPFLAGS + CXXFLAGS + OBJCFLAGS + OBJCXXFLAGS + GCJFLAGS + DFLAGS + FFLAGS + LDFLAGS + ARFLAGS + MAKEFLAGS + ), # Dynamic linker, see ld(1). - qw(LD_LIBRARY_PATH), + qw( + LD_LIBRARY_PATH + ), # Locale, see locale(1). - qw(LANG LC_ALL LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY - LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT - LC_IDENTIFICATION), + qw( + LANG + LC_ALL + LC_CTYPE + LC_NUMERIC + LC_TIME + LC_COLLATE + LC_MONETARY + LC_MESSAGES + LC_PAPER + LC_NAME + LC_ADDRESS + LC_TELEPHONE + LC_MEASUREMENT + LC_IDENTIFICATION + ), # Build flags, see dpkg-buildpackage(1). - qw(DEB_BUILD_OPTIONS DEB_BUILD_PROFILES), + qw( + DEB_BUILD_OPTIONS + DEB_BUILD_PROFILES + ), # DEB_flag_{SET,STRIP,APPEND,PREPEND} will be recorded after being merged # with system config and user config. # See deb-vendor(1). - qw(DEB_VENDOR), + qw( + DEB_VENDOR + ), # See dpkg(1). - qw(DPKG_ROOT DPKG_ADMINDIR), + qw( + DPKG_ROOT + DPKG_ADMINDIR + ), # See dpkg-architecture(1). - qw(DPKG_DATADIR), + qw( + DPKG_DATADIR + ), # See Dpkg::Vendor(3). - qw(DPKG_ORIGINS_DIR), + qw( + DPKG_ORIGINS_DIR + ), # See dpkg-gensymbols(1). - qw(DPKG_GENSYMBOLS_CHECK_LEVEL), + qw( + DPKG_GENSYMBOLS_CHECK_LEVEL + ), # See <https://reproducible-builds.org/specs/source-date-epoch>. - qw(SOURCE_DATE_EPOCH), + qw( + SOURCE_DATE_EPOCH + ), ); sub get_build_env_allowed { diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm index 04fa511ec..ebc50e211 100644 --- a/scripts/Dpkg/Changelog.pm +++ b/scripts/Dpkg/Changelog.pm @@ -490,7 +490,13 @@ Save the changelog in the given file. our ( @URGENCIES, %URGENCIES ); BEGIN { - @URGENCIES = qw(low medium high critical emergency); + @URGENCIES = qw( + low + medium + high + critical + emergency + ); my $i = 1; %URGENCIES = map { $_ => $i++ } @URGENCIES; } diff --git a/scripts/Dpkg/Control/FieldsCore.pm b/scripts/Dpkg/Control/FieldsCore.pm index a6d73dfdd..e6aab7bf2 100644 --- a/scripts/Dpkg/Control/FieldsCore.pm +++ b/scripts/Dpkg/Control/FieldsCore.pm @@ -603,84 +603,323 @@ our %FIELDS = ( }, ); -my @src_dep_fields = qw(build-depends build-depends-arch build-depends-indep - build-conflicts build-conflicts-arch build-conflicts-indep); -my @bin_dep_fields = qw(pre-depends depends recommends suggests enhances - conflicts breaks replaces provides built-using); -my @src_checksums_fields = qw(checksums-md5 checksums-sha1 checksums-sha256); -my @bin_checksums_fields = qw(md5sum sha1 sha256); +my @src_dep_fields = qw( + build-depends + build-depends-arch + build-depends-indep + build-conflicts + build-conflicts-arch + build-conflicts-indep +); +my @bin_dep_fields = qw( + pre-depends + depends + recommends + suggests + enhances + conflicts + breaks + replaces + provides + built-using +); +my @src_checksums_fields = qw( + checksums-md5 + checksums-sha1 + checksums-sha256 +); +my @bin_checksums_fields = qw( + md5sum + sha1 + sha256 +); our %FIELD_ORDER = ( CTRL_PKG_SRC() => [ - qw(format source binary architecture version origin maintainer - uploaders homepage description standards-version vcs-browser - vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn - vcs-svn testsuite testsuite-triggers), @src_dep_fields, - qw(package-list), @src_checksums_fields, qw(files) + qw( + format + source + binary + architecture + version + origin + maintainer + uploaders + homepage + description + standards-version + vcs-browser + vcs-arch + vcs-bzr + vcs-cvs + vcs-darcs + vcs-git + vcs-hg + vcs-mtn + vcs-svn + testsuite + testsuite-triggers + ), + @src_dep_fields, + qw( + package-list + ), + @src_checksums_fields, + qw( + files + ), ], CTRL_PKG_DEB() => [ - qw(package package-type source version built-using kernel-version - built-for-profiles auto-built-package architecture subarchitecture - installer-menu-item build-essential essential protected origin bugs - maintainer installed-size), @bin_dep_fields, - qw(section priority multi-arch homepage description tag task) + qw( + package + package-type + source + version + built-using + kernel-version + built-for-profiles + auto-built-package + architecture + subarchitecture + installer-menu-item + build-essential + essential + protected + origin + bugs + maintainer + installed-size + ), + @bin_dep_fields, + qw( + section + priority + multi-arch + homepage + description + tag + task + ), ], CTRL_INDEX_SRC() => [ - qw(format package binary architecture version priority section origin - maintainer uploaders homepage description standards-version vcs-browser - vcs-arch vcs-bzr vcs-cvs vcs-darcs vcs-git vcs-hg vcs-mtn vcs-svn - testsuite testsuite-triggers), @src_dep_fields, - qw(package-list directory), @src_checksums_fields, qw(files) + qw( + format + package + binary + architecture + version + priority + section + origin + maintainer + uploaders + homepage + description + standards-version + vcs-browser + vcs-arch + vcs-bzr + vcs-cvs + vcs-darcs + vcs-git + vcs-hg + vcs-mtn + vcs-svn + testsuite + testsuite-triggers + ), + @src_dep_fields, + qw( + package-list + directory + ), + @src_checksums_fields, + qw( + files + ), ], CTRL_INDEX_PKG() => [ - qw(package package-type source version built-using kernel-version - built-for-profiles auto-built-package architecture subarchitecture - installer-menu-item build-essential essential protected origin bugs - maintainer installed-size), @bin_dep_fields, - qw(filename size), @bin_checksums_fields, - qw(section priority multi-arch homepage description tag task) + qw( + package + package-type + source + version + built-using + kernel-version + built-for-profiles + auto-built-package + architecture + subarchitecture + installer-menu-item + build-essential + essential + protected + origin + bugs + maintainer + installed-size + ), + @bin_dep_fields, + qw( + filename + size + ), + @bin_checksums_fields, + qw( + section + priority + multi-arch + homepage + description + tag + task + ), ], CTRL_REPO_RELEASE() => [ - qw(origin label suite codename changelogs date valid-until - architectures components description), @bin_checksums_fields + qw( + origin + label + suite + codename + changelogs + date + valid-until + architectures + components + description + ), + @bin_checksums_fields ], CTRL_CHANGELOG() => [ - qw(source binary-only version distribution urgency maintainer - timestamp date closes changes) + qw( + source + binary-only + version + distribution + urgency + maintainer + timestamp + date + closes + changes + ), ], CTRL_COPYRIGHT_HEADER() => [ - qw(format upstream-name upstream-contact source disclaimer comment - license copyright) + qw( + format + upstream-name + upstream-contact + source + disclaimer + comment + license + copyright + ), ], CTRL_COPYRIGHT_FILES() => [ - qw(files copyright license comment) + qw( + files + copyright + license + comment + ), ], CTRL_COPYRIGHT_LICENSE() => [ - qw(license comment) + qw( + license + comment + ), ], CTRL_FILE_BUILDINFO() => [ - qw(format source binary architecture version binary-only-changes), + qw( + format + source + binary + architecture + version + binary-only-changes + ), @src_checksums_fields, - qw(build-origin build-architecture build-kernel-version build-date - build-path build-tainted-by installed-build-depends environment), + qw( + build-origin + build-architecture + build-kernel-version + build-date + build-path + build-tainted-by + installed-build-depends + environment + ), ], CTRL_FILE_CHANGES() => [ - qw(format date source binary binary-only built-for-profiles architecture - version distribution urgency maintainer changed-by description - closes changes), @src_checksums_fields, qw(files) + qw( + format + date + source + binary + binary-only + built-for-profiles + architecture + version + distribution + urgency + maintainer + changed-by + description + closes + changes + ), + @src_checksums_fields, + qw( + files + ), ], CTRL_FILE_STATUS() => [ # Same as fieldinfos in lib/dpkg/parse.c - qw(package essential protected status priority section installed-size - origin - maintainer bugs architecture multi-arch source version config-version - replaces provides depends pre-depends recommends suggests breaks - conflicts enhances conffiles description triggers-pending - triggers-awaited), + qw( + package + essential + protected + status + priority + section + installed-size + origin + maintainer + bugs + architecture + multi-arch + source + version + config-version + replaces + provides + depends + pre-depends + recommends + suggests + breaks + conflicts + enhances + conffiles + description + triggers-pending + triggers-awaited + ), # These are allowed here, but not tracked by lib/dpkg/parse.c. - qw(auto-built-package build-essential built-for-profiles built-using - homepage installer-menu-item kernel-version package-type - subarchitecture tag task) + qw( + auto-built-package + build-essential + built-for-profiles + built-using + homepage + installer-menu-item + kernel-version + package-type + subarchitecture + tag + task + ), ], ); diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm index b6e9d832f..e6460ce71 100644 --- a/scripts/Dpkg/Shlibs/Symbol.pm +++ b/scripts/Dpkg/Shlibs/Symbol.pm @@ -31,7 +31,10 @@ use Dpkg::Version; use Dpkg::Shlibs::Cppfilt; # Supported alias types in the order of matching preference -use constant ALIAS_TYPES => qw(c++ symver); +use constant ALIAS_TYPES => qw( + c++ + symver +); # Needed by the deprecated key, which is a correct use. no if $Dpkg::Version::VERSION ge '1.02', diff --git a/scripts/t/Dpkg_Control_Fields.t b/scripts/t/Dpkg_Control_Fields.t index df6091499..481cc0958 100644 --- a/scripts/t/Dpkg_Control_Fields.t +++ b/scripts/t/Dpkg_Control_Fields.t @@ -30,30 +30,68 @@ BEGIN { #my $datadir = test_get_data_path(); my @src_dep_fields = qw( - Build-Depends Build-Depends-Arch Build-Depends-Indep - Build-Conflicts Build-Conflicts-Arch Build-Conflicts-Indep + Build-Depends + Build-Depends-Arch + Build-Depends-Indep + Build-Conflicts + Build-Conflicts-Arch + Build-Conflicts-Indep ); my @bin_dep_normal_fields = qw( - Pre-Depends Depends Recommends Suggests Enhances + Pre-Depends + Depends + Recommends + Suggests + Enhances ); my @bin_dep_union_fields = qw( - Conflicts Breaks Replaces Provides Built-Using + Conflicts + Breaks + Replaces + Provides + Built-Using +); +my @bin_dep_fields = ( + @bin_dep_normal_fields, + @bin_dep_union_fields, ); -my @bin_dep_fields = (@bin_dep_normal_fields, @bin_dep_union_fields); my @src_checksums = qw( - Checksums-Md5 Checksums-Sha1 Checksums-Sha256 + Checksums-Md5 + Checksums-Sha1 + Checksums-Sha256 ); my @bin_checksums = qw( - MD5sum SHA1 SHA256 + MD5sum + SHA1 + SHA256 +); +my @src_files = ( + @src_checksums, + qw( + Files + ), +); +my @bin_files = ( + qw( + Filename + Size + ), + @bin_checksums, ); -my @src_files = (@src_checksums, qw(Files)); -my @bin_files = (qw(Filename Size), @bin_checksums); my @vcs_fields = qw( - Vcs-Browser Vcs-Arch Vcs-Bzr Vcs-Cvs Vcs-Darcs Vcs-Git Vcs-Hg Vcs-Mtn + Vcs-Browser + Vcs-Arch + Vcs-Bzr + Vcs-Cvs + Vcs-Darcs + Vcs-Git + Vcs-Hg + Vcs-Mtn Vcs-Svn ); my @test_fields = qw( - Testsuite Testsuite-Triggers + Testsuite + Testsuite-Triggers ); my %fields = ( @@ -61,146 +99,362 @@ my %fields = ( name => 'debian/control source stanza', unordered => 1, fields => [ - qw(Bugs Homepage Description Origin Maintainer Uploaders - Priority Section Source Standards-Version), - @test_fields, @vcs_fields, @src_dep_fields + qw( + Bugs + Homepage + Description + Origin + Maintainer + Uploaders + Priority + Section + Source + Standards-Version + ), + @test_fields, + @vcs_fields, + @src_dep_fields, ], }, CTRL_INFO_PKG() => { name => 'debian/control binary stanza', unordered => 1, fields => [ - qw(Architecture Build-Essential Build-Profiles Built-For-Profiles - Description Essential Protected Homepage - Installer-Menu-Item Kernel-Version Multi-Arch - Package Package-Type Priority Section Subarchitecture - Tag Task), @bin_dep_fields + qw( + Architecture + Build-Essential + Build-Profiles + Built-For-Profiles + Description + Essential + Protected + Homepage + Installer-Menu-Item + Kernel-Version + Multi-Arch + Package + Package-Type + Priority + Section + Subarchitecture + Tag + Task + ), + @bin_dep_fields, ], }, CTRL_PKG_SRC() => { name => '.dsc', fields => [ - qw(Format Source Binary Architecture Version Origin Maintainer - Uploaders Homepage Description Standards-Version), - @vcs_fields, @test_fields, @src_dep_fields, - qw(Package-List), - @src_files + qw( + Format + Source + Binary + Architecture + Version + Origin + Maintainer + Uploaders + Homepage + Description + Standards-Version + ), + @vcs_fields, + @test_fields, + @src_dep_fields, + qw( + Package-List + ), + @src_files, ], }, CTRL_PKG_DEB() => { name => 'DEBIAN/control', fields => [ - qw(Package Package-Type Source Version Built-Using Kernel-Version - Built-For-Profiles Auto-Built-Package Architecture - Subarchitecture Installer-Menu-Item - Build-Essential Essential Protected Origin Bugs - Maintainer Installed-Size), @bin_dep_fields, - qw(Section Priority Multi-Arch Homepage Description Tag Task) + qw( + Package + Package-Type + Source + Version + Built-Using + Kernel-Version + Built-For-Profiles + Auto-Built-Package + Architecture + Subarchitecture + Installer-Menu-Item + Build-Essential + Essential + Protected + Origin + Bugs + Maintainer + Installed-Size + ), + @bin_dep_fields, + qw( + Section + Priority + Multi-Arch + Homepage + Description + Tag + Task + ), ], }, CTRL_INDEX_SRC() => { name => 'Sources', fields => [ - qw(Format Package Binary Architecture Version Priority Section - Origin Maintainer Uploaders Homepage Description - Standards-Version), - @vcs_fields, @test_fields, @src_dep_fields, - qw(Package-List Directory), - @src_files + qw( + Format + Package + Binary + Architecture + Version + Priority + Section + Origin + Maintainer + Uploaders + Homepage + Description + Standards-Version + ), + @vcs_fields, + @test_fields, + @src_dep_fields, + qw( + Package-List + Directory + ), + @src_files, ], }, CTRL_INDEX_PKG() => { name => 'Packages', fields => [ - qw(Package Package-Type Source Version Built-Using Kernel-Version - Built-For-Profiles Auto-Built-Package Architecture - Subarchitecture Installer-Menu-Item - Build-Essential Essential Protected Origin Bugs - Maintainer Installed-Size), @bin_dep_fields, @bin_files, - qw(Section Priority Multi-Arch Homepage Description Tag Task) + qw( + Package + Package-Type + Source + Version + Built-Using + Kernel-Version + Built-For-Profiles + Auto-Built-Package + Architecture + Subarchitecture + Installer-Menu-Item + Build-Essential + Essential + Protected + Origin + Bugs + Maintainer + Installed-Size + ), + @bin_dep_fields, + @bin_files, + qw( + Section + Priority + Multi-Arch + Homepage + Description + Tag + Task + ), ], }, CTRL_REPO_RELEASE() => { name => 'Release', fields => [ - qw(Origin Label Suite Codename Changelogs Date Valid-Until - Architectures Components Description), - @bin_checksums + qw( + Origin + Label + Suite + Codename + Changelogs + Date + Valid-Until + Architectures + Components + Description + ), + @bin_checksums, ], }, CTRL_CHANGELOG() => { name => 'debian/changelog', fields => [ - qw(Source Binary-Only Version Distribution Urgency Maintainer - Timestamp Date Closes Changes) + qw( + Source + Binary-Only + Version + Distribution + Urgency + Maintainer + Timestamp + Date + Closes + Changes + ), ], }, CTRL_COPYRIGHT_HEADER() => { name => 'debian/copyright Format stanza', fields => [ - qw(Format Upstream-Name Upstream-Contact Source Disclaimer Comment - License Copyright) + qw( + Format + Upstream-Name + Upstream-Contact + Source + Disclaimer + Comment + License + Copyright + ), ], }, CTRL_COPYRIGHT_FILES() => { name => 'debian/copyright Files stanza', fields => [ - qw(Files Copyright License Comment) + qw( + Files + Copyright + License + Comment + ), ], }, CTRL_COPYRIGHT_LICENSE() => { name => 'debian/copyright License stanza', fields => [ - qw(License Comment) + qw( + License + Comment + ), ], }, CTRL_TESTS() => { name => 'debian/tests/control', unordered => 1, fields => [ - qw(Classes Depends Features Restrictions Test-Command Tests - Tests-Directory) + qw( + Classes + Depends + Features + Restrictions + Test-Command + Tests + Tests-Directory + ), ], }, CTRL_FILE_BUILDINFO() => { name => '.buildinfo', fields => [ - qw(Format Source Binary Architecture Version Binary-Only-Changes), + qw( + Format + Source + Binary + Architecture + Version + Binary-Only-Changes + ), @src_checksums, - qw(Build-Origin Build-Architecture Build-Kernel-Version - Build-Date Build-Path Build-Tainted-By - Installed-Build-Depends Environment) + qw( + Build-Origin + Build-Architecture + Build-Kernel-Version + Build-Date + Build-Path + Build-Tainted-By + Installed-Build-Depends + Environment + ), ], }, CTRL_FILE_CHANGES() => { name => '.changes', fields => [ - qw(Format Date Source Binary Binary-Only Built-For-Profiles - Architecture Version Distribution Urgency Maintainer - Changed-By Description Closes Changes), - @src_files + qw( + Format + Date + Source + Binary + Binary-Only + Built-For-Profiles + Architecture + Version + Distribution + Urgency + Maintainer + Changed-By + Description + Closes + Changes + ), + @src_files, ], }, CTRL_FILE_VENDOR() => { name => 'dpkg origin', unordered => 1, fields => [ - qw(Bugs Parent Vendor Vendor-Url) + qw( + Bugs + Parent + Vendor + Vendor-Url + ), ], }, CTRL_FILE_STATUS() => { name => 'dpkg status', fields => [ - qw(Package Essential Protected Status Priority Section - Installed-Size - Origin Maintainer Bugs Architecture Multi-Arch Source - Version Config-Version - Replaces Provides Depends Pre-Depends - Recommends Suggests Breaks Conflicts Enhances - Conffiles Description Triggers-Pending Triggers-Awaited - Auto-Built-Package Build-Essential Built-For-Profiles - Built-Using Homepage Installer-Menu-Item Kernel-Version - Package-Type Subarchitecture Tag Task) + qw( + Package + Essential + Protected + Status + Priority + Section + Installed-Size + Origin + Maintainer + Bugs + Architecture + Multi-Arch + Source + Version + Config-Version + Replaces + Provides + Depends + Pre-Depends + Recommends + Suggests + Breaks + Conflicts + Enhances + Conffiles + Description + Triggers-Pending + Triggers-Awaited + Auto-Built-Package + Build-Essential + Built-For-Profiles + Built-Using + Homepage + Installer-Menu-Item + Kernel-Version + Package-Type + Subarchitecture + Tag + Task + ), ], }, ); -- Dpkg.Org's dpkg
