]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blame - src/patches/isdn4k-utils-CVS-2006-07-20-redhat.patch
projects / people / pmueller / ipfire-2.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Am Pakfire weitergearbeitet.
[people/pmueller/ipfire-2.x.git] / src / patches / isdn4k-utils-CVS-2006-07-20-redhat.patch
CommitLineData
c6c9630e
MT		 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 = $(RPM_OPT_FLAGS)
10+INCLUDES = -I.
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 = $(RPM_OPT_FLAGS)
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 $(RPM_OPT_FLAGS)
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 $(RPM_OPT_FLAGS)
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 $(RPM_OPT_FLAGS)
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 $(RPM_OPT_FLAGS)
102+INCLUDES = -I.
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 $(RPM_OPT_FLAGS)
136+INCLUDES = -I. -Iinclude
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 $(RPM_OPT_FLAGS) -I.
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 $(RPM_OPT_FLAGS)
186+INCLUDES = -I.
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 $(RPM_OPT_FLAGS)
212+INCLUDES = -I.
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=$(RPM_OPT_FLAGS)
244 #CCFLAGS=-I$(ISDN_INCLUDE) -g
245
246 # nothing to change behind this line
247@@ -34,13 +34,6 @@
248 imontty: imontty.c imontty.h
249 cc $(CCFLAGS) -o imontty imontty.c
250
251-rootperm:
252- @echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
253- @if gcc -x c -o G g && rm -f g && ./G ; then \
254- echo -e "\n\n Need root permission for (de)installation!\n\n"; \
255- exit 1; \
256- fi
257-
258 imontty.8: imontty.8.in
259 MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \
260 sed \
261@@ -52,10 +45,10 @@
262 mkdir -p $(DESTDIR)$(MAN8DIR)
263 $(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
264
265-install: $(PROGS) rootperm install-man
266- install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
267+install: $(PROGS) install-man
268+ install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
269
270-uninstall: rootperm
271+uninstall:
272 for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
273
274 clean:
275--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat 2002-07-19 21:03:54.000000000 +0200
276+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in 2003-09-30 17:44:24.000000000 +0200
277@@ -6,14 +6,14 @@
278 MANDIR = @CONFIG_MANDIR@
279 CC = @CC@
280 INSTALL = @INSTALL@
281-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
282-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
283-INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d
284+INSTALL_SBIN = $(INSTALL) -m 755
285+INSTALL_DATA = $(INSTALL) -m 644
286+INSTALL_DIR = $(INSTALL) -m 755 -d
287
288 PPPSTATSRCS = ipppstats.c
289 PPPSTATOBJS = ipppstats.o
290
291-CFLAGS = -fomit-frame-pointer -O2
292+CFLAGS = $(RPM_OPT_FLAGS)
293
294 all: ipppstats
295
296--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat 2002-07-19 23:23:53.000000000 +0200
297+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in 2003-09-30 17:44:24.000000000 +0200
298@@ -5,8 +5,8 @@
299 #
300 #
301 SHELL = /bin/sh
302-CFLAGS = -Wall -O2
303-INCLUDES = -I.
304+CFLAGS = -Wall $(RPM_OPT_FLAGS)
305+INCLUDES = -I.
306 LDFLAGS = -L../lib @LIBS@
307 PROGRAM = iprofd
308 MODULES = iprofd.o
309@@ -15,8 +15,8 @@
310 MANDIR = @CONFIG_MANDIR@
311 MAN8DIR = $(MANDIR)/man8
312 INSTALL = @INSTALL@
313-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
314-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
315+INSTALL_PROGRAM = $(INSTALL) -m 0750
316+INSTALL_MAN = $(INSTALL) -m 0644
317 prefix = @prefix@
318 exec_prefix = @exec_prefix@
319 CC = @CC@
320--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat 2002-07-19 23:23:54.000000000 +0200
321+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in 2003-09-30 17:44:24.000000000 +0200
322@@ -5,8 +5,8 @@
323 #
324 #
325 SHELL = /bin/sh
326-CFLAGS = -Wall -O2
327-INCLUDES = -I.
328+CFLAGS = -Wall $(RPM_OPT_FLAGS)
329+INCLUDES = -I.
330 LDFLAGS = @LIBS@
331 PROGRAM = isdnctrl
332 MODULES = isdnctrl.o
333@@ -15,8 +15,8 @@
334 MANDIR = @CONFIG_MANDIR@
335 MAN8DIR = $(MANDIR)/man8
336 INSTALL = @INSTALL@
337-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
338-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
339+INSTALL_PROGRAM = $(INSTALL) -m 0750
340+INSTALL_MAN = $(INSTALL) -m 0644
341 CC = @CC@ -DVERSION=\"@I4LVERSION@\"
342 prefix = @prefix@
343 exec_prefix = @exec_prefix@
344--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat 2000-09-08 10:55:51.000000000 +0200
345+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf 2003-09-30 17:44:24.000000000 +0200
346@@ -2,38 +2,31 @@
347 #
348 # More information: See the isdnlog documentation
349
350+#INTERFACE = ippp0 # Isdn network interface. This information is required
351+ # with the "-hx" / hangup="value" option.
352+
353+
354 [MSN]
355 NUMBER = 4711
356 ALIAS = Phone
357 SI = 1
358 ZONE = 1
359-START = {
360- [FLAG]
361- FLAGS = I|O|R|C|B|A|E|H
362- PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
363-}
364+#START = {
365+# [FLAG]
366+# FLAGS = I|O|R|C|B|A|E|H
367+# PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
368+#}
369
370 [MSN]
371 NUMBER = 4711
372 ALIAS = HDLC
373 SI = 7
374 ZONE = 1
375-START = {
376- [FLAG]
377- FLAGS = I|O|R|C|B|A|E|
378- PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
379-}
380-
381-[MSN]
382-NUMBER = 4712
383-ALIAS = Modem
384-SI = 1
385-ZONE = 1
386-START = {
387- [FLAG]
388- FLAGS = I|O|R|C|B|A|E|H
389- PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
390-}
391+#START = {
392+# [FLAG]
393+# FLAGS = I|O|R|C|B|A|E|
394+# PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
395+#}
396
397 [NUMBER]
398 NUMBER = 01910
399--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat 2000-08-15 17:16:23.000000000 +0200
400+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in 2003-09-30 17:44:24.000000000 +0200
401@@ -20,7 +20,7 @@
402 BINDIR:=$(DESTDIR)@prefix@/bin
403 INCDIR:=$(DESTDIR)@prefix@/include
404
405-CFLAGS:=-Wall -O2
406+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
407
408 all: depend $(FILES)
409
410@@ -46,7 +46,7 @@
411 install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
412 $(INCDIR)
413
414-install:
415+install: install-dirs
416 install -m0755 $(BINS) $(BINDIR)
417 install -m0644 $(MAN1) $(MAN1DIR)
418 install -m0644 $(MAN3) $(MAN3DIR)
419--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat 2003-07-25 23:23:15.000000000 +0200
420+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in 2003-09-30 17:44:24.000000000 +0200
421@@ -6,7 +6,7 @@
422 -include ../../../.config
423 BZIP2 = @BZIP2@
424 SHELL = /bin/sh
425-CFLAGS = -Wall -g
426+CFLAGS = -Wall $(RPM_OPT_FLAGS)
427 INCLUDES =
428 LDFLAGS = @DBMLIB@
429 export DBEXT = @DBEXT@
430@@ -20,9 +20,9 @@
431 SBINDIR = @CONFIG_SBINDIR@
432 MAN8DIR = $(MANDIR)/man8
433 INSTALL = @INSTALL@
434-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
435-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
436-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
437+INSTALL_PROGRAM = $(INSTALL) -m 0750
438+INSTALL_MAN = $(INSTALL) -m 0644
439+INSTALL_DATA = $(INSTALL) -m 0644
440 prefix = @prefix@
441 exec_prefix = @exec_prefix@
442 DATADIR = @datadir@
443--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in.redhat 1999-12-24 15:17:08.000000000 +0100
444+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in 2003-09-30 17:44:24.000000000 +0200
445@@ -8,8 +8,8 @@
446 CGIDIR = @CGIDIR@
447 TELDIR = @TELDIR@
448 INSTALL = @INSTALL@
449-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0755
450-INSTALL_FILE = $(INSTALL) -o 0 -g 0 -m 0644
451+INSTALL_PROGRAM = $(INSTALL) -m 0755
452+INSTALL_FILE = $(INSTALL) -m 0644
453
454 FILES = index.html info.html *.jpg *.gif tt.js
455
456--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat 2003-03-11 14:08:00.000000000 +0100
457+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in 2003-09-30 17:44:24.000000000 +0200
458@@ -5,7 +5,7 @@
459 #
460 BZIP2 = @BZIP2@
461 SHELL = /bin/sh
462-CFLAGS = -Wall -g
463+CFLAGS = -Wall $(RPM_OPT_FLAGS)
464 INCLUDES =
465 LDFLAGS = @DBMLIB@
466 CDBEXTRALIBS = @CDBEXTRALIBS@
467@@ -20,8 +20,8 @@
468 SBINDIR = @CONFIG_SBINDIR@
469 MAN8DIR = $(MANDIR)/man8
470 INSTALL = @INSTALL@
471-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
472-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
473+INSTALL_PROGRAM = $(INSTALL) -m 0750
474+INSTALL_MAN = $(INSTALL) -m 0644
475 prefix = @prefix@
476 exec_prefix = @exec_prefix@
477 #CC = @CC@ -V2.7.2.3
478--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat 2003-08-26 21:46:11.000000000 +0200
479+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in 2003-09-30 17:44:24.000000000 +0200
480@@ -1542,10 +1542,10 @@
481 # autoconf isdnlog specific stuff
482 #
483 INSTALL := @INSTALL@
484-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
485-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
486-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
487-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
488+INSTALL_DIR := $(INSTALL) -m 0755 -d
489+INSTALL_SBIN := $(INSTALL) -m 0700
490+INSTALL_BIN := $(INSTALL) -m 0755
491+INSTALL_DATA := $(INSTALL) -m 0644
492
493 BZIP2 := @BZIP2@
494 BUNZIP2 := $(BZIP2) -f -d
495@@ -1600,9 +1600,9 @@
496 SUBDIRS += $(LIBISDNDIR)
497 endif
498
499-# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
500+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
501
502-export CFLAGS = -Wall -pipe
503+export CFLAGS = -Wall $(RPM_OPT_FLAGS)
504 ifndef _CC
505 export _CC = gcc
506 endif
507@@ -1837,8 +1837,7 @@
508 echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
509 fi
510
511-uninstall: rootperm
512- if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
513+uninstall:
514 rm -f $(DESTDIR)$(SBINDIR)/$(ISDNLOG) \
515 $(DESTDIR)$(BINDIR)/$(ISDNREP) \
516 $(DESTDIR)$(BINDIR)/$(ISDNCONF)
517@@ -1859,7 +1858,7 @@
518 $(DESTDIR)$(DATADIR)/dest.cdb
519
520
521-installdirs: rootperm
522+installdirs:
523 $(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR)
524 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
525 $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
526@@ -1868,7 +1867,7 @@
527 $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
528 $(INSTALL_DIR) $(DESTDIR)$(DATADIR)
529
530-install: all rootperm installdirs install-conf install-data install-progs
531+install: all installdirs install-conf install-data install-progs
532
533 install-old-conf:
534 @if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \
535--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat 1999-12-12 18:22:36.000000000 +0100
536+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in 2003-09-30 17:44:24.000000000 +0200
537@@ -11,7 +11,7 @@
538 # Install as root with numeric Id's, since these are the
539 # only ones that _really_ exist on _every_ system.
540 #
541- INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
542+ INSTALLOPTS += INSTALL= install -m 644
543 endif
544
545 all: .depend
546--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat 2002-07-19 21:03:56.000000000 +0200
547+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in 2003-09-30 17:44:24.000000000 +0200
548@@ -5,16 +5,16 @@
549 #
550 #
551 SHELL = /bin/sh
552-CFLAGS = -Wall -O2
553-INCLUDES = -I.
554+CFLAGS = -Wall $(RPM_OPT_FLAGS)
555+INCLUDES = -I.
556 DEFS =
557 LDFLAGS = -L../lib @LIBS@
558 PROGRAM = loopctrl
559 MODULES = loopctrl.o
560 MANPAGE = loopctrl.8
561 INSTALL = @INSTALL@
562-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
563-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
564+INSTALL_PROGRAM = $(INSTALL) -m 0750
565+INSTALL_MAN = $(INSTALL) -m 0644
566 prefix = @prefix@
567 exec_prefix = @exec_prefix@
568 ifeq (../.config,$(wildcard ../.config))
569--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat 2002-07-19 21:03:57.000000000 +0200
570+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in 2003-09-30 17:44:24.000000000 +0200
571@@ -5,8 +5,8 @@
572 #
573 #
574 SHELL = /bin/sh
575-CFLAGS = -Wall -Wstrict-prototypes -O2 -g
576-INCLUDES = -I. -DDEBUG
577+CFLAGS = -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
578+INCLUDES = -I. -DDEBUG
579 LDFLAGS = -L../lib @LIBS@
580 PROGRAM = pcbitctl
581 MODULES = pcbitctl.o convhexbin.o
582@@ -15,8 +15,8 @@
583 MANDIR = @CONFIG_MANDIR@
584 MAN8DIR = $(MANDIR)/man8
585 INSTALL = @INSTALL@
586-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
587-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
588+INSTALL_PROGRAM = $(INSTALL) -m 0750
589+INSTALL_MAN = $(INSTALL) -m 0644
590 prefix = @prefix@
591 exec_prefix = @exec_prefix@
592 CC = @CC@
593--- isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile.redhat 2001-05-01 14:43:50.000000000 +0200
594+++ isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile 2003-09-30 17:44:24.000000000 +0200
595@@ -8,7 +8,7 @@
596 # as published by the Free Software Foundation; either version
597 # 2 of the License, or (at your option) any later version.
598
599-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
600+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
601
602 include $(TOPDIR)/Rules.make
603
604--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat 2002-07-19 23:23:54.000000000 +0200
605+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am 2003-09-30 17:44:24.000000000 +0200
606@@ -8,7 +8,7 @@
607 stamp-h.in comperr
608
609 INCLUDES = -I../capi20 $(all_includes)
610-CFLAGS = -Wall -O2
611+CFLAGS = -Wall $(RPM_OPT_FLAGS)
612 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
613 LDADD = -lcapi20
614
615--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat 1997-04-28 18:51:29.000000000 +0200
616+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example 2003-09-30 17:44:24.000000000 +0200
617@@ -5,7 +5,7 @@
618 # login (server startup) time. If access is 'yes' the host can login
619 # and count messages without special access.
620
621-L:localhost:Y
622+#L:localhost:Y
623 L:*:N
624
625 # Full access list
626@@ -13,7 +13,7 @@
627 # All hosts in the full access list (begins with 'A') are checked if the
628 # server gets the 'login' command.
629
630-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
631-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
632+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
633+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
634
635 A:*:!:!:!:!:!
636--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat 1997-10-22 22:46:58.000000000 +0200
637+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example 2003-09-30 17:44:24.000000000 +0200
638@@ -20,18 +20,18 @@
639
640 # Settings for port ttyI6
641
642-port /dev/ttyI6
643- modeminit ATZ&B512&E7830022
644- user nicole
645- group users
646- spooldir /var/spool/vbox/nicole
647+#port /dev/ttyI6
648+# modeminit ATZ&B512&E7830022
649+# user nicole
650+# group users
651+# spooldir /var/spool/vbox/nicole
652
653
654 # Settings for port ttyI7
655
656-port /dev/ttyI7
657- modeminit ATZ&B512&E7850413
658- user michael
659- group users
660- spooldir /var/spool/vbox/michael
661+#port /dev/ttyI7
662+# modeminit ATZ&B512&E7850413
663+# user michael
664+# group users
665+# spooldir /var/spool/vbox/michael
666
667--- isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in.redhat 2002-01-31 21:05:40.000000000 +0100
668+++ isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in 2003-09-30 17:44:24.000000000 +0200
669@@ -14,33 +14,33 @@
670 # [*] Program to install binaries to the sbin directory (eg vboxgetty): #
671 #----------------------------------------------------------------------------#
672
673-INSTALL_SBIN = @INSTALL@ -m 750 -o root -g root -s
674+INSTALL_SBIN = @INSTALL@ -m 750
675
676 #----------------------------------------------------------------------------#
677 # [*] Program to install binaries to the bin directory (eg vboxconvert): #
678 #----------------------------------------------------------------------------#
679
680-INSTALL_BIN = @INSTALL@ -m 755 -o root -g root -s
681+INSTALL_BIN = @INSTALL@ -m 755
682
683 #----------------------------------------------------------------------------#
684 # [*] Program to install bash scripts to the bin directory (eg vboxplay): #
685 #----------------------------------------------------------------------------#
686
687-INSTALL_SHBIN = @INSTALL@ -m 755 -o root -g root
688+INSTALL_SHBIN = @INSTALL@ -m 755
689
690 #----------------------------------------------------------------------------#
691 # [*] Program to install binaries to the bin directory and set the suid bit #
692 # (eg vboxbeep): #
693 #----------------------------------------------------------------------------#
694
695-INSTALL_UBIN = @INSTALL@ -m 4755 -o root -g root -s
696+INSTALL_UBIN = @INSTALL@ -m 4755
697
698 #----------------------------------------------------------------------------#
699 # [*] Program to install configurations to sysconf directory #
700 # (eg vboxgetty.conf): #
701 #----------------------------------------------------------------------------#
702
703-INSTALL_SYSCONF = @INSTALL@ -m 640 -o root -g root
704+INSTALL_SYSCONF = @INSTALL@ -m 640
705
706 #----------------------------------------------------------------------------#
707 # [*] Program to create missing directories: #
708--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat 1998-03-08 19:54:01.000000000 +0100
709+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile 2003-09-30 17:44:24.000000000 +0200
710@@ -21,7 +21,7 @@
711 OBJS = xisdnload.o
712 OSMAJORVERSION = OSMajorVersion
713 OSMINORVERSION = OSMinorVersion
714- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
715+ DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
716
717 AllTarget(xisdnload)
718 NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
719--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat 1998-11-23 13:12:04.000000000 +0100
720+++ isdn4k-utils-CVS-2003-09-23/.config.rpm 2003-09-30 17:59:55.000000000 +0200
721@@ -5,16 +5,16 @@
722 #
723 # Code maturity level options
724 #
725-CONFIG_EXPERIMENTAL=y
726+# CONFIG_EXPERIMENTAL is not set
727
728 #
729 # General configuration
730 #
731 CONFIG_BUILDX11=y
732-CONFIG_KERNELDIR='/usr/src/linux'
733+CONFIG_KERNELDIR='/usr/src/linux'
734 CONFIG_BINDIR='/usr/bin'
735-CONFIG_SBINDIR='/sbin'
736-CONFIG_MANDIR='/usr/man'
737+CONFIG_SBINDIR='/usr/sbin'
738+CONFIG_MANDIR='/usr/share/man'
739 CONFIG_RUNDIR='/var/run'
740 CONFIG_LOCKDIR='/var/lock'
741 CONFIG_LOCKFILE='LCK..'
742@@ -23,11 +23,9 @@
743 CONFIG_CALLERIDFILE='callerid.conf'
744 CONFIG_USERCONFFILE='~/.isdn'
745 CONFIG_COUNTRYCODE='49'
746-CONFIG_AREACODE=''
747+CONFIG_AREACODE='9999'
748 CONFIG_COUNTRY_PREFIX='+'
749 CONFIG_AREA_PREFIX='0'
750-CONFIG_DATADIR='/usr/lib/isdn'
751-CONFIG_LIB_AREACODE=y
752
753 #
754 # Runtime configuration tools
755@@ -36,18 +34,20 @@
756 CONFIG_ISDNCTRL_CONF=y
757 CONFIG_ISDNCTRL_TIMRU=y
758 CONFIG_IPROFD=y
759+CONFIG_DIVERTCTRL=y
760
761 #
762 # Card configuration tools
763 #
764-# CONFIG_TELESCTRL is not set
765+CONFIG_TELESCTRL=y
766 CONFIG_HISAXCTRL=y
767 CONFIG_ICNCTRL=y
768 # CONFIG_ICNCTRL_DEBUG is not set
769 CONFIG_PCBITCTL=y
770 CONFIG_AVMCAPICTRL=y
771+CONFIG_EICONCTRL=y
772 CONFIG_LOOPCTRL=y
773-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
774+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
775 # CONFIG_LOOPCTRL_DEBUG is not set
776
777 #
778@@ -64,14 +64,20 @@
779 CONFIG_ISDNLOG_USERFILE='isdnlog.users'
780 CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
781 CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
782-CONFIG_ISDNLOG_RELOADCMD='reload'
783-CONFIG_ISDNLOG_STOPCMD='stop'
784+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
785+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
786 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
787 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
788 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
789 # CONFIG_ISDNLOG_POSTGRES is not set
790 # CONFIG_ISDNLOG_MYSQLDB is not set
791+# CONFIG_ISDNLOG_ORACLE is not set
792 CONFIG_ISDN_LOG_DE=y
793+CONFIG_ISDN_LOG_CC_DE=y
794+CONFIG_ISDN_LOG_DEST_DE=y
795+# CONFIG_ISDN_LOG_DEST_AT is not set
796+# CONFIG_ISDN_LOG_DEST_NL is not set
797+# CONFIG_ISDN_LOG_DEST_CH is not set
798 CONFIG_IPPPSTATS=y
799 CONFIG_XISDNLOAD=y
800 CONFIG_XMONISDN=y
801@@ -79,8 +85,8 @@
802 #
803 # Options for xmonisdn
804 #
805-CONFIG_XMONISDN_UPCMD='/sbin/netup'
806-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
807+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
808+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
809
810 #
811 # Applications
812@@ -94,23 +100,22 @@
813 VBOX_LOGDIR='/var/log/vbox'
814 VBOX_PIDDIR='/var/run'
815 VBOX_LOCKDIR='/var/lock'
816-VBOX_DOCDIR='/usr/doc/vbox'
817-VBOX_TCL='tcl8.0'
818+VBOX_DOCDIR='/usr/share/doc/vbox'
819+VBOX_TCL='tcl8.3'
820+# VBOX_SUSPEND_ID is not set
821 CONFIG_IPPPD=y
822
823 #
824 # Options for ipppd
825 #
826-CONFIG_IPPPD_MSCHAP=y
827+# CONFIG_IPPPD_MSCHAP is not set
828+CONFIG_IPPP_FILTER=y
829 # CONFIG_IPPPD_RADIUS is not set
830 # CONFIG_RADIUS_WTMP_LOGGING is not set
831 RADIUS_CLIENT_CONFIG_FILE=''
832 CONFIG_CAPIFAX=y
833 CONFIG_RCAPID=y
834
835-#
836-# Documentation
837-#
838-CONFIG_GENMAN=y
839-CONFIG_FAQ=y
840-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
841+# CAPI plugins
842+CONFIG_PPPDCAPIPLUGIN=y
843+
844--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat 2000-11-12 17:06:42.000000000 +0100
845+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c 2004-01-20 19:14:07.000000000 +0100
846@@ -41,7 +41,7 @@
847
848 #include "compressions.h"
849
850-#if 0
851+#if HAVE_LZSCOMP_H
852 #include <linux/isdn_lzscomp.h>
853 #else
854 #include "../ipppcomp/isdn_lzscomp.h"
855--- isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile.redhat 2004-02-14 16:02:46.000000000 +0100
856+++ isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile 2004-11-18 16:48:54.848276370 +0100
857@@ -12,13 +12,13 @@
858 export CAPIINC=$(TOPDIR)/../capi20
859 export CAPILIB=$(TOPDIR)/../capi20
860 export INSTALL=$(TOPDIR)/install-sh -c
861-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
862+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
863 export MKDIR=$(TOPDIR)/mkinstalldirs
864
865 PPPSRCDIRS=/src/isdn/pppd
866
867 ifeq ($(PPPVERSIONS),)
868-PPPVERSIONS = 2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3
869+PPPVERSIONS = 2.4.3
870 endif
871
872 PEERDIR=${DESTDIR}/etc/ppp/peers/isdn
873@@ -62,7 +62,7 @@
874 done
875
876 install-man:
877- for i in ${DESTDIR}/usr/share/man ${DESTDIR}/usr/man; do \
878+ for i in ${DESTDIR}/usr/share/man ; do \
879 if [ -d $$i/man8 ] ; then \
880 echo $(INSTALLDATA) capiplugin.8 $$i/man8; \
881 $(INSTALLDATA) capiplugin.8 $$i/man8; \
882--- isdn4k-utils-CVS-2004-11-18/Makefile.redhat 2004-08-30 16:06:42.000000000 +0200
883+++ isdn4k-utils-CVS-2004-11-18/Makefile 2004-12-01 22:19:13.193347501 +0100
884@@ -16,8 +16,8 @@
885 # Following line is important for lib and isdnlog (sl).
886 export ROOTDIR=$(shell pwd)
887
888-ifeq (.config,$(wildcard .config))
889-include .config
890+ifeq (.config.h,$(wildcard .config.h))
891+include .config.h
892 do-it-all: subtargets
893 else
894 CONFIGURATION = config
895@@ -130,16 +130,10 @@
896 exit 1; \
897 fi
898
899-install: rootperm
900+install:
901 set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
902- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
903- then \
904- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
905- else \
906- sh scripts/makedev.sh $(DESTDIR) ; \
907- fi
908
909-uninstall: rootperm
910+uninstall:
911 set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
912
913 #
914@@ -202,7 +196,7 @@
915 @set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
916 if [ -x $$i/configure ] ; then \
917 /bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
918- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
919+ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(LIBDIR) --datadir=$(CONFIG_DATADIR) --enable-ippp-filter || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
920 elif [ -f $$i/Makefile.in ] ; then \
921 /bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
922 $(MAKE) -C $$i -f Makefile.in config; \
923--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat 2004-08-30 16:56:36.000000000 +0200
924+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in 2005-02-16 18:42:54.119955183 +0100
925@@ -15,10 +15,10 @@
926 MANDIR := @CONFIG_MANDIR@
927 CC := @CC@
928 INSTALL := @INSTALL@
929-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
930-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
931-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
932-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
933+INSTALL_DIR := $(INSTALL) -m 0755 -d
934+INSTALL_SBIN := $(INSTALL) -m 0700
935+INSTALL_BIN := $(INSTALL) -m 0755
936+INSTALL_DATA := $(INSTALL) -m 0644
937 RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
938
939 ifeq (@CONFIG_IPPPD_MSCHAP@,y)
940@@ -73,7 +73,7 @@
941
942 DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
943 COMPILE_FLAGS =
944-CFLAGS = -O2 -fomit-frame-pointer -Wall
945+CFLAGS = $(RPM_OPT_FLAGS)
946 VER = 2.2.0
947
948 # it's a hack
949--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags 2005-02-16 18:53:15.393382578 +0100
950+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile 2005-02-16 18:53:51.914999474 +0100
951@@ -1,4 +1,4 @@
952-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
953+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
954 #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
955
956 all: rate-at
957--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags 2005-02-16 19:04:04.338731270 +0100
958+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile 2005-02-16 19:04:24.150811068 +0100
959@@ -28,7 +28,7 @@
960 # USER CONFIGURATION AREA
961 ######################################################################
962
963-CFLAGS = -g -Wall -pipe #-O6
964+CFLAGS = $(RPM_OPT_FLAGS)
965 DEFS =
966 ifndef _CC
967 export _CC = gcc
Peter's tree of IPFire 2.x