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: 16-Sep-2003 14:57:18
Branch: HEAD Handle: 2003091613571800
Modified files:
openpkg-src/apt apt.patch
Log:
write index to same directory and regenerate patch for gensrclist.cc
Summary:
Revision Changes Path
1.6 +110 -117 openpkg-src/apt/apt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 apt.patch
--- openpkg-src/apt/apt.patch 16 Sep 2003 11:59:03 -0000 1.5
+++ openpkg-src/apt/apt.patch 16 Sep 2003 12:57:18 -0000 1.6
@@ -255,106 +255,6 @@
int (* cmp)(const void *, const void *))
{
---- tools/gensrclist.cc 2003-06-10 09:14:44.000000000 -0500
-+++ tools/gensrclist.cc 2003-09-12 13:28:59.653936000 -0500
-@@ -6,6 +6,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <rpm/glob.h>
- #include <rpm/rpmlib.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -133,6 +134,89 @@
- }
- #endif
-
-+#ifndef HAVE_SCANDIR
-+// from glibc 1.09.1 mod'd by jmik, ins'd by asm, fix'd by sbi
-+int alphasort(const void * a, const void * b)
-+{
-+ return strcmp ((*(struct dirent **) a)->d_name,
-+ (*(struct dirent **) b)->d_name);
-+}
-+
-+int scandir(const char * dir, struct dirent *** namelist,
-+ int (* select)(const struct dirent *),
-+ int (* cmp)(const void *, const void *))
-+
-+{
-+ DIR *dp = opendir (dir);
-+ struct dirent **v = NULL;
-+ size_t vsize = 0, i;
-+ struct dirent *d;
-+ int save;
-+
-+ if (dp == NULL)
-+ return -1;
-+
-+ save = errno;
-+ errno = 0;
-+
-+ i = 0;
-+ while ((d = readdir (dp)) != NULL)
-+ {
-+ if (select == NULL || (*select) (d))
-+ {
-+ if (i == vsize)
-+ {
-+ struct dirent **newv;
-+ if (vsize == 0)
-+ vsize = 10;
-+ else
-+ vsize *= 2;
-+ newv = (struct dirent **) realloc (v, vsize * sizeof (*v));
-+ if (newv == NULL)
-+ {
-+ lose:
-+ errno = ENOMEM;
-+ break;
-+ }
-+ v = newv;
-+ }
-+
-+ v[i] = (struct dirent *) malloc (d->d_reclen);
-+ if (v[i] == NULL)
-+ goto lose;
-+
-+ // *v[i++] = *d;
-+ memcpy(v[i], d, d->d_reclen);
-+ i++;
-+ }
-+ }
-+
-+ v[i] = NULL;
-+
-+ if (errno != 0)
-+ {
-+ save = errno;
-+ (void) closedir (dp);
-+ while (i > 0)
-+ free (v[--i]);
-+ free (v);
-+ errno = save;
-+ return -1;
-+ }
-+
-+ (void) closedir (dp);
-+ errno = save;
-+
-+ /* Sort the list if we have a comparison function to sort with. */
-+ if (cmp != NULL)
-+ qsort (v, i, sizeof (struct dirent *), cmp);
-+
-+ *namelist = v;
-+ return i;
-+}
-+// end of new stuff from glibc
-+#endif
-+
- int main(int argc, char ** argv)
- {
- char buf[300];
--- tools/cached_md5.cc.orig 2003-09-13 20:46:01.000000000 +0200
+++ tools/cached_md5.cc 2003-09-13 20:50:59.000000000 +0200
@@ -1,7 +1,6 @@
@@ -375,16 +275,6 @@
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
---- tools/gensrclist.cc.orig 2003-09-13 20:46:01.000000000 +0200
-+++ tools/gensrclist.cc 2003-09-13 20:51:13.000000000 +0200
-@@ -1,7 +1,6 @@
- /*
- * $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
- */
--#include <alloca.h>
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
--- apt-pkg/rpm/rpmindexfile.h.orig 2003-06-10 16:12:48.000000000 +0200
+++ apt-pkg/rpm/rpmindexfile.h 2003-09-16 11:06:24.000000000 +0200
@@ -140,7 +140,7 @@
@@ -506,9 +396,112 @@
List.push_back(F);
return true;
---- tools/gensrclist.cc.orig 2003-09-16 13:36:47.000000000 +0200
-+++ tools/gensrclist.cc 2003-09-16 13:38:01.000000000 +0200
-@@ -281,10 +281,10 @@
+--- tools/gensrclist.cc.orig 2003-06-10 16:14:44.000000000 +0200
++++ tools/gensrclist.cc 2003-09-16 14:55:51.000000000 +0200
+@@ -1,11 +1,11 @@
+ /*
+ * $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
+ */
+-#include <alloca.h>
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <rpm/glob.h>
+ #include <rpm/rpmlib.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -133,6 +133,89 @@
+ }
+ #endif
+
++#ifndef HAVE_SCANDIR
++// from glibc 1.09.1 mod'd by jmik, ins'd by asm, fix'd by sbi
++int alphasort(const void * a, const void * b)
++{
++ return strcmp ((*(struct dirent **) a)->d_name,
++ (*(struct dirent **) b)->d_name);
++}
++
++int scandir(const char * dir, struct dirent *** namelist,
++ int (* select)(const struct dirent *),
++ int (* cmp)(const void *, const void *))
++
++{
++ DIR *dp = opendir (dir);
++ struct dirent **v = NULL;
++ size_t vsize = 0, i;
++ struct dirent *d;
++ int save;
++
++ if (dp == NULL)
++ return -1;
++
++ save = errno;
++ errno = 0;
++
++ i = 0;
++ while ((d = readdir (dp)) != NULL)
++ {
++ if (select == NULL || (*select) (d))
++ {
++ if (i == vsize)
++ {
++ struct dirent **newv;
++ if (vsize == 0)
++ vsize = 10;
++ else
++ vsize *= 2;
++ newv = (struct dirent **) realloc (v, vsize * sizeof (*v));
++ if (newv == NULL)
++ {
++ lose:
++ errno = ENOMEM;
++ break;
++ }
++ v = newv;
++ }
++
++ v[i] = (struct dirent *) malloc (d->d_reclen);
++ if (v[i] == NULL)
++ goto lose;
++
++ // *v[i++] = *d;
++ memcpy(v[i], d, d->d_reclen);
++ i++;
++ }
++ }
++
++ v[i] = NULL;
++
++ if (errno != 0)
++ {
++ save = errno;
++ (void) closedir (dp);
++ while (i > 0)
++ free (v[--i]);
++ free (v);
++ errno = save;
++ return -1;
++ }
++
++ (void) closedir (dp);
++ errno = save;
++
++ /* Sort the list if we have a comparison function to sort with. */
++ if (cmp != NULL)
++ qsort (v, i, sizeof (struct dirent *), cmp);
++
++ *namelist = v;
++ return i;
++}
++// end of new stuff from glibc
++#endif
++
+ int main(int argc, char ** argv)
+ {
+ char buf[300];
+@@ -198,10 +281,10 @@
} else
strcpy(buf, arg_dir);
@@ -521,7 +514,7 @@
#ifdef OLD_FLATSCHEME
if (flatStructure) {
// add the last component of the directory to srpmdir
-@@ -304,14 +304,6 @@
+@@ -221,14 +304,6 @@
#else
if (!flatStructure) {
srpmdir = "../"+srpmdir;
@@ -536,15 +529,15 @@
}
#endif
-@@ -325,9 +317,9 @@
+@@ -242,9 +317,9 @@
chdir(buf);
if (srcListSuffix != NULL)
- sprintf(buf, "%s/srclist.%s", cwd, srcListSuffix);
-+ sprintf(buf, "%s/00INDEX.apt-srclist.%s", cwd, srcListSuffix);
++ sprintf(buf, "00INDEX.apt-srclist.%s", srcListSuffix);
else
- sprintf(buf, "%s/srclist.%s", cwd, arg_suffix);
-+ sprintf(buf, "%s/00INDEX.apt-srclist.%s", cwd, arg_suffix);
++ sprintf(buf, "00INDEX.apt-srclist.%s", arg_suffix);
if (srcListAppend == true && FileExists(buf)) {
outfd = fdOpen(buf, O_WRONLY|O_APPEND, 0644);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
