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: 29-Nov-2003 23:13:44
Branch: HEAD Handle: 2003112922134201
Added files:
openpkg-src/apt preferences translate.list vendors.list
Modified files:
openpkg-src/apt apt.patch apt.spec sources.list
openpkg-web news.txt
Log:
flush work of this evening
Summary:
Revision Changes Path
1.13 +97 -21 openpkg-src/apt/apt.patch
1.10 +9 -4 openpkg-src/apt/apt.spec
1.1 +2 -0 openpkg-src/apt/preferences
1.2 +3 -2 openpkg-src/apt/sources.list
1.1 +2 -0 openpkg-src/apt/translate.list
1.1 +9 -0 openpkg-src/apt/vendors.list
1.7616 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 apt.patch
--- openpkg-src/apt/apt.patch 28 Nov 2003 22:47:58 -0000 1.12
+++ openpkg-src/apt/apt.patch 29 Nov 2003 22:13:43 -0000 1.13
@@ -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 23:01:52.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-11-29 22:44:33.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 23:01:52.000000000 +0100
++++ apt-pkg/init.cc 2003-11-29 22:44:33.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -55,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 23:01:52.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-11-29 22:44:33.000000000 +0100
@@ -61,7 +61,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
@@ -67,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-11-29 22:44:33.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -78,7 +78,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-11-29 22:44:33.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -89,7 +89,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-11-29 22:44:33.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -100,7 +100,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-11-29 22:44:33.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -111,7 +111,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-11-29 22:44:33.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -122,7 +122,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-11-29 22:44:33.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -133,8 +133,8 @@
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 23:01:52.000000000 +0100
-@@ -123,12 +123,12 @@
++++ apt-pkg/rpm/rpmsystem.cc 2003-11-29 22:47:42.000000000 +0100
+@@ -123,13 +123,13 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
{
@@ -145,10 +145,12 @@
Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
Cnf.CndSet("Dir::State::prefetch", "prefetch");
- Cnf.CndSet("Dir::Locale","/usr/share/locale");
+- Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
+ Cnf.CndSet("Dir::Locale","@l_prefix@/share/locale");
- Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
++ Cnf.CndSet("Acquire::DistroID","OpenPKG");
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
+
@@ -200,7 +200,7 @@
if (FileExists(RPMDBHandler::DataPath(false)))
@@ -160,7 +162,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 23:01:52.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-11-29 22:44:33.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -171,7 +173,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 23:01:52.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-11-29 22:44:33.000000000 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -181,9 +183,31 @@
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: cmdline/apt-shell.cc
+--- cmdline/apt-shell.cc.orig 2003-11-24 18:00:20.000000000 +0100
++++ cmdline/apt-shell.cc 2003-11-29 22:46:42.000000000 +0100
+@@ -3672,7 +3672,7 @@
+ " remove - Remove packages\n"
+ " keep - Keep packages\n"
+ " upgrade - Perform a global upgrade\n"
+- " dist-upgrade - Perform a globla distribution upgrade\n"
++ " dist-upgrade - Perform a global distribution upgrade\n"
+ " build-dep - Install build-dependencies for source packages\n"
+ // " dselect-upgrade - Follow dselect selections\n"
+ " update - Retrieve new lists of packages\n"
+@@ -3694,8 +3694,7 @@
+ " autoclean - Erase old downloaded archive files\n"
+ "\n"
+ "For more information type \"help <cmd>\" or \"<cmd> [-h|--help]\".\n"
+- "\n"
+- " This APT has Super Cow Powers.\n");
++ );
+ return true;
+ }
+
Index: configure.in
--- configure.in.orig 2003-11-24 17:58:30.000000000 +0100
-+++ configure.in 2003-11-28 23:01:52.000000000 +0100
++++ configure.in 2003-11-29 22:44:33.000000000 +0100
@@ -48,14 +48,14 @@
AC_CHECK_HEADER(rpm/rpmlib.h,
[
@@ -219,7 +243,7 @@
])
Index: methods/gpg.cc
--- methods/gpg.cc.orig 2003-11-24 17:59:24.000000000 +0100
-+++ methods/gpg.cc 2003-11-28 23:01:52.000000000 +0100
++++ methods/gpg.cc 2003-11-29 22:44:33.000000000 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -314,9 +338,21 @@
char *getFileSigner(const char *file, const char *sigfile,
const char *outfile, string &signerKeyID)
+Index: methods/http.cc
+--- methods/http.cc.orig 2003-11-24 17:59:25.000000000 +0100
++++ methods/http.cc 2003-11-29 22:52:44.000000000 +0100
+@@ -680,7 +680,7 @@
+ // CNC:2003-01-29
+ string UserAgent = _config->Find("Acquire::http::User-Agent");
+ if (UserAgent.empty() == true)
+- UserAgent = "RPM APT-HTTP/1.3";
++ UserAgent = "OpenPKG RPM APT-HTTP/1.3";
+ Req += string("User-Agent: ") + UserAgent + "\r\n\r\n";
+
+ if (Debug == true)
Index: test/scratch.cc
--- test/scratch.cc.orig 2003-11-24 17:57:07.000000000 +0100
-+++ test/scratch.cc 2003-11-28 23:01:52.000000000 +0100
++++ test/scratch.cc 2003-11-29 22:44:33.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -328,7 +364,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 23:01:52.000000000 +0100
++++ tools/cached_md5.cc 2003-11-29 22:44:33.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -344,7 +380,7 @@
#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
++++ tools/genbasedir 2003-11-29 22:49:11.000000000 +0100
@@ -39,7 +39,7 @@
phashstuff()
{
@@ -354,6 +390,39 @@
echo " $md5 $size $2"
}
+@@ -167,7 +167,7 @@
+ rm -f $comps; touch $comps
+ for dir in $topdir/RPMS.* $topdir/SRPMS.* $topdir/../SRPMS.*; do
+ if [ -d $dir ]; then
+- echo $dir | sed 's/.*\.//' >> $comps
++ echo $dir | sed 's/.*RPMS\.//' >> $comps
+ fi
+ done
+ components=`cat $comps|sort|uniq`
+@@ -222,9 +222,9 @@
+ fi
+
+ if test x$updateinfo = x; then
+- (cd $basedir; genpkglist $progress $bloat $meta_opts --index
$srcidxdir/srcidx.$comp $topdir $comp)
++ (cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts
--index $srcidxdir/srcidx.$comp $topdir $comp)
+ else
+- (cd $basedir; genpkglist $progress $bloat $meta_opts --index
$srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
++ (cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts
--index $srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
+ fi
+
+ if [ -z "$meta" -a -f $basedir/pkglist.$comp ]; then
+@@ -314,9 +314,9 @@
+ fi
+
+ if [ $mapi -ne 0 ]; then
+- (cd $basedir; gensrclist $progress $flat $meta_opts --mapi $srctopdir
$comp $srcidxdir/srcidx.$comp)
++ (cd $basedir; @l_prefix@/bin/gensrclist $progress $flat $meta_opts --mapi
$srctopdir $comp $srcidxdir/srcidx.$comp)
+ else
+- (cd $basedir; gensrclist $progress $flat $meta_opts $srctopdir $comp
$srcidxdir/srcidx)
++ (cd $basedir; @l_prefix@/bin/gensrclist $progress $flat $meta_opts
$srctopdir $comp $srcidxdir/srcidx)
+ fi
+
+ if [ -z "$meta" -a -f $basedir/srclist.$comp ]; then
@@ -420,14 +420,14 @@
if [ $partial -eq 0 ]; then
echo -n "Updating global release file... "
@@ -380,9 +449,16 @@
echo "Architectures: Unknown" >> $release
echo "Components: $components" >> $release
echo "Description: Not available" >> $release
+@@ -587,6 +587,4 @@
+ rm -f $basedir/hashfile.gpg.old
+ fi
+
+-echo "All your base are belong to us!!!"
+-
+ # vim:ts=4:sw=4
Index: tools/genpkglist.cc
--- tools/genpkglist.cc.orig 2003-11-24 17:58:36.000000000 +0100
-+++ tools/genpkglist.cc 2003-11-28 23:01:52.000000000 +0100
++++ tools/genpkglist.cc 2003-11-29 22:44:33.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -407,7 +483,7 @@
{
Index: tools/gensrclist.cc
--- tools/gensrclist.cc.orig 2003-11-24 17:58:34.000000000 +0100
-+++ tools/gensrclist.cc 2003-11-28 23:01:52.000000000 +0100
++++ tools/gensrclist.cc 2003-11-29 22:44:33.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 apt.spec
--- openpkg-src/apt/apt.spec 28 Nov 2003 22:47:58 -0000 1.9
+++ openpkg-src/apt/apt.spec 29 Nov 2003 22:13:43 -0000 1.10
@@ -37,13 +37,16 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20031128
+Release: 20031129
# list of sources
Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
Source1: apt.conf
-Source2: rpmpriorities
-Source3: sources.list
+Source2: sources.list
+Source3: vendors.list
+Source4: translate.list
+Source5: rpmpriorities
+Source6: preferences
Patch0: apt.patch
# build information
@@ -130,7 +133,9 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt \
$RPM_BUILD_ROOT%{l_prefix}/etc/apt/apt.conf.d
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE apt.conf} %{SOURCE rpmpriorities} %{SOURCE sources.list} \
+ %{SOURCE apt.conf} \
+ %{SOURCE rpmpriorities} %{SOURCE preferences} \
+ %{SOURCE sources.list} %{SOURCE vendors.list} %{SOURCE translate.list} \
$RPM_BUILD_ROOT%{l_prefix}/etc/apt/
# strip down installation
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/preferences
============================================================================
$ cvs diff -u -r0 -r1.1 preferences
--- /dev/null 2003-11-29 23:13:44.000000000 +0100
+++ preferences 2003-11-29 23:13:44.000000000 +0100
@@ -0,0 +1,2 @@
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/sources.list
============================================================================
$ cvs diff -u -r1.1 -r1.2 sources.list
--- openpkg-src/apt/sources.list 28 Nov 2003 22:47:58 -0000 1.1
+++ openpkg-src/apt/sources.list 29 Nov 2003 22:13:43 -0000 1.2
@@ -2,6 +2,7 @@
## sources.list -- APT package source list
##
-rpm ftp://ftp.openpkg.org/ private/apt current
-rpm-src ftp://ftp.openpkg.org/ private/apt current
+rpm-src ftp://ftp.openpkg.org private/apt CURRENT
+rpm-src ftp://ftp.openpkg.org private/apt 1.3-RELEASE 1.3-RELEASE-PLUS 1.3-SOLID
+#rpm ftp://ftp.openpkg.org private/apt 1.3-RELEASE.ix86-freebsd4.8
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/translate.list
============================================================================
$ cvs diff -u -r0 -r1.1 translate.list
--- /dev/null 2003-11-29 23:13:44.000000000 +0100
+++ translate.list 2003-11-29 23:13:44.000000000 +0100
@@ -0,0 +1,2 @@
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/vendors.list
============================================================================
$ cvs diff -u -r0 -r1.1 vendors.list
--- /dev/null 2003-11-29 23:13:44.000000000 +0100
+++ vendors.list 2003-11-29 23:13:44.000000000 +0100
@@ -0,0 +1,9 @@
+//
+// vendors.list -- APT vendor PGP key list
+//
+
+simple-key "openpkg" {
+ Fingerprint "6D96EFCFCF75328810DB40C2807593E063C4CB9F";
+ Name "OpenPKG <[EMAIL PROTECTED]>";
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7615 -r1.7616 news.txt
--- openpkg-web/news.txt 29 Nov 2003 15:44:21 -0000 1.7615
+++ openpkg-web/news.txt 29 Nov 2003 22:13:42 -0000 1.7616
@@ -1,3 +1,4 @@
+29-Nov-2003: Upgraded package: P<apt-0.5.15.3-20031129>
29-Nov-2003: Upgraded package: P<openpkg-20031129-20031129>
29-Nov-2003: New package: P<meta-rdbms-20031129-20031129>
29-Nov-2003: Upgraded package: P<gnutls-0.9.99-20031129>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
