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 Date: 28-Nov-2003 23:09:24
Branch: HEAD Handle: 2003112822092300
Modified files:
openpkg-src/apt apt.patch
Log:
make genbasedir more portable although it is still semantically broken
Summary:
Revision Changes Path
1.11 +60 -29 openpkg-src/apt/apt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 apt.patch
--- openpkg-src/apt/apt.patch 28 Nov 2003 21:44:56 -0000 1.10
+++ openpkg-src/apt/apt.patch 28 Nov 2003 22:09:23 -0000 1.11
@@ -1,6 +1,6 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-11-28 23:01:52.000000000 +0100
@@ -162,7 +162,7 @@
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
@@ -21,7 +21,7 @@
Score += 10;
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 21:06:52.000000000 +0100
++++ apt-pkg/init.cc 2003-11-28 23:01:52.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -35,7 +35,7 @@
/* Just in case something goes horribly wrong, we can fall back to the
old /var/state paths.. */
-@@ -61,13 +61,13 @@
+@@ -61,7 +61,7 @@
Cnf.Set("Dir::State::cdroms","cdroms.list");
// Cache
@@ -44,13 +44,6 @@
Cnf.Set("Dir::Cache::archives","archives/");
Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
-
- // Configuration
-- Cnf.Set("Dir::Etc","etc/apt/");
-+ Cnf.Set("Dir::Etc","etc/apt/");
- Cnf.Set("Dir::Etc::sourcelist","sources.list");
- // CNC:2003-03-03
- Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
@@ -76,7 +76,7 @@
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
@@ -62,7 +55,7 @@
bool Res = true;
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 21:06:52.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-11-28 23:01:52.000000000 +0100
@@ -61,7 +61,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
@@ -74,7 +67,7 @@
{"base", luaopen_base},
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-11-28 23:01:52.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -85,7 +78,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.cc 2003-11-28 23:01:52.000000000 +0100
@@ -58,7 +58,7 @@
Res = URI;
}
@@ -141,7 +134,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.h 2003-11-28 23:01:52.000000000 +0100
@@ -140,7 +140,7 @@
{
protected:
@@ -153,7 +146,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-11-28 23:01:52.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -164,7 +157,7 @@
RPMPackageData::RPMPackageData()
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-11-28 23:01:52.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -175,7 +168,7 @@
#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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-11-28 23:01:52.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -186,7 +179,7 @@
#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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-11-28 23:01:52.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -197,7 +190,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-11-28 23:01:52.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -208,7 +201,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2003-11-28 23:01:52.000000000 +0100
@@ -123,12 +123,12 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
@@ -235,7 +228,7 @@
return Score;
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 21:06:52.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-11-28 23:01:52.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -246,7 +239,7 @@
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 21:06:52.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-11-28 23:01:52.000000000 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -258,7 +251,7 @@
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 21:06:52.000000000 +0100
++++ configure.in 2003-11-28 23:01:52.000000000 +0100
@@ -48,14 +48,14 @@
AC_CHECK_HEADER(rpm/rpmlib.h,
[
@@ -293,8 +286,8 @@
AC_SUBST(RPMLIBS)
])
Index: methods/gpg.cc
---- methods/gpg.cc.orig 2003-11-28 21:06:52.000000000 +0100
-+++ methods/gpg.cc 2003-11-28 21:07:38.000000000 +0100
+--- methods/gpg.cc.orig 2003-11-24 17:59:24.000000000 +0100
++++ methods/gpg.cc 2003-11-28 23:01:52.000000000 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -391,7 +384,7 @@
const char *outfile, string &signerKeyID)
Index: test/scratch.cc
--- test/scratch.cc.orig 2003-11-24 17:57:07.000000000 +0100
-+++ test/scratch.cc 2003-11-28 21:06:52.000000000 +0100
++++ test/scratch.cc 2003-11-28 23:01:52.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -403,7 +396,7 @@
const char *Tmp = "/usr/include/linux/kerneld.h";
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 21:06:52.000000000 +0100
++++ tools/cached_md5.cc 2003-11-28 23:01:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -417,9 +410,47 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
+Index: tools/genbasedir
+--- tools/genbasedir.orig 2003-11-24 17:58:35.000000000 +0100
++++ tools/genbasedir 2003-11-28 23:04:32.000000000 +0100
+@@ -39,7 +39,7 @@
+ phashstuff()
+ {
+ size=`getsize $1`
+- md5=`md5sum $1|cut -f1 -d\ `
++ md5=`openssl md5 <$1`
+ echo " $md5 $size $2"
+ }
+
+@@ -420,14 +420,14 @@
+ if [ $partial -eq 0 ]; then
+ echo -n "Updating global release file... "
+ sed -n -e "/^MD5Sum:/q" \
+- -e "s/^Date:.*\$/Date: `date -R`/" \
++ -e "s/^Date:.*\$/Date: `date '+%a, %d %b %Y
%H:%M:%S %z' | sed -e 's/%z/+0000/'`/" \
+ -e "s/^Components:.*\$/Components: $components/" \
+ -e "p" $release.old > $release
+ echo "MD5Sum:" >> $release
+ else
+ echo -n "Partially updating global release file... "
+ sed -n -e "/^\$/q" \
+- -e "s/^Date:.*\$/Date: `date -R`/" \
++ -e "s/^Date:.*\$/Date: `date '+%a, %d %b %Y
%H:%M:%S %z' | sed -e 's/%z/+0000/'`/" \
+ -e "p" $release.old > $release.pre
+ for comp in $components; do
+ sed -e "\#^ .* $pkglist_.$comp\(.bz2\)\?\$#d" \
+@@ -448,7 +448,7 @@
+ echo "Label: Unknown" >> $release
+ echo "Suite: Unknown" >> $release
+ echo "Codename: Unknown" >> $release
+- echo "Date: `date -R`" >> $release
++ echo "Date: `date '+%a, %d %b %Y %H:%M:%S %z' | sed -e 's/%z/+0000/'`"
>> $release
+ echo "Architectures: Unknown" >> $release
+ echo "Components: $components" >> $release
+ echo "Description: Not available" >> $release
Index: tools/genpkglist.cc
--- tools/genpkglist.cc.orig 2003-11-24 17:58:36.000000000 +0100
-+++ tools/genpkglist.cc 2003-11-28 21:06:52.000000000 +0100
++++ tools/genpkglist.cc 2003-11-28 23:01:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -470,7 +501,7 @@
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 21:06:52.000000000 +0100
++++ tools/gensrclist.cc 2003-11-28 23:01:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
