diff --git a/.cvsignore b/.cvsignore index 874737e..dbf970b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1 @@ -apt-0.5.15lorg3.2.tar.bz2 -apt-0.5.15lorg3.2-ppc.patch -apt-0.5.15lorg3.x-cache-corruption.patch -apt-0.5.15lorg3.92.tar.bz2 -apt-0.5.15lorg3.93.tar.bz2 +apt-0.5.15lorg3.94.tar.bz2 diff --git a/apt-0.5.15lorg3.93-gcc43.patch b/apt-0.5.15lorg3.93-gcc43.patch deleted file mode 100644 index 0a9f6a0..0000000 --- a/apt-0.5.15lorg3.93-gcc43.patch +++ /dev/null @@ -1,308 +0,0 @@ -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmmisc.h 2008-01-04 10:12:07.000000000 +0200 -@@ -3,6 +3,8 @@ - - #include - -+#include -+ - #ifdef APT_WITH_GNU_HASH_MAP - - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc.gcc43 2007-07-11 10:28:26.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpm.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #if RPM_VERSION >= 0x040100 - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc.gcc43 2007-07-09 10:03:30.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmrecords.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -25,6 +25,8 @@ - - #include - -+#include -+ - using namespace std; - - // RecordParser::rpmRecordParser - Constructor /*{{{*/ -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc.gcc43 2007-08-17 13:49:37.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -1434,7 +1435,7 @@ bool RPMRepomdReaderHandler::Skip() - return true; - } - --string RPMRepomdReaderHandler::FindTag(char *Tag) -+string RPMRepomdReaderHandler::FindTag(const char *Tag) - { - string str = ""; - if (NodeP) { -@@ -1447,7 +1448,7 @@ string RPMRepomdReaderHandler::FindTag(c - return str; - } - --string RPMRepomdReaderHandler::FindVerTag(char *Tag) -+string RPMRepomdReaderHandler::FindVerTag(const char *Tag) - { - string str = ""; - for (xmlNode *n = NodeP->children; n; n = n->next) { -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmcallback.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -9,7 +9,7 @@ - #include - using namespace std; - --static char *copyTags[] = {"name", -+static const char *copyTags[] = {"name", - "version", - "release", - "arch", -@@ -18,7 +18,7 @@ static char *copyTags[] = {"name", - - static void getPackageData(const Header h, map &Data) - { -- char **Tag = ©Tags[0]; -+ const char **Tag = ©Tags[0]; - char rTag[20]; - Data.clear(); - for (Tag = ©Tags[0]; *Tag != NULL; *Tag++) { -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc.gcc43 2007-07-09 10:03:30.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/repomd.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -19,6 +19,8 @@ - #ifdef APT_WITH_REPOMD - - #include -+#include -+ - #include - #include - #include -@@ -27,6 +29,7 @@ - - #include - -+ - using namespace std; - - // Parse repomd.xml file for checksums -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmsystem.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -31,6 +31,7 @@ - - #include - -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h ---- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h.gcc43 2007-07-09 10:03:30.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.h 2008-01-04 10:12:07.000000000 +0200 -@@ -24,6 +24,9 @@ - #include - #include - -+#include -+#include -+ - #include - - // Our Extra RPM tags. These should not be accessed directly. Use -@@ -328,8 +331,8 @@ class RPMRepomdReaderHandler : public RP - string XmlPath; - xmlNode *NodeP; - -- string FindTag(char *Tag); -- string FindVerTag(char *Tag); -+ string FindTag(const char *Tag); -+ string FindVerTag(const char *Tag); - - public: - virtual bool Skip(); -diff -up apt-0.5.15lorg3.93/apt-pkg/indexfile.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/indexfile.cc ---- apt-0.5.15lorg3.93/apt-pkg/indexfile.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/indexfile.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -15,6 +15,7 @@ - #include - #include - /*}}}*/ -+#include - - // Global list of Item supported - static pkgIndexFile::Type *ItmList[10]; -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/fileutl.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -22,6 +22,7 @@ - #include - - #include -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/progress.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -17,6 +17,7 @@ - - #include - -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc.gcc43 2007-07-09 10:03:30.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/sqlite.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -9,6 +9,8 @@ - #include - #include - -+#include -+ - // debug stuff.. - #include - using namespace std; -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h ---- apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/strutl.h 2008-01-04 10:12:07.000000000 +0200 -@@ -21,6 +21,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/error.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h ---- apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/md5.h 2008-01-04 10:12:07.000000000 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - using std::string; - -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h ---- apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h 2008-01-04 10:12:07.000000000 +0200 -@@ -18,6 +18,7 @@ - #pragma interface "apt-pkg/sha1.h" - #endif - -+#include - #include - - using std::string; -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/cmndline.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -19,6 +19,8 @@ - #include - - #include -+ -+#include - /*}}}*/ - using namespace std; - -diff -up apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc ---- apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/contrib/mmap.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -30,6 +30,7 @@ - - #include - -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc ---- apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/pkgsystem.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -17,6 +17,7 @@ - #include - #include - /*}}}*/ -+#include - - pkgSystem *_system = 0; - static pkgSystem *SysList[10]; -diff -up apt-0.5.15lorg3.93/apt-pkg/algorithms.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/algorithms.cc ---- apt-0.5.15lorg3.93/apt-pkg/algorithms.cc.gcc43 2008-01-04 10:12:07.000000000 +0200 -+++ apt-0.5.15lorg3.93/apt-pkg/algorithms.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - - #include -+#include - /*}}}*/ - using namespace std; - -diff -up apt-0.5.15lorg3.93/apt-pkg/clean.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/clean.cc ---- apt-0.5.15lorg3.93/apt-pkg/clean.cc.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/clean.cc 2008-01-04 10:12:07.000000000 +0200 -@@ -19,6 +19,7 @@ - - #include - -+#include - #include - #include - #include -diff -up apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h.gcc43 apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h ---- apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h.gcc43 2007-05-14 12:01:55.000000000 +0300 -+++ apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h 2008-01-04 10:12:07.000000000 +0200 -@@ -59,7 +59,7 @@ class pkgCacheGenerator - public: - - // CNC:2003-02-27 - We need this in rpmListParser. -- bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg); -+ bool NewPackage(pkgCache::PkgIterator &Pkg,string Name); - - unsigned long WriteUniqString(const char *S,unsigned int Size); - inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());}; -diff -up apt-0.5.15lorg3.93/apt-pkg/init.cc.gcc43 apt-0.5.15lorg3.93/apt-pkg/init.cc ---- apt-0.5.15lorg3.93/apt-pkg/init.cc.gcc43 2008-01-04 10:19:47.000000000 +0200 -+++ apt-0.5.15lorg3.93/apt-pkg/init.cc 2008-01-04 10:19:56.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - - #include -+#include - #include - #include - #include diff --git a/apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch b/apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch deleted file mode 100644 index 2100f31..0000000 --- a/apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc -index a3fb896..cd226ee 100644 ---- a/apt-pkg/algorithms.cc -+++ b/apt-pkg/algorithms.cc -@@ -962,8 +962,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) - End->Type != pkgCache::Dep::Conflicts && - End->Type != pkgCache::Dep::Obsoletes)) - { -- // Try a little harder to fix protected packages.. -- if ((Flags[I->ID] & Protected) == Protected) -+ // Try a little harder for protected packages and obsoletes.. -+ if ((Flags[I->ID] & Protected) == Protected || -+ End->Type == pkgCache::Dep::Obsoletes) - { - if (DoUpgrade(Pkg) == true) - { -diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc -index 70b392a..3d4574f 100644 ---- a/apt-pkg/policy.cc -+++ b/apt-pkg/policy.cc -@@ -295,6 +295,13 @@ signed short pkgPolicy::GetPkgPriority(const pkgCache::PkgIterator &Pkg) - Max = Prio; - } - } -+ -+ /* XXX HACK alert: give non-native packages slightly lower priority */ -+ string CAS = _config->Find("RPM::CompatArchSuffix"); -+ if (!CAS.empty() && -+ string(Pkg.Name()).rfind(CAS) != string::npos) { -+ Max--; -+ } - return Max; - } - /*}}}*/ -diff --git a/apt-pkg/rpm/rpmpackagedata.cc b/apt-pkg/rpm/rpmpackagedata.cc -index 7dbac3a..24060e2 100644 ---- a/apt-pkg/rpm/rpmpackagedata.cc -+++ b/apt-pkg/rpm/rpmpackagedata.cc -@@ -42,6 +42,10 @@ RPMPackageData::RPMPackageData() - PreferredArch = _config->Find(PA.c_str(), BaseArch.c_str()); - string CAS = MLBase + "::CompatArchSuffix"; - CompatArchSuffix = _config->Find(CAS.c_str(), ".32bit"); -+ -+ // Blech, export for easy use elsewhere .. for now -+ _config->Set("RPM::PreferredArch", PreferredArch); -+ _config->Set("RPM::CompatArchSuffix", CompatArchSuffix); - } - - // Populate priorities diff --git a/apt-0.5.15lorg3.93-repomd-assert.patch b/apt-0.5.15lorg3.93-repomd-assert.patch deleted file mode 100644 index 21d9ed1..0000000 --- a/apt-0.5.15lorg3.93-repomd-assert.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 40dc6292aaa1ffa9c06fd94b276f378411b3b629 -Author: Panu Matilainen -Date: Mon Nov 19 09:09:39 2007 +0200 - - Fix assert failure in some cases where repomd.xml can't be found - -diff --git a/apt-pkg/rpm/rpmindexfile.cc b/apt-pkg/rpm/rpmindexfile.cc -index 937712a..1e1eb22 100644 ---- a/apt-pkg/rpm/rpmindexfile.cc -+++ b/apt-pkg/rpm/rpmindexfile.cc -@@ -561,7 +561,12 @@ string rpmRepomdIndex::ArchiveInfo(pkgCache::VerIterator Ver) const - } - pkgCache::PkgFileIterator rpmRepomdIndex::FindInCache(pkgCache &Cache) const - { -- string FileName = IndexPath(); -+ string FileName = ""; -+ /* repomd requires release to be present to find any other files */ -+ if (FileExists(ReleasePath())) { -+ FileName = IndexPath(); -+ } -+ - pkgCache::PkgFileIterator File = Cache.FileBegin(); - for (; File.end() == false; File++) - { diff --git a/apt.spec b/apt.spec index e807d9c..2b5fc79 100644 --- a/apt.spec +++ b/apt.spec @@ -5,8 +5,8 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt -Version: 0.5.15lorg3.93 -Release: 5%{?dist} +Version: 0.5.15lorg3.94 +Release: 1%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ # SourceLicense: GPLv2+ except lua/ which is MIT @@ -36,12 +36,6 @@ Source150: default.conf Patch0: apt-0.5.15lorg3.2-ppc.patch # band aid for mmap issues (#211254) Patch1: apt-0.5.15lorg3.x-cache-corruption.patch -# multilib obsoletes hackery (#353271) -Patch2: apt-0.5.15lorg3.93-multilib-obsoletes-hack.patch -# avoid assertion failure when repomd.xml doesn't exist -Patch3: apt-0.5.15lorg3.93-repomd-assert.patch -# assorted correctness fixes to make gcc 4.3 happier -Patch4: apt-0.5.15lorg3.93-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -126,9 +120,6 @@ RHL/RHEL/FC distributions. %setup -q %patch0 -p1 -b .ppc %patch1 -p0 -b .mmap -%patch2 -p1 -b .obsoletes-hack -%patch3 -p1 -b .repomd-assert -%patch4 -p1 -b .gcc43 install -pm 644 %{SOURCE19} comps2prio.xsl @@ -294,6 +285,10 @@ fi %changelog +* Fri Jan 11 2008 Panu Matilainen 0.5.15lorg3.94-1 +- update to 0.5.15lorg3.94, should fix #222927, #246866, #279921, and #419811 +- update rpmpriorities to match current package set (#426143) + * Fri Jan 04 2008 Panu Matilainen 0.5.15lorg3.93-5 - fix build with gcc 4.3 diff --git a/rpmpriorities b/rpmpriorities index a6a1535..2a2d0d9 100644 --- a/rpmpriorities +++ b/rpmpriorities @@ -7,7 +7,7 @@ Essential: setserial file rpm - sysklogd + rsyslog losetup kudzu glibc @@ -24,7 +24,7 @@ Essential: hdparm hotplug readline - util-linux + util-linux-ng basesystem setup e2fsprogs diff --git a/sources b/sources index 8245555..d6ca2c2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 319591417226d12f0264cce78a1c95fa apt-0.5.15lorg3.2-ppc.patch 6c2e9568a0c2bbe6b0bbd1aa0643a377 apt-0.5.15lorg3.x-cache-corruption.patch -5437ac203f7fe15b9bbd74b3c99e2b6a apt-0.5.15lorg3.93.tar.bz2 +91075f1f0226eaf2dadc73cee00c3de1 apt-0.5.15lorg3.94.tar.bz2