Commit Graph

242 Commits

Author SHA1 Message Date
Gleb Fotengauer-Malinovskiy
16411cf341 rpmhandler.cc: drop check for _dbapi 2016-07-15 18:07:04 +03:00
Gleb Fotengauer-Malinovskiy
8dc7047a6d Fix build with rpm-4.13 2016-07-15 18:07:04 +03:00
David Kalnischkies
afdcaf63cf * apt-pkg/pkgcache.h:
- switch {,Install-}Size to unsigned long long
* apt-pkg/depcache.cc:
  - deal with long long, not with int to remove 2GB Limit (LP: #250909)
(cherry picked from commit e2c66de5c5e63d8400efb0522c31fbe1ec225f93)
2016-07-13 20:19:40 +03:00
Gleb Fotengauer-Malinovskiy
adf3585f8a Disable fancypercents by default 2016-06-20 15:15:36 +03:00
Alexey Gladkov
c89d404a18 Use rpm-4.12.90 v1
Signed-off-by: Alexey Gladkov <legion@altlinux.org>
2016-06-20 11:52:46 +02:00
Ivan Zakharyaschev
59b478d2ca 0.5.15lorg2-alt53
- doc/: Add a note about APT_CONFIG in the -c description
  (Closes: Debian #578267) (thx David Kalnischkies).
2015-11-27 19:22:50 +03:00
David Kalnischkies
edf1257ae9 * doc/apt.ent:
- Add a note about APT_CONFIG in the -c description (Closes: #578267)

(cherry picked from commit 75a53a7c29bf3b2dd8d898ed650b1fe937119080
from git://anonscm.debian.org/git/apt/apt.git with:

git cherry-pick -Xsubtree=apt -x 75a53a7c

)

Conflicts:
	apt/debian/changelog
	apt/doc/apt.ent
2015-11-27 19:15:34 +03:00
Gleb Fotengauer-Malinovskiy
cf5a1ae293 0.5.15lorg2-alt52
- Fixed apt usage with redefined rpm binary name.
2015-05-29 21:03:42 +03:00
Gleb Fotengauer-Malinovskiy
8c3f1ed576 rpmpm.cc: fix use after free of temporary std::string object
According to C++ standard (since C++89), this string is destroyed right
after evaluation of .c_str().
In addition, gcc5 with c++11 ABI mode enabled cleans memory in
basic_string destructor and reuses memory in *next* basic_string
constructor.

This led to the error:
 # apt-get install doxygen -o RPM::PM=external -o Dir::Bin::gpg=false -qq
 Executing RPM (/bin/rpm -U -v --oldpackage)...
 Could not exec /
 E: Sub-process /bin/rpm returned an error code (100)
2015-05-29 21:03:09 +03:00
Gleb Fotengauer-Malinovskiy
85c16e95fb 0.5.15lorg2-alt51
- Bumped soversion.
- Rebuilt for C++11 ABI.
2015-05-28 14:20:31 +03:00
Gleb Fotengauer-Malinovskiy
c17f8ba375 Bump soversion 2015-05-28 13:47:48 +03:00
Gleb Fotengauer-Malinovskiy
3519ad01ac 0.5.15lorg2-alt50
- Increased default APT::Cache-Limit:
 + up to 96M on 64bit systems.
 + up to 80M on 32bit systems.
2015-03-31 20:03:22 +03:00
Gleb Fotengauer-Malinovskiy
abf6d39f75 Increase default APT::Cache-Limit 2015-03-31 20:03:22 +03:00
Ivan Zakharyaschev
5705543497 .spec: rm trailing whitespace.
(Hopefully, this doesn't break the changelog inheritance check.)
2015-03-31 20:03:22 +03:00
Ivan Zakharyaschev
20e5371562 .spec: unneeded setup for Emacs. 2015-03-31 20:03:22 +03:00
62ebba07ee 0.5.15lorg2-alt49
- Reintroduced '%set_verify_elf_method strict'.
2014-11-28 14:11:09 +00:00
Gleb Fotengauer-Malinovskiy
2b715d3452 0.5.15lorg2-alt48
- Added buildtime to downloaded package name.
2014-11-27 19:34:20 +03:00
Gleb Fotengauer-Malinovskiy
d17234e74e acquire-item.cc: add BTime string to the name of downloaded package 2014-11-25 16:05:10 +03:00
a2b813b80b 0.5.15lorg2-alt47
- Added apt's package NEVRA string to OptionsHash.
2014-09-12 00:57:44 +00:00
54d7a63354 Add package NEVRA string to OptionsHash 2014-09-12 00:56:08 +00:00
Gleb Fotengauer-Malinovskiy
4aad676788 buildlib/archtable: add aarch64 2014-09-10 14:08:31 +04:00
Gleb Fotengauer-Malinovskiy
be0d3a6eb0 0.5.15lorg2-alt46.1
- Bump soversion.
2014-08-13 16:37:03 +04:00
Gleb Fotengauer-Malinovskiy
3091599081 Bump soversion 2014-08-13 16:32:36 +04:00
Gleb Fotengauer-Malinovskiy
202f4861f2 0.5.15lorg2-alt46
- apt-pkg/policy.cc: it is ok, if default PinDir doesn't exist
  (reported by rider@).
2014-07-04 15:56:18 +04:00
Gleb Fotengauer-Malinovskiy
02a55b051d apt-pkg/policy.cc: it is ok, if default PinDir doesn't exist
Reported-by: rider@
2014-07-04 15:56:13 +04:00
Gleb Fotengauer-Malinovskiy
6e29b2fe58 0.5.15lorg2-alt45.1
- Rebuilt with rpm-4.0.4-alt100.78 (different size of rpmTagTable).
2014-07-01 17:47:42 +04:00
Gleb Fotengauer-Malinovskiy
23176d5070 Fix translation 2014-06-28 16:20:59 +04:00
Gleb Fotengauer-Malinovskiy
0c16f06b0d 0.5.15lorg2-alt45
- Honor buildtime.
- Added support of preferences.d dir.
- apt-pkg/algorithms.cc: mark all installed packages first without auto
  installation in a dist-upgrade (probably fixes
  http://lists.altlinux.org/pipermail/devel/2009-May/171113.html ).
2014-06-25 19:02:08 +04:00
Gleb Fotengauer-Malinovskiy
e2184306b2 * apt-pkg/algorithms.cc: mark all installed packages first
Mark all installed non-obsoleted packages first without auto
installation in a dist-upgrade.

Based on upstream commit c427b1e218e61bd1aacbddf9013e58b8aa445a7c.
2014-06-25 19:02:02 +04:00
Julian Andres Klode
dceb12217d Support /etc/apt/preferences.d (Closes: #535512)
(cherry picked from commit e68ca100711326895126dc1fca86a2124a8e8d63)

Conflicts:
	apt/apt-pkg/init.cc
	apt/apt-pkg/policy.cc
	debian/apt.dirs
	debian/changelog
2014-06-25 18:53:20 +04:00
Gleb Fotengauer-Malinovskiy
b9eda9c3d7 Honor package buildtime 2014-06-25 18:53:07 +04:00
Gleb Fotengauer-Malinovskiy
c088a55112 spec: apply all patches 2014-06-24 18:03:22 +04:00
Gleb Fotengauer-Malinovskiy
79b66f684e Apply apt-0.5.15lorg2-alt-lfs.patch
Added in commit f236235:
0.5.15lorg2-alt42

- Fixed and enabled LFS support (closes: #28214).
2014-06-24 18:03:22 +04:00
Gleb Fotengauer-Malinovskiy
f70d38a336 Apply apt-0.5.15lorg2-apt-cdrom-to-media.patch
Added in commit c34d193:
0.5.15lorg2-alt43

- use apt-cdrom for general distribution media
- stricted verify-elf removed
2014-06-24 18:03:22 +04:00
Gleb Fotengauer-Malinovskiy
fecd3f817b Apply apt-0.5.15lorg2-alt-rpmdbopen.patch
Added in commit 96870b6:
- add patch: open rpm database with O_CREAT flag (we need it to use apt in system installer)
2014-06-24 18:03:22 +04:00
Gleb Fotengauer-Malinovskiy
4224cb4f8f Apply apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch
Added in commit 7956d44:
apt-shell: quit from shell by Ctrl+D (#18343)
2014-06-24 18:03:21 +04:00
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