mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

63 lines
1.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/mine/extraver.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./readdb.c (revision 53)
  20. +++ ./readdb.c (working copy)
  21. @@ -115,7 +115,7 @@
  22. struct dependency *dep;
  23. char line[1024], *t;
  24. char filename[PATH_MAX];
  25. - int line_length;
  26. + int line_length, i;
  27. FILE *f = dbf;
  28. if ( !dbf ) {
  29. @@ -151,8 +151,15 @@
  30. if ( line[line_length-1] == '\n' ) line[--line_length] = 0;
  31. if ( !strncmp(line, "[V] ", 4) ) {
  32. +#ifdef ROCK20
  33. p->version = malloc(line_length-3);
  34. sscanf(line+4, "%s", p->version);
  35. +#else
  36. + p->version = strdup(line+4);
  37. + for (i=0; p->version[i]; i++)
  38. + if (p->version[i] == ' ')
  39. + p->version[i] = '-';
  40. +#endif
  41. continue;
  42. }
  43. @@ -217,8 +224,15 @@
  44. line[--line_length] = 0;
  45. if ( !strncmp(line, "[V] ", 4) ) {
  46. +#ifdef ROCK20
  47. p->installed_version = malloc(line_length-3);
  48. - strcpy(p->installed_version, line+4);
  49. + sscanf(line+4, "%s", p->installed_version);
  50. +#else
  51. + p->installed_version = strdup(line+4);
  52. + for (i=0; p->installed_version[i]; i++)
  53. + if (p->installed_version[i] == ' ')
  54. + p->installed_version[i] = '-';
  55. +#endif
  56. continue;
  57. }
  58. }