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.

68 lines
2.6 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/isdn4k-utils/gcc40.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 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. diff -dur isdn4k-utils/hisax/hisaxctrl.c isdn4k-utils-p/hisax/hisaxctrl.c
  20. --- isdn4k-utils/hisax/hisaxctrl.c 2000-06-30 11:37:38.000000000 +0200
  21. +++ isdn4k-utils-p/hisax/hisaxctrl.c 2005-10-21 00:17:49.000000000 +0200
  22. @@ -43,7 +43,7 @@
  23. fprintf(stderr, "cannot open file %s\n", fname);
  24. exit(-1);
  25. }
  26. - p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4);
  27. + buffer = p = (unsigned char *) malloc(MAX_SIZE+4);
  28. if (!buffer) {
  29. fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4);
  30. exit(-1);
  31. diff -dur isdn4k-utils/ipppd/main.c isdn4k-utils-p/ipppd/main.c
  32. --- isdn4k-utils/ipppd/main.c 2002-07-18 02:06:21.000000000 +0200
  33. +++ isdn4k-utils-p/ipppd/main.c 2005-10-21 00:19:22.000000000 +0200
  34. @@ -1041,9 +1041,10 @@
  35. static char line[256]; /* line to be logged accumulated here */
  36. static char *linep;
  37. +static void pr_log __P((void *, char *, ...));
  38. +
  39. void log_packet(u_char *p,int len,char *prefix,int linkunit)
  40. {
  41. - static void pr_log __P((void *, char *, ...));
  42. int i, n;
  43. u_short proto;
  44. diff -dur isdn4k-utils/isdnlog/tools/isdnrate.c isdn4k-utils-p/isdnlog/tools/isdnrate.c
  45. --- isdn4k-utils/isdnlog/tools/isdnrate.c 2001-06-21 18:34:56.000000000 +0200
  46. +++ isdn4k-utils-p/isdnlog/tools/isdnrate.c 2005-10-21 00:12:22.000000000 +0200
  47. @@ -304,7 +304,7 @@
  48. static void print_header(void);
  49. -static char *myname, *myshortname;
  50. +char *myname, *myshortname;
  51. static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z";
  52. static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n";
  53. @@ -313,7 +313,8 @@
  54. static int usestat = 0;
  55. static int duration = LCR_DURATION;
  56. static time_t start;
  57. -static int day, month, year, hour, min, sec;
  58. +int day, month, hour;
  59. +static int year, min, sec;
  60. static char ignore[MAXPROVIDER];
  61. static char *fromarea = 0;
  62. static char wanted_day;