Commit Graph

206 Commits

Author SHA1 Message Date
Gleb Fotengauer-Malinovskiy
09af461bc4 Apply apt-0.5.15lorg2-alt-apt-shell-list_completion.patch
Added in commit 1c7245a:
apt-shell: show up "list" command by completion (#5953)
2014-06-24 18:03:07 +04:00
Gleb Fotengauer-Malinovskiy
6bbc09c437 Apply apt-0.5.15lorg2-alt-gcc4.3.patch
Added in commit d20fc76:
- fix build with gcc-4.3
2014-06-24 17:59:06 +04:00
Gleb Fotengauer-Malinovskiy
3863733eed Apply apt-0.5.15lorg2-lorg-cache-limit.patch
Added in commit d5ff215:
lorg-cache-limit.patch: increase cache size limit
2014-06-24 17:58:50 +04:00
Gleb Fotengauer-Malinovskiy
c6ce51a9cc Apply apt-0.5.15lorg2-alt-genpkglist-no-fileflags.patch
Added in commit ab49688:
genpkglist.cc: RPMTAG_FILEFLAGS should not be copied into header list

(Or, at least, RPMTAG_FILEFLAGS should be copiled consistently with
RPMTAG_BASENAMES, RPMTAG_DIRNAMES, and RPMTAG_DIRINDEXES.)
2014-06-24 17:58:27 +04:00
Gleb Fotengauer-Malinovskiy
6a43ffa836 Apply apt-0.5.15lorg2-lorg-pkgcachegen-selfprov.patch
Added in commit 818a9d5:
lorg-pkgcachegen-selfprov.patch: allow self-referencing provides

E.g. ocaml-runtime#3.10.2-alt1 can provide ocaml-runtime = 3.10.
2014-06-24 17:58:10 +04:00
Gleb Fotengauer-Malinovskiy
6b6a46f6fe Apply apt-0.5.15lorg2-alt-manifest.patch
Added in commit c8560f7:
- add support of manifest file
2014-06-24 17:57:55 +04:00
Gleb Fotengauer-Malinovskiy
3e598a0610 Apply apt-0.5.15lorg2-alt-genpkglist-reqfiles.patch
Added in commit 30e27b0:
apt-0.5.15lorg2-alt-genpkglist-reqfiles.patch

genpkglist strips file lists by default (without --bloat option).
It keeps only some "useful files" by using a few ad hoc patterns.

This can break file-level dependencies.  Consider pkgA requires
/usr/lib/foo1/bar, and pkgB owns this file without explicitly
providing it.  Now if genpkglist strips /usr/lib/foo1/bar
from pkgB file list, this is going to be an unmet dependency.

This patch changes genpkglist behaviour, so that, when genpkglist
is invoked without --bloat option, it first finds all file-level
dependencies (something like "rpm -qaR |grep ^/").  This requires
a separate pass.  The list of file-level dependencies is saved into
"reqfiles" global variable.  And on the second (normal) pass, the
function usefulFile() is modified to check the "reqfiles" variable;
that is, it should keep a file in the file list if it's been required
by some package in the repo.

(Unfortunately, this patch does not solve all of the problems
I want it to solve; we have separate repos for i586 and noarch --
inter-repo file-level dependencies cannot be resolved this way.)
2014-06-24 17:56:35 +04:00
Gleb Fotengauer-Malinovskiy
81250f42d6 Apply apt-0.5.15lorg2-alt-src-apt-shell-wrong_message_fix.patch
Added in commit 2485721:
Fixed wrong message during remove package(s) in apt-shell (#7618)
2014-06-24 17:56:18 +04:00
Gleb Fotengauer-Malinovskiy
820936e9f8 Apply apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch
Added in commit e6ba1a5:
Fixed typo in output of help command in apt-shell (#5400)
2014-06-24 17:56:01 +04:00
Gleb Fotengauer-Malinovskiy
2d57d88e71 Apply apt-0.5.15lorg2-alt-exit-status.patch
Added in commit 50c8f02:
fixed apt-get exit status (#11527)
2014-06-24 17:55:47 +04:00
Gleb Fotengauer-Malinovskiy
3070a3cfb9 Apply apt-0.5.15lorg2-alt-versionmatch-TryToChangeVer.patch
Added in commit 6c2eeb8:
updated versionmatch/TryToChangeVer logic

My previous versionmatch.patch was half-way wrong and/or incomplete.
The problem was that pkgCache::VerIterator::CompareVer() does not
do full-blown version comparison, but rather something strange
(see apt-pkg/pkgcache.cc).

I also noticed that, while TryToInstall() does use Fix.ScoreSort,
TryToChangeVer() does not, which is probably wrong.

The solution is as follows:

1) pkgVersionMatch::FindAll() does not sort versions any longer;
it does not have sufficient information, such as Cache and Fix,
to sort the versions.

2) TryToChangeVer() calls FindAll() instead of Find() and uses
Fix.ScoreSort to sort the versions.  If Fix.ScoreSort returns 0,
it also tries Cache.VS().CmpVersion(), which is the right way to
reach rpmvercmp().

Also updated 'Selected version ... for ...' diagnostics.

(old result and message)
$ ~tmp/build/aptbox/apt-get --dry-run install python=2.4 2>&1 |grep ^Selected
Selected version 2.4.4-alt8 for python
$

The result was wrong, because I have a better version,
which is 2.4.4-alt8.1.

(new result and message)
$ ~tmp/build/aptbox/apt-get --dry-run install python=2.4 2>&1 |grep ^Selected
Selected version python-strict#2.4.4-alt8.1 for python=2.4
$

Update: also do not sort ascending and reverse the list, this is going
to break "stable sort" logic.  Just sort descending.

Update2: actually make CmpVersion() primarily sort condition and
Fix.ScoreSort secondary sort condition.  Fix.ScoreSort should not be
activated early, because e.g. for 'python-devel>=2.3' it is going to
select python2.3-dev, but I want python-dev#2.4.
2014-06-24 17:54:38 +04:00
Gleb Fotengauer-Malinovskiy
5c157e80d3 Apply apt-0.5.15lorg2-alt-apt-get-simple-output.patch
Added in commit 9eacf5f:
0.5.15lorg2-alt6

- apt-get: Fixed virtual packages handling (Alexey Tourbin).
- apt-get: Implemented simple-output option (Stanislav Ievlev).
2014-06-24 17:54:21 +04:00
Gleb Fotengauer-Malinovskiy
ec12f06c4b Apply apt-0.5.15lorg2-alt-apt-get-TryToInstall-PrvPkgCandVer.patch
Added in commit 9eacf5f:
0.5.15lorg2-alt6

- apt-get: Fixed virtual packages handling (Alexey Tourbin).
- apt-get: Implemented simple-output option (Stanislav Ievlev).
2014-06-24 17:53:51 +04:00
Gleb Fotengauer-Malinovskiy
b99eba002f Apply apt-0.5.15lorg2-alt-realloc.patch
Added in commit d9cc297:
Fix realloc(3) usage.
2014-06-24 17:53:29 +04:00
Gleb Fotengauer-Malinovskiy
3fb1186bee Apply apt-0.5.15lorg2-alt-pkgCache-PrvIterator.patch
Added in commit 6b8849f:
apt-pkg/cacheiterators.h(pkgCache::PrvIterator): Add default constructor, required for aptitude 0.4.1 (Raorn, #9604).
2014-06-24 17:52:59 +04:00
Gleb Fotengauer-Malinovskiy
204050e6d5 Apply apt-0.5.15lorg2-alt-pkgInitConfig-cpu.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:52:44 +04:00
Gleb Fotengauer-Malinovskiy
761d0a0c73 Apply apt-0.5.15lorg2-alt-apt-shell-resetconfig.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:52:29 +04:00
Gleb Fotengauer-Malinovskiy
92fc808040 Apply apt-0.5.15cnc6-apt-utils-locale.patch
Added in commit 8542fdc:
0.5.15cnc6-alt17

- apt-utils: Set locale to "C" (#2587).
- apt-utils: Added list of utilities to package description (#3564).
- apt-get: Implemented APT::Get::PrintLocalFile option.
2014-06-24 17:52:09 +04:00
Gleb Fotengauer-Malinovskiy
89a98dd27f Apply apt-0.5.15cnc6-alt-PrintLocalFile.patch
Added in commit 8542fdc:
0.5.15cnc6-alt17

- apt-utils: Set locale to "C" (#2587).
- apt-utils: Added list of utilities to package description (#3564).
- apt-get: Implemented APT::Get::PrintLocalFile option.
2014-06-24 17:51:53 +04:00
Gleb Fotengauer-Malinovskiy
eafde03fad Apply apt-0.5.15cnc6-alt-apt-pipe.patch
Added in commit fd9f159:
0.5.15cnc6-alt7

- Acquire::CDROM::mount value in apt.conf(5) changed from /mnt/cdrom to /media/cdrom
- apt-pipe utility added
2014-06-24 17:51:18 +04:00
Gleb Fotengauer-Malinovskiy
d0ebd8ce44 Apply apt-0.5.15cnc6-alt-vendor.patch
Added in commit 3cda23c:
0.5.15cnc6-alt15

- apt-pkg/sourcelist.cc:
  Added support for multiple fingerprints for the same vendor name
2014-06-24 17:50:55 +04:00
Gleb Fotengauer-Malinovskiy
afc2d58e1c Apply apt-0.5.15cnc6-alt-quiet-update.patch
Added in commit a4e32c8:
0.5.15cnc6-alt16

- apt-shell: -q option for update added
2014-06-24 17:50:40 +04:00
Gleb Fotengauer-Malinovskiy
6ad87320c1 Apply apt-0.5.15cnc6-alt-dash-cmd.patch
Added in commit 62c21c2:
0.5.15cnc6-alt14

- apt-shell: #5401 fixed (rider@)
- apt-pipe: race during shutting down fixed
2014-06-24 17:50:21 +04:00
Gleb Fotengauer-Malinovskiy
1d9742a687 Apply apt-0.5.15cnc6-alt-apt-shell-dl.patch
Added in commit a8de0fe:
0.5.15cnc6-alt13

- apt-shell: possible fix of #4707 (rider@)
2014-06-24 17:50:01 +04:00
Gleb Fotengauer-Malinovskiy
face4b472c Apply apt-0.5.15cnc6-alt-lsgroup.patch
Added in commit 6432ae5:
0.5.15cnc6-alt8

- belarusian translation updated
- apt-shell: ls -g/-G implemented (rider@)
- apt-pipe minor cleanups
2014-06-24 17:49:26 +04:00
Gleb Fotengauer-Malinovskiy
c67c739801 Apply apt-0.5.15cnc6-alt-apt-get-TryToInstall.patch
Added in commit 8b55ef8:
0.5.15cnc6-alt11

- apt-get: corrected virtual package remove algorithm (#6276).
- Updated default cdrom mount point (#6152).
2014-06-24 17:49:05 +04:00
Gleb Fotengauer-Malinovskiy
654307ad58 Apply apt-0.5.15cnc6-alt-umount.patch
Added in commit f064429:
0.5.15cnc6-alt6

- /var/lib/apt: relocated to libapt subpackage (#4697).
- UnmountCdrom(): silently ignore subfs and supermount filesystems (#4806).
2014-06-24 17:48:42 +04:00
Gleb Fotengauer-Malinovskiy
cfcfc5759b Apply apt-0.5.15cnc6-alt-apt-shell.patch
Added in commit d952729:
0.5.15cnc6-alt4

- apt-shell fixes from Mouse (#4306).
2014-06-24 17:48:22 +04:00
Gleb Fotengauer-Malinovskiy
1adbad161e Apply apt-0.5.15cnc6-alt-pkgcachegen.patch
Added in commit 68f3ce8:
0.5.15cnc6-alt3

- apt-pkg/pkgcachegen.cc:
  Remove old sources cache file before creating new one.
- More fixes reported by compiler, patch by Anton V. Denisov.
2014-06-24 17:47:48 +04:00
Gleb Fotengauer-Malinovskiy
01b39aea26 Apply apt-0.5.15cnc6-alt-rpm-order.patch
Added in commit 6e5c25c:
0.5.15cnc6-alt1

- Updated to 0.5.15cnc6
- New:
  + apt-0.5.15cnc6-alt-rpm-order (fix RPM::Order default value)
- Updated:
  + apt-0.5.15cnc6-alt-fixes
  + apt-0.5.15cnc6-alt-defaults
  + apt-0.5.15cnc6-alt-rpm-fancypercent
  + apt-0.5.15cnc6-alt-virtual_scores
- Merged upstream:
  + apt-0.5.15cnc6-alt-install_virtual
2014-06-24 17:46:50 +04:00
Gleb Fotengauer-Malinovskiy
763307181d Apply apt-0.5.15lorg2-alt-lua51.patch
Added in commit cbb5c92:
0.5.15cnc5-alt2

- Added one more %triggerun to correct apt.conf,
  due to apt methods migration.
- Applied patch from Alexey Tourbin to use systemwide lua5.
- Applied patch from Sviatoslav Sviridov to workaround VendorList bug.
2014-06-24 17:46:14 +04:00
Gleb Fotengauer-Malinovskiy
d25ff21d36 Apply apt-0.5.15cnc5-alt-gettext.patch
Added in commit 4938f61:
0.5.15cnc5-alt4

- Fixed build with fresh autotools.
2014-06-24 17:45:56 +04:00
Gleb Fotengauer-Malinovskiy
0d15e03058 Apply apt-0.5.15cnc6-alt-virtual-scores.patch
Added in commit 4ef124c:
0.5.5cnc4.1-alt7

- apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM): honor "quiet" option.
- Additional sorting hacks for virtual packages (mouse).
2014-06-24 17:45:31 +04:00
Gleb Fotengauer-Malinovskiy
7bca70185f Apply apt-0.5.4cnc9-alt-pkgorderlist-score.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:45:02 +04:00
Gleb Fotengauer-Malinovskiy
401a272323 Apply apt-0.5.5cnc4.1-alt-PrioComp.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:44:28 +04:00
Gleb Fotengauer-Malinovskiy
ed26526b06 Apply apt-0.5.15cnc5-alt-packagemanager-CheckRConflicts.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:44:08 +04:00
Gleb Fotengauer-Malinovskiy
c3f3399116 Apply apt-0.5.15cnc5-alt-md5hash-debug.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:43:51 +04:00
Gleb Fotengauer-Malinovskiy
0c1ecbb7bc Apply apt-0.5.15cnc5-alt-gpg-homedir.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:43:16 +04:00
Gleb Fotengauer-Malinovskiy
7be75b2c02 Apply apt-0.5.15cnc6-alt-rpm-fancypercent.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:42:36 +04:00
Gleb Fotengauer-Malinovskiy
9c683e8cd3 Apply apt-0.5.15cnc5-alt-execrpm-cmd.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:42:18 +04:00
Gleb Fotengauer-Malinovskiy
a2750a7a83 Apply apt-0.5.15cnc6-alt-parseargs.patch
Added in commit 4ef124c:
0.5.5cnc4.1-alt7

- apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM): honor "quiet" option.
- Additional sorting hacks for virtual packages (mouse).
2014-06-24 17:42:03 +04:00
Gleb Fotengauer-Malinovskiy
991385872c Apply apt-0.5.15cnc5-alt-getsrc.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:41:42 +04:00
Gleb Fotengauer-Malinovskiy
6a7d6b92b3 Apply apt-0.5.5cnc5-alt-rsync.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:40:40 +04:00
Gleb Fotengauer-Malinovskiy
2ee8510e8c Apply apt-0.5.15cnc6-alt-defaults.patch
Added in commit 4ef124c:
0.5.5cnc4.1-alt7

- apt-pkg/rpm/rpmpm.cc(pkgRPMPM::ExecRPM): honor "quiet" option.
- Additional sorting hacks for virtual packages (mouse).
2014-06-24 17:40:18 +04:00
Gleb Fotengauer-Malinovskiy
8276cdafe3 Apply apt-0.5.15cnc5-alt-debsystem.patch
Added in commit 3212342:
0.5.5cnc1-alt3

- Introduced APT::Ignore-dpkg support and set this flag by default,
  to address #0002119.
2014-06-24 17:39:53 +04:00
Gleb Fotengauer-Malinovskiy
4402a20942 Apply apt-0.5.15cnc5-alt-distro.patch
Added in commit e3ad0ef:

- Added librpm-4.0.4 build support.
- Built with librpm-4.0.4, updated buildrequires.
2014-06-24 17:39:34 +04:00
Gleb Fotengauer-Malinovskiy
6a89824004 Apply apt-0.5.15cnc5-alt-rpm-build.patch
Added in commit 0501f88:
0.5.15cnc5-alt1

- Specfile cleanup.
- Rediffed patches.
- Fixed --help/--version segfault.
- Fixed some compilation warnings.
- Relocated methods to /usr/lib/apt/methods/.
2014-06-24 17:39:13 +04:00
Gleb Fotengauer-Malinovskiy
1c62d14da4 Apply apt-0.5.15lorg2-alt-readline.patch
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
2014-06-24 17:38:48 +04:00
Gleb Fotengauer-Malinovskiy
72d2427d28 Apply apt-0.5.15cnc5-alt-libtool.patch
Added in commit 0501f88:
0.5.15cnc5-alt1

- Specfile cleanup.
- Rediffed patches.
- Fixed --help/--version segfault.
- Fixed some compilation warnings.
- Relocated methods to /usr/lib/apt/methods/.
2014-06-24 17:38:26 +04:00
Gleb Fotengauer-Malinovskiy
d594c24ee9 Apply apt-0.5.15lorg2-alt-fixes.patch
Added in commit 0501f88:
0.5.15cnc5-alt1

- Specfile cleanup.
- Rediffed patches.
- Fixed --help/--version segfault.
- Fixed some compilation warnings.
- Relocated methods to /usr/lib/apt/methods/.
2014-06-24 17:38:03 +04:00