This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via bd1063ae4ed4d6ca05d55d9192ab6949253caf96 (commit) via 3b2006e02441ab6a551918ee4f730a715d7f5681 (commit) via f7d84274593006e0b65fe4afe6781dcfc48cfb90 (commit) from 5447802fdc59ea866d6287d82e0f6920443c2816 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit bd1063ae4ed4d6ca05d55d9192ab6949253caf96 Merge: f7d8427 3b2006e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 16 12:14:26 2012 +0200

Merge remote-tracking branch 'stevee/isdn4k-utils-arm'

commit 3b2006e02441ab6a551918ee4f730a715d7f5681 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Sep 16 10:50:52 2012 +0200

isdn4k-utils: Fix build on ARM.

Fixes #10086.

commit f7d84274593006e0b65fe4afe6781dcfc48cfb90 Author: Kim Barthel kbarthel@ipfire.org Date: Mon Sep 3 22:45:34 2012 +0200

pkg-config: Updated to 0.27.1.

- Various fixes for using the internal glib snapshot. It should now be usable pretty much everywhere with the exception that universal builds are not supported on OS X. - Remove usage of gettext from the internal glib to avoid gettext and libintl dependencies. - Update internal glib snapshot to 2.32.4. - Fix check for POSIX shell used in tests to work better. - Handle spaces in autodetected prefix on Windows. - Bugs fixed 3550, 51883, 52031, 53493.

See #10214 for further information.

-----------------------------------------------------------------------

Summary of changes: isdn4k-utils/isdn4k-utils.nm | 2 +- ...atch => 001-isdn4k-utils-0202131200-true.patch} | 0 ...-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch} | 0 ... => 003-isdn4k-utils-CVS-2006-07-20-capi.patch} | 0 ...> 004-isdn4k-utils-CVS-2009-10-20-ipfire.patch} | 0 ... => 005-isdn4k-utils-CVS-2010-05-01-capi.patch} | 0 ...-isdn4k-utils-CVS-2010-05-01-capi-soname.patch} | 0 ... 007-isdn4k-utils-autoconf-2.6.4-quoting.patch} | 0 ...iinit.patch => 008-isdn4k-utils-capiinit.patch} | 0 ...-utils-man.patch => 009-isdn4k-utils-man.patch} | 0 ...4k-utils-misc-overflow-in-capi-subsystem.patch} | 0 ...=> 011-isdn4k-utils-pppcapiplugin-libdir.patch} | 0 ...linux.patch => 012-isdn4k-utils-sh-linux.patch} | 0 ...-statfs.patch => 013-isdn4k-utils-statfs.patch} | 0 .../{ppp-userpass.patch => 014-ppp-userpass.patch} | 0 .../patches/015-isdn4k-utils-fix-ipppd.patch | 23 ++++++++++++++++++++ .../patches/pkg-config-0.25-autoconf-1.patch | 20 ----------------- pkg-config/pkg-config.nm | 12 ++++++---- 18 files changed, 31 insertions(+), 26 deletions(-) rename isdn4k-utils/patches/{isdn4k-utils-0202131200-true.patch => 001-isdn4k-utils-0202131200-true.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-CVS-2004-11-18-autoconf25x.patch => 002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-CVS-2006-07-20-capi.patch => 003-isdn4k-utils-CVS-2006-07-20-capi.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-CVS-2009-10-20-ipfire.patch => 004-isdn4k-utils-CVS-2009-10-20-ipfire.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-CVS-2010-05-01-capi.patch => 005-isdn4k-utils-CVS-2010-05-01-capi.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-CVS-2010-05-01-capi-soname.patch => 006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-autoconf-2.6.4-quoting.patch => 007-isdn4k-utils-autoconf-2.6.4-quoting.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-capiinit.patch => 008-isdn4k-utils-capiinit.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-man.patch => 009-isdn4k-utils-man.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-misc-overflow-in-capi-subsystem.patch => 010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-pppcapiplugin-libdir.patch => 011-isdn4k-utils-pppcapiplugin-libdir.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-sh-linux.patch => 012-isdn4k-utils-sh-linux.patch} (100%) rename isdn4k-utils/patches/{isdn4k-utils-statfs.patch => 013-isdn4k-utils-statfs.patch} (100%) rename isdn4k-utils/patches/{ppp-userpass.patch => 014-ppp-userpass.patch} (100%) create mode 100644 isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch delete mode 100644 pkg-config/patches/pkg-config-0.25-autoconf-1.patch

