From 99be052c2019aede09052fce51659ecec6e4d26f Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 28 Sep 2003 00:18:56 +0000 Subject: [PATCH] Clifford Wolf : - Updated mine-0.15 and made neccassary adaptions in scripts/functions git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1522 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-CLIFFORD | 4 + package/base/mine/mine.desc | 4 +- package/base/mine/no-crash-and-comments.patch | 108 ------------------ scripts/functions | 5 +- 4 files changed, 10 insertions(+), 111 deletions(-) delete mode 100644 package/base/mine/no-crash-and-comments.patch diff --git a/Documentation/Developers/CHANGELOG-CLIFFORD b/Documentation/Developers/CHANGELOG-CLIFFORD index b158adbbf..3b41fd6f2 100644 --- a/Documentation/Developers/CHANGELOG-CLIFFORD +++ b/Documentation/Developers/CHANGELOG-CLIFFORD @@ -1,4 +1,8 @@ +*) 2003-09-27 (2.0.0-camp - 2.0.0-rc1) + + - Updated mine-0.15 and made neccassary adoptions in scripts/functions + *) 2003-09-24 (2.0.0-camp - 2.0.0-rc1) - Fixed *.Z to *.bz2 conversion in Download script diff --git a/package/base/mine/mine.desc b/package/base/mine/mine.desc index 053410d58..e29947451 100644 --- a/package/base/mine/mine.desc +++ b/package/base/mine/mine.desc @@ -34,8 +34,8 @@ [L] GPL [S] Stable -[V] 0.14 +[V] 0.15 [P] X 01---5---9 229.000 -[D] 1779869666 mine-0.14.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/ +[D] 1122719992 mine-0.15.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/ diff --git a/package/base/mine/no-crash-and-comments.patch b/package/base/mine/no-crash-and-comments.patch deleted file mode 100644 index a2a8a7803..000000000 --- a/package/base/mine/no-crash-and-comments.patch +++ /dev/null @@ -1,108 +0,0 @@ - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/mine/no-crash-and-comments.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ur mine-0.14/Makefile mine-0.14-fixed/Makefile ---- mine-0.14/Makefile 2003-06-09 14:44:48.000000000 +0200 -+++ mine-0.14-fixed/Makefile 2003-06-14 14:50:25.000000000 +0200 -@@ -44,7 +44,7 @@ - # Set and configure the c-compiler - # - CFLAGS = -I$(CDB_DIR) -I$(BZIP2_DIR) -I$(LIBTAR_DIR)/lib -I. -Wall --CFLAGS += -I$(LIBTAR_DIR)/listhash -D'MINE_VERSION="$(MINE_VER)"' -O2 -ggdb -+CFLAGS += -I$(LIBTAR_DIR)/listhash -D'MINE_VERSION="$(MINE_VER)"' -ggdb - ifeq ($(USE_AVL), 1) - CFLAGS += -DUSE_AVL=1 - MINE_OBJ += avl.o -diff -ur mine-0.14/readdb.c mine-0.14-fixed/readdb.c ---- mine-0.14/readdb.c 2003-06-09 14:44:48.000000000 +0200 -+++ mine-0.14-fixed/readdb.c 2003-06-14 18:06:57.000000000 +0200 -@@ -1,6 +1,6 @@ - /* - * GEM MINE - The ROCK Linux Package Manager -- * Copyright (C) 2002-2003 Clifford Wolf -+ * Copyright (C) 2002-2003 Clifford Wolf and Rene Rebe - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -141,6 +141,7 @@ - e->next = d->list; d->list = e; e->content.pkg = p; - directory_entry_count++; - -+ /* read basic info like V and C tags */ - while ( fgets(line, 1024, f) != NULL && strcmp(line,"\027\n") ) { - if ( (line_length = strlen(line)) < 3 ) continue; - if ( line[line_length-1] == '\n' ) line[--line_length] = 0; -@@ -165,6 +166,7 @@ - } - if ( !dbf ) fclose(f); - -+ /* read package dependencies */ - if ( !dbf ) { - snprintf(filename, PATH_MAX, "%s/%s/info/dependencies/%s", - sourcedir, config, packagename); -@@ -359,7 +361,7 @@ - struct dirent **namelist; - struct directory *d; - struct package *p; -- struct dependency *dep; -+ struct dependency **next_dep; - char filename[PATH_MAX]; - FILE *f; - int i; -@@ -370,6 +372,7 @@ - - printf("Reading package database. Please wait...\n"); - if ( strncmp(sourcedir, "http://", 7) && strncmp(sourcedir, "ftp://", 6) ) { -+ /* determine package files and max disk number */ - snprintf(filename, PATH_MAX, "%s/index.txt", sourcedir); - if ( (f = fopen(filename, "r")) != NULL ) { - char pkgdir[200], disk[200], line[160]; -@@ -435,10 +438,24 @@ - - for (d = directories; d != NULL; d = d->next) sort_directory(d); - -- for (p = packages; p != NULL; p = p->next) -- for (dep = p->deps; dep != NULL; dep = dep->next) -- sscanf(memdb_get(&pkg_addr_hash, dep->name), "%p", &dep->pkg); -- -+ for (p = packages; p != NULL; p = p->next) { -+ /* fill the dependenies with references to the individual packges */ -+ for (next_dep = &(p->deps); *next_dep != NULL;) { -+ char* pkg_ptr_str = memdb_get(&pkg_addr_hash, (*next_dep)->name); -+ if (pkg_ptr_str) -+ sscanf(pkg_ptr_str, "%p", &(*next_dep)->pkg); -+ if ((*next_dep)->pkg) { -+ next_dep = &((*next_dep)->next); -+ } else { -+ /* drop dependency since it is not in db - this can happend -+ if multiple builds are run with modified packages */ -+ struct dependency *tbd_dep = *next_dep; -+ *next_dep = tbd_dep->next; -+ free (tbd_dep->name); -+ free (tbd_dep); -+ } -+ } -+ } - memdb_free(&files_on_disks); - memdb_init(&pkg_addr_hash); - return 0; diff --git a/scripts/functions b/scripts/functions index de34a659e..78dc2dd24 100644 --- a/scripts/functions +++ b/scripts/functions @@ -429,7 +429,10 @@ create_package_db() { echo -e "\027" cat $1/cksums/$pkg - echo -e "\027" ) >> $3.tmp + echo -e "\027" + + echo -e "\004" + ) >> $3.tmp else echo_error "Binary file for $bfile not present." \ "Skipped in package database."