debian.patch

   1 --- bridge-utils-1.5.orig/brctl/Makefile.in
   2 +++ bridge-utils-1.5/brctl/Makefile.in
   3 @@ -37,7 +37,7 @@
   4         $(CC) $(LDFLAGS) $(brctl_OBJECTS) $(LIBS) -o brctl
   5
   6  %.o: %.c brctl.h
   7 -       $(CC) $(CFLAGS) $(INCLUDE) -c $<
   8 +       $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE) -c $<
   9
  10  clean:
  11         rm -f *.o brctl core
  12 --- bridge-utils-1.5.orig/brctl/brctl.c
  13 +++ bridge-utils-1.5/brctl/brctl.c
  14 @@ -69,7 +69,8 @@
  15         argc -= optind;
  16         argv += optind;
  17         if ((cmd = command_lookup(*argv)) == NULL) {
  18 -               fprintf(stderr, "never heard of command [%s]\n", argv[1]);
  19 +/* Debian bug #406907 */
  20 +               fprintf(stderr, "never heard of command [%s]\n", argv[0]);
  21                 goto help;
  22         }
  23
  24 --- bridge-utils-1.5.orig/libbridge/Makefile.in
  25 +++ bridge-utils-1.5/libbridge/Makefile.in
  26 @@ -5,8 +5,7 @@
  27  RANLIB=@RANLIB@
  28
  29  CC=@CC@
  30 -CFLAGS = -Wall -g $(KERNEL_HEADERS)
  31 -
  32 +CFLAGS = -Wall -g $(KERNEL_HEADERS) @CFLAGS@
  33  prefix=@prefix@
  34  exec_prefix=@exec_prefix@
  35  includedir=@includedir@
  36 @@ -34,8 +33,8 @@
  37         $(RANLIB) $@
  38
  39  %.o: %.c libbridge.h libbridge_private.h
  40 -       $(CC) $(CFLAGS) $(INCLUDE) -c $<
  41 +       $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE) -c $<
  42
  43  libbridge_compat.o:    libbridge_compat.c if_index.c
  44 -       $(CC) $(CFLAGS) -c libbridge_compat.c
  45 +       $(CC) $(CFLAGS) $(CPPFLAGS) -c libbridge_compat.c
  46
  47 --- bridge-utils-1.5.orig/libbridge/libbridge_devif.c
  48 +++ bridge-utils-1.5/libbridge/libbridge_devif.c
  49 @@ -288,12 +288,16 @@
  50         char path[SYSFS_PATH_MAX];
  51         FILE *f;
  52
  53 -       snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
  54 +/* Debian bug #496491 */
  55 +       snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name);
  56
  57         f = fopen(path, "w");
  58         if (f) {
  59                 ret = fprintf(f, "%ld\n", value);
  60                 fclose(f);
  61 +/* Debian bug #574363 */
  62 +               if (errno)
  63 +                       ret=-1;
  64         } else {
  65                 /* fallback to old ioctl */
  66                 struct ifreq ifr;
  67 @@ -355,6 +359,9 @@
  68         if (f) {
  69                 ret = fprintf(f, "%ld\n", value);
  70                 fclose(f);
  71 +/* Debian bug #574363 */
  72 +               if (errno)
  73 +                       ret=-1;
  74         } else {
  75                 int index = get_portno(bridge, ifname);
  76