webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-11 09:48:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Erstmal ein Commit:

Browse Source 
OpenVPN zurueck auf den Stand des alten gebracht. Wir bevorzugen die stabile Loesung.
ISDN4K-Utils kompiliert - Noch kein rootfile vorhanden.
Ibod aktualisiert.
Snort-Initscript setzt die Berechtigung der PID auf 644.
libxslt hinzugefuegt - Benoetigt vom mISDN-Script.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@623 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-10 19:10:01 +00:00
parent 541d93f0ec
commit c6c9630eec
35 changed files with 4806 additions and 3657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/patches/ibod-config.patch Normal file
View File

@@ -0,0 +1,11 @@
--- isdn4k-utils-07022001/ibod.h.orig Wed Nov 1 21:06:07 2000
+++ isdn4k-utils-07022001/ibod.h Wed Nov 1 21:06:29 2000
@@ -10,7 +10,7 @@
#define STAYUP 0
#define STAYUP_TIME 30
-#define IBOD_DEFAULT_DIR "/etc/ppp"
+#define IBOD_DEFAULT_DIR "/etc/isdn"
#define MAX_STR_LEN 512
#define ISDN_INFO_DEV "/dev/isdninfo"
#define ISDN_CTLR_DEV "/dev/isdnctrl"

13
src/patches/isdn4k-utils-0202131200-true.patch Normal file
View File

@@ -0,0 +1,13 @@
--- isdn4k-utils/imon/imon.c.orig Fri Feb 22 17:24:54 2002
+++ isdn4k-utils/imon/imon.c Fri Feb 22 17:28:00 2002
@@ -63,6 +63,10 @@
#include <linux/isdn.h>
+#ifndef TRUE
+#define TRUE 1
+#endif
+
#define KEY_Q 81
#define KEY_q 113

564
src/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch Normal file
View File