Difference in files: diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm index 425cd20..c176834 100644 --- a/isdn4k-utils/isdn4k-utils.nm +++ b/isdn4k-utils/isdn4k-utils.nm @@ -6,7 +6,7 @@ name = isdn4k-utils version = 3.2 devel_ver = CVS-2010-05-01 -release = 7 +release = 8 thisapp = %{name}-%{devel_ver}-patched

groups = Networking/Tools diff --git a/isdn4k-utils/patches/001-isdn4k-utils-0202131200-true.patch b/isdn4k-utils/patches/001-isdn4k-utils-0202131200-true.patch new file mode 100644 index 0000000..33ef17c --- /dev/null +++ b/isdn4k-utils/patches/001-isdn4k-utils-0202131200-true.patch @@ -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 + diff --git a/isdn4k-utils/patches/002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch b/isdn4k-utils/patches/002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch new file mode 100644 index 0000000..fa8dd31 --- /dev/null +++ b/isdn4k-utils/patches/002-isdn4k-utils-CVS-2004-11-18-autoconf25x.patch @@ -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) diff --git a/isdn4k-utils/patches/003-isdn4k-utils-CVS-2006-07-20-capi.patch b/isdn4k-utils/patches/003-isdn4k-utils-CVS-2006-07-20-capi.patch new file mode 100644 index 0000000..e0283fe --- /dev/null +++ b/isdn4k-utils/patches/003-isdn4k-utils-CVS-2006-07-20-capi.patch @@ -0,0 +1,12 @@ +diff -up isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c +--- isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig 2009-01-19 15:18:10.000000000 +0100 ++++ isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c 2009-01-19 15:19:30.000000000 +0100 +@@ -26,7 +26,7 @@ + #include <dlfcn.h> + + +-#define LIBCAPI "libcapi20.so" ++#define LIBCAPI "libcapi20.so.3" + static int loadlib(void); + + /* ---------------------------------------------------------------------- */ diff --git a/isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch b/isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch new file mode 100644 index 0000000..4e28211 --- /dev/null +++ b/isdn4k-utils/patches/004-isdn4k-utils-CVS-2009-10-20-ipfire.patch @@ -0,0 +1,808 @@ +--- 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 = $(CFLAGS) ++INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 = $(CFLAGS) + 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 $(CFLAGS) + 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 $(CFLAGS) + 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 $(CFLAGS) + 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 $(CFLAGS) ++INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) ++INCLUDES = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) -I. -I@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 $(CFLAGS) ++INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) ++INCLUDES = -I. -I@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=$(CFLAGS) -I$(CONFIG_KERNELDIR)/include + #CCFLAGS=-I$(ISDN_INCLUDE) -g + + # nothing to change behind this line +--- 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 = $(CFLAGS) -I@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 $(CFLAGS) ++INCLUDES = -I. -I@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 $(CFLAGS) ++INCLUDES = -I. -I@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 $(CFLAGS) + + 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 $(CFLAGS) + 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/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 $(CFLAGS) + 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 $(CFLAGS) + ifndef _CC + export _CC = gcc + endif +--- 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 $(CFLAGS) ++INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) ++INCLUDES = -I. -DDEBUG -I@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/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 $(CFLAGS) + 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/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.5' ++# 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-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@ +-CFLAGS = -O2 -fomit-frame-pointer -Wall ++CFLAGS = $(CFLAGS) + 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 $(CFLAGS) -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 = $(CFLAGS) + DEFS = + ifndef _CC + export _CC = gcc +diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile +--- isdn4k-utils-CVS-2009-10-20/Makefile.me 2009-10-20 12:28:37.000000000 +0200 ++++ isdn4k-utils-CVS-2009-10-20/Makefile 2009-10-20 12:29:14.000000000 +0200 +@@ -18,8 +18,8 @@ LIBDIR:=/usr/lib + # 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 +@@ -134,14 +134,8 @@ 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 + + # diff --git a/isdn4k-utils/patches/005-isdn4k-utils-CVS-2010-05-01-capi.patch b/isdn4k-utils/patches/005-isdn4k-utils-CVS-2010-05-01-capi.patch new file mode 100644 index 0000000..f5998eb --- /dev/null +++ b/isdn4k-utils/patches/005-isdn4k-utils-CVS-2010-05-01-capi.patch @@ -0,0 +1,12 @@ +diff -up isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c +--- isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig 2009-01-19 15:18:10.000000000 +0100 ++++ isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c 2009-01-19 15:19:30.000000000 +0100 +@@ -26,7 +26,7 @@ + #include <dlfcn.h> + + +-#define LIBCAPI "libcapi20.so" ++#define LIBCAPI "libcapi20.so.3" + static int loadlib(void); + + /* ---------------------------------------------------------------------- */ diff --git a/isdn4k-utils/patches/006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch b/isdn4k-utils/patches/006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch new file mode 100644 index 0000000..a22f79a --- /dev/null +++ b/isdn4k-utils/patches/006-isdn4k-utils-CVS-2010-05-01-capi-soname.patch @@ -0,0 +1,44 @@ +*** isdn4k-utils/capi20.new/capi20.c.org 2010-05-07 20:56:21.000000000 +0200 +--- isdn4k-utils/capi20.new/capi20.c 2010-05-07 22:01:45.000000000 +0200 +*************** +*** 590,598 **** + psDir = opendir( pnModuleDir ); + if ( psDir != NULL ) { + /* read entry by entry */ + while ( ( psEntry = readdir( psDir ) ) != NULL ) { +! /* skip ".", ".." and files which do not end with "so" */ + nLen = strlen( psEntry -> d_name ); + + switch ( nLen ) { + case 1: +--- 590,598 ---- + psDir = opendir( pnModuleDir ); + if ( psDir != NULL ) { + /* read entry by entry */ + while ( ( psEntry = readdir( psDir ) ) != NULL ) { +! /* skip ".", ".." and files which do not end with "so.?" */ + nLen = strlen( psEntry -> d_name ); + + switch ( nLen ) { + case 1: +*************** +*** 605,613 **** + continue; + } + break; + default: +! if ( strncmp( psEntry -> d_name + nLen - 3, ".so", nLen ) ) { + continue; + } + break; + } +--- 605,613 ---- + continue; + } + break; + default: +! if ( strncmp( psEntry -> d_name + nLen - 5, ".so.0", 4 ) ) { + continue; + } + break; + } diff --git a/isdn4k-utils/patches/007-isdn4k-utils-autoconf-2.6.4-quoting.patch b/isdn4k-utils/patches/007-isdn4k-utils-autoconf-2.6.4-quoting.patch new file mode 100644 index 0000000..c4b3144 --- /dev/null +++ b/isdn4k-utils/patches/007-isdn4k-utils-autoconf-2.6.4-quoting.patch @@ -0,0 +1,14 @@ +diff -up isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in.orig isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in +--- isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in.orig 2010-05-03 14:50:46.000000000 +0200 ++++ isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in 2010-05-03 14:58:15.000000000 +0200 +@@ -140,8 +140,8 @@ if test -e tools/cdb/i4l_cdb.c ; then + AC_MSG_RESULT(Using 'cdb' as database) + else + 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])))) ++ [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",[rdb extension]) + diff --git a/isdn4k-utils/patches/008-isdn4k-utils-capiinit.patch b/isdn4k-utils/patches/008-isdn4k-utils-capiinit.patch new file mode 100644 index 0000000..7593d07 --- /dev/null +++ b/isdn4k-utils/patches/008-isdn4k-utils-capiinit.patch @@ -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); diff --git a/isdn4k-utils/patches/009-isdn4k-utils-man.patch b/isdn4k-utils/patches/009-isdn4k-utils-man.patch new file mode 100644 index 0000000..55eb37b --- /dev/null +++ b/isdn4k-utils/patches/009-isdn4k-utils-man.patch @@ -0,0 +1,20 @@ +--- isdn4k-utils/xmonisdn/Makefile.in.man Mon Oct 18 04:35:44 1999 ++++ isdn4k-utils/xmonisdn/Makefile.in Tue Jun 19 21:36:11 2001 +@@ -51,7 +51,7 @@ + CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)" + rm -rf X11 + +-xmonisdn.man: xmonisdn.man.in Makefile ++xmonisdn.man: xmonisdn.man.in + MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \ + sed \ + -e "s#@MANDATE@#$${MANDATE}#g" \ +@@ -60,7 +60,7 @@ + -e s,@CONFIG_XMONISDN_DOWNCMD@,${CONFIG_XMONISDN_DOWNCMD},g \ + < $< > $@ + +-config: ++config: xmonisdn.man + @cp Makefile.in GNUmakefile + @xmkmf + diff --git a/isdn4k-utils/patches/010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch b/isdn4k-utils/patches/010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch new file mode 100644 index 0000000..c840672 --- /dev/null +++ b/isdn4k-utils/patches/010-isdn4k-utils-misc-overflow-in-capi-subsystem.patch @@ -0,0 +1,17 @@ +diff -up isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig isdn4k-utils-CVS-2006-07-20/capi20/convert.c +--- isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig 2009-01-19 17:24:26.000000000 +0100 ++++ isdn4k-utils-CVS-2006-07-20/capi20/convert.c 2009-01-19 17:25:42.000000000 +0100 +@@ -894,8 +894,12 @@ static char *p = 0; + static void bufprint(char *fmt,...) + { + va_list f; ++ size_t remain = (p >= buf && p < buf+sizeof(buf)) ++ ? buf+sizeof(buf)-p ++ : 0; ++ + va_start(f, fmt); +- vsprintf(p, fmt, f); ++ vsnprintf(p, remain, fmt, f); + va_end(f); + p += strlen(p); + } diff --git a/isdn4k-utils/patches/011-isdn4k-utils-pppcapiplugin-libdir.patch b/isdn4k-utils/patches/011-isdn4k-utils-pppcapiplugin-libdir.patch new file mode 100644 index 0000000..133345b --- /dev/null +++ b/isdn4k-utils/patches/011-isdn4k-utils-pppcapiplugin-libdir.patch @@ -0,0 +1,9 @@ +diff -Nur a/pppdcapiplugin/Makefile.template b/pppdcapiplugin/Makefile.template +--- a/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200 ++++ b/pppdcapiplugin/Makefile.template 2012-03-17 18:36:00.035594144 +0100 +@@ -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) diff --git a/isdn4k-utils/patches/012-isdn4k-utils-sh-linux.patch b/isdn4k-utils/patches/012-isdn4k-utils-sh-linux.patch new file mode 100644 index 0000000..c63d42d --- /dev/null +++ b/isdn4k-utils/patches/012-isdn4k-utils-sh-linux.patch @@ -0,0 +1,11 @@ +--- isdn4k-utils-CVS-2006-07-20/ipppd/main.c.org 2008-07-06 00:10:14.000000000 +0900 ++++ isdn4k-utils-CVS-2006-07-20/ipppd/main.c 2008-07-06 00:11:11.000000000 +0900 +@@ -1302,7 +1302,7 @@ + * what gets passed for a va_list is like a void * in some sense. + */ + a = va_arg(args, void *); +-#ifdef __alpha__ /* always do this? */ ++#if defined(__alpha__) || defined(__sh__) /* always do this? */ + n = fmtmsg(buf, buflen + 1, f, a); + #else + n = vfmtmsg(buf, buflen + 1, f, a); diff --git a/isdn4k-utils/patches/013-isdn4k-utils-statfs.patch b/isdn4k-utils/patches/013-isdn4k-utils-statfs.patch new file mode 100644 index 0000000..7c6b2c3 --- /dev/null +++ b/isdn4k-utils/patches/013-isdn4k-utils-statfs.patch @@ -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; + diff --git a/isdn4k-utils/patches/014-ppp-userpass.patch b/isdn4k-utils/patches/014-ppp-userpass.patch new file mode 100644 index 0000000..82111ca --- /dev/null +++ b/isdn4k-utils/patches/014-ppp-userpass.patch @@ -0,0 +1,11 @@ +--- a/pppdcapiplugin/Rules.make.orig 2009-10-20 11:07:28.000000000 +0200 ++++ b/pppdcapiplugin/Rules.make 2010-07-22 20:17:24.000000000 +0200 +@@ -24,7 +24,7 @@ + $(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn + + userpass.so: userpass.o +- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(MYCFLAGS) -nostdlib userpass.o ++ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(MYCFLAGS) userpass.o + + %.o: %.c + $(CC) $(CFLAGS) $(MYCFLAGS) -c -o $@ $< diff --git a/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch b/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch new file mode 100644 index 0000000..ebe9e8e --- /dev/null +++ b/isdn4k-utils/patches/015-isdn4k-utils-fix-ipppd.patch @@ -0,0 +1,23 @@ +*** isdn4k-utils-CVS-2010-05-01-patched/ipppd.org/main.c 1969-12-31 20:03:58.571929416 -0500 +--- isdn4k-utils-CVS-2010-05-01-patched/ipppd/main.c 2012-07-18 05:46:07.636040971 -0400 +*************** +*** 1301,1309 **** + * XXX We assume a va_list is either a pointer or an array, so + * what gets passed for a va_list is like a void * in some sense. + */ + a = va_arg(args, void *); +! #if defined(__alpha__) || defined(__sh__) /* always do this? */ + n = fmtmsg(buf, buflen + 1, f, a); + #else + n = vfmtmsg(buf, buflen + 1, f, a); + #endif +--- 1301,1309 ---- + * XXX We assume a va_list is either a pointer or an array, so + * what gets passed for a va_list is like a void * in some sense. + */ + a = va_arg(args, void *); +! #if defined(__alpha__) || defined(__sh__) || defined ( __arm__ ) /* always do this? */ + n = fmtmsg(buf, buflen + 1, f, a); + #else + n = vfmtmsg(buf, buflen + 1, f, a); + #endif diff --git a/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch b/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch deleted file mode 100644 index 33ef17c..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 - diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch deleted file mode 100644 index fa8dd31..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch +++ /dev/null @@ -1,564 +0,0 @@ ---- 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) diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch deleted file mode 100644 index e0283fe..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c ---- isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig 2009-01-19 15:18:10.000000000 +0100 -+++ isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c 2009-01-19 15:19:30.000000000 +0100 -@@ -26,7 +26,7 @@ - #include <dlfcn.h> - - --#define LIBCAPI "libcapi20.so" -+#define LIBCAPI "libcapi20.so.3" - static int loadlib(void); - - /* ---------------------------------------------------------------------- */ diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2009-10-20-ipfire.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2009-10-20-ipfire.patch deleted file mode 100644 index 4e28211..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-CVS-2009-10-20-ipfire.patch +++ /dev/null @@ -1,808 +0,0 @@ ---- 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 = $(CFLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 = $(CFLAGS) - 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 $(CFLAGS) - 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 $(CFLAGS) - 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 $(CFLAGS) - 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 $(CFLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) -+INCLUDES = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) -I. -I@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 $(CFLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) -+INCLUDES = -I. -I@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=$(CFLAGS) -I$(CONFIG_KERNELDIR)/include - #CCFLAGS=-I$(ISDN_INCLUDE) -g - - # nothing to change behind this line ---- 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 = $(CFLAGS) -I@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 $(CFLAGS) -+INCLUDES = -I. -I@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 $(CFLAGS) -+INCLUDES = -I. -I@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 $(CFLAGS) - - 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 $(CFLAGS) - 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/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 $(CFLAGS) - 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 $(CFLAGS) - ifndef _CC - export _CC = gcc - endif ---- 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 $(CFLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@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 $(CFLAGS) -+INCLUDES = -I. -DDEBUG -I@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/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 $(CFLAGS) - 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/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.5' -+# 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-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@ --CFLAGS = -O2 -fomit-frame-pointer -Wall -+CFLAGS = $(CFLAGS) - 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 $(CFLAGS) -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 = $(CFLAGS) - DEFS = - ifndef _CC - export _CC = gcc -diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile ---- isdn4k-utils-CVS-2009-10-20/Makefile.me 2009-10-20 12:28:37.000000000 +0200 -+++ isdn4k-utils-CVS-2009-10-20/Makefile 2009-10-20 12:29:14.000000000 +0200 -@@ -18,8 +18,8 @@ LIBDIR:=/usr/lib - # 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 -@@ -134,14 +134,8 @@ 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 - - # diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi-soname.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi-soname.patch deleted file mode 100644 index a22f79a..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi-soname.patch +++ /dev/null @@ -1,44 +0,0 @@ -*** isdn4k-utils/capi20.new/capi20.c.org 2010-05-07 20:56:21.000000000 +0200 ---- isdn4k-utils/capi20.new/capi20.c 2010-05-07 22:01:45.000000000 +0200 -*************** -*** 590,598 **** - psDir = opendir( pnModuleDir ); - if ( psDir != NULL ) { - /* read entry by entry */ - while ( ( psEntry = readdir( psDir ) ) != NULL ) { -! /* skip ".", ".." and files which do not end with "so" */ - nLen = strlen( psEntry -> d_name ); - - switch ( nLen ) { - case 1: ---- 590,598 ---- - psDir = opendir( pnModuleDir ); - if ( psDir != NULL ) { - /* read entry by entry */ - while ( ( psEntry = readdir( psDir ) ) != NULL ) { -! /* skip ".", ".." and files which do not end with "so.?" */ - nLen = strlen( psEntry -> d_name ); - - switch ( nLen ) { - case 1: -*************** -*** 605,613 **** - continue; - } - break; - default: -! if ( strncmp( psEntry -> d_name + nLen - 3, ".so", nLen ) ) { - continue; - } - break; - } ---- 605,613 ---- - continue; - } - break; - default: -! if ( strncmp( psEntry -> d_name + nLen - 5, ".so.0", 4 ) ) { - continue; - } - break; - } diff --git a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch deleted file mode 100644 index f5998eb..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c ---- isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig 2009-01-19 15:18:10.000000000 +0100 -+++ isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c 2009-01-19 15:19:30.000000000 +0100 -@@ -26,7 +26,7 @@ - #include <dlfcn.h> - - --#define LIBCAPI "libcapi20.so" -+#define LIBCAPI "libcapi20.so.3" - static int loadlib(void); - - /* ---------------------------------------------------------------------- */ diff --git a/isdn4k-utils/patches/isdn4k-utils-autoconf-2.6.4-quoting.patch b/isdn4k-utils/patches/isdn4k-utils-autoconf-2.6.4-quoting.patch deleted file mode 100644 index c4b3144..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-autoconf-2.6.4-quoting.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in.orig isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in ---- isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in.orig 2010-05-03 14:50:46.000000000 +0200 -+++ isdn4k-utils-CVS-2009-10-20-patched/isdnlog/configure.in 2010-05-03 14:58:15.000000000 +0200 -@@ -140,8 +140,8 @@ if test -e tools/cdb/i4l_cdb.c ; then - AC_MSG_RESULT(Using 'cdb' as database) - else - 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])))) -+ [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",[rdb extension]) - diff --git a/isdn4k-utils/patches/isdn4k-utils-capiinit.patch b/isdn4k-utils/patches/isdn4k-utils-capiinit.patch deleted file mode 100644 index 7593d07..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-capiinit.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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); diff --git a/isdn4k-utils/patches/isdn4k-utils-man.patch b/isdn4k-utils/patches/isdn4k-utils-man.patch deleted file mode 100644 index 55eb37b..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-man.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- isdn4k-utils/xmonisdn/Makefile.in.man Mon Oct 18 04:35:44 1999 -+++ isdn4k-utils/xmonisdn/Makefile.in Tue Jun 19 21:36:11 2001 -@@ -51,7 +51,7 @@ - CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)" - rm -rf X11 - --xmonisdn.man: xmonisdn.man.in Makefile -+xmonisdn.man: xmonisdn.man.in - MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \ - sed \ - -e "s#@MANDATE@#$${MANDATE}#g" \ -@@ -60,7 +60,7 @@ - -e s,@CONFIG_XMONISDN_DOWNCMD@,${CONFIG_XMONISDN_DOWNCMD},g \ - < $< > $@ - --config: -+config: xmonisdn.man - @cp Makefile.in GNUmakefile - @xmkmf - diff --git a/isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch b/isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch deleted file mode 100644 index c840672..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig isdn4k-utils-CVS-2006-07-20/capi20/convert.c ---- isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig 2009-01-19 17:24:26.000000000 +0100 -+++ isdn4k-utils-CVS-2006-07-20/capi20/convert.c 2009-01-19 17:25:42.000000000 +0100 -@@ -894,8 +894,12 @@ static char *p = 0; - static void bufprint(char *fmt,...) - { - va_list f; -+ size_t remain = (p >= buf && p < buf+sizeof(buf)) -+ ? buf+sizeof(buf)-p -+ : 0; -+ - va_start(f, fmt); -- vsprintf(p, fmt, f); -+ vsnprintf(p, remain, fmt, f); - va_end(f); - p += strlen(p); - } diff --git a/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch b/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch deleted file mode 100644 index 133345b..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nur a/pppdcapiplugin/Makefile.template b/pppdcapiplugin/Makefile.template ---- a/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200 -+++ b/pppdcapiplugin/Makefile.template 2012-03-17 18:36:00.035594144 +0100 -@@ -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) diff --git a/isdn4k-utils/patches/isdn4k-utils-sh-linux.patch b/isdn4k-utils/patches/isdn4k-utils-sh-linux.patch deleted file mode 100644 index c63d42d..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-sh-linux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- isdn4k-utils-CVS-2006-07-20/ipppd/main.c.org 2008-07-06 00:10:14.000000000 +0900 -+++ isdn4k-utils-CVS-2006-07-20/ipppd/main.c 2008-07-06 00:11:11.000000000 +0900 -@@ -1302,7 +1302,7 @@ - * what gets passed for a va_list is like a void * in some sense. - */ - a = va_arg(args, void *); --#ifdef __alpha__ /* always do this? */ -+#if defined(__alpha__) || defined(__sh__) /* always do this? */ - n = fmtmsg(buf, buflen + 1, f, a); - #else - n = vfmtmsg(buf, buflen + 1, f, a); diff --git a/isdn4k-utils/patches/isdn4k-utils-statfs.patch b/isdn4k-utils/patches/isdn4k-utils-statfs.patch deleted file mode 100644 index 7c6b2c3..0000000 --- a/isdn4k-utils/patches/isdn4k-utils-statfs.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- 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; - diff --git a/isdn4k-utils/patches/ppp-userpass.patch b/isdn4k-utils/patches/ppp-userpass.patch deleted file mode 100644 index 82111ca..0000000 --- a/isdn4k-utils/patches/ppp-userpass.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pppdcapiplugin/Rules.make.orig 2009-10-20 11:07:28.000000000 +0200 -+++ b/pppdcapiplugin/Rules.make 2010-07-22 20:17:24.000000000 +0200 -@@ -24,7 +24,7 @@ - $(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn - - userpass.so: userpass.o -- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(MYCFLAGS) -nostdlib userpass.o -+ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(MYCFLAGS) userpass.o - - %.o: %.c - $(CC) $(CFLAGS) $(MYCFLAGS) -c -o $@ $< diff --git a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkg-config/patches/pkg-config-0.25-autoconf-1.patch deleted file mode 100644 index 8df41fc..0000000 --- a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pkg-config-0.25/pkg.m4.~1~ 2009-12-06 21:39:02.000000000 +0100 -+++ pkg-config-0.25/pkg.m4 2010-07-07 10:07:12.000000000 +0200 -@@ -135,7 +135,7 @@ 258871_PKG_ERRORS - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT]) - ]) - elif test = untried; then - AC_MSG_RESULT([no]) -@@ -146,7 +146,7 @@ path to pkg-config. - - _PKG_TEXT - --To get pkg-config, see http://pkg-config.freedesktop.org/.])dnl -+To get pkg-config, see http://pkg-config.freedesktop.org/.]) - ]) - else - []_CFLAGS=[][]_CFLAGS diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm index bc36a26..cc3a3f5 100644 --- a/pkg-config/pkg-config.nm +++ b/pkg-config/pkg-config.nm @@ -4,8 +4,8 @@ ###############################################################################

name = pkg-config -version = 0.25 -release = 2 +version = 0.27.1 +release = 1

groups = Development/Tools url = http://pkg-config.freedesktop.org/ @@ -18,17 +18,19 @@ description compiler and linker flags. end

-source_dl = +source_dl = http://pkgconfig.freedesktop.org/releases/ +sources = %{thisapp}.tar.gz

build requires m4 - popt-devel + glib2-devel sed end

configure_options += \ - --with-installed-popt + --disable-shared \ + --with-installed-glib

test make check

hooks/post-receive -- IPFire 3.x development tree