rpms/isdn4k-utils/devel capi.init, NONE, 1.1 isdn4k-utils-CVS-2006-02-13-cleanup.patch, NONE, 1.1 isdn4k-utils-CVS-2006-02-13-redhat.patch, NONE, 1.1 isdn4k-utils-capiinit.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 isdn4k-utils.spec, 1.55, 1.56 sources, 1.13, 1.14 isdn4k-utils-CVS-2004-11-18-cleanup.patch, 1.1, NONE isdn4k-utils-CVS-2005-02-16-redhat.patch, 1.1, NONE isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch, 1.1, NONE isdn4k-utils-isdnlog.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 19 14:42:29 UTC 2006
- Previous message (by thread): rpms/bind/FC-5 bind-9.3.2-bz173961.patch, NONE, 1.1 bind-9.3.2-prctl_set_dumpable.patch, NONE, 1.1 bind-chroot-admin.in, 1.5, 1.6 bind.spec, 1.102, 1.103
- Next message (by thread): rpms/gnome-terminal/devel gnome-terminal.spec,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17767
Modified Files:
.cvsignore isdn4k-utils.spec sources
Added Files:
capi.init isdn4k-utils-CVS-2006-02-13-cleanup.patch
isdn4k-utils-CVS-2006-02-13-redhat.patch
isdn4k-utils-capiinit.patch
Removed Files:
isdn4k-utils-CVS-2004-11-18-cleanup.patch
isdn4k-utils-CVS-2005-02-16-redhat.patch
isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch
isdn4k-utils-isdnlog.patch
Log Message:
- update to CVS-2006-02-13
- add support capi #169902
--- NEW FILE capi.init ---
#! /bin/bash
#
# chkconfig: 2345 9 91
# description: start and stop capi services for passiv ISDN cards
#
PATH=/bin:/sbin:/usr/bin:/usr/sbin
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
. /etc/rc.d/init.d/functions
else
exit 0
fi
[ -f /sbin/capiinit ] || exit 0
[ -f /etc/capi.conf ] || exit 0
RETVAL=0
function start()
{
# don't start again if it's already started
[ ! -f /var/lock/subsys/capi ] || exit 0
action $"Starting capi4linux:" capiinit start
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
touch /var/lock/subsys/capi
fi
}
function stop()
{
if [ -f /var/lock/subsys/capi ] ; then
action $"Stopping capi4linux:" capiinit stop
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
rm -f /var/lock/subsys/capi
fi
fi
}
function restart()
{
stop
start
}
function condrestart()
{
if [ -f /var/lock/subsys/capi ] ; then
restart
fi
}
function status()
{
capiinfo
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
condrestart)
condrestart
;;
status)
status
;;
*)
echo $"Usage: $0 {start|stop|restart|status|condrestart}"
exit 1
esac
exit 0
isdn4k-utils-CVS-2006-02-13-cleanup.patch:
./icn/icnctrl.c | 2 !!
./isdnlog/isdnlog/processor.c | 2 !!
./isdnlog/isdnrep/isdnbill.c | 2 !!
./isdnlog/isdnrep/isdnrep.c | 2 !!
./isdnlog/tools/zone.c | 2 !!
./loop/loopctrl.c | 2 !!
eicon/eiconctrl.c | 2 +-
7 files changed, 1 insertion(+), 1 deletion(-), 12 modifications(!)
--- NEW FILE isdn4k-utils-CVS-2006-02-13-cleanup.patch ---
*** ./icn/icnctrl.c.old 2002-11-27 14:30:43.000000000 +0000
--- ./icn/icnctrl.c 2002-11-27 14:31:10.000000000 +0000
***************
*** 223,229 ****
icn_cdef newcard;
cmd = strrchr(argv[0], '/');
! cmd = (cmd == NULL) ? argv[0] : ++cmd;
if (argc > 1) {
if (!strcmp(argv[1], "-d")) {
strcpy(ioctl_s.drvid, argv[2]);
--- 223,229 ----
icn_cdef newcard;
cmd = strrchr(argv[0], '/');
! cmd = (cmd == NULL) ? argv[0] : (cmd + 1);
if (argc > 1) {
if (!strcmp(argv[1], "-d")) {
strcpy(ioctl_s.drvid, argv[2]);
*** ./isdnlog/isdnlog/processor.c.old 2002-11-27 14:27:28.000000000 +0000
--- ./isdnlog/isdnlog/processor.c 2002-11-27 14:27:41.000000000 +0000
***************
*** 3497,3503 ****
isdn_net_ioctl_phone netdvX_phone;
#endif
} phone;
! auto int rc, chan, l1, l2, lmin, lmax, ldiv, match;
if ((iflst = fopen("/proc/net/dev", "r")) == NULL)
return(-1);
--- 3497,3503 ----
isdn_net_ioctl_phone netdvX_phone;
#endif
} phone;
! auto int rc, chan = 0, l1, l2, lmin, lmax, ldiv, match;
if ((iflst = fopen("/proc/net/dev", "r")) == NULL)
return(-1);
*** ./isdnlog/isdnrep/isdnbill.c.old 2002-11-27 14:30:11.000000000 +0000
--- ./isdnlog/isdnrep/isdnbill.c 2002-11-27 14:30:22.000000000 +0000
***************
*** 874,880 ****
#endif
auto char s[BUFSIZ], sx[BUFSIZ];
auto int i, l, col, day, lday = UNKNOWN, month, lmonth = UNKNOWN;
! auto double dur;
auto char *version;
auto char *myname = basename(argv[0]);
auto int opt, go, s0, indent;
--- 874,880 ----
#endif
auto char s[BUFSIZ], sx[BUFSIZ];
auto int i, l, col, day, lday = UNKNOWN, month, lmonth = UNKNOWN;
! auto double dur = 0.0;
auto char *version;
auto char *myname = basename(argv[0]);
auto int opt, go, s0, indent;
*** ./isdnlog/isdnrep/isdnrep.c.old 2002-11-27 14:29:13.000000000 +0000
--- ./isdnlog/isdnrep/isdnrep.c 2002-11-27 14:29:50.000000000 +0000
***************
*** 2593,2599 ****
{
static char String[256];
one_call *tmp_call;
! int RetCode;
if (bill)
--- 2593,2599 ----
{
static char String[256];
one_call *tmp_call;
! int RetCode = 0;
if (bill)
*** ./isdnlog/tools/zone.c.old 2002-11-27 14:28:01.000000000 +0000
--- ./isdnlog/tools/zone.c 2002-11-27 14:28:11.000000000 +0000
***************
*** 531,537 ****
char *p = value.dptr;
char to[10];
US count;
! int ito;
unsigned char z=0;
if (sthp->cc) /* if areacodes */
/* here is since 1.00 a zero-terminated strring */
--- 531,537 ----
char *p = value.dptr;
char to[10];
US count;
! int ito = 0;
unsigned char z=0;
if (sthp->cc) /* if areacodes */
/* here is since 1.00 a zero-terminated strring */
*** ./loop/loopctrl.c.old 2002-11-27 14:32:08.000000000 +0000
--- ./loop/loopctrl.c 2002-11-27 14:32:23.000000000 +0000
***************
*** 175,181 ****
isdnloop_sdef startparm;
cmd = strrchr(argv[0], '/');
! cmd = (cmd == NULL) ? argv[0] : ++cmd;
if (argc > 1) {
if (!strcmp(argv[1], "-d")) {
strcpy(ioctl_s.drvid, argv[2]);
--- 175,181 ----
isdnloop_sdef startparm;
cmd = strrchr(argv[0], '/');
! cmd = (cmd == NULL) ? argv[0] : (cmd + 1);
if (argc > 1) {
if (!strcmp(argv[1], "-d")) {
strcpy(ioctl_s.drvid, argv[2]);
--- eicon/eiconctrl.c.orig 2006-04-19 16:16:02.000000000 +0200
+++ eicon/eiconctrl.c 2006-04-19 16:17:25.000000000 +0200
@@ -1970,7 +1970,7 @@
val = strtol(p, &q, 16);
p = q;
val = strtol(p, &q, 16);
- (unsigned short) *buffer = (unsigned short) val;
+ *buffer = (unsigned short) val;
pos = 2;
while ((p != q) && (*q != 0)) {
p = q;
isdn4k-utils-CVS-2006-02-13-redhat.patch:
isdn4k-utils-CVS-2003-09-23/.config.rpm | 49 +++++-----
isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in | 6 -
isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/doc/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/icn/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/imon/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/imontty/Makefile | 19 +--
isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c | 2
isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in | 19 +--
isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf | 35 ++-----
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in | 4
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in | 4
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in | 6 -
isdn4k-utils-CVS-2003-09-23/lib/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/loop/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile | 2
isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example | 6 -
isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example | 20 ++--
isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile | 2
isdn4k-utils-CVS-2004-11-18/Makefile | 16 +--
isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile | 6 -
isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in | 10 +-
isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile | 2
isdn4k-utils-CVS-2005-02-16/lib/Makefile | 2
38 files changed, 160 insertions(+), 176 deletions(-)
--- NEW FILE isdn4k-utils-CVS-2006-02-13-redhat.patch ---
--- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat 2002-07-19 21:03:49.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/act2000
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = actctrl
@@ -18,9 +18,9 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat 1999-06-19 11:39:59.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -12,7 +12,7 @@
# only ones that _really_ exist on _every_ system.
#
BUILDOPTS := $(DATAOPTS)
- INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+ INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
endif
all: .depend
--- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat 2002-07-19 21:03:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS)
LDFLAGS = -L../lib @LIBS@
INCLUDES = -I.
PROGRAMS = avmcapictrl
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat 2000-03-03 16:54:12.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat 2000-10-20 19:14:20.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat 2000-03-17 17:19:43.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr core
INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
LDFLAGS = $(all_libraries)
LDADD =
--- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat 2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/divert
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = divertctrl
MODULES = divertctrl.o
MANPAGE = divertctrl.8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat 1999-12-24 15:14:50.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -9,7 +9,7 @@
SED = @SED@
MANDIR = @CONFIG_MANDIR@
MANPAGES = ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN = @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN = @INSTALL@ -m 0644
prefix = @prefix@
%.1: %.man
--- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat 2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -DUNIX -DLINUX
-INCLUDES = -I. -Iinclude
+CFLAGS = -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES = -I. -Iinclude -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/eicon
LDFLAGS = -L../lib @LIBS@
PROGRAMS =
PROGRAM = eiconctrl
@@ -22,9 +22,9 @@
DATA_DIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@
COPTS = -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
--- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat 2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAMS =
MODULES = hisaxctrl.o
@@ -16,9 +16,9 @@
DATADIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat 2002-07-19 21:03:52.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/icn
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = icnctrl
@@ -17,9 +17,9 @@
DATADIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@
COPTS =
--- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat 2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAM = imon
MODULES = imon.o
@@ -18,8 +18,8 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat 2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile 2003-09-30 17:44:24.000000000 +0200
@@ -15,14 +15,14 @@
# Manual config standalone
#
CONFIG_SBINDRIR := /sbin
- MAN8DIR := /usr/man/man8
+ MAN8DIR := /usr/share/man/man8
endif
INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
MANPAGE=imontty.8
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
#CCFLAGS=-I$(ISDN_INCLUDE) -g
# nothing to change behind this line
@@ -34,13 +34,6 @@
imontty: imontty.c imontty.h
cc $(CCFLAGS) -o imontty imontty.c
-rootperm:
- @echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
- @if gcc -x c -o G g && rm -f g && ./G ; then \
- echo -e "\n\n Need root permission for (de)installation!\n\n"; \
- exit 1; \
- fi
-
imontty.8: imontty.8.in
MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \
sed \
@@ -52,10 +45,10 @@
mkdir -p $(DESTDIR)$(MAN8DIR)
$(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
-install: $(PROGS) rootperm install-man
- install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
+install: $(PROGS) install-man
+ install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
-uninstall: rootperm
+uninstall:
for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
clean:
--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat 2002-07-19 21:03:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,14 +6,14 @@
MANDIR = @CONFIG_MANDIR@
CC = @CC@
INSTALL = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR = $(INSTALL) -m 755 -d
PPPSTATSRCS = ipppstats.c
PPPSTATOBJS = ipppstats.o
-CFLAGS = -fomit-frame-pointer -O2
+CFLAGS = $(RPM_OPT_FLAGS) -I at CONFIG_KERNELDIR@/include
all: ipppstats
--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat 2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAM = iprofd
MODULES = iprofd.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat 2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = @LIBS@
PROGRAM = isdnctrl
MODULES = isdnctrl.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@ -DVERSION=\"@I4LVERSION@\"
prefix = @prefix@
exec_prefix = @exec_prefix@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat 2000-09-08 10:55:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf 2003-09-30 17:44:24.000000000 +0200
@@ -2,38 +2,31 @@
#
# More information: See the isdnlog documentation
+#INTERFACE = ippp0 # Isdn network interface. This information is required
+ # with the "-hx" / hangup="value" option.
+
+
[MSN]
NUMBER = 4711
ALIAS = Phone
SI = 1
ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|H
- PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+# [FLAG]
+# FLAGS = I|O|R|C|B|A|E|H
+# PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
[MSN]
NUMBER = 4711
ALIAS = HDLC
SI = 7
ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|
- PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS = Modem
-SI = 1
-ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|H
- PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+# [FLAG]
+# FLAGS = I|O|R|C|B|A|E|
+# PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
[NUMBER]
NUMBER = 01910
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat 2000-08-15 17:16:23.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -20,7 +20,7 @@
BINDIR:=$(DESTDIR)@prefix@/bin
INCDIR:=$(DESTDIR)@prefix@/include
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
all: depend $(FILES)
@@ -46,7 +46,7 @@
install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
$(INCDIR)
-install:
+install: install-dirs
install -m0755 $(BINS) $(BINDIR)
install -m0644 $(MAN1) $(MAN1DIR)
install -m0644 $(MAN3) $(MAN3DIR)
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat 2003-07-25 23:23:15.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
-include ../../../.config
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
export DBEXT = @DBEXT@
@@ -20,9 +20,9 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
+INSTALL_DATA = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
DATADIR = @datadir@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in.redhat 1999-12-24 15:17:08.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -8,8 +8,8 @@
CGIDIR = @CGIDIR@
TELDIR = @TELDIR@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0755
-INSTALL_FILE = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0755
+INSTALL_FILE = $(INSTALL) -m 0644
FILES = index.html info.html *.jpg *.gif tt.js
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat 2003-03-11 14:08:00.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
#
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
CDBEXTRALIBS = @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
#CC = @CC@ -V2.7.2.3
--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat 2003-08-26 21:46:11.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -1542,10 +1542,10 @@
# autoconf isdnlog specific stuff
#
INSTALL := @INSTALL@
-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR := $(INSTALL) -m 0755 -d
+INSTALL_SBIN := $(INSTALL) -m 0700
+INSTALL_BIN := $(INSTALL) -m 0755
+INSTALL_DATA := $(INSTALL) -m 0644
BZIP2 := @BZIP2@
BUNZIP2 := $(BZIP2) -f -d
@@ -1600,9 +1600,9 @@
SUBDIRS += $(LIBISDNDIR)
endif
-# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
-export CFLAGS = -Wall -pipe
+export CFLAGS = -Wall $(RPM_OPT_FLAGS)
ifndef _CC
export _CC = gcc
endif
@@ -1837,8 +1837,7 @@
echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
fi
-uninstall: rootperm
- if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
+uninstall:
rm -f $(DESTDIR)$(SBINDIR)/$(ISDNLOG) \
$(DESTDIR)$(BINDIR)/$(ISDNREP) \
$(DESTDIR)$(BINDIR)/$(ISDNCONF)
@@ -1859,7 +1858,7 @@
$(DESTDIR)$(DATADIR)/dest.cdb
-installdirs: rootperm
+installdirs:
$(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR)
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
@@ -1868,7 +1867,7 @@
$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
$(INSTALL_DIR) $(DESTDIR)$(DATADIR)
-install: all rootperm installdirs install-conf install-data install-progs
+install: all installdirs install-conf install-data install-progs
install-old-conf:
@if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \
--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat 1999-12-12 18:22:36.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -11,7 +11,7 @@
# Install as root with numeric Id's, since these are the
# only ones that _really_ exist on _every_ system.
#
- INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+ INSTALLOPTS += INSTALL= install -m 644
endif
all: .depend
--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat 2002-07-19 21:03:56.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/loopctrl
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = loopctrl
MODULES = loopctrl.o
MANPAGE = loopctrl.8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat 2002-07-19 21:03:57.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -Wstrict-prototypes -O2 -g
-INCLUDES = -I. -DDEBUG
+CFLAGS = -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+INCLUDES = -I. -DDEBUG -I at CONFIG_KERNELDIR@/drivers/isdn/pcbit
LDFLAGS = -L../lib @LIBS@
PROGRAM = pcbitctl
MODULES = pcbitctl.o convhexbin.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile.redhat 2001-05-01 14:43:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
include $(TOPDIR)/Rules.make
--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat 2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat 1997-04-28 18:51:29.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
# login (server startup) time. If access is 'yes' the host can login
# and count messages without special access.
-L:localhost:Y
+#L:localhost:Y
L:*:N
# Full access list
@@ -13,7 +13,7 @@
# All hosts in the full access list (begins with 'A') are checked if the
# server gets the 'login' command.
-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
A:*:!:!:!:!:!
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat 1997-10-22 22:46:58.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example 2003-09-30 17:44:24.000000000 +0200
@@ -20,18 +20,18 @@
# Settings for port ttyI6
-port /dev/ttyI6
- modeminit ATZ&B512&E7830022
- user nicole
- group users
- spooldir /var/spool/vbox/nicole
+#port /dev/ttyI6
+# modeminit ATZ&B512&E7830022
+# user nicole
+# group users
+# spooldir /var/spool/vbox/nicole
# Settings for port ttyI7
-port /dev/ttyI7
- modeminit ATZ&B512&E7850413
- user michael
- group users
- spooldir /var/spool/vbox/michael
+#port /dev/ttyI7
+# modeminit ATZ&B512&E7850413
+# user michael
+# group users
+# spooldir /var/spool/vbox/michael
--- isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in.redhat 2002-01-31 21:05:40.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -14,33 +14,33 @@
# [*] Program to install binaries to the sbin directory (eg vboxgetty): #
#----------------------------------------------------------------------------#
-INSTALL_SBIN = @INSTALL@ -m 750 -o root -g root -s
+INSTALL_SBIN = @INSTALL@ -m 750
#----------------------------------------------------------------------------#
# [*] Program to install binaries to the bin directory (eg vboxconvert): #
#----------------------------------------------------------------------------#
-INSTALL_BIN = @INSTALL@ -m 755 -o root -g root -s
+INSTALL_BIN = @INSTALL@ -m 755
#----------------------------------------------------------------------------#
# [*] Program to install bash scripts to the bin directory (eg vboxplay): #
#----------------------------------------------------------------------------#
-INSTALL_SHBIN = @INSTALL@ -m 755 -o root -g root
+INSTALL_SHBIN = @INSTALL@ -m 755
#----------------------------------------------------------------------------#
# [*] Program to install binaries to the bin directory and set the suid bit #
# (eg vboxbeep): #
#----------------------------------------------------------------------------#
-INSTALL_UBIN = @INSTALL@ -m 4755 -o root -g root -s
+INSTALL_UBIN = @INSTALL@ -m 4755
#----------------------------------------------------------------------------#
# [*] Program to install configurations to sysconf directory #
# (eg vboxgetty.conf): #
#----------------------------------------------------------------------------#
-INSTALL_SYSCONF = @INSTALL@ -m 640 -o root -g root
+INSTALL_SYSCONF = @INSTALL@ -m 640
#----------------------------------------------------------------------------#
# [*] Program to create missing directories: #
--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat 1998-03-08 19:54:01.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile 2003-09-30 17:44:24.000000000 +0200
@@ -21,7 +21,7 @@
OBJS = xisdnload.o
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+ DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
AllTarget(xisdnload)
NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat 1998-11-23 13:12:04.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/.config.rpm 2003-09-30 17:59:55.000000000 +0200
@@ -5,16 +5,16 @@
#
# Code maturity level options
#
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
#
# General configuration
#
CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux-2.4'
CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
CONFIG_RUNDIR='/var/run'
CONFIG_LOCKDIR='/var/lock'
CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
CONFIG_CALLERIDFILE='callerid.conf'
CONFIG_USERCONFFILE='~/.isdn'
CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
CONFIG_COUNTRY_PREFIX='+'
CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
#
# Runtime configuration tools
@@ -36,18 +34,20 @@
CONFIG_ISDNCTRL_CONF=y
CONFIG_ISDNCTRL_TIMRU=y
CONFIG_IPROFD=y
+CONFIG_DIVERTCTRL=y
#
# Card configuration tools
#
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
CONFIG_HISAXCTRL=y
CONFIG_ICNCTRL=y
# CONFIG_ICNCTRL_DEBUG is not set
CONFIG_PCBITCTL=y
CONFIG_AVMCAPICTRL=y
+CONFIG_EICONCTRL=y
CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
# CONFIG_LOOPCTRL_DEBUG is not set
#
@@ -64,14 +64,20 @@
CONFIG_ISDNLOG_USERFILE='isdnlog.users'
CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
# CONFIG_ISDNLOG_POSTGRES is not set
# CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
CONFIG_IPPPSTATS=y
CONFIG_XISDNLOAD=y
CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
#
# Options for xmonisdn
#
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
#
# Applications
@@ -94,23 +100,22 @@
VBOX_LOGDIR='/var/log/vbox'
VBOX_PIDDIR='/var/run'
VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.3'
+# VBOX_SUSPEND_ID is not set
CONFIG_IPPPD=y
#
# Options for ipppd
#
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
# CONFIG_IPPPD_RADIUS is not set
# CONFIG_RADIUS_WTMP_LOGGING is not set
RADIUS_CLIENT_CONFIG_FILE=''
CONFIG_CAPIFAX=y
CONFIG_RCAPID=y
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat 2000-11-12 17:06:42.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c 2004-01-20 19:14:07.000000000 +0100
@@ -41,7 +41,7 @@
#include "compressions.h"
-#if 0
+#if HAVE_LZSCOMP_H
#include <linux/isdn_lzscomp.h>
#else
#include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile.redhat 2004-02-14 16:02:46.000000000 +0100
+++ isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile 2004-11-18 16:48:54.848276370 +0100
@@ -12,13 +12,13 @@
export CAPIINC=$(TOPDIR)/../capi20
export CAPILIB=$(TOPDIR)/../capi20
export INSTALL=$(TOPDIR)/install-sh -c
-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
export MKDIR=$(TOPDIR)/mkinstalldirs
PPPSRCDIRS=/src/isdn/pppd
ifeq ($(PPPVERSIONS),)
-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
+PPPVERSIONS = 2.4.3
endif
PEERDIR=${DESTDIR}/etc/ppp/peers/isdn
@@ -62,7 +62,7 @@
done
install-man:
- for i in ${DESTDIR}/usr/share/man ${DESTDIR}/usr/man; do \
+ for i in ${DESTDIR}/usr/share/man ; do \
if [ -d $$i/man8 ] ; then \
echo $(INSTALLDATA) capiplugin.8 $$i/man8; \
$(INSTALLDATA) capiplugin.8 $$i/man8; \
--- isdn4k-utils-CVS-2004-11-18/Makefile.redhat 2004-08-30 16:06:42.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/Makefile 2004-12-01 22:19:13.193347501 +0100
@@ -16,8 +16,8 @@
# Following line is important for lib and isdnlog (sl).
export ROOTDIR=$(shell pwd)
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
do-it-all: subtargets
else
CONFIGURATION = config
@@ -130,16 +130,10 @@
exit 1; \
fi
-install: rootperm
+install:
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
- then \
- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
- else \
- sh scripts/makedev.sh $(DESTDIR) ; \
- fi
-uninstall: rootperm
+uninstall:
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
#
@@ -202,7 +196,7 @@
@set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
if [ -x $$i/configure ] ; then \
/bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(LIBDIR) --datadir=$(CONFIG_DATADIR) --with-kernel=$(RPM_BUILD_DIR)/isdn4k-utils/linux-2.4 --enable-ippp-filter || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
elif [ -f $$i/Makefile.in ] ; then \
/bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
$(MAKE) -C $$i -f Makefile.in config; \
--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat 2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in 2005-02-16 18:42:54.119955183 +0100
@@ -15,10 +15,10 @@
MANDIR := @CONFIG_MANDIR@
CC := @CC@
INSTALL := @INSTALL@
-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR := $(INSTALL) -m 0755 -d
+INSTALL_SBIN := $(INSTALL) -m 0700
+INSTALL_BIN := $(INSTALL) -m 0755
+INSTALL_DATA := $(INSTALL) -m 0644
RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
COMPILE_FLAGS =
-CFLAGS = -O2 -fomit-frame-pointer -Wall
+CFLAGS = $(RPM_OPT_FLAGS)
VER = 2.2.0
# it's a hack
--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags 2005-02-16 18:53:15.393382578 +0100
+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile 2005-02-16 18:53:51.914999474 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
#CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
all: rate-at
--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags 2005-02-16 19:04:04.338731270 +0100
+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile 2005-02-16 19:04:24.150811068 +0100
@@ -28,7 +28,7 @@
# USER CONFIGURATION AREA
######################################################################
-CFLAGS = -g -Wall -pipe #-O6
+CFLAGS = $(RPM_OPT_FLAGS)
DEFS =
ifndef _CC
export _CC = gcc
isdn4k-utils-capiinit.patch:
capiinit/capi.conf | 10 +++++-----
capiinit/capiinit.c | 1 +
isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
--- NEW FILE isdn4k-utils-capiinit.patch ---
--- isdn4k-utils.orig/capiinit/capiinit.c 2006-04-18 19:27:03.689945766 +0200
+++ isdn4k-utils/capiinit/capiinit.c 2006-04-18 19:36:53.130636890 +0200
@@ -1251,6 +1251,7 @@
if (check_procfs() < 0) return -1;
if (check_for_kernelcapi() < 0) return -1;
if (check_for_capi() < 0) return -1;
+ sleep(5); /* wait until the device node is created successfully by udev */
if (check_for_devcapi() < 0) return -1;
if (check_for_capifs() < 0) return 0; /* only warning */
if (check_for_capifs_mounted() < 0) return -1;
--- isdn4k-utils.orig/capiinit/capi.conf 2006-04-18 19:37:43.515250539 +0200
+++ isdn4k-utils/capiinit/capi.conf 2006-04-18 19:37:53.953559630 +0200
@@ -1,10 +1,10 @@
# card file proto io irq mem cardnr options
#b1isa b1.t4 DSS1 0x150 7 - - P2P
-b1pci b1.t4 DSS1 - - - -
-c4 c4.bin DSS1 - - - -
-c4 - DSS1 - - - -
-c4 - DSS1 - - - - P2P
-c4 - DSS1 - - - - P2P
+#b1pci b1.t4 DSS1 - - - -
+#c4 c4.bin DSS1 - - - -
+#c4 - DSS1 - - - -
+#c4 - DSS1 - - - - P2P
+#c4 - DSS1 - - - - P2P
#c2 c2.bin DSS1 - - - -
#c2 - DSS1 - - - -
#t1isa t1.t4 DSS1 0x340 9 - 0
--- isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c.capi 2006-04-18 20:53:22.437430551 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinit/capiinit.c 2006-04-19 11:50:56.385891286 +0200
@@ -1495,8 +1496,8 @@
unload_module("capiutil");
if ((mp = mounted("capifs")) != 0 && strcmp(mp, "/dev/capi") == 0)
system("umount /dev/capi");
- if (filesystem_available("capifs"))
- unload_filesystem("capifs");
+ /*if (filesystem_available("capifs"))
+ unload_filesystem("capifs"); */
}
if (cardname && cname[0] == 0) {
fprintf(stderr,"ERROR: card \"%s\" not found\n", cardname);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 9 Mar 2005 17:54:04 -0000 1.12
+++ .cvsignore 19 Apr 2006 14:42:26 -0000 1.13
@@ -6,3 +6,4 @@
isdn-header-1.tar.bz2
isdn4k-utils-CVS-2005-02-16.tar.bz2
isdn4k-utils-CVS-2005-03-09.tar.bz2
+isdn4k-utils-CVS-2006-02-13.tar.bz2
Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- isdn4k-utils.spec 10 Apr 2006 14:23:07 -0000 1.55
+++ isdn4k-utils.spec 19 Apr 2006 14:42:26 -0000 1.56
@@ -1,6 +1,6 @@
%define app_defaults_dir %{_datadir}/X11/app-defaults
-%define interver CVS-2005-03-09
+%define interver CVS-2006-02-13
%ifarch s390 s390x
%define PIE -fPIE
%else
@@ -15,7 +15,7 @@
Summary: Utilities for configuring an ISDN subsystem.
Name: isdn4k-utils
Version: 3.2
-Release: 42
+Release: 43
License: GPL
Group: Applications/System
@@ -27,21 +27,23 @@
Source5: isdnstatus
Source6: isdnhangup
Source7: isdn-header-1.tar.bz2
+Source8: capi.init
-Patch0: isdn4k-utils-CVS-2005-02-16-redhat.patch
+Patch0: isdn4k-utils-CVS-2006-02-13-redhat.patch
Patch2: ibod-config.patch
Patch3: isdn4k-utils-man.patch
Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2004-11-18-cleanup.patch
-Patch9: isdn4k-utils-isdnlog.patch
+Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
Patch11: isdn4k-utils-statfs.patch
Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
-Patch13: isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch
+Patch13: isdn4k-utils-capiinit.patch
BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
+Requires: udev >= 039-10.14.EL4
+Requires: hwdata >= 0.146.18.EL-1
Requires: initscripts >= 5.92
BuildPrereq: openjade
@@ -113,11 +115,10 @@
%patch4 -p1 -b .ac25x
%patch5 -p1 -b .true
%patch7 -p0 -b .cleanup
-%patch9 -p1 -b .typo
%patch10 -p1 -b .lib64
%patch11 -p1 -b .statfs
%patch12 -p1 -b .xmon
-%patch13 -p1 -b .ppp243
+%patch13 -p1 -b .capi
for i in */configure; do
cd `dirname $i`
@@ -218,6 +219,7 @@
# install isdn startup script
mkdir -p %{buildroot}%{initdir}
install -m755 %{SOURCE2} %{buildroot}%{initdir}/isdn
+install -m755 %{SOURCE8} %{buildroot}%{initdir}/capi
# move some binaries into /sbin
mkdir -p %{buildroot}/sbin
@@ -267,6 +269,9 @@
rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
+mkdir -p $RPM_BUILD_ROOT/etc
+install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
+
%post
/sbin/ldconfig
/sbin/chkconfig --add isdn
@@ -401,7 +406,9 @@
%verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
%verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
%config(noreplace) /etc/ppp/peers/*
+%config(noreplace) /etc/capi.conf
%config %{initdir}/isdn
+%config %{initdir}/capi
%{_libdir}/pppd
%{_bindir}/*
%{_libdir}/isdn
@@ -480,6 +487,10 @@
%doc xmonisdn/README
%changelog
+* Wed Apr 19 2006 Than Ngo <than at redhat.com> 3.2-43
+- update to CVS-2006-02-13
+- add support capi #169902
+
* Thu Mar 30 2006 Than Ngo <than at redhat.com> 3.2-42
- support pppd 2.4.3 #187218
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 9 Mar 2005 17:54:04 -0000 1.13
+++ sources 19 Apr 2006 14:42:26 -0000 1.14
@@ -1,3 +1,3 @@
38b45be27c0a82b38380f680fdee0aff ibod-1.4-src.tar.gz
f3363587ff8007ff3261dba9e877c36e isdn-header-1.tar.bz2
-b09ec8549a0b681cbb1213e433b65c06 isdn4k-utils-CVS-2005-03-09.tar.bz2
+865d84dc643877ccc9a178a26f39bc45 isdn4k-utils-CVS-2006-02-13.tar.bz2
--- isdn4k-utils-CVS-2004-11-18-cleanup.patch DELETED ---
--- isdn4k-utils-CVS-2005-02-16-redhat.patch DELETED ---
--- isdn4k-utils-CVS-2005-03-09-pppd-2.4.3.patch DELETED ---
--- isdn4k-utils-isdnlog.patch DELETED ---
- Previous message (by thread): rpms/bind/FC-5 bind-9.3.2-bz173961.patch, NONE, 1.1 bind-9.3.2-prctl_set_dumpable.patch, NONE, 1.1 bind-chroot-admin.in, 1.5, 1.6 bind.spec, 1.102, 1.103
- Next message (by thread): rpms/gnome-terminal/devel gnome-terminal.spec,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list