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 21:16:57
Branch: HEAD Handle: 2003112820165600
Modified files:
openpkg-src/apt apt.patch apt.spec
Removed files:
openpkg-src/apt apt.patch.porting
Log:
integrate Solaris patch into single patch
Summary:
Revision Changes Path
1.9 +115 -30 openpkg-src/apt/apt.patch
1.2 +0 -90 openpkg-src/apt/apt.patch.porting
1.5 +7 -9 openpkg-src/apt/apt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 apt.patch
--- openpkg-src/apt/apt.patch 28 Nov 2003 20:04:10 -0000 1.8
+++ openpkg-src/apt/apt.patch 28 Nov 2003 20:16:56 -0000 1.9
@@ -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 20:53:09.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2003-11-28 21:06: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 20:53:09.000000000 +0100
++++ apt-pkg/init.cc 2003-11-28 21:06:52.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -62,7 +62,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 20:53:09.000000000 +0100
++++ apt-pkg/luaiface.cc 2003-11-28 21:06:52.000000000 +0100
@@ -61,7 +61,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
@@ -74,7 +74,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2003-11-28 21:06:52.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -85,7 +85,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.cc 2003-11-28 21:06:52.000000000 +0100
@@ -58,7 +58,7 @@
Res = URI;
}
@@ -141,7 +141,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmindexfile.h 2003-11-28 21:06:52.000000000 +0100
@@ -140,7 +140,7 @@
{
protected:
@@ -153,7 +153,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2003-11-28 21:06:52.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -164,7 +164,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2003-11-28 21:06:52.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -175,7 +175,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2003-11-28 21:06:52.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -186,7 +186,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2003-11-28 21:06:52.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -197,7 +197,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2003-11-28 21:06:52.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -208,7 +208,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2003-11-28 21:06:52.000000000 +0100
@@ -123,12 +123,12 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
@@ -235,7 +235,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 20:53:09.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2003-11-28 21:06:52.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -246,7 +246,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 20:53:09.000000000 +0100
++++ apt-pkg/sourcelist.cc 2003-11-28 21:06:52.000000000 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -258,7 +258,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 20:53:09.000000000 +0100
++++ configure.in 2003-11-28 21:06:52.000000000 +0100
@@ -48,14 +48,14 @@
AC_CHECK_HEADER(rpm/rpmlib.h,
[
@@ -293,20 +293,105 @@
AC_SUBST(RPMLIBS)
])
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)
- {
-- string path = _config->Find("Dir::Bin::gpg", "/usr/bin/gpg");
-+ string path = _config->Find("Dir::Bin::gpg", "@l_prefix@/bin/gpg");
- string pubring = "";
- const char *argv[16];
- int argc = 0;
+--- methods/gpg.cc.orig 2003-11-28 21:06:52.000000000 +0100
++++ methods/gpg.cc 2003-11-28 21:07:38.000000000 +0100
+@@ -10,6 +10,11 @@
+ #include <stdio.h>
+ #include <sys/wait.h>
+
++#ifdef OPENPKG_SOLARIS
++#include <sys/syscall.h>
++#include <sys/systm.h>
++#endif
++
+ #include <apti18n.h>
+
+ class GPGMethod : public pkgAcqMethod
+@@ -173,7 +178,81 @@
+ }
+ #undef STRCMP
+
++#ifdef OPENPKG_SOLARIS
++
++static const char letters[] =
++"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
++
++static int gen_tempname (char *tmpl)
++{
++ int len;
++ char *XXXXXX;
++ static uint64_t value;
++ uint64_t random_time_bits;
++ int count, fd = -1;
++ int save_errno = errno;
++
++ len = strlen(tmpl);
++ if ( len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) {
++ __set_errno(EINVAL);
++ return -1;
++ }
++
++ XXXXXX = &tmpl[len - 6];
++ random_time_bits = time(NULL);
++ value += random_time_bits ^ getpid();
++
++ for ( count = 0; count < TMP_MAX; value += 7777, ++count) {
++ uint64_t v = value;
++ XXXXXX[0] = letters[v % 62];
++ v /= 62;
++ XXXXXX[1] = letters[v % 62];
++ v /= 62;
++ XXXXXX[2] = letters[v % 62];
++ v /= 62;
++ XXXXXX[3] = letters[v % 62];
++ v /= 62;
++ XXXXXX[4] = letters[v % 62];
++ v /= 62;
++ XXXXXX[5] = letters[v % 62];
++
++ fd = mkdir(tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
++
++ if ( fd > 0 ) {
++ __set_errno(save_errno);
++ return fd;
++ }
++ else if ( errno != EEXIST ) {
++ return -1;
++ }
++
++ }
++
++ __set_errno(EEXIST);
++ return -1;
++}
++
++static char *mkdtemp(char *templat)
++{
++ if (gen_tempname (templat))
++ return NULL;
++ else
++ return templat;
++}
++
++static void unsetenv(char *varname)
++{
++ char *tempstr = (char *)malloc(strlen(varname) + 2);
++ if ( tempstr == (char *)NULL ) {
++ return;
++ }
++ sprintf(tempstr, "%s=", varname);
++ tempstr[strlen(varname) + 1] = '\0';
++ putenv(tempstr);
++ free(tempstr);
++}
+
++#endif /* OPENPKG_SOLARIS */
+
+ char *getFileSigner(const char *file, const char *sigfile,
+ 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 20:53:09.000000000 +0100
++++ test/scratch.cc 2003-11-28 21:06:52.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -318,7 +403,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 20:53:44.000000000 +0100
++++ tools/cached_md5.cc 2003-11-28 21:06:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -334,7 +419,7 @@
#include <string.h>
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
++++ tools/genpkglist.cc 2003-11-28 21:06:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -385,7 +470,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 20:53:09.000000000 +0100
++++ tools/gensrclist.cc 2003-11-28 21:06:52.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ .
rm -f openpkg-src/apt/apt.patch.porting <<'@@ .'
Index: openpkg-src/apt/apt.patch.porting
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 apt.spec
--- openpkg-src/apt/apt.spec 28 Nov 2003 20:04:10 -0000 1.4
+++ openpkg-src/apt/apt.spec 28 Nov 2003 20:16:56 -0000 1.5
@@ -40,7 +40,6 @@
Source1: apt.conf
Source2: rpmpriorities
Patch0: apt.patch
-Patch1: apt.patch.porting
# build information
Prefix: %{l_prefix}
@@ -61,16 +60,11 @@
%setup -q
%patch -p0 -P 0
- # platform specific patching
+ # replace hard-coded paths with OpenPKG ones
l_rpmlibs=""
case "%{l_platform -t}" in
- *sunos* )
- %patch -p0 -P 1
- l_rpmlibs="${l_rpmlibs} -lsocket"
- ;;
+ *sunos* ) l_rpmlibs="${l_rpmlibs} -lsocket" ;;
esac
-
- # replace hard-coded paths with OpenPKG ones
find . -type f ! -name "*.orig" -print | \
xargs %{l_shtool} subst \
%{l_value -s l_prefix} \
@@ -84,8 +78,12 @@
%build
# configure package
+ defines="-DOLD_FLATSCHEME"
+ case "%{l_platform -t}" in
+ *sunos* ) defines="$defines -DOPENPKG_SOLARIS" ;;
+ esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags`
-DOLD_FLATSCHEME" \
+ CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags` $defines" \
CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
./configure \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
