From: Michael Tremer Date: Sun, 6 Nov 2011 12:15:55 +0000 (+0100) Subject: ibod+isdn4k-utils: New packages. X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fisdn;p=people%2Fms%2Fipfire-3.x.git ibod+isdn4k-utils: New packages. Taken from an older isdn branch by stevee. --- diff --git a/ibod/ibod.nm b/ibod/ibod.nm new file mode 100644 index 000000000..5827b1847 --- /dev/null +++ b/ibod/ibod.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = ibod +version = 1.4 +release = 1 + +groups = Networking/Tools +url = http://www.datenwelt.net/oss/ibod/ +license = GPLv2 +summary = An ISDN bandwidth monitor. + +description + Ibod is a daemon program for GNU/Linux that constantly monitors \ + the ISDN interface for inbound and outbound traffic throughput. +end + +sources = %{thisapp}.tar.bz2 + +build + build + gcc %{CFLAGS} ibod.c -o ibod + end + + install + mkdir -pv %{BUILDROOT}/usr/bin + mkdir -pv %{BUILDROOT}/usr/share/man/man{1,4} + mkdir -pv %{BUILDROOT}/etc/isdn + install -m 0755 ibod %{BUILDROOT}/usr/bin + install -m 0644 ibod.1 %{BUILDROOT}/usr/share/man/man1 + install -m 0644 ibod.cf.4 %{BUILDROOT}/usr/share/man/man4 + install -m 0644 ibod.cf %{BUILDROOT}/etc/isdn + end +end + +packages + package %{name} + configfiles + /etc/isdn/ibod.cf + end + end +end diff --git a/ibod/patches/ibod-1.4-config.patch b/ibod/patches/ibod-1.4-config.patch new file mode 100644 index 000000000..6c92ddcac --- /dev/null +++ b/ibod/patches/ibod-1.4-config.patch @@ -0,0 +1,11 @@ +--- isdn4k-utils-07022001/ibod.h.orig Wed Nov 1 21:06:07 2000 ++++ isdn4k-utils-07022001/ibod.h Wed Nov 1 21:06:29 2000 +@@ -10,7 +10,7 @@ + #define STAYUP 0 + #define STAYUP_TIME 30 + +-#define IBOD_DEFAULT_DIR "/etc/ppp" ++#define IBOD_DEFAULT_DIR "/etc/isdn" + #define MAX_STR_LEN 512 + #define ISDN_INFO_DEV "/dev/isdninfo" + #define ISDN_CTLR_DEV "/dev/isdnctrl" diff --git a/ibod/patches/ibod-1.4-license.patch b/ibod/patches/ibod-1.4-license.patch new file mode 100644 index 000000000..df72fb882 --- /dev/null +++ b/ibod/patches/ibod-1.4-license.patch @@ -0,0 +1,346 @@ +diff -Nur ibod/LICENSE ibod-1.5.0/LICENSE +--- ibod/LICENSE 1970-01-01 01:00:00.000000000 +0100 ++++ ibod-1.5.0/LICENSE 2001-01-10 11:16:33.000000000 +0100 +@@ -0,0 +1,342 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General ++Public License instead of this License. ++ ++ diff --git a/isdn4k-utils/isdn4k-utils-CVS-2006-07-20-glibc.patch b/isdn4k-utils/isdn4k-utils-CVS-2006-07-20-glibc.patch new file mode 100644 index 000000000..d703afdf5 --- /dev/null +++ b/isdn4k-utils/isdn4k-utils-CVS-2006-07-20-glibc.patch @@ -0,0 +1,11 @@ +diff -up isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig isdn4k-utils-CVS-2006-07-20/capi20/capi20.h +--- isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig 2007-09-27 21:45:43.000000000 +0200 ++++ isdn4k-utils-CVS-2006-07-20/capi20/capi20.h 2007-09-27 23:45:40.000000000 +0200 +@@ -20,6 +20,7 @@ + #ifndef __CAPI20_H__ + #define __CAPI20_H__ + ++#include + #include + + #ifdef __cplusplus diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm new file mode 100644 index 000000000..ecf7a653f --- /dev/null +++ b/isdn4k-utils/isdn4k-utils.nm @@ -0,0 +1,82 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = isdn4k-utils +version = 3.2 +devel_ver = CVS-2010-05-01 +release = 1 +thisapp = %{name}-%{devel_ver}-patched + +groups = Networking/Tools +url = +license = GPLv2+ and GPL+ and MIT and BSD and zlib +summary = Utilities for configuring an ISDN subsystem. + +description + The isdn4k-utils package contains a collection of utilities needed \ + for configuring and running an ISDN subsystem. +end + +source_dl = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/ +sources = %{thisapp}.tar.bz2 + +build + requires + autoconf + automake + libpcap-devel + libtool + ncurses-devel + ppp-devel + end + + CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + + prepare_cmds + # remove useless files + find -type d -name CVS | xargs rm -rf + + # enable capi20.new + rm -rf capi20 && mv capi20.new capi20 + + # Reconfigure the whole package + for i in */configure; do + cd `dirname $i` + autoreconf --force --install || exit 1 + cd .. + done + + # Set configuration + mv .config.rpm .config + sed -e "s/^CONFIG_BUILDX11=.*/#&/" -i .config + sed -e "s/^CONFIG_VBOX=.*/#&/" -i .config + sed -e "s/^CONFIG_XMONISDN=.*/#&/" -i .config + sed -e "s/^CONFIG_XISDNLOAD=.*/#&/" -i .config + echo "CONFIG_GENMAN=y" >> .config + echo "CONFIG_FAQ=y" >> .config + echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config + echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config + echo "LIBDIR='/usr/lib'" >> .config + echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config + echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config + sed -e "s,',,g" .config > .config.h + end + + build + make subconfig + + make CFLAGS="%{CFLAGS}" + end + + install + mkdir -pv %{BUILDROOT}/usr/sbin + make install CFLAGS="%{CFLAGS}" DESTDIR="%{BUILDROOT}" + end +end + +packages + package %{name} + end +end diff --git a/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch b/isdn4k-utils/patches/isdn4k-utils-0202131200-true.patch new file mode 100644 index 000000000..33ef17c15 --- /dev/null +++ b/isdn4k-utils/patches/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 + ++#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 new file mode 100644 index 000000000..fa8dd3150 --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-CVS-2006-07-20-capi.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2006-07-20-capi.patch new file mode 100644 index 000000000..e0283fe62 --- /dev/null +++ b/isdn4k-utils/patches/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 + + +-#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 new file mode 100644 index 000000000..4e2821128 --- /dev/null +++ b/isdn4k-utils/patches/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 + #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 new file mode 100644 index 000000000..a22f79af1 --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-CVS-2010-05-01-capi.patch b/isdn4k-utils/patches/isdn4k-utils-CVS-2010-05-01-capi.patch new file mode 100644 index 000000000..f5998eb18 --- /dev/null +++ b/isdn4k-utils/patches/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 + + +-#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 new file mode 100644 index 000000000..c4b3144de --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-capiinit.patch b/isdn4k-utils/patches/isdn4k-utils-capiinit.patch new file mode 100644 index 000000000..7593d07b5 --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-man.patch b/isdn4k-utils/patches/isdn4k-utils-man.patch new file mode 100644 index 000000000..55eb37b4e --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-misc-overflow-in-capi-subsystem.patch b/isdn4k-utils/patches/isdn4k-utils-misc-overflow-in-capi-subsystem.patch new file mode 100644 index 000000000..c840672df --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-sh-linux.patch b/isdn4k-utils/patches/isdn4k-utils-sh-linux.patch new file mode 100644 index 000000000..c63d42dcf --- /dev/null +++ b/isdn4k-utils/patches/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/isdn4k-utils-statfs.patch b/isdn4k-utils/patches/isdn4k-utils-statfs.patch new file mode 100644 index 000000000..7c6b2c3a8 --- /dev/null +++ b/isdn4k-utils/patches/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/ppp-userpass.patch b/isdn4k-utils/patches/ppp-userpass.patch new file mode 100644 index 000000000..82111ca37 --- /dev/null +++ b/isdn4k-utils/patches/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 $@ $<