OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Nov-2003 21:04:11
Branch: HEAD Handle: 2003112820040901
Modified files:
openpkg-src/apt apt.patch apt.spec
openpkg-web news.txt
Log:
upgrading package: apt 0.5.5cnc6 -> 0.5.15cnc3
Summary:
Revision Changes Path
1.8 +184 -213 openpkg-src/apt/apt.patch
1.4 +6 -6 openpkg-src/apt/apt.spec
1.7605 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 apt.patch
--- openpkg-src/apt/apt.patch 16 Sep 2003 13:22:59 -0000 1.7
+++ openpkg-src/apt/apt.patch 28 Nov 2003 20:04:10 -0000 1.8
@@ -1,5 +1,6 @@
---- apt-pkg/deb/debsystem.cc 2003-06-10 09:13:47.000000000 -0500
-+++ apt-pkg/deb/debsystem.cc 2003-09-12 10:24:15.152860000 -0500
+Index: apt-pkg/deb/debsystem.cc
+--- apt-pkg/deb/debsystem.cc.orig 2003-11-24 17:58:46.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-11-28 20:53:09.000000000 +0100
@@ -162,7 +162,7 @@
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
@@ -18,8 +19,9 @@
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
---- apt-pkg/init.cc 2003-06-10 09:10:21.000000000 -0500
-+++ apt-pkg/init.cc 2003-09-12 10:24:15.172832000 -0500
+Index: apt-pkg/init.cc
+--- apt-pkg/init.cc.orig 2003-11-24 17:58:44.000000000 +0100
++++ apt-pkg/init.cc 2003-11-28 20:53:09.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -53,38 +55,26 @@
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
-- Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+- Cnf.Set("Dir::Bin::methods",LIBDIR "/apt/methods");
+ Cnf.Set("Dir::Bin::methods","@l_prefix@/lib/apt/methods");
+ Cnf.Set("Acquire::ComprExtension", ".bz2");
bool Res = true;
-
---- apt-pkg/luaiface.cc 2003-06-10 09:10:10.000000000 -0500
-+++ apt-pkg/luaiface.cc 2003-09-12 10:24:15.190908000 -0500
-@@ -59,7 +59,7 @@
+Index: apt-pkg/luaiface.cc
+--- apt-pkg/luaiface.cc.orig 2003-11-24 17:58:50.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-11-28 20:53:09.000000000 +0100
+@@ -61,7 +61,7 @@
Lua::Lua()
- : DepCache(0), Cache(0), Fix(0), DontFix(0)
+ : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
{
- _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+ _config->CndSet("Dir::Bin::scripts", "@l_prefix@/lib/apt/scripts");
const luaL_reg lualibs[] = {
{"base", luaopen_base},
---- apt-pkg/rpm/rpmhandler.cc 2003-06-10 09:12:44.000000000 -0500
-+++ apt-pkg/rpm/rpmhandler.cc 2003-09-12 10:24:15.220455000 -0500
-@@ -383,9 +383,9 @@
- File = "Packages";
- #endif
- if (DirectoryOnly == true)
-- return _config->Find("RPM::RootDir")+"/var/lib/rpm";
-+ return _config->Find("RPM::RootDir")+"@dbpath@";
- else
-- return _config->Find("RPM::RootDir")+"/var/lib/rpm/"+File;
-+ return _config->Find("RPM::RootDir")+"@dbpath@/"+File;
- }
-
- bool RPMDBHandler::Skip()
---- apt-pkg/rpm/rpmhandler.h 2003-06-10 09:12:36.000000000 -0500
-+++ apt-pkg/rpm/rpmhandler.h 2003-09-12 10:28:48.228417000 -0500
+Index: apt-pkg/rpm/rpmhandler.h
+--- apt-pkg/rpm/rpmhandler.h.orig 2003-11-24 17:58:54.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-11-28 20:53:09.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -93,8 +83,77 @@
#include <rpm/rpmlib.h>
#include <rpm/rpmmacro.h>
---- apt-pkg/rpm/rpmpackagedata.cc 2003-06-10 09:12:34.000000000 -0500
-+++ apt-pkg/rpm/rpmpackagedata.cc 2003-09-12 10:31:37.552481000 -0500
+Index: apt-pkg/rpm/rpmindexfile.cc
+--- apt-pkg/rpm/rpmindexfile.cc.orig 2003-11-24 17:58:58.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.cc 2003-11-28 20:53:09.000000000 +0100
+@@ -58,7 +58,7 @@
+ Res = URI;
+ }
+ else
+- Res = URI + Dist + "/base/";
++ Res = URI + Dist + "/";
+
+ Res += Type;
+
+@@ -145,7 +145,7 @@
+ Res = URI;
+ }
+ else
+- Res = URI + Dist + "/base/";
++ Res = URI + Dist + "/";
+
+ Res += Type + '.' + Section;
+
+@@ -277,8 +277,8 @@
+ if (Repository->IsAuthenticated() == true &&
+ Repository->HasRelease() == false)
+ return true;
+- new pkgAcqIndex(Owner,Repository,IndexURI("srclist"),Info("srclist"),
+- "srclist");
++ new
pkgAcqIndex(Owner,Repository,IndexURI("00INDEX.apt-srclist"),Info("00INDEX.apt-srclist"),
++ "00INDEX.apt-srclist");
+ return true;
+ }
+ /*}}}*/
+@@ -347,10 +347,10 @@
+ if (Repository->IsAuthenticated() == true &&
+ Repository->HasRelease() == false)
+ return true;
+- new pkgAcqIndex(Owner,Repository,IndexURI("pkglist"),Info("pkglist"),
+- "pkglist");
+- new pkgAcqIndexRel(Owner,Repository,IndexURI("release"),Info("release"),
+- "release");
++ new
pkgAcqIndex(Owner,Repository,IndexURI("00INDEX.apt-pkglist"),Info("00INDEX.apt-pkglist"),
++ "00INDEX.apt-pkglist");
++ new
pkgAcqIndexRel(Owner,Repository,IndexURI("00INDEX.apt-release"),Info("00INDEX.apt-release"),
++ "00INDEX.apt-release");
+ return true;
+ }
+ /*}}}*/
+@@ -424,7 +424,7 @@
+ return _error->Error(_("Problem opening %s"),PackageFile.c_str());
+ }
+ // We call SubProgress with Size(), since we won't call SelectFile() here.
+- Prog.SubProgress(Size(),Info("pkglist"));
++ Prog.SubProgress(Size(),Info("00INDEX.apt-pkglist"));
+ if (Gen.MergeFileProvides(Parser) == false)
+ return _error->Error(_("Problem with MergeFileProvides %s"),
+ PackageFile.c_str());
+Index: apt-pkg/rpm/rpmindexfile.h
+--- apt-pkg/rpm/rpmindexfile.h.orig 2003-11-24 17:58:58.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.h 2003-11-28 20:53:09.000000000 +0100
+@@ -140,7 +140,7 @@
+ {
+ protected:
+
+- virtual string MainType() const {return "srclist";}
++ virtual string MainType() const {return "00INDEX.apt-srclist";}
+
+ public:
+
+Index: apt-pkg/rpm/rpmpackagedata.cc
+--- apt-pkg/rpm/rpmpackagedata.cc.orig 2003-11-24 17:58:55.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-11-28 20:53:09.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -103,18 +162,31 @@
#include <rpm/rpmlib.h>
RPMPackageData::RPMPackageData()
---- apt-pkg/rpm/rpmpm.cc 2003-06-10 09:12:46.000000000 -0500
-+++ apt-pkg/rpm/rpmpm.cc 2003-09-12 10:32:29.231349000 -0500
+Index: apt-pkg/rpm/rpmpm.cc
+--- apt-pkg/rpm/rpmpm.cc.orig 2003-11-24 17:58:53.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-11-28 20:53:09.000000000 +0100
@@ -34,6 +34,7 @@
+ #include <stdio.h>
#include <iostream>
++#include <rpm/glob.h>
+ #ifdef HAVE_RPM41
+ #include <rpm/rpmdb.h>
+ #define packagesTotal rpmcliPackagesTotal
+Index: apt-pkg/rpm/rpmpm.h
+--- apt-pkg/rpm/rpmpm.h.orig 2003-11-24 17:58:54.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-11-28 20:53:09.000000000 +0100
+@@ -11,6 +11,7 @@
+ #ifndef PKGLIB_rpmPM_H
+ #define PKGLIB_rpmPM_H
+#include <rpm/glob.h>
#include <rpm/rpmlib.h>
- /*}}}*/
-
---- apt-pkg/rpm/rpmrecords.h 2003-06-10 09:12:18.000000000 -0500
-+++ apt-pkg/rpm/rpmrecords.h 2003-09-12 10:33:05.832241000 -0500
+ #ifdef HAVE_RPM41
+ #include <rpm/rpmts.h>
+Index: apt-pkg/rpm/rpmrecords.h
+--- apt-pkg/rpm/rpmrecords.h.orig 2003-11-24 17:58:57.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-11-28 20:53:09.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -123,8 +195,9 @@
#include <rpm/rpmlib.h>
---- apt-pkg/rpm/rpmsrcrecords.h 2003-06-10 09:12:46.000000000 -0500
-+++ apt-pkg/rpm/rpmsrcrecords.h 2003-09-12 10:36:00.104583000 -0500
+Index: apt-pkg/rpm/rpmsrcrecords.h
+--- apt-pkg/rpm/rpmsrcrecords.h.orig 2003-11-24 17:58:58.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-11-28 20:53:09.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -133,9 +206,10 @@
#include <rpm/rpmlib.h>
---- apt-pkg/rpm/rpmsystem.cc 2003-06-10 09:12:35.000000000 -0500
-+++ apt-pkg/rpm/rpmsystem.cc 2003-09-12 10:24:15.244358000 -0500
-@@ -120,12 +120,12 @@
+Index: apt-pkg/rpm/rpmsystem.cc
+--- apt-pkg/rpm/rpmsystem.cc.orig 2003-11-24 17:58:54.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2003-11-28 20:53:09.000000000 +0100
+@@ -123,12 +123,12 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
{
@@ -150,7 +224,7 @@
Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
-@@ -197,7 +197,7 @@
+@@ -200,7 +200,7 @@
if (FileExists(RPMDBHandler::DataPath(false)))
Score += 10;
@@ -159,8 +233,9 @@
Score += 10;
return Score;
---- apt-pkg/rpm/rpmversion.cc 2003-06-10 09:12:33.000000000 -0500
-+++ apt-pkg/rpm/rpmversion.cc 2003-09-12 10:38:49.691754000 -0500
+Index: apt-pkg/rpm/rpmversion.cc
+--- apt-pkg/rpm/rpmversion.cc.orig 2003-11-24 17:58:55.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-11-28 20:53:09.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -169,8 +244,21 @@
#include <rpm/rpmlib.h>
#include <rpm/misc.h>
---- configure.in 2003-06-10 09:04:02.000000000 -0500
-+++ configure.in 2003-09-12 13:08:37.264445000 -0500
+Index: apt-pkg/sourcelist.cc
+--- apt-pkg/sourcelist.cc.orig 2003-11-24 17:58:39.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-11-28 20:53:09.000000000 +0100
+@@ -105,7 +105,7 @@
+ // Check for an absolute dists specification.
+ if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
+ {
+- if (ParseQuoteWord(Buffer,Section) == true)
++ if (ParseQuoteWord(Buffer,Section) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (Absolute
dist)"),CurLine,File.c_str());
+ Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+ return CreateItem(List,URI,Dist,Section,Vendor);
+Index: configure.in
+--- configure.in.orig 2003-11-24 17:58:30.000000000 +0100
++++ configure.in 2003-11-28 20:53:09.000000000 +0100
@@ -48,14 +48,14 @@
AC_CHECK_HEADER(rpm/rpmlib.h,
[
@@ -204,8 +292,9 @@
AC_SUBST(RPMLIBS)
])
---- methods/gpg.cc 2003-06-10 09:14:06.000000000 -0500
-+++ methods/gpg.cc 2003-09-12 10:24:15.270075000 -0500
+Index: methods/gpg.cc
+--- methods/gpg.cc.orig 2003-11-24 17:59:24.000000000 +0100
++++ methods/gpg.cc 2003-11-28 20:53:09.000000000 +0100
@@ -195,7 +195,7 @@
return "could not spawn new process";
else if (pid == 0)
@@ -215,9 +304,10 @@
string pubring = "";
const char *argv[16];
int argc = 0;
---- test/scratch.cc 2003-06-10 09:20:33.000000000 -0500
-+++ test/scratch.cc 2003-09-12 10:24:15.304800000 -0500
-@@ -49,7 +49,7 @@
+Index: test/scratch.cc
+--- test/scratch.cc.orig 2003-11-24 17:57:07.000000000 +0100
++++ test/scratch.cc 2003-11-28 20:53:09.000000000 +0100
+@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
pkgFLCache::PkgIterator Pkg(Db.GetFLCache(),0);
@@ -226,9 +316,15 @@
cerr << "Error!" << endl;
const char *Tmp = "/usr/include/linux/kerneld.h";
---- tools/cached_md5.cc 2003-06-10 09:14:45.000000000 -0500
-+++ tools/cached_md5.cc 2003-09-12 13:27:32.586894000 -0500
-@@ -6,6 +6,7 @@
+Index: tools/cached_md5.cc
+--- tools/cached_md5.cc.orig 2003-11-24 17:58:34.000000000 +0100
++++ tools/cached_md5.cc 2003-11-28 20:53:44.000000000 +0100
+@@ -1,11 +1,11 @@
+ /*
+ * $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
+ */
+-#include <alloca.h>
+ #include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@@ -236,9 +332,15 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
---- tools/genpkglist.cc 2003-06-10 09:14:47.000000000 -0500
-+++ tools/genpkglist.cc 2003-09-12 13:24:43.717633000 -0500
-@@ -6,6 +6,7 @@
+Index: tools/genpkglist.cc
+--- tools/genpkglist.cc.orig 2003-11-24 17:58:36.000000000 +0100
++++ tools/genpkglist.cc 2003-11-28 20:53:30.000000000 +0100
+@@ -1,11 +1,11 @@
+ /*
+ * $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
+ */
+-#include <alloca.h>
+ #include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@@ -246,7 +348,7 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
-@@ -368,7 +369,7 @@
+@@ -369,7 +369,7 @@
}
int scandir(const char * dir, struct dirent *** namelist,
@@ -255,123 +357,35 @@
int (* cmp)(const void *, const void *))
{
---- tools/cached_md5.cc.orig 2003-09-13 20:46:01.000000000 +0200
-+++ tools/cached_md5.cc 2003-09-13 20:50:59.000000000 +0200
-@@ -1,7 +1,6 @@
- /*
- * $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
- */
--#include <alloca.h>
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
---- tools/genpkglist.cc.orig 2003-09-13 20:46:01.000000000 +0200
-+++ tools/genpkglist.cc 2003-09-13 20:50:44.000000000 +0200
-@@ -1,7 +1,6 @@
- /*
- * $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
- */
--#include <alloca.h>
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
---- apt-pkg/rpm/rpmindexfile.h.orig 2003-06-10 16:12:48.000000000 +0200
-+++ apt-pkg/rpm/rpmindexfile.h 2003-09-16 11:06:24.000000000 +0200
-@@ -140,7 +140,7 @@
- {
- protected:
-
-- virtual string MainType() const {return "srclist";}
-+ virtual string MainType() const {return "00INDEX.apt-srclist";}
-
- public:
-
---- apt-pkg/rpm/rpmindexfile.cc.orig 2003-06-10 16:12:52.000000000 +0200
-+++ apt-pkg/rpm/rpmindexfile.cc 2003-09-16 11:08:04.000000000 +0200
-@@ -58,7 +58,7 @@
- Res = URI;
+@@ -544,10 +544,10 @@
+ rpmsdir = string(op_dir);
+ }
}
- else
-- Res = URI + Dist + "/base/";
-+ Res = URI + Dist + "/";
+- pkglist_path = string(rpmsdir);
+- rpmsdir = rpmsdir + "/RPMS." + string(op_suf);
++ pkglist_path = rpmsdir + "/" + string(op_suf);
++ rpmsdir = rpmsdir + "/" + string(op_suf);
- Res += Type;
+- string dirtag = "RPMS." + string(op_suf);
++ string dirtag = string(op_suf);
+
+ entry_no = scandir(rpmsdir.c_str(), &dirEntries, selectDirent, alphasort);
+ if (entry_no < 0) {
+@@ -559,9 +559,9 @@
+ chdir(rpmsdir.c_str());
-@@ -145,7 +145,7 @@
- Res = URI;
- }
+ if (pkgListSuffix != NULL)
+- pkglist_path = pkglist_path + "/base/pkglist." + pkgListSuffix;
++ pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + pkgListSuffix;
else
-- Res = URI + Dist + "/base/";
-+ Res = URI + Dist + "/";
+- pkglist_path = pkglist_path + "/base/pkglist." + op_suf;
++ pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + op_suf;
- Res += Type + '.' + Section;
-
-@@ -274,8 +274,8 @@
- if (Repository->IsAuthenticated() == true &&
- Repository->HasRelease() == false)
- return true;
-- new pkgAcqIndex(Owner,Repository,IndexURI("srclist"),Info("srclist"),
-- "srclist");
-+ new
pkgAcqIndex(Owner,Repository,IndexURI("00INDEX.apt-srclist"),Info("00INDEX.apt-srclist"),
-+ "00INDEX.apt-srclist");
- return true;
- }
- /*}}}*/
-@@ -344,10 +344,10 @@
- if (Repository->IsAuthenticated() == true &&
- Repository->HasRelease() == false)
- return true;
-- new pkgAcqIndex(Owner,Repository,IndexURI("pkglist"),Info("pkglist"),
-- "pkglist");
-- new pkgAcqIndexRel(Owner,Repository,IndexURI("release"),Info("release"),
-- "release");
-+ new
pkgAcqIndex(Owner,Repository,IndexURI("00INDEX.apt-pkglist"),Info("00INDEX.apt-pkglist"),
-+ "00INDEX.apt-pkglist");
-+ new
pkgAcqIndexRel(Owner,Repository,IndexURI("00INDEX.apt-release"),Info("00INDEX.apt-release"),
-+ "00INDEX.apt-release");
- return true;
- }
- /*}}}*/
-@@ -421,7 +421,7 @@
- return _error->Error(_("Problem opening %s"),PackageFile.c_str());
- }
- // We call SubProgress with Size(), since we won't call SelectFile() here.
-- Prog.SubProgress(Size(),Info("pkglist"));
-+ Prog.SubProgress(Size(),Info("00INDEX.apt-pkglist"));
- if (Gen.MergeFileProvides(Parser) == false)
- return _error->Error(_("Problem with MergeFileProvides %s"),
- PackageFile.c_str());
---- apt-pkg/sourcelist.cc.orig 2003-09-16 12:02:35.000000000 +0200
-+++ apt-pkg/sourcelist.cc 2003-09-16 12:05:04.000000000 +0200
-@@ -102,7 +102,7 @@
- // Check for an absolute dists specification.
- if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
- {
-- if (ParseQuoteWord(Buffer,Section) == true)
-+ if (ParseQuoteWord(Buffer,Section) == false)
- return _error->Error(_("Malformed line %lu in source list %s (Absolute
dist)"),CurLine,File.c_str());
- Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
- return CreateItem(List,URI,Dist,Section,Vendor);
---- apt-pkg/rpm/rpmsrcrecords.cc.orig 2003-06-10 16:12:48.000000000 +0200
-+++ apt-pkg/rpm/rpmsrcrecords.cc 2003-09-16 13:54:50.000000000 +0200
-@@ -116,15 +116,6 @@
- F.Path = string(dir)+"/"+string(srpm);
- F.Type = "srpm";
-
--#ifndef REMOVE_THIS_SOMEDAY
-- /* This code is here to detect if that's a "new" style SRPM directory
-- * scheme, or an old style. Someday, when most repositories were already
-- * rebuilt with the new gensrclist tool, this code may be safely
-- * removed. */
-- if (F.Path[0] != '.')
-- F.Path = "../" + F.Path;
--#endif
--
- List.push_back(F);
- return true;
---- tools/gensrclist.cc.orig 2003-06-10 16:14:44.000000000 +0200
-+++ tools/gensrclist.cc 2003-09-16 14:55:51.000000000 +0200
+ if (pkgListAppend == true && FileExists(pkglist_path)) {
+Index: tools/gensrclist.cc
+--- tools/gensrclist.cc.orig 2003-11-24 17:58:34.000000000 +0100
++++ tools/gensrclist.cc 2003-11-28 20:53:09.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ -385,7 +399,7 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
-@@ -133,6 +133,89 @@
+@@ -134,6 +134,89 @@
}
#endif
@@ -475,7 +489,7 @@
int main(int argc, char ** argv)
{
char buf[300];
-@@ -198,10 +281,10 @@
+@@ -199,10 +282,10 @@
} else
strcpy(buf, arg_dir);
@@ -488,22 +502,7 @@
#ifdef OLD_FLATSCHEME
if (flatStructure) {
// add the last component of the directory to srpmdir
-@@ -221,14 +304,6 @@
- #else
- if (!flatStructure) {
- srpmdir = "../"+srpmdir;
--#ifndef REMOVE_THIS_SOMEDAY
-- /* This code is here just so that code in rpmsrcrecords.cc is able
-- * to detect if that's a "new" style SRPM directory scheme, or an
-- * old style. Someday, when most repositories were already rebuilt
-- * with that new gensrclist tool, this code may be safely removed. */
-- } else {
-- srpmdir = "./"+srpmdir;
--#endif
- }
- #endif
-
-@@ -242,9 +317,9 @@
+@@ -234,9 +317,9 @@
chdir(buf);
if (srcListSuffix != NULL)
@@ -515,31 +514,3 @@
if (srcListAppend == true && FileExists(buf)) {
outfd = fdOpen(buf, O_WRONLY|O_APPEND, 0644);
---- tools/genpkglist.cc.orig 2003-09-16 15:15:42.000000000 +0200
-+++ tools/genpkglist.cc 2003-09-16 15:18:39.000000000 +0200
-@@ -543,10 +543,10 @@
- rpmsdir = string(op_dir);
- }
- }
-- pkglist_path = string(rpmsdir);
-- rpmsdir = rpmsdir + "/RPMS." + string(op_suf);
-+ pkglist_path = rpmsdir + "/" + string(op_suf);
-+ rpmsdir = rpmsdir + "/" + string(op_suf);
-
-- string dirtag = "RPMS." + string(op_suf);
-+ string dirtag = string(op_suf);
-
- entry_no = scandir(rpmsdir.c_str(), &dirEntries, selectDirent, alphasort);
- if (entry_no < 0) {
-@@ -558,9 +558,9 @@
- chdir(rpmsdir.c_str());
-
- if (pkgListSuffix != NULL)
-- pkglist_path = pkglist_path + "/base/pkglist." + pkgListSuffix;
-+ pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + pkgListSuffix;
- else
-- pkglist_path = pkglist_path + "/base/pkglist." + op_suf;
-+ pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + op_suf;
-
-
- if (pkgListAppend == true && FileExists(pkglist_path)) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 apt.spec
--- openpkg-src/apt/apt.spec 16 Sep 2003 09:14:44 -0000 1.3
+++ openpkg-src/apt/apt.spec 28 Nov 2003 20:04:10 -0000 1.4
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Bootstrapping
License: GPL
-Version: 0.5.5cnc6
-Release: 20030916
+Version: 0.5.15cnc3
+Release: 20031128
# list of sources
Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{version}.tar.bz2
@@ -59,13 +59,13 @@
%prep
%setup -q
- %patch0 -p0
+ %patch -p0 -P 0
# platform specific patching
l_rpmlibs=""
case "%{l_platform -t}" in
*sunos* )
- %patch1 -p0
+ %patch -p0 -P 1
l_rpmlibs="${l_rpmlibs} -lsocket"
;;
esac
@@ -76,7 +76,6 @@
%{l_value -s l_prefix} \
-e 's;@l_bindir@;%{l_prefix}/bin;g' \
-e 's;@name@;apt;g' \
- -e "s;@dbpath@;%{_dbpath};g" \
-e "s;@rpmlibs@;`%{l_prefix}/bin/rpm-config --libs`;g" \
-e "s;@l_rpmlibs@;${l_rpmlibs};g"
@@ -86,11 +85,12 @@
%build
# configure package
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags`" \
+ CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags`
-DOLD_FLATSCHEME" \
CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
./configure \
--prefix=%{l_prefix} \
+ --libdir=%{l_prefix}/lib/apt \
--localstatedir=%{l_prefix}/var/apt \
--disable-shared \
--enable-static \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7604 -r1.7605 news.txt
--- openpkg-web/news.txt 28 Nov 2003 19:22:37 -0000 1.7604
+++ openpkg-web/news.txt 28 Nov 2003 20:04:09 -0000 1.7605
@@ -1,3 +1,4 @@
+28-Nov-2003: Upgraded package: P<apt-0.5.15cnc3-20031128>
28-Nov-2003: Upgraded package: P<perl-xml-20031128-20031128>
28-Nov-2003: Upgraded package: P<libxml-2.6.2-20031128>
28-Nov-2003: Upgraded package: P<libgdome-0.8.1-20031128>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
