Clifford Wolf
20 years ago
5 changed files with 2 additions and 242 deletions
Split View
Diff Options
-
+0 -81package/base/mine/devdoc.patch
-
+0 -44package/base/mine/dialog-1.0.patch
-
+0 -63package/base/mine/extraver.patch
-
+2 -2package/base/mine/mine.desc
-
+0 -52package/base/mine/rocket.patch
@ -1,81 +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/devdoc.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
Index: mine/selector.c
|
|||
===================================================================
|
|||
--- mine/selector.c (revision 58)
|
|||
+++ mine/selector.c (working copy)
|
|||
@@ -111,6 +111,10 @@
|
|||
fullname = "Base Packages"; |
|||
if ( !blanks && !strcmp(fullname, "extra") ) |
|||
fullname = "Additional Packages"; |
|||
+ if ( !blanks && !strcmp(fullname, "dev") )
|
|||
+ fullname = "Development Packages";
|
|||
+ if ( !blanks && !strcmp(fullname, "doc") )
|
|||
+ fullname = "Documentation Packages";
|
|||
|
|||
snprintf(tmpstring1, 512, |
|||
"%*s(%c) %s/", blanks, "", |
|||
Index: mine/readdb.c
|
|||
===================================================================
|
|||
--- mine/readdb.c (revision 58)
|
|||
+++ mine/readdb.c (working copy)
|
|||
@@ -145,6 +145,20 @@
|
|||
e->next = d->list; d->list = e; e->content.pkg = p; |
|||
directory_entry_count++; |
|||
|
|||
+ if ( strlen(packagename) > 4 && !strcmp(packagename+strlen(packagename)-4, ":dev") ) {
|
|||
+ d = get_create_directory(rootdir, "dev");
|
|||
+ e = calloc(1, sizeof(struct directory_entry));
|
|||
+ e->next = d->list; d->list = e; e->content.pkg = p;
|
|||
+ directory_entry_count++;
|
|||
+ }
|
|||
+
|
|||
+ if ( strlen(packagename) > 4 && !strcmp(packagename+strlen(packagename)-4, ":doc") ) {
|
|||
+ d = get_create_directory(rootdir, "doc");
|
|||
+ e = calloc(1, sizeof(struct directory_entry));
|
|||
+ 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; |
|||
@@ -283,9 +297,11 @@
|
|||
} |
|||
|
|||
char *root_order[] = { |
|||
- "all"
|
|||
+ "all",
|
|||
"base", |
|||
"extra", |
|||
+ "dev",
|
|||
+ "doc",
|
|||
NULL |
|||
}; |
|||
|
|||
@@ -298,7 +314,7 @@
|
|||
} |
|||
|
|||
if ( v1 == v2 ) return strcmp(n1, n2); |
|||
- return v1 == v2 ? 0 : v1 > v2 ? -1 : 1;
|
|||
+ return v1 == v2 ? 0 : v1 > v2 ? +1 : -1;
|
|||
} |
|||
|
|||
void sort_directory(struct directory *d) |
|||
@ -1,44 +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/dialog-1.0.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- mine-0.20/selector.c 2004-11-04 10:53:31.000000000 +0100
|
|||
+++ mine-0.20-p/selector.c 2004-11-08 04:32:45.206956448 +0100
|
|||
@@ -21,6 +21,7 @@
|
|||
#include <dialog.h> |
|||
#include <limits.h> |
|||
#include <sys/ioctl.h> |
|||
+#include <stdio.h>
|
|||
|
|||
int screensize_x = 70; |
|||
int screensize_y = 19; |
|||
@@ -535,12 +536,12 @@
|
|||
screensize_y = ws.ws_row - 3; |
|||
} |
|||
|
|||
- init_dialog();
|
|||
+ init_dialog(stdin, stdout);
|
|||
|
|||
/* Yup - that's a label for goto.... */ |
|||
main_loop: |
|||
while (1) { |
|||
- put_backtitle();
|
|||
+ dlg_put_backtitle();
|
|||
|
|||
for (p=packages; p != NULL; p = p->next) { |
|||
p->is_dependency=0; |
|||
@ -1,63 +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/extraver.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./readdb.c (revision 53)
|
|||
+++ ./readdb.c (working copy)
|
|||
@@ -115,7 +115,7 @@
|
|||
struct dependency *dep; |
|||
char line[1024], *t; |
|||
char filename[PATH_MAX]; |
|||
- int line_length;
|
|||
+ int line_length, i;
|
|||
FILE *f = dbf; |
|||
|
|||
if ( !dbf ) { |
|||
@@ -151,8 +151,15 @@
|
|||
if ( line[line_length-1] == '\n' ) line[--line_length] = 0; |
|||
|
|||
if ( !strncmp(line, "[V] ", 4) ) { |
|||
+#ifdef ROCK20
|
|||
p->version = malloc(line_length-3); |
|||
sscanf(line+4, "%s", p->version); |
|||
+#else
|
|||
+ p->version = strdup(line+4);
|
|||
+ for (i=0; p->version[i]; i++)
|
|||
+ if (p->version[i] == ' ')
|
|||
+ p->version[i] = '-';
|
|||
+#endif
|
|||
continue; |
|||
} |
|||
|
|||
@@ -217,8 +224,15 @@
|
|||
line[--line_length] = 0; |
|||
|
|||
if ( !strncmp(line, "[V] ", 4) ) { |
|||
+#ifdef ROCK20
|
|||
p->installed_version = malloc(line_length-3); |
|||
- strcpy(p->installed_version, line+4);
|
|||
+ sscanf(line+4, "%s", p->installed_version);
|
|||
+#else
|
|||
+ p->installed_version = strdup(line+4);
|
|||
+ for (i=0; p->installed_version[i]; i++)
|
|||
+ if (p->installed_version[i] == ' ')
|
|||
+ p->installed_version[i] = '-';
|
|||
+#endif
|
|||
continue; |
|||
} |
|||
} |
|||
@ -1,52 +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/rocket.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
Index: mine/rocket.sh
|
|||
===================================================================
|
|||
--- mine/rocket.sh (revision 58)
|
|||
+++ mine/rocket.sh (working copy)
|
|||
@@ -43,7 +43,7 @@
|
|||
chunk == 2 { print > "/var/adm/rocket/dependencies/" pkg; } |
|||
chunk == 3 { print > "/var/adm/rocket/cksums/" pkg; } |
|||
|
|||
-chunk == 1 && $1 == "[V]" { ver=$2; }
|
|||
+chunk == 1 && $1 == "[V]" { ver = $2 "-" $3; }
|
|||
|
|||
' < <( curl -s "$1/packages.db" | gunzip; ) |
|||
} |
|||
@@ -69,7 +69,8 @@
|
|||
create_gem) |
|||
shift |
|||
for pkg; do |
|||
- v="$(grep '^Package Name and Version' /var/adm/packages/$pkg | cut -f6 -d' ')"
|
|||
+ v="$(grep '^Package Name and Version' /var/adm/packages/$pkg | \
|
|||
+ cut -f6,7 -d' ' | tr ' ' - )"
|
|||
mine -T /var/adm / "$pkg" "$pkg-$v.tar.bz2" |
|||
mine -C /var/adm "$pkg-$v.tar.bz2" "$pkg" "$pkg-$v.gem" |
|||
done |
|||
@@ -93,7 +94,8 @@
|
|||
install) |
|||
shift |
|||
for x; do |
|||
- url="$( grep "^$x " /var/adm/rocket/locations.txt | cut -f2 -d' ' | tail -1; )"
|
|||
+ url="$( grep "^$x " /var/adm/rocket/locations.txt | \
|
|||
+ cut -f2 -d' ' | tail -n1; )"
|
|||
if [ -z "$url" ]; then |
|||
echo "Package $x not found - maybe you need to add the archive" |
|||
echo "to /etc/rocket.conf and run 'rocket update' first." |
|||