summaryrefslogtreecommitdiff
path: root/apt-pkg
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pu/colored-error' into 'master'Julian Andres Klode2020-03-242-25/+91
|\ | | | | | | | | Add color highlighting to E:/W:/N: prefixes See merge request apt-team/apt!112
| * Add color highlighting to E:/W:/N: prefixesJulian Andres Klode2020-03-241-0/+46
| | | | | | | | | | | | This matches the definitions used by dpkg. Closes: #953527
| * error: Extract operator<< into error.cc (de-inline it)Julian Andres Klode2020-03-102-25/+45
| | | | | | | | | | Extract the code, and reformat it with clang-format so we can modify it.
* | Parse last line in deb file correctly by adding a newlineDavid Kalnischkies2020-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While merging apt-pkg and apt-inst libraries the codepath of handling deb files in apt-pkg was adapted to use the 'old' code from apt-inst instead of fork&exec of dpkg-deb -I. The information we get this way forms the main part of the package stanza, but we add a few semi-optional fields to the stanza to make it look and work more like a stanza we got from a repository. Just be careful with the area where these two parts touch as if, hypothetically, we would stip all newlines around the parts, but forget to add a newline between them later, the two lines around the merge would stick a bit too close together forming one which could result in fun parsing errors if this merged line was previously e.g. a well-formed Depends line and has now extra fluff attached. This codepath has a history with too many newlines (#802553) though, so how likely is it really that it will some day lack one you may ask. References: 6089a4b17c61ef30b2efc00e270b0907f51f352a
* | Don't crash pattern matching sections if pkg has no sectionDavid Kalnischkies2020-03-101-1/+1
|/ | | | | | | | Packages from third-party sources do not always follow the established patterns of more properly maintained archives. In that case it was a driver package for a scanner&printer device which has only a minimum of info attached, but also minimal non-installed packages do not include sections, so we really shouldn't assume their availability.
* Show absolute time while waiting for lock instead of %, rework messageJulian Andres Klode2020-03-063-5/+19
| | | | | | | | | | | | | | | | | | | | | Showing a percentage for a timeout is pretty non-standard. Rework the progress class so it can show an absolute progress (currently hardcoded to use seconds as a unit). If there is a timeout (aka if it's not the maximum long long unsigned -1llu), then show the timeout, otherwise just count up seconds, e.g. Waiting for cache lock: Could not get lock /var/lib/dpkg/lock-frontend. It is held by process 33842 (apt)... 1/120s or Waiting for cache lock: Could not get lock /var/lib/dpkg/lock-frontend. It is held by process 33842 (apt)... 1s Also improve the error message to use "Waiting for cache lock: %s" instead of "... (%s)", as having multiple sentences inside parenthesis is super weird, as is having two closing parens. We pass the information via _config, as that's reasonably easy and avoids ABI hackage. It also provides an interesting debugging tool for other kinds of progress.
* GetLock: No strerror if it's just another process holding the lockJulian Andres Klode2020-03-061-2/+4
| | | | | | | | This improves the locking message, getting rid of useless details. If we have a process holding the lock, we got that because the lock is being hold by it, so there's no point telling the people the reason for not getting the lock is the EAGAIN error and displaying its strerrror().
* (temporarily) unhide pkgDPkgPM again to have python-apt compileJulian Andres Klode2020-02-271-1/+1
|
* pkgcache: Add operator bool() to map_pointerJulian Andres Klode2020-02-271-0/+1
|
* apt(8): Wait for frontend and cache lockJulian Andres Klode2020-02-266-14/+54
| | | | | | This is a rework of !6 with additional stuff for the frontend lock, so we can lock the frontend lock and then keep looping over dpkg lock.
* apt-pkg: default visibility to hiddenJulian Andres Klode2020-02-2655-359/+264
|
* cacheset: Fix -Wdeprecated-copy warningsJulian Andres Klode2020-02-262-4/+8
| | | | | | | | | Remove the operator= from Container_iterator, as it was basically just the default anyway, and add copy constructors to *Interface that match their operator=. Tried adding copy constructor to Container_iterator, but that only made things worse.
* Fix various compiler warningsJulian Andres Klode2020-02-264-9/+5
|
* Parse records including empty tag names correctlyDavid Kalnischkies2020-02-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No sensible file should include these, but even insensible files do not gain unfair advantages with it as this parser does not deal with security critical files before they haven't passed other checks like signatures or hashsums. The problem is that the parser accepts and parses empty tag names correctly, but does not store the data parsed which will effect later passes over the data resulting e.g. in the following tag containing the name and value of the previous (empty) tag, its own tagname and its own value or a crash due to an attempt to access invalid memory depending on who passes over the data and what is done with it. This commit fixes both, the incidient of the crash reported by Anatoly Trosinenko who reproduced it via apt-sortpkgs: | $ cat /tmp/Packages-null | 0: | PACKAGE:0 | | : | PACKAGE: | | PACKAGE:: | $ apt-sortpkgs /tmp/Packages-null and the deeper parsing issue shown by the included testcase. Reported-By: Anatoly Trosinenko <anatoly.trosinenko@gmail.com> References: 8710a36a01c0cb1648926792c2ad05185535558e
* cache: Swap locations of hashtables, hide them from non-apt usersJulian Andres Klode2020-02-261-2/+5
| | | | | Only expose the locations of the hasthables if APT_COMPILING_APT is set.
* Make metaIndex::GetNotBefore virtualJulian Andres Klode2020-02-263-9/+2
|
* pkgsystem: Drop more virtual workaround shenanigansJulian Andres Klode2020-02-266-56/+22
|
* metaindex: Add Origin, Label, Version, DefaultPin, ReleaseNotes membersJulian Andres Klode2020-02-263-32/+19
| | | | These were hidden behind the d-pointer previously.
* Remove various dynamic_cast uses, use virtual methods insteadJulian Andres Klode2020-02-263-16/+6
|
* Merge pkgPackageManager::SmartUnpackJulian Andres Klode2020-02-262-7/+1
|
* Rename pkgSimulate::Go2 to pkgSimulate::GoJulian Andres Klode2020-02-263-8/+3
|
* cdrom: Remove old udev dlopen stuffJulian Andres Klode2020-02-262-27/+0
|
* Drop pkgAcquire::Item::ModifyRetries() ABI hackJulian Andres Klode2020-02-263-12/+7
|
* Merge pkgAcquire::RunFdsSane back into RunFdsJulian Andres Klode2020-02-262-15/+4
|
* Remove ABI workaround for debDebPkgFileIndex::ArchiveInfoJulian Andres Klode2020-02-263-7/+3
|
* Merge CommandLine::DispatchArgJulian Andres Klode2020-02-262-7/+0
|
* Remove pkgAcqFile::Failed overloadJulian Andres Klode2020-02-262-7/+0
|
* Merge branch 'pu/tagfile-hardening' into 'master'Julian Andres Klode2020-02-251-1/+14
|\ | | | | | | | | Pu/tagfile hardening See merge request apt-team/apt!104
| * tagfile: Check out-of-bounds access to Tags vectorJulian Andres Klode2020-02-201-0/+8
| | | | | | | | | | Check that the index we're going to use is within the size of the array.
| * tagfile: Check if memchr() returned null before usingJulian Andres Klode2020-02-201-1/+6
| | | | | | | | | | This fixes a segmentation fault trying to read from nullptr+1, aka address 1.
* | patterns: Mark things hidden, and only allow internal use of headerJulian Andres Klode2020-02-251-33/+38
| |
* | Remove left-over SummationImplementation classJulian Andres Klode2020-02-252-73/+0
| |
* | Initialize libgcrypt on first useJulian Andres Klode2020-02-251-0/+23
| | | | | | | | | | | | | | This is not supposed to be done this way, but frankly, since we abstract away the backend, there's not much else we can do here. Closes: #949074
* | Add d-pointers to groups, packages, versions, and filesJulian Andres Klode2020-02-251-2/+17
| | | | | | | | | | | | | | | | This allows us to extend those in-cache objects with more data later on without breaking the ABI. Reserve 12 pointers for private data in the pkgCache class, and double the size of pools to 24.
* | Silence narrow conversion warnings, add error checksJulian Andres Klode2020-02-251-7/+20
| | | | | | | | | | | | When converting a long offset to a uint32_t to be stored in the map, check that this is safe to do. If the offset is negative, or we lose data in the conversion, we lost.
* | Make map_pointer<T> typesafeJulian Andres Klode2020-02-247-32/+54
| | | | | | | | | | | | | | | | | | | | | | Instead of just using uint32_t, which would allow you to assign e.g. a map_pointer<Version> to a map_pointer<Package>, use our own smarter struct that has strict type checking. We allow creating a map_pointer from a nullptr, and we allow comparing map_pointer to nullptr, which also deals with comparisons against 0 which are often used, as 0 will be implictly converted to nullptr.
* | Wrap AllocateInMap with a templated versionJulian Andres Klode2020-02-242-15/+20
| |
* | Replace map_pointer_t with map_pointer<T>Julian Andres Klode2020-02-244-98/+98
|/ | | | | | This is a first step to a type safe cache, adding typing information everywhere. Next, we'll replace map_pointer<T> implementation with a type safe one.
* Merge branch 'source_to_debsrc' into 'master'Julian Andres Klode2020-02-181-1/+1
|\ | | | | | | | | apt-pkg/srcrecords.cc: 'source' means 'deb-src' in error message See merge request apt-team/apt!101
| * apt-pkg/srcrecords.cc: 'source' means 'deb-src' in error messageNis Martensen2020-02-121-1/+1
| | | | | | | | | | | | | | | | The filename "sources.list" suggests that all contained lines are meant to describe some package source, so users might not immediately understand that this refers to 'deb-src' type lines. Please see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919285 for an example of the resulting confusion.
* | Remove CRC-16 implementationJulian Andres Klode2020-02-183-97/+0
| |
* | Use a 32-bit djb VersionHash instead of CRC-16Julian Andres Klode2020-02-187-15/+15
| |
* | Merge branch 'pu/source-version' into 'master'Julian Andres Klode2020-02-184-37/+78
|\ \ | | | | | | | | | | | | ABI BREAK: Implement pinning by source package See merge request apt-team/apt!96
| * | policy: Implement pinning by source packageJulian Andres Klode2020-01-171-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the src: syntax inside policy, allowing you to pin by source package. This by default only pins the native architecuture, use src:pkg:any to pin for all architectures in your cache. Closes: #166032
| * | Allow querying all binaries built by a source packageJulian Andres Klode2020-01-173-23/+35
| | | | | | | | | | | | | | | | | | This adds a simple way to lookup binaries by a source package, but this adds all binaries into one list, even with different source versions. Be careful.
* | | Remove code tagged APT_PKG_590, add some missing includesJulian Andres Klode2020-02-1814-2047/+4
| | | | | | | | | | | | | | | | | | Remove all code scheduled to be removed after 5.90, and fix files to include files they previously got from hashes.h including more headers.
* | | Bump ABI to 6.0Julian Andres Klode2020-02-181-2/+2
| | |
* | | Revert "Add a Packages-Require-Authorization Release file field"Julian Andres Klode2020-02-166-61/+3
| | | | | | | | | | | | | | | | | | | | | | | | This experiment did not turn out sensibly, as some servers do not accept credentials when none are expected and fail, so you cannot mirror such a repository. This reverts commit c2b9b0489538fed4770515bd8853a960b13a2618.
* | | policy: Add SetPriority() methodsJulian Andres Klode2020-02-162-0/+17
| |/ |/| | | | | | | These allow overriding priorities, however, pins set by SetPriority for package files will be overriden by calls to InitDefaults().
* | Fix remaining usec vs sec time-delta calculation typosDavid Kalnischkies2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While moving to a more stable clock in 79b61ae I typoed the microsecond calculation part and copied it all over the place… Julian fixed the first two instances in 089e6271 and Trent reported the apt-ftparchive instances leaving one instance in progress (invisible for user though). A bit ironic that in an attempt to stop "confusing (and amusing) users" I managed to hide a typo for close to two years doing just that… Sadly we can't really test this as while "apt-ftparchive generate /dev/null" is a great interactive test, it is hard to teach our test framework that the output is "reasonably below an hour" (usually 0s, but on busy test systems it is perhaps longer…). Thanks: Trent W. Buck for initial patch Closes: #950776 References: 79b61ae7673eb6213493e2cb202f0d70c390932d, 089e627153781ae7c320a5a0724c6c70d684b689