@@ -0,0 +1,564 @@
--- isdn4k-utils-CVS-2004-11-18/vbox/configure.in.ac25x 1998-11-23 10:18:04.000000000 +0100
+++ isdn4k-utils-CVS-2004-11-18/vbox/configure.in 2004-11-18 17:47:52.638741078 +0100
@@ -17,9 +17,9 @@
AC_PREFIX_DEFAULT()
-AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE}")
-AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
-AC_DEFINE_UNQUOTED(VERDATE, "${VERDATE}")
+AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE}", [package])
+AC_DEFINE_UNQUOTED(VERSION, "${VERSION}", [version])
+AC_DEFINE_UNQUOTED(VERDATE, "${VERDATE}", [verdate])
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
@@ -87,7 +87,7 @@
AC_MSG_RESULT(${VBOX_SPOOLDIR})
-AC_DEFINE_UNQUOTED(SPOOLDIR, "${VBOX_SPOOLDIR}")
+AC_DEFINE_UNQUOTED(SPOOLDIR, "${VBOX_SPOOLDIR}", [spool dir])
AC_SUBST(VBOX_SPOOLDIR)
dnl #===============#
@@ -105,7 +105,7 @@
AC_MSG_RESULT(${VBOX_LOGDIR})
-AC_DEFINE_UNQUOTED(LOGFILEDIR, "${VBOX_LOGDIR}")
+AC_DEFINE_UNQUOTED(LOGFILEDIR, "${VBOX_LOGDIR}", [log dir])
AC_SUBST(VBOX_LOGDIR)
dnl #===============#
@@ -123,7 +123,7 @@
AC_MSG_RESULT(${VBOX_PIDDIR})
-AC_DEFINE_UNQUOTED(PIDFILEDIR, "${VBOX_PIDDIR}")
+AC_DEFINE_UNQUOTED(PIDFILEDIR, "${VBOX_PIDDIR}", [pid dir])
AC_SUBST(VBOX_PIDDIR)
dnl #================#
@@ -141,7 +141,7 @@
AC_MSG_RESULT(${VBOX_LCKDIR})
-AC_DEFINE_UNQUOTED(LCKFILEDIR, "${VBOX_LCKDIR}")
+AC_DEFINE_UNQUOTED(LCKFILEDIR, "${VBOX_LCKDIR}", [lock dir])
AC_SUBST(VBOX_LCKDIR)
dnl #===================#
@@ -159,7 +159,7 @@
AC_MSG_RESULT(${ISDN_GLOBAL_CONFIG})
-AC_DEFINE_UNQUOTED(I4LCONFDIR, "${ISDN_GLOBAL_CONFIG}")
+AC_DEFINE_UNQUOTED(I4LCONFDIR, "${ISDN_GLOBAL_CONFIG}", [global config])
dnl #------------------------------------------------------------------------#
dnl # Check and optimize compiler flags: #
--- isdn4k-utils-CVS-2004-11-18/vbox/acinclude.m4.ac25x 2002-07-06 02:11:19.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/vbox/acinclude.m4 2004-11-18 17:47:52.639740930 +0100
@@ -49,23 +49,23 @@
cos,
AC_CHECK_LIB(dl,
dlerror,
- [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
- [AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
- [AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
,
${gnd_tcl_lib_dir} -lm -ldl
- )],
+ ),
${gnd_tcl_lib_dir} -lm -ldl
- )],
+ ),
${gnd_tcl_lib_dir} -lm -ldl
- )],
- )],
+ ),
+ ),
)
if (test "${LINK_TCL_LIBS}" != "")
@@ -154,7 +154,7 @@
AC_CHECK_LIB(ncurses,
resizeterm,
- AC_DEFINE(HAVE_RESIZETERM)
+ AC_DEFINE(HAVE_RESIZETERM, 1, [have resizeterm])
)
fi
--- isdn4k-utils-CVS-2004-11-18/vbox/aclocal.m4.ac25x 2002-07-06 02:11:19.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/vbox/aclocal.m4 2004-11-18 17:47:52.640740782 +0100
@@ -61,23 +61,23 @@
cos,
[AC_CHECK_LIB(dl,
dlerror,
- [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
- [AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
- [AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
+ AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
Tcl_CreateInterp,
LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
,
${gnd_tcl_lib_dir} -lm -ldl
- )],
+ ),
${gnd_tcl_lib_dir} -lm -ldl
- )],
+ ),
${gnd_tcl_lib_dir} -lm -ldl
- )],
- )],
+ ),
+ ),
)
if (test "${LINK_TCL_LIBS}" != "")
@@ -103,15 +103,7 @@
HAVE_TCL_INCL="y"
LINK_TCL_INCL="${gnd_tcl_inc_dir}"
- fi
- else
- AC_MSG_CHECKING("for tcl header in /usr/include/tcl8.3/tcl.h")
- if (test -e "/usr/include/tcl8.3/tcl.h")
- then
- AC_MSG_RESULT("yes")
- HAVE_TCL_INCL="y"
- LINK_TCL_INCL="-I/usr/include/tcl8.3"
- else
+ else
AC_MSG_RESULT("no")
fi
fi
--- isdn4k-utils-CVS-2004-11-18/ipppd/configure.in.ac25x 2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/ipppd/configure.in 2004-11-18 17:55:56.899083430 +0100
@@ -17,21 +17,21 @@
AC_PROG_CC
dnl Checks for libraries.
-AC_CHECK_LIB(bsd, daemon,HAVE_LIBBSD=1; AC_DEFINE(HAVE_LIBBSD),
+AC_CHECK_LIB(bsd, daemon,HAVE_LIBBSD=1; AC_DEFINE(HAVE_LIBBSD,1,[libbsd]),
[AC_MSG_WARN(Could not find libbsd, build disabled)])
dnl Replace `main' with a function in -lcrypt:
-AC_CHECK_LIB(crypt, main,HAVE_LIBCRYPT=1; AC_DEFINE(HAVE_LIBCRYPT))
-AC_CHECK_LIB(des, des_ecb_encrypt, HAVE_LIBDES=1; AC_DEFINE(HAVE_LIBDES))
-AC_CHECK_LIB(ssl, DES_ecb_encrypt, HAVE_LIBSSL=1; AC_DEFINE(HAVE_LIBSSL))
+AC_CHECK_LIB(crypt, main,HAVE_LIBCRYPT=1; AC_DEFINE(HAVE_LIBCRYPT,1,[libcrypt]))
+AC_CHECK_LIB(des, des_ecb_encrypt, HAVE_LIBDES=1; AC_DEFINE(HAVE_LIBDES,1,[libdes]))
+AC_CHECK_LIB(ssl, DES_ecb_encrypt, HAVE_LIBSSL=1; AC_DEFINE(HAVE_LIBSSL,1,[libssl]))
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h limits.h paths.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h)
-AC_CHECK_HEADER(shadow.h, HAVE_SHADOW_H=1; AC_DEFINE(HAVE_SHADOW_H))
-AC_CHECK_HEADER(linux/isdn_lzscomp.h, HAVE_LZSCOMP_H=1; AC_DEFINE(HAVE_LZSCOMP_H))
-AC_CHECK_HEADER(pcap-bpf.h, [HAVE_PCAP_BPF_H=1; AC_DEFINE(HAVE_PCAP_BPF_H)],
- [AC_CHECK_HEADER(net/bpf.h, [HAVE_NET_BPF_H=1; AC_DEFINE(HAVE_NET_BPF_H)],
+AC_CHECK_HEADER(shadow.h, HAVE_SHADOW_H=1; AC_DEFINE(HAVE_SHADOW_H,1,[have shadow.h]))
+AC_CHECK_HEADER(linux/isdn_lzscomp.h, HAVE_LZSCOMP_H=1; AC_DEFINE(HAVE_LZSCOMP_H,1,[isdn_lzscomp.h]))
+AC_CHECK_HEADER(pcap-bpf.h, [HAVE_PCAP_BPF_H=1; AC_DEFINE(HAVE_PCAP_BPF_H,1,[pcap-bpf.h])],
+ [AC_CHECK_HEADER(net/bpf.h, [HAVE_NET_BPF_H=1; AC_DEFINE(HAVE_NET_BPF_H,1,[net/bpf.h])],
[AC_MSG_ERROR(Could not find pcap header file)])])
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -51,62 +51,63 @@
AC_ARG_WITH(sbin,
[ --with-sbin=DIR Set directory where ipppd is istalled. [/sbin]],
CONFIG_SBINDIR="${withval}"
- AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
)
dnl Optional man directory
AC_ARG_WITH(sbin,
[ --with-man=DIR Set manpage directory. [/usr/man]],
CONFIG_MANDIR="${withval}"
- AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
)
dnl Optional /var/run directory
AC_ARG_WITH(sbin,
[ --with-varrun=DIR Set directory for .pid files. [/var/run]],
CONFIG_RUNDIR="${withval}"
- AC_DEFINE(CONFIG_RUNDIR,"${withval}"),
+ AC_DEFINE(CONFIG_RUNDIR,"${withval}",[/var/run dir]),
)
dnl Optional MSCHAP
AC_ARG_ENABLE(mschap,
[ --enable-mschap Enable Microsoft chap authentication [no]],
CONFIG_IPPPD_MSCHAP="y"
- AC_DEFINE(CONFIG_IPPPD_MSCHAP,"y"),
+ AC_DEFINE(CONFIG_IPPPD_MSCHAP,"y",[support M$-chap]),
)
dnl Optional RADIUS
AC_ARG_ENABLE(radius,
[ --enable-radius Enable RADIUS authentication [no]],
CONFIG_IPPPD_RADIUS="y"
- AC_DEFINE(CONFIG_IPPPD_RADIUS,"y"),
+ AC_DEFINE(CONFIG_IPPPD_RADIUS,"y",[support radius]),
)
dnl Optional radiusclient config file
AC_ARG_WITH(radiusclient_config,
[ --with-radiusclient=FILE Set filename for radiusclient configuration],
RADIUS_CLIENT_CONFIG_FILE="${withval}"
- AC_DEFINE(RADIUS_CLIENT_CONFIG_FILE,"${withval}"),
+ AC_DEFINE(RADIUS_CLIENT_CONFIG_FILE,"${withval}",[radius config]),
)
dnl Optional RADIUS_WTMP_LOGGING
AC_ARG_ENABLE(radius_wtmp_logging,
[ --enable-radius-wtmp Enable RADIUS_WTMP_LOGGING authentication [no]],
CONFIG_IPPPD_RADIUS_WTMP_LOGGING="y"
- AC_DEFINE(CONFIG_IPPPD_RADIUS_WTMP_LOGGING,"y"),
+ AC_DEFINE(CONFIG_IPPPD_RADIUS_WTMP_LOGGING,"y",[radius logging]),
)
dnl Optional DEBUGGING
AC_ARG_ENABLE(debug,
[ --enable-debug Enable debugging [no]],
CONFIG_IPPPD_DEBUGFLAGS="-DDEBUGALL"
- AC_DEFINE(CONFIG_IPPPD_DEBUGFLAGS,"-DDEBUGALL"),
+ AC_DEFINE(CONFIG_IPPPD_DEBUGFLAGS,"-DDEBUGALL",[options]),
)
AC_ARG_ENABLE(ippp-filter,
[ --enable-ippp-filter Enable IPPP Filters (needs kernel supports) [no]],
CONFIG_IPPP_FILTER="y"
AC_DEFINE(CONFIG_IPPP_FILTER,"y"),
+ AC_DEFINE(CONFIG_IPPP_FILTER,"y", [ipppd filter]),
)
AC_SUBST(I4LVERSION)
--- isdn4k-utils-CVS-2004-11-18/isdnlog/configure.in.ac25x 2004-10-28 03:53:29.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/isdnlog/configure.in 2004-11-18 17:47:52.642740487 +0100
@@ -79,45 +79,46 @@
dnl To make it possible to set variables in policy.h
dnl they have to be defined with AC_DEFINE...
dnl
-AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR")
-AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE")
-AC_DEFINE_UNQUOTED(DATADIR,"$datadir")
-AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT)
-AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE")
-AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE")
-AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE")
-AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD")
-AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD")
-AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD")
+AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR", [old config dir])
+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE", [old config file])
+AC_DEFINE_UNQUOTED(DATADIR,"$datadir", [data dir])
+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT, [server port])
+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE", [user file])
+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE", [log file])
+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE", [charge file])
+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD", [reload command])
+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD", [stop command])
+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD", [reboot command])
+
if test "$CONFIG_ISDN_LOG_DE" = "y" ; then
NATION="de"
NATION_MACRO="ISDN_DE"
- AC_DEFINE(ISDN_DE)
+ AC_DEFINE(ISDN_DE, 1, [German ISDN])
fi
if test "$CONFIG_ISDN_LOG_AT" = "y" ; then
NATION="at"
NATION_MACRO="ISDN_AT"
- AC_DEFINE(ISDN_AT)
+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
fi
if test "$CONFIG_ISDN_LOG_CH" = "y" ; then
NATION="ch"
NATION_MACRO="ISDN_CH"
- AC_DEFINE(ISDN_CH)
+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
fi
if test "$CONFIG_ISDN_LOG_NL" = "y" ; then
NATION="nl"
NATION_MACRO="ISDN_NL"
- AC_DEFINE(ISDN_NL)
+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
fi
if test "$CONFIG_ISDN_LOG_LU" = "y" ; then
NATION="lu"
NATION_MACRO="ISDN_LU"
- AC_DEFINE(ISDN_LU)
+ AC_DEFINE(ISDN_LU, 1, [Luxembourg ISDN])
fi
if test "$CONFIG_ISDN_LOG_XX" = "y" ; then
NATION=$CONFIG_ISDN_LOG_CC
NATION_MACRO="ISDN_XX"
- AC_DEFINE(ISDN_XX)
+ AC_DEFINE(ISDN_XX, 1, [Other country])
fi
dnl Checks for programs.
@@ -130,17 +131,17 @@
dnl Checks for libraries.
if test -e tools/cdb/i4l_cdb.c ; then
- AC_DEFINE(USE_CDB)
+ AC_DEFINE(USE_CDB, 1, [Use CDB])
CDBEXTRALIBS="tools/cdb/i4l_cdb.a"
DBEXT=".cdb"
RDBEXT=".cdb"
AC_MSG_RESULT(Using 'cdb' as database)
else
-AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM),
- [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM),
- [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])])
+AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]),
+ AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]),
+ AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb]))))
fi
-AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT")
+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension])
dnl log database support
AC_CHECK_POSTGRES
@@ -158,7 +159,7 @@
dnl Manual config
AC_ARG_WITH(isdnlib,
[ --with-isdnlib=DIR Set isdn library [../lib]],
- LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval"))
+ LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval",[libisdn dir]))
AC_ARG_WITH(area-lib,
[ --with-area-lib=STRING Set area library type [area]],
ALIB=$withval)
@@ -167,16 +168,16 @@
CHARGECOUNTRY=$withval)
AC_ARG_WITH(oldconfdir,
[ --with-oldconfdir=DIR Set old config directory [/etc/isdnlog]],
- OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval"))
+ OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval", [old config dir]))
AC_ARG_WITH(oldconf,
[ --with-oldconf=NAME Set old config file name [isdnlog.conf]],
- OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval"))
+ OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval", [old config file]))
AC_ARG_WITH(datadir,
[ --with-datadir=DIR Set data directory [/usr/lib/isdn]],
- datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval"))
+ datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval", [data dir]))
AC_ARG_WITH(sport,
[ --with-sport=INT Set server port [20011]],
- SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval))
+ SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval, [server port]))
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -196,28 +197,28 @@
if test "$ALIB" = "area" ; then
LIBAREA=1
- AC_DEFINE(LIBAREA)
+ AC_DEFINE(LIBAREA, 1, [libarea])
fi
case "$CHARGECOUNTRY" in
DE)
NATION="de"
NATION_MACRO="ISDN_DE"
- AC_DEFINE(ISDN_DE)
+ AC_DEFINE(ISDN_DE, 1, [German ISDN])
;;
AT)
NATION="at"
NATION_MACRO="ISDN_AT"
- AC_DEFINE(ISDN_AT)
+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN])
;;
CH)
NATION="ch"
NATION_MACRO="ISDN_CH"
- AC_DEFINE(ISDN_CH)
+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN])
;;
NL)
NATION="nl"
NATION_MACRO="ISDN_NL"
- AC_DEFINE(ISDN_NL)
+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN])
;;
esac
--- isdn4k-utils-CVS-2004-11-18/isdnlog/aclocal.m4.ac25x 2002-07-19 21:03:55.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/isdnlog/aclocal.m4 2004-11-18 17:47:52.643740339 +0100
@@ -45,13 +45,13 @@
if test "$pqdir" != "no" ; then
AC_MSG_RESULT("yes")
POSTGRES=1
- AC_DEFINE_UNQUOTED(POSTGRES,1)
+ AC_DEFINE_UNQUOTED(POSTGRES,1,[postgres support])
else
AC_MSG_RESULT("no POSTGRES DISABLED")
pqdir=""
fi
POSTGRESDIR="$pqdir"
- AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir")
+ AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[postgres dir])
AC_SUBST(POSTGRES)
AC_SUBST(POSTGRESDIR)
])
@@ -108,13 +108,13 @@
if test "$mydir" != "no" ; then
AC_MSG_RESULT("yes")
MYSQLDB=1
- AC_DEFINE_UNQUOTED(MYSQLDB,1)
+ AC_DEFINE_UNQUOTED(MYSQLDB,1,[MySQL support])
else
AC_MSG_RESULT("no MYSQL DISABLED")
mydir=""
fi
MYSQLDIR="$mydir"
- AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir")
+ AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[MySQL dir])
AC_SUBST(MYSQLDB)
AC_SUBST(MYSQLDIR)
])
@@ -134,7 +134,7 @@
if test "$oradir" != "no" ; then
AC_MSG_RESULT("yes")
ORACLE=1
- AC_DEFINE_UNQUOTED(ORACLE,1)
+ AC_DEFINE_UNQUOTED(ORACLE,1,[oracle support, unsupported])
else
AC_MSG_RESULT("no ORACLE DISABLED")
fi
--- isdn4k-utils-CVS-2004-11-18/vbox3/configure.in.ac25x 1998-11-10 19:36:19.000000000 +0100
+++ isdn4k-utils-CVS-2004-11-18/vbox3/configure.in 2004-11-18 17:47:52.644740191 +0100
@@ -17,11 +17,9 @@
## programs ###############################################################
AC_PROG_CC
-AC_PROG_CC_WORKS
-AC_PROG_CC_GNU
AC_PROG_RANLIB
-AM_PROG_INSTALL
+AC_PROG_INSTALL
## libraries ##############################################################
--- isdn4k-utils-CVS-2004-11-18/vbox3/vboxgetty/Makefile.am.ac25x 1998-11-10 19:36:25.000000000 +0100
+++ isdn4k-utils-CVS-2004-11-18/vbox3/vboxgetty/Makefile.am 2004-11-18 17:47:52.644740191 +0100
@@ -12,7 +12,7 @@
## vboxgetty ##############################################################
-DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
+DEFS = -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"'
INCLUDES = $(all_includes) $(tcl_include)
--- isdn4k-utils-CVS-2004-11-18/isdnctrl/configure.in.ac25x 2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/isdnctrl/configure.in 2004-11-18 17:47:52.645740043 +0100
@@ -30,21 +30,21 @@
AC_ARG_WITH(sbin,
[ --with-sbin=DIR Set dir where binary is istalled. [/sbin]],
CONFIG_SBINDIR="${withval}"
- AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
)
dnl Optional man directory
AC_ARG_WITH(man,
[ --with-man=DIR Set manpage dir. [/usr/man]],
CONFIG_MANDIR="${withval}"
- AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
)
dnl Optional config-file-option
AC_ARG_ENABLE(cfile,
[ --enable-cfile Enable configfile option [no]],
CONFIG_ISDNCTRL_CONF=y
- AC_DEFINE(CONFIG_ISDNCTRL_CONF,y),
+ AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable config file]),
)
AC_SUBST(INSTALL)
--- isdn4k-utils-CVS-2004-11-18/imon/configure.in.ac25x 2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/imon/configure.in 2004-11-18 17:47:52.646739895 +0100
@@ -38,14 +38,14 @@
AC_ARG_WITH(sbin,
[ --with-sbin=DIR Set dir where binary is istalled. [/sbin]],
CONFIG_SBINDIR="${withval}"
- AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[kernel directory]),
)
dnl Optional man directory
AC_ARG_WITH(man,
- [ --with-man=DIR Set manpage dir. [/usr/man]],
+ [ --with-man=DIR Set manpage dir. [/usr/share/man]],
CONFIG_MANDIR="${withval}"
- AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man directory]),
)
AC_SUBST(INSTALL)
--- isdn4k-utils-CVS-2004-11-18/eicon/configure.in.ac25x 2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/eicon/configure.in 2004-11-18 17:47:52.646739895 +0100
@@ -35,21 +35,21 @@
AC_ARG_WITH(firmware,
[ --with-firmware=DIR Set dir where firmware istalled. [/usr/lib/isdn]],
CONFIG_DATADIR="${withval}"
- AC_DEFINE(CONFIG_DATADIR,"${withval}"),
+ AC_DEFINE(CONFIG_DATADIR,"${withval}",[data dir]),
)
dnl Optional sbin directory
AC_ARG_WITH(sbin,
[ --with-sbin=DIR Set dir where binary is istalled. [/sbin]],
CONFIG_SBINDIR="${withval}"
- AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]),
)
dnl Optional man directory
AC_ARG_WITH(man,
[ --with-man=DIR Set manpage dir. [/usr/man]],
CONFIG_MANDIR="${withval}"
- AC_DEFINE(CONFIG_MANDIR,"${withval}"),
+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]),
)
dnl Check, if user wants dump option for debugging
@@ -58,10 +58,10 @@
CONFIG_EICONCTRL_DEBUG="y"
)
-AC_DEFINE(HAVE_XLOG)
+AC_DEFINE(HAVE_XLOG,1,[define if you have xlog])
AC_SUBST(HAVE_XLOG)
-AC_DEFINE(HAVE_TRACE)
+AC_DEFINE(HAVE_TRACE,1,[define if you have trace])
AC_SUBST(HAVE_TRACE)
AC_SUBST(HAVE_NPCI)

125
src/patches/isdn4k-utils-CVS-2006-02-13-cleanup.patch Normal file
View File

@@ -0,0 +1,125 @@
*** ./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;

11
src/patches/isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch Normal file
View File

@@ -0,0 +1,11 @@
--- isdn4k-utils-CVS-2006-07-20/pppdcapiplugin/Makefile.me 2006-07-19 16:43:45.000000000 +0200
+++ isdn4k-utils-CVS-2006-07-20/pppdcapiplugin/Makefile 2006-07-19 16:43:59.000000000 +0200
@@ -18,7 +18,7 @@
PPPSRCDIRS=/src/isdn/pppd
ifeq ($(PPPVERSIONS),)
-PPPVERSIONS = 2.4.3
+PPPVERSIONS = 2.4.3 2.4.4
endif
PEERDIR=${DESTDIR}/etc/ppp/peers/isdn

967
src/patches/isdn4k-utils-CVS-2006-07-20-redhat.patch Normal file
View File

@@ -0,0 +1,967 @@
--- 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.
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.
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
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.
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.
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.
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)
#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)
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.
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.
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.
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
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'
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) --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

41
src/patches/isdn4k-utils-capiinit.patch Normal file
View File

@@ -0,0 +1,41 @@
--- 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);

84
src/patches/isdn4k-utils-statfs.patch Normal file
View File

@@ -0,0 +1,84 @@
--- isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c.old 2000-11-30 16:35:20.000000000 +0100
+++ isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c 2005-04-20 16:30:31.000000000 +0200
@@ -434,7 +434,7 @@
static int check_spool_space(unsigned long need)
{
struct statfs stat;
- unsigned long have;
+ unsigned long long have;
log(L_DEBUG, "Checking free space on \"%s\"...\n", setup.spool);
@@ -449,7 +449,7 @@
{
have = (stat.f_bfree * stat.f_bsize);
- log_line(L_JUNK, "%ld bytes available; %ld bytes needed... ", have, need);
+ log_line(L_JUNK, "%lld bytes available; %ld bytes needed... ", have, need);
if (have >= need)
{
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.h.old 2005-04-20 16:35:37.000000000 +0200
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.h 2005-04-20 16:37:02.000000000 +0200
@@ -42,3 +42,8 @@
#define ARG8 entry->arg[8]
#define ARG9 entry->arg[9]
#define ARG entry->arg
+
+#if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined (HAVE_SYS_MOUNT)
+unsigned long long getSize(s);
+#endif
+
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.c.old 2005-04-20 16:20:17.000000000 +0200
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.c 2005-04-20 16:24:56.000000000 +0200
@@ -154,7 +154,7 @@
}
#if defined(HAVE_STATVFS)
-int getSize(s)
+unsigned long long getSize(s)
char *s;
{
int c;
@@ -163,10 +163,10 @@
if (( c = statvfs(s, &buf)) != 0)
return(0);
- return(buf.f_bavail * buf.f_frsize / 1024);
+ return((unsigned long long)(buf.f_bavail * buf.f_frsize / 1024));
}
#elif defined(HAVE_SYS_VFS) || defined (HAVE_SYS_MOUNT)
-int getSize(s)
+unsigned long long getSize(s)
char *s;
{
int c;
@@ -175,7 +175,7 @@
if (( c = statfs(s, &buf)) != 0)
return(0);
- return(buf.f_bavail * buf.f_bsize / 1024);
+ return((unsigned long long)(buf.f_bavail * buf.f_bsize / 1024));
}
#endif
@@ -236,7 +236,7 @@
case 'F':
#if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined(HAVE_SYS_MOUNT)
- sprintf(outptr, "%lu", getSize("."));
+ sprintf(outptr, "%llu",(unsigned long long)getSize("."));
#endif
break;
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/divfunc.c.old 2001-03-01 15:59:14.000000000 +0100
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/divfunc.c 2005-04-20 16:34:26.000000000 +0200
@@ -121,7 +121,7 @@
case 'F':
#if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined(HAVE_SYS_MOUNT)
- sprintf(outptr, "%lu", getSize("."));
+ sprintf(outptr, "%llu",(unsigned long long)getSize("."));
#endif
break;

69
src/patches/isdn4k-utils-v3.2p1-c89.patch
View File

@@ -1,69 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/isdn4k-utils/multi-line-strings.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -urN -x '*~' isdn4k-utils/ipppd/options.c isdn4k-utils-gcc-3.3.1/ipppd/options.c
--- isdn4k-utils-old/ipppd/options.c 2002-07-06 02:34:08.000000000 +0200
+++ isdn4k-utils-new/ipppd/options.c 2003-08-19 22:36:18.000000000 +0200
@@ -479,26 +479,25 @@
#define IMPLEMENTATION ""
#endif
-static char *usage_string = "\
-ipppd version %s patch level %d%s\n\
-Usage: %s [ options ], where options are:\n\
-\t<device> Communicate over the named device\n\
+static char *usage_string = ""
+"ipppd version %s patch level %d%s\n"
+"Usage: %s [ options ], where options are:\n"
+"\t<device> Communicate over the named device\n"
#ifdef INCLUDE_OBSOLETE_FEATURES
-\tcrtscts Use hardware RTS/CTS flow control\n\
-\t<speed> Set the baud rate to <speed>\n\
-\tmodem Use modem control lines\n\
+"\tcrtscts Use hardware RTS/CTS flow control\n"
+"\t<speed> Set the baud rate to <speed>\n"
+"\tmodem Use modem control lines\n"
#endif
-\t<loc>:<rem> Set the local and/or remote interface IP\n\
-\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\
-\tasyncmap <n> Set the desired async map to hex <n>\n\
-\tauth Require authentication from peer\n\
-\tconnect <p> Invoke shell command <p> to set up the serial line\n\
-\tdefaultroute Add default route through interface\n\
-\tfile <f> Take options from file <f>\n\
-\tmru <n> Set MRU value to <n> for negotiation\n\
-\tnetmask <n> Set interface netmask to <n>\n\
-See ipppd(8) for more options.\n\
-";
+"\t<loc>:<rem> Set the local and/or remote interface IP\n"
+"\t\taddresses. (you also may use the option 'useifip' to get IPs).\n"
+"\tasyncmap <n> Set the desired async map to hex <n>\n"
+"\tauth Require authentication from peer\n"
+"\tconnect <p> Invoke shell command <p> to set up the serial line\n"
+"\tdefaultroute Add default route through interface\n"
+"\tfile <f> Take options from file <f>\n"
+"\tmru <n> Set MRU value to <n> for negotiation\n"
+"\tnetmask <n> Set interface netmask to <n>\n"
+"See ipppd(8) for more options.\n";
static char *current_option; /* the name of the option being parsed */

96
src/patches/isdn4k-utils-v3.2p1-config.patch
View File

@@ -1,96 +0,0 @@
diff -ruN isdn4k-utils.old/.config isdn4k-utils/.config
--- isdn4k-utils.old/.config Thu Jan 1 01:00:00 1970
+++ isdn4k-utils/.config Mon Dec 1 13:47:00 2003
@@ -0,0 +1,92 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General configuration
+#
+# CONFIG_BUILDX11 is not set
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_RUNDIR='/var/run'
+CONFIG_LOCKDIR='/var/lock'
+CONFIG_LOCKFILE='LCK..'
+CONFIG_I4LCONFDIR='/etc/isdn'
+CONFIG_CONFFILE='isdn.conf'
+CONFIG_CALLERIDFILE='callerid.conf'
+CONFIG_USERCONFFILE=''
+CONFIG_COUNTRYCODE=''
+CONFIG_AREACODE=''
+CONFIG_COUNTRY_PREFIX='+'
+CONFIG_AREA_PREFIX='0'
+CONFIG_DATADIR='/usr/lib/isdn'
+
+#
+# Runtime configuration tools
+#
+CONFIG_ISDNCTRL=y
+CONFIG_ISDNCTRL_CONF=y
+# CONFIG_ISDNCTRL_TIMRU is not set
+# CONFIG_ISDNCTRL_DWABC_UDP_INFO is not set
+# CONFIG_IPROFD is not set
+# CONFIG_DIVERTCTRL is not set
+
+#
+# Card configuration tools
+#
+CONFIG_HISAXCTRL=y
+CONFIG_ICNCTRL=y
+# CONFIG_ICNCTRL_DEBUG is not set
+CONFIG_PCBITCTL=y
+#CONFIG_AVMCAPICTRL is not set
+CONFIG_EICONCTRL=y
+# CONFIG_LOOPCTRL is not set
+
+#
+# Tools for monitoring activity
+#
+# CONFIG_IMON is not set
+# CONFIG_IMONTTY is not set
+# CONFIG_ISDNLOG is not set
+# CONFIG_IPPPSTATS is not set
+# CONFIG_XISDNLOAD is not set
+# CONFIG_XMONISDN is not set
+
+#
+# Applications
+#
+# CONFIG_VBOX is not set
+CONFIG_IPPPD=y
+
+#
+# Options for ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+CONFIG_IPPP_FILTER=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+# CONFIG_CAPIFAX is not set
+# CONFIG_RCAPID is not set
+# CONFIG_PPPDCAPIPLUGIN is not set
+# CONFIG_EUROFILE is not set
+
+#
+# Options for eurofile
+#
+# CONFIG_EFTD is not set
+# CONFIG_EFTP is not set
+# CONFIG_EFT_INSTALL_CONF is not set
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+# CONFIG_FAQ is not set