isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch

   1 --- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat      2002-07-19 21:03:49.000000000 +0200
   2 +++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in     2003-09-30 17:44:24.000000000 +0200
   3 @@ -5,8 +5,8 @@
   4  #
   5  #
   6  SHELL                  = /bin/sh
   7 -CFLAGS                 = -Wall -O2
   8 -INCLUDES               = -I.
   9 +CFLAGS                 = $(CFLAGS)
  10 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/act2000
  11  DEFS                   =
  12  LDFLAGS                        = -L../lib @LIBS@
  13  PROGRAM                        = actctrl
  14 @@ -18,9 +18,9 @@
  15  MANDIR                 = @CONFIG_MANDIR@
  16  MAN8DIR                        = $(MANDIR)/man8
  17  INSTALL                        = @INSTALL@
  18 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
  19 -INSTALL_DATA   = $(INSTALL) -o 0 -g 0 -m 0644
  20 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
  21 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
  22 +INSTALL_DATA   = $(INSTALL) -m 0644
  23 +INSTALL_MAN            = $(INSTALL) -m 0644
  24  prefix                 = @prefix@
  25  exec_prefix            = @exec_prefix@
  26  CC                             = @CC@
  27 --- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat     1999-06-19 11:39:59.000000000 +0200
  28 +++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in    2003-09-30 17:44:24.000000000 +0200
  29 @@ -12,7 +12,7 @@
  30         # only ones that _really_ exist on _every_ system.
  31         #
  32         BUILDOPTS   := $(DATAOPTS)
  33 -       INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
  34 +       INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
  35  endif
  36
  37  all: .depend
  38 --- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat        2002-07-19 21:03:50.000000000 +0200
  39 +++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in       2003-09-30 17:44:24.000000000 +0200
  40 @@ -5,7 +5,7 @@
  41  #
  42  #
  43  SHELL                  = /bin/sh
  44 -CFLAGS                 = -Wall -O2
  45 +CFLAGS                 = $(CFLAGS)
  46  LDFLAGS                        = -L../lib @LIBS@
  47  INCLUDES               = -I.
  48  PROGRAMS               = avmcapictrl
  49 @@ -15,8 +15,8 @@
  50  MANDIR                 = @CONFIG_MANDIR@
  51  MAN8DIR                        = $(MANDIR)/man8
  52  INSTALL                        = @INSTALL@
  53 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
  54 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
  55 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
  56 +INSTALL_MAN            = $(INSTALL) -m 0644
  57  prefix                 = @prefix@
  58  exec_prefix            = @exec_prefix@
  59  CC                             = @CC@
  60 --- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat      2000-03-03 16:54:12.000000000 +0100
  61 +++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am     2003-09-30 17:44:24.000000000 +0200
  62 @@ -8,7 +8,7 @@
  63                           stamp-h.in
  64
  65  INCLUDES = -I../capi20 $(all_includes)
  66 -CFLAGS = -Wall -O2
  67 +CFLAGS = -Wall $(CFLAGS)
  68  LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
  69  LDADD = -lcapi20
  70
  71 --- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat     2000-10-20 19:14:20.000000000 +0200
  72 +++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am    2003-09-30 17:44:24.000000000 +0200
  73 @@ -8,7 +8,7 @@
  74                           stamp-h.in comperr
  75
  76  INCLUDES = -I../capi20 $(all_includes)
  77 -CFLAGS = -Wall -O2
  78 +CFLAGS = -Wall $(CFLAGS)
  79  LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
  80  LDADD = -lcapi20
  81
  82 --- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat     2000-03-17 17:19:43.000000000 +0100
  83 +++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am    2003-09-30 17:44:24.000000000 +0200
  84 @@ -8,7 +8,7 @@
  85                           stamp-h.in comperr core
  86
  87  INCLUDES = $(all_includes)
  88 -CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
  89 +CFLAGS = -Wall -D_GNU_SOURCE $(CFLAGS)
  90  LDFLAGS = $(all_libraries)
  91  LDADD =
  92
  93 --- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat   2002-07-19 21:03:51.000000000 +0200
  94 +++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in  2003-09-30 17:44:24.000000000 +0200
  95 @@ -5,16 +5,16 @@
  96  #
  97  #
  98  SHELL                  = /bin/sh
  99 -CFLAGS                 = -Wall -O2
 100 -INCLUDES               = -I.
 101 +CFLAGS                 = -Wall $(CFLAGS)
 102 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/divert
 103  DEFS                   =
 104  LDFLAGS                        = -L../lib @LIBS@
 105  PROGRAM                        = divertctrl
 106  MODULES                        = divertctrl.o
 107  MANPAGE                        = divertctrl.8
 108  INSTALL                        = @INSTALL@
 109 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 110 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 111 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 112 +INSTALL_MAN            = $(INSTALL) -m 0644
 113  prefix                 = @prefix@
 114  exec_prefix            = @exec_prefix@
 115  ifeq (../.config,$(wildcard ../.config))
 116 --- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat  1999-12-24 15:14:50.000000000 +0100
 117 +++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in 2003-09-30 17:44:24.000000000 +0200
 118 @@ -9,7 +9,7 @@
 119  SED                            = @SED@
 120  MANDIR                 = @CONFIG_MANDIR@
 121  MANPAGES               = ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
 122 -INSTALL_MAN            = @INSTALL@ -o 0 -g 0 -m 0644
 123 +INSTALL_MAN            = @INSTALL@ -m 0644
 124  prefix                 = @prefix@
 125
 126  %.1: %.man
 127 --- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat        2002-07-19 20:42:01.000000000 +0200
 128 +++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in       2003-09-30 17:44:24.000000000 +0200
 129 @@ -7,8 +7,8 @@
 130  #
 131
 132  SHELL                  = /bin/sh
 133 -CFLAGS                 = -Wall -O2 -DUNIX -DLINUX
 134 -INCLUDES               = -I. -Iinclude
 135 +CFLAGS                 = -Wall -DUNIX -DLINUX $(CFLAGS)
 136 +INCLUDES               = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/eicon
 137  LDFLAGS                        = -L../lib @LIBS@
 138  PROGRAMS               =
 139  PROGRAM                        = eiconctrl
 140 @@ -22,9 +22,9 @@
 141  DATA_DIR               = @CONFIG_DATADIR@
 142  MANDIR                 = @CONFIG_MANDIR@
 143  MAN8DIR                        = $(MANDIR)/man8
 144 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 145 -INSTALL_DATA   = $(INSTALL) -o 0 -g 0 -m 0644
 146 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 147 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 148 +INSTALL_DATA   = $(INSTALL) -m 0644
 149 +INSTALL_MAN            = $(INSTALL) -m 0644
 150  CC                             = @CC@
 151  COPTS                  = -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
 152
 153 --- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat        2002-07-19 21:03:51.000000000 +0200
 154 +++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in       2003-09-30 17:44:24.000000000 +0200
 155 @@ -6,7 +6,7 @@
 156  #
 157  #
 158  SHELL                  = /bin/sh
 159 -CFLAGS                 = -Wall -O2 -I.
 160 +CFLAGS                 = -Wall $(CFLAGS) -I. -I@CONFIG_KERNELDIR@/include
 161  LDFLAGS                        = -L../lib @LIBS@
 162  PROGRAMS               =
 163  MODULES                        = hisaxctrl.o
 164 @@ -16,9 +16,9 @@
 165  DATADIR                        = @CONFIG_DATADIR@
 166  MANDIR                 = @CONFIG_MANDIR@
 167  MAN8DIR                        = $(MANDIR)/man8
 168 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 169 -INSTALL_DATA   = $(INSTALL) -o 0 -g 0 -m 0644
 170 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 171 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 172 +INSTALL_DATA   = $(INSTALL) -m 0644
 173 +INSTALL_MAN            = $(INSTALL) -m 0644
 174  prefix                 = @prefix@
 175  exec_prefix            = @exec_prefix@
 176  ifeq ("@CONFIG_HISAXCTRL@","y")
 177 --- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat  2002-07-19 21:03:52.000000000 +0200
 178 +++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in 2003-09-30 17:44:24.000000000 +0200
 179 @@ -5,8 +5,8 @@
 180  #
 181  #
 182  SHELL                  = /bin/sh
 183 -CFLAGS                 = -Wall -O2
 184 -INCLUDES               = -I.
 185 +CFLAGS                 = -Wall $(CFLAGS)
 186 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/icn
 187  DEFS                   =
 188  LDFLAGS                        = -L../lib @LIBS@
 189  PROGRAM                        = icnctrl
 190 @@ -17,9 +17,9 @@
 191  DATADIR                        = @CONFIG_DATADIR@
 192  MANDIR                 = @CONFIG_MANDIR@
 193  MAN8DIR                        = $(MANDIR)/man8
 194 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 195 -INSTALL_DATA   = $(INSTALL) -o 0 -g 0 -m 0644
 196 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 197 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 198 +INSTALL_DATA   = $(INSTALL) -m 0644
 199 +INSTALL_MAN            = $(INSTALL) -m 0644
 200  CC                             = @CC@
 201  COPTS                  =
 202
 203 --- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat 2002-07-19 21:03:53.000000000 +0200
 204 +++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in        2003-09-30 17:44:24.000000000 +0200
 205 @@ -7,8 +7,8 @@
 206  #
 207  #
 208  SHELL                  = /bin/sh
 209 -CFLAGS                 = -Wall -O2
 210 -INCLUDES               = -I.
 211 +CFLAGS                 = -Wall $(CFLAGS)
 212 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include
 213  LDFLAGS                        = -L../lib @LIBS@
 214  PROGRAM                        = imon
 215  MODULES                        = imon.o
 216 @@ -18,8 +18,8 @@
 217  SBINDIR                        = @CONFIG_SBINDIR@
 218  MAN8DIR                        = $(MANDIR)/man8
 219  INSTALL                        = @INSTALL@
 220 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 221 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 222 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 223 +INSTALL_MAN            = $(INSTALL) -m 0644
 224  prefix                 = @prefix@
 225  exec_prefix            = @exec_prefix@
 226  CC                             = @CC@
 227 --- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat 2002-07-19 23:23:53.000000000 +0200
 228 +++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile        2003-09-30 17:44:24.000000000 +0200
 229 @@ -15,14 +15,14 @@
 230         # Manual config standalone
 231         #
 232         CONFIG_SBINDRIR := /sbin
 233 -       MAN8DIR         := /usr/man/man8
 234 +       MAN8DIR         := /usr/share/man/man8
 235  endif
 236
 237  INSTALL=install
 238 -INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
 239 +INSTALL_MAN=$(INSTALL) -m 0644
 240  MANPAGE=imontty.8
 241
 242 -CCFLAGS=-O2
 243 +CCFLAGS=$(CFLAGS) -I$(CONFIG_KERNELDIR)/include
 244  #CCFLAGS=-I$(ISDN_INCLUDE) -g
 245
 246  # nothing to change behind this line
 247 --- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat    2002-07-19 21:03:54.000000000 +0200
 248 +++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in   2003-09-30 17:44:24.000000000 +0200
 249 @@ -6,14 +6,14 @@
 250  MANDIR       = @CONFIG_MANDIR@
 251  CC           = @CC@
 252  INSTALL      = @INSTALL@
 253 -INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
 254 -INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
 255 -INSTALL_DIR  = $(INSTALL) -m 755 -o 0 -g 0 -d
 256 +INSTALL_SBIN = $(INSTALL) -m 755
 257 +INSTALL_DATA = $(INSTALL) -m 644
 258 +INSTALL_DIR  = $(INSTALL) -m 755 -d
 259
 260  PPPSTATSRCS  = ipppstats.c
 261  PPPSTATOBJS  = ipppstats.o
 262
 263 -CFLAGS       = -fomit-frame-pointer -O2
 264 +CFLAGS       = $(CFLAGS) -I@CONFIG_KERNELDIR@/include
 265
 266  all: ipppstats
 267
 268 --- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat       2002-07-19 23:23:53.000000000 +0200
 269 +++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in      2003-09-30 17:44:24.000000000 +0200
 270 @@ -5,8 +5,8 @@
 271  #
 272  #
 273  SHELL                  = /bin/sh
 274 -CFLAGS                 = -Wall -O2
 275 -INCLUDES               = -I.
 276 +CFLAGS                 = -Wall $(CFLAGS)
 277 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include
 278  LDFLAGS                        = -L../lib @LIBS@
 279  PROGRAM                        = iprofd
 280  MODULES                        = iprofd.o
 281 @@ -15,8 +15,8 @@
 282  MANDIR                 = @CONFIG_MANDIR@
 283  MAN8DIR                        = $(MANDIR)/man8
 284  INSTALL                        = @INSTALL@
 285 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 286 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 287 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 288 +INSTALL_MAN            = $(INSTALL) -m 0644
 289  prefix                 = @prefix@
 290  exec_prefix            = @exec_prefix@
 291  CC                             = @CC@
 292 --- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat     2002-07-19 23:23:54.000000000 +0200
 293 +++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in    2003-09-30 17:44:24.000000000 +0200
 294 @@ -5,8 +5,8 @@
 295  #
 296  #
 297  SHELL                    = /bin/sh
 298 -CFLAGS                 = -Wall -O2
 299 -INCLUDES               = -I.
 300 +CFLAGS                 = -Wall $(CFLAGS)
 301 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include
 302  LDFLAGS                        = @LIBS@
 303  PROGRAM                        = isdnctrl
 304  MODULES                        = isdnctrl.o
 305 @@ -15,8 +15,8 @@
 306  MANDIR                 = @CONFIG_MANDIR@
 307  MAN8DIR                        = $(MANDIR)/man8
 308  INSTALL                        = @INSTALL@
 309 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 310 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 311 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 312 +INSTALL_MAN            = $(INSTALL) -m 0644
 313  CC                             = @CC@ -DVERSION=\"@I4LVERSION@\"
 314  prefix                 = @prefix@
 315  exec_prefix            = @exec_prefix@
 316 --- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat    2000-09-08 10:55:51.000000000 +0200
 317 +++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf   2003-09-30 17:44:24.000000000 +0200
 318 @@ -2,38 +2,31 @@
 319  #
 320  # More information: See the isdnlog documentation
 321
 322 +#INTERFACE = ippp0      # Isdn network interface. This information  is  required
 323 +                        # with the "-hx" / hangup="value" option.
 324 +
 325 +
 326  [MSN]
 327  NUMBER = 4711
 328  ALIAS  = Phone
 329  SI     = 1
 330  ZONE   = 1
 331 -START = {
 332 -  [FLAG]
 333 -  FLAGS = I|O|R|C|B|A|E|H
 334 -  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
 335 -}
 336 +#START = {
 337 +#  [FLAG]
 338 +#  FLAGS = I|O|R|C|B|A|E|H
 339 +#  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
 340 +#}
 341
 342  [MSN]
 343  NUMBER = 4711
 344  ALIAS  = HDLC
 345  SI     = 7
 346  ZONE   = 1
 347 -START = {
 348 -  [FLAG]
 349 -  FLAGS = I|O|R|C|B|A|E|
 350 -  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
 351 -}
 352 -
 353 -[MSN]
 354 -NUMBER = 4712
 355 -ALIAS  = Modem
 356 -SI     = 1
 357 -ZONE   = 1
 358 -START = {
 359 -  [FLAG]
 360 -  FLAGS = I|O|R|C|B|A|E|H
 361 -  PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
 362 -}
 363 +#START = {
 364 +#  [FLAG]
 365 +#  FLAGS = I|O|R|C|B|A|E|
 366 +#  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
 367 +#}
 368
 369  [NUMBER]
 370  NUMBER = 01910
 371 --- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat    2000-08-15 17:16:23.000000000 +0200
 372 +++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in   2003-09-30 17:44:24.000000000 +0200
 373 @@ -20,7 +20,7 @@
 374  BINDIR:=$(DESTDIR)@prefix@/bin
 375  INCDIR:=$(DESTDIR)@prefix@/include
 376
 377 -CFLAGS:=-Wall -O2
 378 +CFLAGS:=-Wall $(CFLAGS)
 379
 380  all: depend $(FILES)
 381
 382 @@ -46,7 +46,7 @@
 383         install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
 384                 $(INCDIR)
 385
 386 -install:
 387 +install: install-dirs
 388         install -m0755 $(BINS) $(BINDIR)
 389         install -m0644 $(MAN1) $(MAN1DIR)
 390         install -m0644 $(MAN3) $(MAN3DIR)
 391 --- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat   2003-07-25 23:23:15.000000000 +0200
 392 +++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in  2003-09-30 17:44:24.000000000 +0200
 393 @@ -6,7 +6,7 @@
 394  -include ../../../.config
 395  BZIP2                  = @BZIP2@
 396  SHELL                  = /bin/sh
 397 -CFLAGS                 = -Wall -g
 398 +CFLAGS                 = -Wall $(CFLAGS)
 399  INCLUDES               =
 400  LDFLAGS                        = @DBMLIB@
 401  export DBEXT           = @DBEXT@
 402 @@ -20,9 +20,9 @@
 403  SBINDIR                        = @CONFIG_SBINDIR@
 404  MAN8DIR                        = $(MANDIR)/man8
 405  INSTALL                        = @INSTALL@
 406 -INSTALL_PROGRAM                = $(INSTALL) -o 0 -g 0 -m 0750
 407 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 408 -INSTALL_DATA           = $(INSTALL) -o 0 -g 0 -m 0644
 409 +INSTALL_PROGRAM                = $(INSTALL) -m 0750
 410 +INSTALL_MAN            = $(INSTALL) -m 0644
 411 +INSTALL_DATA           = $(INSTALL) -m 0644
 412  prefix                 = @prefix@
 413  exec_prefix            = @exec_prefix@
 414  DATADIR                        = @datadir@
 415 --- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat   2003-03-11 14:08:00.000000000 +0100
 416 +++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in  2003-09-30 17:44:24.000000000 +0200
 417 @@ -5,7 +5,7 @@
 418  #
 419  BZIP2                  = @BZIP2@
 420  SHELL                  = /bin/sh
 421 -CFLAGS                 = -Wall -g
 422 +CFLAGS                 = -Wall $(CFLAGS)
 423  INCLUDES               =
 424  LDFLAGS                        = @DBMLIB@
 425  CDBEXTRALIBS           = @CDBEXTRALIBS@
 426 @@ -20,8 +20,8 @@
 427  SBINDIR                        = @CONFIG_SBINDIR@
 428  MAN8DIR                        = $(MANDIR)/man8
 429  INSTALL                        = @INSTALL@
 430 -INSTALL_PROGRAM                = $(INSTALL) -o 0 -g 0 -m 0750
 431 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 432 +INSTALL_PROGRAM                = $(INSTALL) -m 0750
 433 +INSTALL_MAN            = $(INSTALL) -m 0644
 434  prefix                 = @prefix@
 435  exec_prefix            = @exec_prefix@
 436  #CC                    = @CC@ -V2.7.2.3
 437 --- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat      2003-08-26 21:46:11.000000000 +0200
 438 +++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in     2003-09-30 17:44:24.000000000 +0200
 439 @@ -1542,10 +1542,10 @@
 440  # autoconf isdnlog specific stuff
 441  #
 442  INSTALL                        := @INSTALL@
 443 -INSTALL_DIR            := $(INSTALL) -m 0755 -o 0 -g 0 -d
 444 -INSTALL_SBIN           := $(INSTALL) -m 0700 -o 0 -g 0
 445 -INSTALL_BIN            := $(INSTALL) -m 0755 -o 0 -g 0
 446 -INSTALL_DATA           := $(INSTALL) -m 0644 -o 0 -g 0
 447 +INSTALL_DIR            := $(INSTALL) -m 0755 -d
 448 +INSTALL_SBIN           := $(INSTALL) -m 0700
 449 +INSTALL_BIN            := $(INSTALL) -m 0755
 450 +INSTALL_DATA           := $(INSTALL) -m 0644
 451
 452  BZIP2                   := @BZIP2@
 453  BUNZIP2                 := $(BZIP2) -f -d
 454 @@ -1600,9 +1600,9 @@
 455  SUBDIRS     += $(LIBISDNDIR)
 456  endif
 457
 458 -# export CFLAGS  = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 459 +# export CFLAGS  = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 460
 461 -export CFLAGS  = -Wall -pipe
 462 +export CFLAGS  = -Wall $(CFLAGS)
 463  ifndef _CC
 464  export _CC  = gcc
 465  endif
 466 --- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat  1999-12-12 18:22:36.000000000 +0100
 467 +++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in 2003-09-30 17:44:24.000000000 +0200
 468 @@ -11,7 +11,7 @@
 469         # Install as root with numeric Id's, since these are the
 470         # only ones that _really_ exist on _every_ system.
 471         #
 472 -       INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
 473 +       INSTALLOPTS += INSTALL= install -m 644
 474  endif
 475
 476  all: .depend
 477 --- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat 2002-07-19 21:03:56.000000000 +0200
 478 +++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in        2003-09-30 17:44:24.000000000 +0200
 479 @@ -5,16 +5,16 @@
 480  #
 481  #
 482  SHELL                  = /bin/sh
 483 -CFLAGS                 = -Wall -O2
 484 -INCLUDES               = -I.
 485 +CFLAGS                 = -Wall $(CFLAGS)
 486 +INCLUDES               = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/loopctrl
 487  DEFS                   =
 488  LDFLAGS                        = -L../lib @LIBS@
 489  PROGRAM                        = loopctrl
 490  MODULES                        = loopctrl.o
 491  MANPAGE                        = loopctrl.8
 492  INSTALL                        = @INSTALL@
 493 -INSTALL_PROGRAM        = $(INSTALL) -o 0 -g 0 -m 0750
 494 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 495 +INSTALL_PROGRAM        = $(INSTALL) -m 0750
 496 +INSTALL_MAN            = $(INSTALL) -m 0644
 497  prefix                 = @prefix@
 498  exec_prefix            = @exec_prefix@
 499  ifeq (../.config,$(wildcard ../.config))
 500 --- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat        2002-07-19 21:03:57.000000000 +0200
 501 +++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in       2003-09-30 17:44:24.000000000 +0200
 502 @@ -5,8 +5,8 @@
 503  #
 504  #
 505  SHELL                  = /bin/sh
 506 -CFLAGS                 = -Wall -Wstrict-prototypes -O2 -g
 507 -INCLUDES               = -I. -DDEBUG
 508 +CFLAGS                 = -Wall -Wstrict-prototypes $(CFLAGS)
 509 +INCLUDES               = -I. -DDEBUG -I@CONFIG_KERNELDIR@/drivers/isdn/pcbit
 510  LDFLAGS                        = -L../lib @LIBS@
 511  PROGRAM                        = pcbitctl
 512  MODULES                        = pcbitctl.o convhexbin.o
 513 @@ -15,8 +15,8 @@
 514  MANDIR                 = @CONFIG_MANDIR@
 515  MAN8DIR                        = $(MANDIR)/man8
 516  INSTALL                        = @INSTALL@
 517 -INSTALL_PROGRAM                = $(INSTALL) -o 0 -g 0 -m 0750
 518 -INSTALL_MAN            = $(INSTALL) -o 0 -g 0 -m 0644
 519 +INSTALL_PROGRAM                = $(INSTALL) -m 0750
 520 +INSTALL_MAN            = $(INSTALL) -m 0644
 521  prefix                 = @prefix@
 522  exec_prefix            = @exec_prefix@
 523  CC                             = @CC@
 524 --- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat       2002-07-19 23:23:54.000000000 +0200
 525 +++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am      2003-09-30 17:44:24.000000000 +0200
 526 @@ -8,7 +8,7 @@
 527                           stamp-h.in comperr
 528
 529  INCLUDES = -I../capi20 $(all_includes)
 530 -CFLAGS = -Wall -O2
 531 +CFLAGS = -Wall $(CFLAGS)
 532  LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 533  LDADD = -lcapi20
 534
 535 --- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat 1997-04-28 18:51:29.000000000 +0200
 536 +++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example        2003-09-30 17:44:24.000000000 +0200
 537 @@ -5,7 +5,7 @@
 538  # login (server startup) time. If access is 'yes' the host can login
 539  # and count messages without special access.
 540
 541 -L:localhost:Y
 542 +#L:localhost:Y
 543  L:*:N
 544
 545  # Full access list
 546 @@ -13,7 +13,7 @@
 547  # All hosts in the full access list (begins with 'A') are checked if the
 548  # server gets the 'login' command.
 549
 550 -A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
 551 -A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 552 +#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
 553 +#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 554
 555  A:*:!:!:!:!:!
 556 --- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat     1997-10-22 22:46:58.000000000 +0200
 557 +++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example    2003-09-30 17:44:24.000000000 +0200
 558 @@ -20,18 +20,18 @@
 559
 560  # Settings for port ttyI6
 561
 562 -port /dev/ttyI6
 563 -  modeminit            ATZ&B512&E7830022
 564 -  user                 nicole
 565 -  group                        users
 566 -  spooldir             /var/spool/vbox/nicole
 567 +#port /dev/ttyI6
 568 +#  modeminit           ATZ&B512&E7830022
 569 +#  user                        nicole
 570 +#  group                       users
 571 +#  spooldir            /var/spool/vbox/nicole
 572
 573
 574  # Settings for port ttyI7
 575
 576 -port /dev/ttyI7
 577 -  modeminit            ATZ&B512&E7850413
 578 -  user                 michael
 579 -  group                        users
 580 -  spooldir             /var/spool/vbox/michael
 581 +#port /dev/ttyI7
 582 +#  modeminit           ATZ&B512&E7850413
 583 +#  user                        michael
 584 +#  group                       users
 585 +#  spooldir            /var/spool/vbox/michael
 586
 587 --- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat      1998-03-08 19:54:01.000000000 +0100
 588 +++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile     2003-09-30 17:44:24.000000000 +0200
 589 @@ -21,7 +21,7 @@
 590             OBJS = xisdnload.o
 591   OSMAJORVERSION = OSMajorVersion
 592   OSMINORVERSION = OSMinorVersion
 593 -      DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 594 +      DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 595
 596  AllTarget(xisdnload)
 597  NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
 598 --- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat      1998-11-23 13:12:04.000000000 +0100
 599 +++ isdn4k-utils-CVS-2003-09-23/.config.rpm     2003-09-30 17:59:55.000000000 +0200
 600 @@ -5,16 +5,16 @@
 601  #
 602  # Code maturity level options
 603  #
 604 -CONFIG_EXPERIMENTAL=y
 605 +# CONFIG_EXPERIMENTAL is not set
 606
 607  #
 608  # General configuration
 609  #
 610  CONFIG_BUILDX11=y
 611 -CONFIG_KERNELDIR='/usr/src/linux'
 612 +CONFIG_KERNELDIR='/usr/src/linux-2.4'
 613  CONFIG_BINDIR='/usr/bin'
 614 -CONFIG_SBINDIR='/sbin'
 615 -CONFIG_MANDIR='/usr/man'
 616 +CONFIG_SBINDIR='/usr/sbin'
 617 +CONFIG_MANDIR='/usr/share/man'
 618  CONFIG_RUNDIR='/var/run'
 619  CONFIG_LOCKDIR='/var/lock'
 620  CONFIG_LOCKFILE='LCK..'
 621 @@ -23,11 +23,9 @@
 622  CONFIG_CALLERIDFILE='callerid.conf'
 623  CONFIG_USERCONFFILE='~/.isdn'
 624  CONFIG_COUNTRYCODE='49'
 625 -CONFIG_AREACODE=''
 626 +CONFIG_AREACODE='9999'
 627  CONFIG_COUNTRY_PREFIX='+'
 628  CONFIG_AREA_PREFIX='0'
 629 -CONFIG_DATADIR='/usr/lib/isdn'
 630 -CONFIG_LIB_AREACODE=y
 631
 632  #
 633  # Runtime configuration tools
 634 @@ -36,18 +34,20 @@
 635  CONFIG_ISDNCTRL_CONF=y
 636  CONFIG_ISDNCTRL_TIMRU=y
 637  CONFIG_IPROFD=y
 638 +#CONFIG_DIVERTCTRL=y
 639
 640  #
 641  # Card configuration tools
 642  #
 643 -# CONFIG_TELESCTRL is not set
 644 +CONFIG_TELESCTRL=y
 645  CONFIG_HISAXCTRL=y
 646  CONFIG_ICNCTRL=y
 647  # CONFIG_ICNCTRL_DEBUG is not set
 648  CONFIG_PCBITCTL=y
 649  CONFIG_AVMCAPICTRL=y
 650 +#CONFIG_EICONCTRL=y
 651  CONFIG_LOOPCTRL=y
 652 -CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
 653 +CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
 654  # CONFIG_LOOPCTRL_DEBUG is not set
 655
 656  #
 657 @@ -64,14 +64,20 @@
 658  CONFIG_ISDNLOG_USERFILE='isdnlog.users'
 659  CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
 660  CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
 661 -CONFIG_ISDNLOG_RELOADCMD='reload'
 662 -CONFIG_ISDNLOG_STOPCMD='stop'
 663 +CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
 664 +CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
 665  CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
 666  CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 667  CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 668  # CONFIG_ISDNLOG_POSTGRES is not set
 669  # CONFIG_ISDNLOG_MYSQLDB is not set
 670 +# CONFIG_ISDNLOG_ORACLE is not set
 671  CONFIG_ISDN_LOG_DE=y
 672 +CONFIG_ISDN_LOG_CC_DE=y
 673 +CONFIG_ISDN_LOG_DEST_DE=y
 674 +# CONFIG_ISDN_LOG_DEST_AT is not set
 675 +# CONFIG_ISDN_LOG_DEST_NL is not set
 676 +# CONFIG_ISDN_LOG_DEST_CH is not set
 677  CONFIG_IPPPSTATS=y
 678  CONFIG_XISDNLOAD=y
 679  CONFIG_XMONISDN=y
 680 @@ -79,8 +85,8 @@
 681  #
 682  # Options for xmonisdn
 683  #
 684 -CONFIG_XMONISDN_UPCMD='/sbin/netup'
 685 -CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
 686 +CONFIG_XMONISDN_UPCMD='/sbin/ifup'
 687 +CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
 688
 689  #
 690  # Applications
 691 @@ -94,23 +100,22 @@
 692  VBOX_LOGDIR='/var/log/vbox'
 693  VBOX_PIDDIR='/var/run'
 694  VBOX_LOCKDIR='/var/lock'
 695 -VBOX_DOCDIR='/usr/doc/vbox'
 696 -VBOX_TCL='tcl8.0'
 697 +VBOX_DOCDIR='/usr/share/doc/vbox'
 698 +VBOX_TCL='tcl8.5'
 699 +# VBOX_SUSPEND_ID is not set
 700  CONFIG_IPPPD=y
 701
 702  #
 703  # Options for ipppd
 704  #
 705 -CONFIG_IPPPD_MSCHAP=y
 706 +# CONFIG_IPPPD_MSCHAP is not set
 707 +CONFIG_IPPP_FILTER=y
 708  # CONFIG_IPPPD_RADIUS is not set
 709  # CONFIG_RADIUS_WTMP_LOGGING is not set
 710  RADIUS_CLIENT_CONFIG_FILE=''
 711  CONFIG_CAPIFAX=y
 712  CONFIG_RCAPID=y
 713
 714 -#
 715 -# Documentation
 716 -#
 717 -CONFIG_GENMAN=y
 718 -CONFIG_FAQ=y
 719 -CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
 720 +# CAPI plugins
 721 +CONFIG_PPPDCAPIPLUGIN=y
 722 +
 723 --- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat      2000-11-12 17:06:42.000000000 +0100
 724 +++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c     2004-01-20 19:14:07.000000000 +0100
 725 @@ -41,7 +41,7 @@
 726
 727  #include "compressions.h"
 728
 729 -#if 0
 730 +#if HAVE_LZSCOMP_H
 731  #include <linux/isdn_lzscomp.h>
 732  #else
 733  #include "../ipppcomp/isdn_lzscomp.h"
 734 --- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat        2004-08-30 16:56:36.000000000 +0200
 735 +++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in       2005-02-16 18:42:54.119955183 +0100
 736 @@ -15,10 +15,10 @@
 737  MANDIR        := @CONFIG_MANDIR@
 738  CC            := @CC@
 739  INSTALL       := @INSTALL@
 740 -INSTALL_DIR   := $(INSTALL) -m 0755 -o 0 -g 0 -d
 741 -INSTALL_SBIN  := $(INSTALL) -m 0700 -o 0 -g 0
 742 -INSTALL_BIN   := $(INSTALL) -m 0755 -o 0 -g 0
 743 -INSTALL_DATA  := $(INSTALL) -m 0644 -o 0 -g 0
 744 +INSTALL_DIR   := $(INSTALL) -m 0755 -d
 745 +INSTALL_SBIN  := $(INSTALL) -m 0700
 746 +INSTALL_BIN   := $(INSTALL) -m 0755
 747 +INSTALL_DATA  := $(INSTALL) -m 0644
 748  RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
 749
 750  ifeq (@CONFIG_IPPPD_MSCHAP@,y)
 751 @@ -73,7 +73,7 @@
 752
 753  DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
 754  COMPILE_FLAGS = @CFLAGS@
 755 -CFLAGS        = -O2 -fomit-frame-pointer -Wall
 756 +CFLAGS        = $(CFLAGS)
 757  VER           = 2.2.0
 758
 759  # it's a hack
 760 --- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags   2005-02-16 18:53:15.393382578 +0100
 761 +++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile  2005-02-16 18:53:51.914999474 +0100
 762 @@ -1,4 +1,4 @@
 763 -CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 764 +CC=gcc $(CFLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 765  #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
 766
 767  all: rate-at
 768 --- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags     2005-02-16 19:04:04.338731270 +0100
 769 +++ isdn4k-utils-CVS-2005-02-16/lib/Makefile    2005-02-16 19:04:24.150811068 +0100
 770 @@ -28,7 +28,7 @@
 771  # USER CONFIGURATION AREA
 772  ######################################################################
 773
 774 -CFLAGS      = -g -Wall -pipe #-O6
 775 +CFLAGS      = $(CFLAGS)
 776  DEFS        =
 777  ifndef _CC
 778  export _CC  = gcc
 779 diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile
 780 --- isdn4k-utils-CVS-2009-10-20/Makefile.me     2009-10-20 12:28:37.000000000 +0200
 781 +++ isdn4k-utils-CVS-2009-10-20/Makefile        2009-10-20 12:29:14.000000000 +0200
 782 @@ -18,8 +18,8 @@ LIBDIR:=/usr/lib
 783  # Following line is important for lib and isdnlog (sl).
 784  export ROOTDIR=$(shell pwd)
 785
 786 -ifeq (.config,$(wildcard .config))
 787 -include .config
 788 +ifeq (.config.h,$(wildcard .config.h))
 789 +include .config.h
 790  do-it-all:      subtargets
 791  else
 792  CONFIGURATION = config
 793 @@ -134,14 +134,8 @@ rootperm:
 794
 795  install:
 796         set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
 797 -       @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
 798 -       then \
 799 -               /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
 800 -       else \
 801 -               sh scripts/makedev.sh $(DESTDIR) ; \
 802 -       fi
 803
 804 -uninstall: rootperm
 805 +uninstall:
 806         set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
 807
 808  #