Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package apt Changes: * add Auto-Built-Package to tagfile-order * don't test with "too early for 32bit" years These adjust for changes in dpkg and the 32-bit test suite regression in RC1. * Do not lowercase package names representing .dsc/.deb/... files (Closes: #854794) Fixes installing stuff by file, if the file contains an uppercase character. * shippable: Perform CI on Debian stretch instead of Ubuntu xenial Makes sense to run our CI on the platform we are targetting. * Don't use -1 fd and AT_SYMLINK_NOFOLLOW for faccessat() Fixes determining the location of the temporary directory on kfreebsd, kfreebsd does not support AT_SYMLINK_NOFOLLOW on faccessat() and it is fairly pointless to use on a directory like /tmp. * CMake: Install statvfs.h to include/sys, not just include/ Wrapper installed in wrong directory, not really used in Debian. * debian: Generate debian/copyright during clean Instead of shipping that as a symlink to COPYING, it's now part of the tarball. Fixes some lintian problems and also allows me to upload later 1.4 releases to Ubuntu (symlink being rejected there). unblock apt/1.4~rc2 -- System Information: Debian Release: 9.0 APT prefers unstable APT policy: (900, 'unstable'), (500, 'unstable-debug'), (500, 'buildd-unstable'), (500, 'testing'), (100, 'experimental'), (1, 'experimental-debug') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) -- Debian Developer - deb.li/jak | jak-linux.org - free software dev | Ubuntu Core Developer | When replying, only quote what is necessary, and write each reply directly below the part(s) it pertains to ('inline'). Thank you.
diff -Nru apt-1.4~rc1/apt-pkg/contrib/fileutl.cc apt-1.4~rc2/apt-pkg/contrib/fileutl.cc --- apt-1.4~rc1/apt-pkg/contrib/fileutl.cc 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/apt-pkg/contrib/fileutl.cc 2017-02-22 16:02:10.000000000 +0100 @@ -2792,7 +2792,7 @@ stat(tmpdir, &st) != 0 || (st.st_mode & S_IFDIR) == 0) // exists and is directory tmpdir = "/tmp"; else if (geteuid() != 0 && // root can do everything anyway - faccessat(-1, tmpdir, R_OK | W_OK | X_OK, AT_EACCESS | AT_SYMLINK_NOFOLLOW) != 0) // current user has rwx access to directory + faccessat(AT_FDCWD, tmpdir, R_OK | W_OK | X_OK, AT_EACCESS) != 0) // current user has rwx access to directory tmpdir = "/tmp"; return string(tmpdir); diff -Nru apt-1.4~rc1/apt-pkg/deb/deblistparser.cc apt-1.4~rc2/apt-pkg/deb/deblistparser.cc --- apt-1.4~rc1/apt-pkg/deb/deblistparser.cc 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/apt-pkg/deb/deblistparser.cc 2017-02-22 16:02:10.000000000 +0100 @@ -72,8 +72,19 @@ string Result = Section.Find(pkgTagSection::Key::Package).to_string(); // Normalize mixed case package names to lower case, like dpkg does - // See Bug#807012 for details - std::transform(Result.begin(), Result.end(), Result.begin(), tolower_ascii); + // See Bug#807012 for details. + // Only do this when the package name does not contain a / - as that + // indicates that the package name was derived from a filename given + // to install or build-dep or similar (Bug#854794) + if (likely(Result.find('/') == string::npos)) + { + for (char &c: Result) + { + char l = tolower_ascii_inline(c); + if (unlikely(l != c)) + c = l; + } + } if(unlikely(Result.empty() == true)) _error->Error("Encountered a section with no Package: header"); diff -Nru apt-1.4~rc1/apt-pkg/tagfile-order.c apt-1.4~rc2/apt-pkg/tagfile-order.c --- apt-1.4~rc1/apt-pkg/tagfile-order.c 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/apt-pkg/tagfile-order.c 2017-02-22 16:02:10.000000000 +0100 @@ -17,6 +17,7 @@ "Kernel-Version", // Used only by d-i "Built-Using", "Built-For-Profiles", + "Auto-Built-Package", "Multi-Arch", "Status", "Priority", diff -Nru apt-1.4~rc1/CMakeLists.txt apt-1.4~rc2/CMakeLists.txt --- apt-1.4~rc1/CMakeLists.txt 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/CMakeLists.txt 2017-02-22 16:02:10.000000000 +0100 @@ -115,7 +115,7 @@ check_function_exists(statvfs HAVE_STATVFS) if (NOT HAVE_STATVFS) - configure_file(CMake/statvfs.h.in ${PROJECT_BINARY_DIR}/include/statvfs.h COPYONLY) + configure_file(CMake/statvfs.h.in ${PROJECT_BINARY_DIR}/include/sys/statvfs.h COPYONLY) endif() CHECK_STRUCT_HAS_MEMBER("struct statfs" f_type sys/vfs.h HAVE_STRUCT_STATFS_F_TYPE) @@ -172,7 +172,7 @@ # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <de...@lists.debian.org>") -set(PACKAGE_VERSION "1.4~rc1") +set(PACKAGE_VERSION "1.4~rc2") if (NOT DEFINED DPKG_DATADIR) execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" diff -Nru apt-1.4~rc1/debian/changelog apt-1.4~rc2/debian/changelog --- apt-1.4~rc1/debian/changelog 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/debian/changelog 2017-02-22 16:02:10.000000000 +0100 @@ -1,3 +1,19 @@ +apt (1.4~rc2) unstable; urgency=medium + + [ David Kalnischkies ] + * add Auto-Built-Package to tagfile-order + * don't test with "too early for 32bit" years + + [ Julian Andres Klode ] + * Do not lowercase package names representing .dsc/.deb/... files (Closes: #854794) + * shippable: Perform CI on Debian stretch instead of Ubuntu xenial + * Don't use -1 fd and AT_SYMLINK_NOFOLLOW for faccessat() + Thanks to James Clarke for debugging these issues + * CMake: Install statvfs.h to include/sys, not just include/ + * debian: Generate debian/copyright during clean + + -- Julian Andres Klode <j...@debian.org> Wed, 22 Feb 2017 16:02:10 +0100 + apt (1.4~rc1) unstable; urgency=medium [ David Kalnischkies ] diff -Nru apt-1.4~rc1/debian/rules apt-1.4~rc2/debian/rules --- apt-1.4~rc1/debian/rules 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/debian/rules 2017-02-22 16:02:10.000000000 +0100 @@ -13,6 +13,9 @@ %: dh $@ +override_dh_clean: + cp COPYING debian/copyright + override_dh_install-indep: dh_install --list-missing diff -Nru apt-1.4~rc1/doc/apt-get.8.xml apt-1.4~rc2/doc/apt-get.8.xml --- apt-1.4~rc1/doc/apt-get.8.xml 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/apt-get.8.xml 2017-02-22 16:02:10.000000000 +0100 @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2017-01-17T00:00:00Z</date> + <date>2017-02-06T00:00:00Z</date> </refentryinfo> <refmeta> diff -Nru apt-1.4~rc1/doc/apt-verbatim.ent apt-1.4~rc2/doc/apt-verbatim.ent --- apt-1.4~rc1/doc/apt-verbatim.ent 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/apt-verbatim.ent 2017-02-22 16:02:10.000000000 +0100 @@ -239,7 +239,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.4~rc1"> +<!ENTITY apt-product-version "1.4~rc2"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "jessie"> diff -Nru apt-1.4~rc1/doc/po/apt-doc.pot apt-1.4~rc2/doc/po/apt-doc.pot --- apt-1.4~rc1/doc/po/apt-doc.pot 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/apt-doc.pot 2017-02-22 16:02:10.000000000 +0100 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.4~rc1\n" +"Project-Id-Version: apt-doc 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" diff -Nru apt-1.4~rc1/doc/po/de.po apt-1.4~rc2/doc/po/de.po --- apt-1.4~rc1/doc/po/de.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/de.po 2017-02-22 16:02:10.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.3\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2016-11-15 21:51+0200\n" "Last-Translator: Chris Leick <c.le...@vollbio.de>\n" "Language-Team: German <debian-l10n-ger...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/es.po apt-1.4~rc2/doc/po/es.po --- apt-1.4~rc1/doc/po/es.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/es.po 2017-02-22 16:02:10.000000000 +0100 @@ -38,7 +38,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne <ocampa...@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-span...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/fr.po apt-1.4~rc2/doc/po/fr.po --- apt-1.4~rc1/doc/po/fr.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/fr.po 2017-02-22 16:02:10.000000000 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2017-01-24 22:43+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregir...@neuf.fr>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/it.po apt-1.4~rc2/doc/po/it.po --- apt-1.4~rc1/doc/po/it.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/it.po 2017-02-22 16:02:10.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2015-12-27 21:26+0200\n" "Last-Translator: Beatrice Torracca <beatri...@libero.it>\n" "Language-Team: Italian <debian-l10n-ital...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/ja.po apt-1.4~rc2/doc/po/ja.po --- apt-1.4~rc1/doc/po/ja.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/ja.po 2017-02-22 16:02:10.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyam...@takumayamada.com>\n" "Language-Team: Japanese <debian-japan...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/nl.po apt-1.4~rc2/doc/po/nl.po --- apt-1.4~rc1/doc/po/nl.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/nl.po 2017-02-22 16:02:10.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.4~beta4-nl\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2017-01-19 17:53+0100\n" "Last-Translator: Frans Spiesschaert <frans.spiesscha...@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-du...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/pl.po apt-1.4~rc2/doc/po/pl.po --- apt-1.4~rc1/doc/po/pl.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/pl.po 2017-02-22 16:02:10.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda <rob...@debian.org>\n" "Language-Team: Polish <manpages-pl-l...@lists.sourceforge.net>\n" diff -Nru apt-1.4~rc1/doc/po/pt_BR.po apt-1.4~rc2/doc/po/pt_BR.po --- apt-1.4~rc1/doc/po/pt_BR.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/pt_BR.po 2017-02-22 16:02:10.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andre...@debian.org>\n" "Language-Team: <debian-l10n-portugu...@lists.debian.org>\n" diff -Nru apt-1.4~rc1/doc/po/pt.po apt-1.4~rc2/doc/po/pt.po --- apt-1.4~rc1/doc/po/pt.po 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/doc/po/pt.po 2017-02-22 16:02:10.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro <a_monte...@gmx.com>\n" "Language-Team: Portuguese <tra...@debianpt.org>\n" diff -Nru apt-1.4~rc1/po/apt-all.pot apt-1.4~rc2/po/apt-all.pot --- apt-1.4~rc1/po/apt-all.pot 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/po/apt-all.pot 2017-02-22 16:02:10.000000000 +0100 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.4~rc1\n" +"Project-Id-Version: apt 1.4~rc2\n" "Report-Msgid-Bugs-To: APT Development Team <de...@lists.debian.org>\n" -"POT-Creation-Date: 2017-02-06 14:41+0100\n" +"POT-Creation-Date: 2017-02-22 16:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" diff -Nru apt-1.4~rc1/shippable.yml apt-1.4~rc2/shippable.yml --- apt-1.4~rc1/shippable.yml 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/shippable.yml 2017-02-22 16:02:10.000000000 +0100 @@ -2,8 +2,8 @@ build: pre_ci_boot: - image_name: ubuntu - image_tag: xenial + image_name: debian + image_tag: stretch pull: true ci: - apt-get install -qq build-essential diff -Nru apt-1.4~rc1/test/integration/test-00-commands-have-help apt-1.4~rc2/test/integration/test-00-commands-have-help --- apt-1.4~rc1/test/integration/test-00-commands-have-help 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/test/integration/test-00-commands-have-help 2017-02-22 16:02:10.000000000 +0100 @@ -75,7 +75,8 @@ unset SOURCE_DATE_EPOCH } testmoo '@0' 'Have you mooed today?' -testmoo '0-12-25' 'Happy package management day!' +# the year 0 is too early for 32bit architectures +testmoo '2000-12-25' 'Happy package management day!' testmoo '1930-02-18' "It's a Bird ... It's a Plane ... It's Super Cow!" testmoo '1966-11-07' 'Whoever needs milk, bows to the animal.' testmoo '1988-03-29' 'Have you mooed today?' diff -Nru apt-1.4~rc1/test/integration/test-apt-get-build-dep-file apt-1.4~rc2/test/integration/test-apt-get-build-dep-file --- apt-1.4~rc1/test/integration/test-apt-get-build-dep-file 2017-02-06 14:41:23.000000000 +0100 +++ apt-1.4~rc2/test/integration/test-apt-get-build-dep-file 2017-02-22 16:02:10.000000000 +0100 @@ -39,7 +39,8 @@ EOF test2vcardbuilddep() { - testsuccessequal "Note, using file './2vcard_0.5-3.dsc' to get the build dependencies + local name="$1" + testsuccessequal "Note, using file './$name' to get the build dependencies Reading package lists... Building dependency tree... The following packages will be REMOVED: @@ -51,14 +52,16 @@ Inst build-essential (1 stable [i386]) Inst debhelper (7 stable [i386]) Conf build-essential (1 stable [i386]) -Conf debhelper (7 stable [i386])" aptget build-dep -s ./2vcard_0.5-3.dsc -testfailure aptget build-dep --simulate 2vcard_0.5-3.dsc +Conf debhelper (7 stable [i386])" aptget build-dep -s ./$name +testfailure aptget build-dep --simulate $name cd downloaded -testsuccess aptget build-dep --simulate ../2vcard_0.5-3.dsc -testsuccess aptget build-dep --simulate "$(readlink -f ../2vcard_0.5-3.dsc)" +testsuccess aptget build-dep --simulate ../$name +testsuccess aptget build-dep --simulate "$(readlink -f ../$name)" cd .. } -test2vcardbuilddep +test2vcardbuilddep "2vcard_0.5-3.dsc" +cp "2vcard_0.5-3.dsc" "2VCard_0.5-3.dsc" +test2vcardbuilddep "2VCard_0.5-3.dsc" msgmsg 'Test with' 'signed dsc' cat > 2vcard_0.5-3.dsc <<EOF @@ -93,7 +96,9 @@ =4eRd -----END PGP SIGNATURE----- EOF -test2vcardbuilddep +test2vcardbuilddep "2vcard_0.5-3.dsc" +cp "2vcard_0.5-3.dsc" "2VCard_0.5-3.dsc" +test2vcardbuilddep "2VCard_0.5-3.dsc" msgmsg 'Test with' 'unpacked source dir'