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: 31-Dec-2003 12:55:10
Branch: HEAD Handle: 2003123111550802
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.4 -> 0.5.15.5
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-re/vcheck/vc.apt
1.15 +89 -95 openpkg-src/apt/apt.patch
1.15 +2 -2 openpkg-src/apt/apt.spec
1.7930 +2 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.apt
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.apt
--- openpkg-re/vcheck/vc.apt 4 Dec 2003 19:37:32 -0000 1.4
+++ openpkg-re/vcheck/vc.apt 31 Dec 2003 11:55:08 -0000 1.5
@@ -4,7 +4,7 @@
prog apt = {
disabled
comment = "rse: vcheck does not support HTTPS and HTTP access is not possible"
- version = 0.5.15cnc4
+ version = 0.5.15cnc5
url = http://moin.conectiva.com.br/AptRpm
regex = apt-(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 apt.patch
--- openpkg-src/apt/apt.patch 4 Dec 2003 19:37:34 -0000 1.14
+++ openpkg-src/apt/apt.patch 31 Dec 2003 11:55:10 -0000 1.15
@@ -1,6 +1,6 @@
Index: apt-pkg/deb/debsystem.cc
---- 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
+--- apt-pkg/deb/debsystem.cc.orig 2003-12-23 21:18:33.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-12-31 12:40:02.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-12-03 15:01:08.000000000 +0100
-+++ apt-pkg/init.cc 2003-12-04 20:22:48.000000000 +0100
+--- apt-pkg/init.cc.orig 2003-12-23 21:18:15.000000000 +0100
++++ apt-pkg/init.cc 2003-12-31 12:40:02.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -54,8 +54,8 @@
bool Res = true;
Index: apt-pkg/luaiface.cc
---- 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
+--- apt-pkg/luaiface.cc.orig 2003-12-23 21:19:11.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-12-31 12:40:02.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-12-03 15:01:28.000000000 +0100
-+++ apt-pkg/rpm/rpmhandler.h 2003-12-04 20:22:48.000000000 +0100
+--- apt-pkg/rpm/rpmhandler.h.orig 2003-12-23 21:19:27.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-12-31 12:40:02.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-12-03 15:01:31.000000000 +0100
-+++ apt-pkg/rpm/rpmpackagedata.cc 2003-12-04 20:22:48.000000000 +0100
+--- apt-pkg/rpm/rpmpackagedata.cc.orig 2003-12-23 21:19:36.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-12-31 12:40:02.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -88,30 +88,30 @@
RPMPackageData::RPMPackageData()
Index: apt-pkg/rpm/rpmpm.cc
---- 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
+--- apt-pkg/rpm/rpmpm.cc.orig 2003-12-23 21:19:20.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-12-31 12:40:02.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
+#include <rpm/glob.h>
- #ifdef HAVE_RPM41
+ #if RPM_VERSION >= 0x040100
#include <rpm/rpmdb.h>
#define packagesTotal rpmcliPackagesTotal
Index: apt-pkg/rpm/rpmpm.h
---- 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
+--- apt-pkg/rpm/rpmpm.h.orig 2003-12-23 21:19:23.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-12-31 12:40:02.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
+#include <rpm/glob.h>
#include <rpm/rpmlib.h>
- #ifdef HAVE_RPM41
+ #if RPM_VERSION >= 0x040100
#include <rpm/rpmts.h>
Index: apt-pkg/rpm/rpmrecords.h
---- 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
+--- apt-pkg/rpm/rpmrecords.h.orig 2003-12-23 21:19:51.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-12-31 12:40:02.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-12-03 15:01:36.000000000 +0100
-+++ apt-pkg/rpm/rpmsrcrecords.h 2003-12-04 20:22:48.000000000 +0100
+--- apt-pkg/rpm/rpmsrcrecords.h.orig 2003-12-23 21:20:01.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-12-31 12:40:02.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -132,8 +132,8 @@
Index: apt-pkg/rpm/rpmsystem.cc
---- 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
+--- apt-pkg/rpm/rpmsystem.cc.orig 2003-12-23 21:19:32.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2003-12-31 12:40:02.000000000 +0100
@@ -126,13 +126,13 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
@@ -161,8 +161,8 @@
return Score;
Index: apt-pkg/rpm/rpmversion.cc
---- 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
+--- apt-pkg/rpm/rpmversion.cc.orig 2003-12-23 21:19:34.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-12-31 12:40:02.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-12-03 15:00:52.000000000 +0100
-+++ apt-pkg/sourcelist.cc 2003-12-04 20:22:48.000000000 +0100
+--- apt-pkg/sourcelist.cc.orig 2003-12-23 21:17:28.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-12-31 12:40:02.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-12-03 15:04:15.000000000 +0100
-+++ cmdline/apt-shell.cc 2003-12-04 20:22:48.000000000 +0100
+--- cmdline/apt-shell.cc.orig 2003-12-23 21:31:46.000000000 +0100
++++ cmdline/apt-shell.cc 2003-12-31 12:40:02.000000000 +0100
@@ -3672,7 +3672,7 @@
" remove - Remove packages\n"
" keep - Keep packages\n"
@@ -206,44 +206,50 @@
}
Index: configure.in
---- 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,
- [
- AC_CHECK_LIB(rpmdb,rpmdbOpen,
-- [RPMDBLIBS="-lrpmdb"],
-+ [RPMDBLIBS="@l_rpmlibs_base@"],
- [RPMDBLIBS="-ldb-3.1"],
-- [-lrpm -lrpmio -lz -lbz2 -lpopt])
-+ [EMAIL PROTECTED]@ @[EMAIL PROTECTED])
-
- AC_CHECK_LIB(rpm,rpmdbGetIteratorOffset,
- [AC_DEFINE_UNQUOTED(HAVE_RPM, 1)
- AC_DEFINE_UNQUOTED(HAVE_RPM4, 1)
+--- configure.in.orig 2003-12-23 21:15:40.000000000 +0100
++++ configure.in 2003-12-31 12:40:23.000000000 +0100
+@@ -47,7 +47,7 @@
+
+ dnl Check for RPM version
+ AC_MSG_CHECKING(for RPM version)
+- RPM_VERSION_RAW=`LANG= LC_ALL= $RPM_PATH --version | sed 's/^RPM version //'`
++ RPM_VERSION_RAW=`LANG= LC_ALL= $RPM_PATH --version | sed 's/^OpenPKG RPM //'`
+ RPM_VERSION_MAJOR=`echo $RPM_VERSION_RAW | cut -d. -f1`
+ RPM_VERSION_MINOR=`echo $RPM_VERSION_RAW | cut -d. -f2`
+ RPM_VERSION_MICRO=`echo $RPM_VERSION_RAW | cut -d. -f3`
+@@ -79,13 +79,13 @@
+ [AC_MSG_ERROR([Can't find rpmlib.h])])
+
+ if test $RPM_VERSION_MAJOR -lt 4; then
+- RPMLIBS="-lrpm -lz -lbz2 -lpopt"
++ RPMLIBS="@l_rpmlibs_base@ @l_rpmlibs_extra@"
+ else
+ AC_CHECK_LIB(rpmdb,rpmdbOpen,
+- [RPMDBLIBS="-lrpmdb"],
++ [RPMDBLIBS="@l_rpmlibs_base@"],
+ [RPMDBLIBS="-ldb-3.1"],
+- [-lrpm -lrpmio -lz -lbz2 -lpopt])
- RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
++ [EMAIL PROTECTED]@ @[EMAIL PROTECTED])
+ RPMLIBS="@l_rpmlibs_base@ $RPMDBLIBS @l_rpmlibs_extra@"
- AC_CHECK_LIB(rpm, rpmtsUpdateDSI,
- [AC_DEFINE_UNQUOTED(HAVE_RPM41, 1)
- rpm_version="4.1"],
-@@ -64,11 +64,11 @@
- ],
- [AC_CHECK_LIB(rpm,rpmdbFirstRecNum,
- [AC_DEFINE_UNQUOTED(HAVE_RPM, 1)
-- RPMLIBS="-lrpm -ldb1 -lz -lbz2 -lpopt"
-+ RPMLIBS="@l_rpmlibs_base@"
- rpm_version="3"],,
-- [-ldb1 -lz -lbz2 -lpopt])
-+ [EMAIL PROTECTED]@])
- ],
-- [$RPMDBLIBS -lrpmio -lz -lbz2 -lpopt])
-+ [$RPMDBLIBS @l_rpmlibs_base@ @[EMAIL PROTECTED])
+ fi
+ AC_MSG_CHECKING(for RPM libraries)
+ AC_MSG_RESULT($RPMLIBS)
+Index: lua/Makefile.in
+--- lua/Makefile.in.orig 2003-12-23 21:13:37.000000000 +0100
++++ lua/Makefile.in 2003-12-31 12:40:02.000000000 +0100
+@@ -192,7 +192,7 @@
+ luac_luac_CFLAGS = -DLUA_OPNAMES
- AC_SUBST(RPMLIBS)
- ])
+ 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 \
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
+--- lua/local/lrexlib.c.orig 2003-12-23 21:13:42.000000000 +0100
++++ lua/local/lrexlib.c 2003-12-31 12:40:02.000000000 +0100
@@ -20,6 +20,7 @@
#ifdef WITH_POSIX
@@ -253,8 +259,8 @@
static int rex_comp(lua_State *L) {
Index: methods/gpg.cc
---- methods/gpg.cc.orig 2003-12-03 15:02:26.000000000 +0100
-+++ methods/gpg.cc 2003-12-04 20:22:48.000000000 +0100
+--- methods/gpg.cc.orig 2003-12-23 21:24:04.000000000 +0100
++++ methods/gpg.cc 2003-12-31 12:40:02.000000000 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -350,8 +356,8 @@
char *getFileSigner(const char *file, const char *sigfile,
const char *outfile, string &signerKeyID)
Index: methods/http.cc
---- methods/http.cc.orig 2003-12-03 15:02:28.000000000 +0100
-+++ methods/http.cc 2003-12-04 20:22:48.000000000 +0100
+--- methods/http.cc.orig 2003-12-23 21:24:14.000000000 +0100
++++ methods/http.cc 2003-12-31 12:40:02.000000000 +0100
@@ -680,7 +680,7 @@
// CNC:2003-01-29
string UserAgent = _config->Find("Acquire::http::User-Agent");
@@ -362,8 +368,8 @@
if (Debug == true)
Index: test/scratch.cc
---- test/scratch.cc.orig 2003-12-03 14:56:59.000000000 +0100
-+++ test/scratch.cc 2003-12-04 20:22:48.000000000 +0100
+--- test/scratch.cc.orig 2003-12-23 21:13:20.000000000 +0100
++++ test/scratch.cc 2003-12-31 12:40:02.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -374,8 +380,8 @@
const char *Tmp = "/usr/include/linux/kerneld.h";
Index: tools/cached_md5.cc
---- 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
+--- tools/cached_md5.cc.orig 2003-12-23 21:16:37.000000000 +0100
++++ tools/cached_md5.cc 2003-12-31 12:40:02.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -390,9 +396,9 @@
#include <stdlib.h>
#include <string.h>
Index: tools/genbasedir
---- 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 @@
+--- tools/genbasedir.orig 2003-12-23 21:16:47.000000000 +0100
++++ tools/genbasedir 2003-12-31 12:40:02.000000000 +0100
+@@ -43,7 +43,7 @@
phashstuff()
{
size=`getsize $1`
@@ -401,7 +407,7 @@
echo " $md5 $size $2"
}
-@@ -167,7 +167,7 @@
+@@ -171,7 +171,7 @@
rm -f $comps; touch $comps
for dir in $topdir/RPMS.* $topdir/SRPMS.* $topdir/../SRPMS.*; do
if [ -d $dir ]; then
@@ -410,7 +416,7 @@
fi
done
components=`cat $comps|sort|uniq`
-@@ -222,9 +222,9 @@
+@@ -226,9 +226,9 @@
fi
if test x$updateinfo = x; then
@@ -422,7 +428,7 @@
fi
if [ -z "$meta" -a -f $basedir/pkglist.$comp ]; then
-@@ -314,9 +314,9 @@
+@@ -318,9 +318,9 @@
fi
if [ $mapi -ne 0 ]; then
@@ -434,7 +440,7 @@
fi
if [ -z "$meta" -a -f $basedir/srclist.$comp ]; then
-@@ -420,14 +420,14 @@
+@@ -424,14 +424,14 @@
if [ $partial -eq 0 ]; then
echo -n "Updating global release file... "
sed -n -e "/^MD5Sum:/q" \
@@ -451,7 +457,7 @@
-e "p" $release.old > $release.pre
for comp in $components; do
sed -e "\#^ .* $pkglist_.$comp\(.bz2\)\?\$#d" \
-@@ -448,7 +448,7 @@
+@@ -452,7 +452,7 @@
echo "Label: Unknown" >> $release
echo "Suite: Unknown" >> $release
echo "Codename: Unknown" >> $release
@@ -460,7 +466,7 @@
echo "Architectures: Unknown" >> $release
echo "Components: $components" >> $release
echo "Description: Not available" >> $release
-@@ -587,6 +587,4 @@
+@@ -591,6 +591,4 @@
rm -f $basedir/hashfile.gpg.old
fi
@@ -468,8 +474,8 @@
-
# vim:ts=4:sw=4
Index: tools/genpkglist.cc
---- tools/genpkglist.cc.orig 2003-12-03 15:00:47.000000000 +0100
-+++ tools/genpkglist.cc 2003-12-04 20:22:48.000000000 +0100
+--- tools/genpkglist.cc.orig 2003-12-23 21:16:54.000000000 +0100
++++ tools/genpkglist.cc 2003-12-31 12:40:02.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -493,8 +499,8 @@
{
Index: tools/gensrclist.cc
---- tools/gensrclist.cc.orig 2003-12-03 15:00:43.000000000 +0100
-+++ tools/gensrclist.cc 2003-12-04 20:22:48.000000000 +0100
+--- tools/gensrclist.cc.orig 2003-12-23 21:16:39.000000000 +0100
++++ tools/gensrclist.cc 2003-12-31 12:40:02.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ -598,15 +604,3 @@
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.14 -r1.15 apt.spec
--- openpkg-src/apt/apt.spec 4 Dec 2003 19:37:34 -0000 1.14
+++ openpkg-src/apt/apt.spec 31 Dec 2003 11:55:10 -0000 1.15
@@ -25,7 +25,7 @@
# package version
%define V_base 0.5.15
-%define V_rev 4
+%define V_rev 5
# package information
Name: apt
@@ -37,7 +37,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20031204
+Release: 20031231
# 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.7929 -r1.7930 news.txt
--- openpkg-web/news.txt 31 Dec 2003 11:34:47 -0000 1.7929
+++ openpkg-web/news.txt 31 Dec 2003 11:55:09 -0000 1.7930
@@ -1,3 +1,5 @@
+31-Dec-2003: Upgraded package: P<apt-0.5.15.5-20031231>
+31-Dec-2003: Upgraded package: P<apache-1.3.29-20031231>
31-Dec-2003: Upgraded package: P<openldap-2.2.4-20031231>
31-Dec-2003: Upgraded package: P<gpp-2.13-20031231>
31-Dec-2003: Upgraded package: P<perl-util-20031231-20031231>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
