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 openpkg$ Date: 04-Dec-2003 20:37:34
Branch: HEAD Handle: 2003120419373202
Modified files:
openpkg-re/vcheck vc.apt
openpkg-src/apt apt.patch apt.spec
openpkg-web news.txt
Log:
upgrading package: apt 0.5.15.3 -> 0.5.15.4
Summary:
Revision Changes Path
1.4 +1 -1 openpkg-re/vcheck/vc.apt
1.14 +68 -45 openpkg-src/apt/apt.patch
1.14 +2 -2 openpkg-src/apt/apt.spec
1.7672 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.apt
============================================================================
$ cvs diff -u -r1.3 -r1.4 vc.apt
--- openpkg-re/vcheck/vc.apt 28 Nov 2003 21:34:40 -0000 1.3
+++ openpkg-re/vcheck/vc.apt 4 Dec 2003 19:37:32 -0000 1.4
@@ -4,7 +4,7 @@
prog apt = {
disabled
comment = "rse: vcheck does not support HTTPS and HTTP access is not possible"
- version = 0.5.15cnc3
+ version = 0.5.15cnc4
url = http://moin.conectiva.com.br/AptRpm
regex = apt-(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 apt.patch
--- openpkg-src/apt/apt.patch 29 Nov 2003 22:13:43 -0000 1.13
+++ openpkg-src/apt/apt.patch 4 Dec 2003 19:37:34 -0000 1.14
@@ -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-29 22:44:33.000000000 +0100
+--- apt-pkg/deb/debsystem.cc.orig 2003-12-03 15:01:15.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-12-04 20:22:48.000000000 +0100
@@ -162,7 +162,7 @@
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
@@ -20,8 +20,8 @@
if (FileExists("/etc/debian_version") == true)
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-29 22:44:33.000000000 +0100
+--- apt-pkg/init.cc.orig 2003-12-03 15:01:08.000000000 +0100
++++ apt-pkg/init.cc 2003-12-04 20:22:48.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -54,9 +54,9 @@
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-29 22:44:33.000000000 +0100
-@@ -61,7 +61,7 @@
+--- apt-pkg/luaiface.cc.orig 2003-12-03 15:01:22.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-12-04 20:22:48.000000000 +0100
+@@ -81,7 +81,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
{
@@ -66,8 +66,8 @@
const luaL_reg lualibs[] = {
{"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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmhandler.h.orig 2003-12-03 15:01:28.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-12-04 20:22:48.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -77,8 +77,8 @@
#include <rpm/rpmmacro.h>
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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmpackagedata.cc.orig 2003-12-03 15:01:31.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-12-04 20:22:48.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -88,8 +88,8 @@
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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmpm.cc.orig 2003-12-03 15:01:27.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-12-04 20:22:48.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -99,8 +99,8 @@
#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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmpm.h.orig 2003-12-03 15:01:28.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-12-04 20:22:48.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -110,8 +110,8 @@
#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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmrecords.h.orig 2003-12-03 15:01:33.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-12-04 20:22:48.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -121,8 +121,8 @@
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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmsrcrecords.h.orig 2003-12-03 15:01:36.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-12-04 20:22:48.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -132,9 +132,9 @@
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-29 22:47:42.000000000 +0100
-@@ -123,13 +123,13 @@
+--- apt-pkg/rpm/rpmsystem.cc.orig 2003-12-03 15:01:29.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2003-12-04 20:22:48.000000000 +0100
+@@ -126,13 +126,13 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
{
@@ -151,7 +151,7 @@
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
-@@ -200,7 +200,7 @@
+@@ -229,7 +229,7 @@
if (FileExists(RPMDBHandler::DataPath(false)))
Score += 10;
@@ -161,8 +161,8 @@
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-29 22:44:33.000000000 +0100
+--- apt-pkg/rpm/rpmversion.cc.orig 2003-12-03 15:01:30.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-12-04 20:22:48.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -172,8 +172,8 @@
#include <rpm/misc.h>
Index: apt-pkg/sourcelist.cc
---- apt-pkg/sourcelist.cc.orig 2003-11-24 17:58:39.000000000 +0100
-+++ apt-pkg/sourcelist.cc 2003-11-29 22:44:33.000000000 +0100
+--- apt-pkg/sourcelist.cc.orig 2003-12-03 15:00:52.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-12-04 20:22:48.000000000 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -184,8 +184,8 @@
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
+--- cmdline/apt-shell.cc.orig 2003-12-03 15:04:15.000000000 +0100
++++ cmdline/apt-shell.cc 2003-12-04 20:22:48.000000000 +0100
@@ -3672,7 +3672,7 @@
" remove - Remove packages\n"
" keep - Keep packages\n"
@@ -206,8 +206,8 @@
}
Index: configure.in
---- configure.in.orig 2003-11-24 17:58:30.000000000 +0100
-+++ configure.in 2003-11-29 22:44:33.000000000 +0100
+--- configure.in.orig 2003-12-03 15:00:08.000000000 +0100
++++ configure.in 2003-12-04 20:22:48.000000000 +0100
@@ -48,14 +48,14 @@
AC_CHECK_HEADER(rpm/rpmlib.h,
[
@@ -241,9 +241,20 @@
AC_SUBST(RPMLIBS)
])
+Index: lua/local/lrexlib.c
+--- lua/local/lrexlib.c.orig 2003-12-03 14:59:29.000000000 +0100
++++ lua/local/lrexlib.c 2003-12-04 20:23:22.000000000 +0100
+@@ -20,6 +20,7 @@
+
+ #ifdef WITH_POSIX
+
++#include <sys/types.h>
+ #include <regex.h>
+
+ static int rex_comp(lua_State *L) {
Index: methods/gpg.cc
---- methods/gpg.cc.orig 2003-11-24 17:59:24.000000000 +0100
-+++ methods/gpg.cc 2003-11-29 22:44:33.000000000 +0100
+--- methods/gpg.cc.orig 2003-12-03 15:02:26.000000000 +0100
++++ methods/gpg.cc 2003-12-04 20:22:48.000000000 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -339,8 +350,8 @@
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
+--- methods/http.cc.orig 2003-12-03 15:02:28.000000000 +0100
++++ methods/http.cc 2003-12-04 20:22:48.000000000 +0100
@@ -680,7 +680,7 @@
// CNC:2003-01-29
string UserAgent = _config->Find("Acquire::http::User-Agent");
@@ -351,8 +362,8 @@
if (Debug == true)
Index: test/scratch.cc
---- test/scratch.cc.orig 2003-11-24 17:57:07.000000000 +0100
-+++ test/scratch.cc 2003-11-29 22:44:33.000000000 +0100
+--- test/scratch.cc.orig 2003-12-03 14:56:59.000000000 +0100
++++ test/scratch.cc 2003-12-04 20:22:48.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -363,8 +374,8 @@
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-29 22:44:33.000000000 +0100
+--- tools/cached_md5.cc.orig 2003-12-03 15:00:42.000000000 +0100
++++ tools/cached_md5.cc 2003-12-04 20:22:48.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -379,8 +390,8 @@
#include <stdlib.h>
#include <string.h>
Index: tools/genbasedir
---- tools/genbasedir.orig 2003-11-24 17:58:35.000000000 +0100
-+++ tools/genbasedir 2003-11-29 22:49:11.000000000 +0100
+--- tools/genbasedir.orig 2003-12-03 15:00:45.000000000 +0100
++++ tools/genbasedir 2003-12-04 20:22:48.000000000 +0100
@@ -39,7 +39,7 @@
phashstuff()
{
@@ -457,8 +468,8 @@
-
# 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-29 22:44:33.000000000 +0100
+--- tools/genpkglist.cc.orig 2003-12-03 15:00:47.000000000 +0100
++++ tools/genpkglist.cc 2003-12-04 20:22:48.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -482,8 +493,8 @@
{
Index: tools/gensrclist.cc
---- tools/gensrclist.cc.orig 2003-11-24 17:58:34.000000000 +0100
-+++ tools/gensrclist.cc 2003-11-29 22:44:33.000000000 +0100
+--- tools/gensrclist.cc.orig 2003-12-03 15:00:43.000000000 +0100
++++ tools/gensrclist.cc 2003-12-04 20:22:48.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ -587,3 +598,15 @@
int main(int argc, char ** argv)
{
char buf[300];
+Index: lua/Makefile.in
+--- lua/Makefile.in.orig 2003-12-03 14:59:17.000000000 +0100
++++ lua/Makefile.in 2003-12-04 20:31:30.000000000 +0100
+@@ -191,7 +191,7 @@
+ luac_luac_CFLAGS = -DLUA_OPNAMES
+
+ liblua_la_CFLAGS = -DUSE_DLOPEN -DWITH_POSIX
+-liblua_la_LIBADD = -lm -ldl
++liblua_la_LIBADD = -lm
+ liblua_la_SOURCES = \
+ local/linit.c \
+ local/linit.h \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 apt.spec
--- openpkg-src/apt/apt.spec 30 Nov 2003 12:56:18 -0000 1.13
+++ openpkg-src/apt/apt.spec 4 Dec 2003 19:37:34 -0000 1.14
@@ -25,7 +25,7 @@
# package version
%define V_base 0.5.15
-%define V_rev 3
+%define V_rev 4
# package information
Name: apt
@@ -37,7 +37,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20031130
+Release: 20031204
# list of sources
Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7671 -r1.7672 news.txt
--- openpkg-web/news.txt 4 Dec 2003 19:09:36 -0000 1.7671
+++ openpkg-web/news.txt 4 Dec 2003 19:37:32 -0000 1.7672
@@ -1,3 +1,4 @@
+04-Dec-2003: Upgraded package: P<apt-0.5.15.4-20031204>
04-Dec-2003: Upgraded package: P<gnutls-1.0.0-20031204>
04-Dec-2003: Upgraded package: P<postfix-2.0.16-20031204>
04-Dec-2003: Upgraded package: P<gmime-2.1.1-20031204>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
