smeserver/isdn4k-utils
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-upstream
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Tue Feb 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 3.27-18.sme

Browse Source 
- Rebuilt for SME11
This commit is contained in:
Jean-Philippe Pialasse 2025-02-12 00:28:17 -05:00
parent 73f00f9aee
commit 6ec1703dcc
28 changed files with 3495 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
40-isdn.rules Normal file
View File

@ -0,0 +1,4 @@
# do not edit this file, it will be overwritten on update
SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout"
SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"

6
README.md
View File

@ -1,3 +1,5 @@
# Template-for-SMEServer-Core-upstream # isdn4linux
Template to use for creating a repo for an SMEServer core upstream package (non perl) * original site : https://www.isdn4linux.de
* mandriva git hub with patch : https://github.com/OpenMandrivaAssociation/isdn4k-utils
* last fedora version https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/i/isdn4k-utils-3.27-17.fc30.src.rpm

10
capi.service Normal file
View File

@ -0,0 +1,10 @@
[Unit]
Description=Capi services for passiv ISDN cards
After=syslog.target
[Service]
ExecStart=/sbin/capiinit start
ExecStop=/sbin/capiinit stop
[Install]
WantedBy=multi-user.target

18
capi20.conf Normal file
View File

@ -0,0 +1,18 @@
# libcapi20 features autodetection of connected CAPI
# devices. In case you need to select a special device
# use the remote configuration file:
# ~/.capi20rc
# if it doesn't exist look for
# /etc/capi20.conf
#
# To set the remote machine, the above file need to have
# the following line
# REMOTE <driver> <remote hostname|ip-address> <remote port>
#
# Drivers:
# * fritzbox - Remote CAPI via FRITZ!Box
# * rcapi - Melware Remote CAPI
#
# If this doesn't exist, the library tries the old, normal way
# of using the local /dev/isdn/capi20.
# REMOTE fritzbox 192.168.178.1 5031

76
capiinit.8 Normal file
View File

@ -0,0 +1,76 @@
.\" $Id: $
.\"
.\" CHECKIN $Date: $
.\"
.TH capiinit 8
.SH NAME
capiinit \- start or stop CAPI-capable ISDN cards
.SH SYNOPSIS
capiinit [OPTIONS] start | stop | show | status | prepare | reload | activate | deactivate
.P
capiinit [OPTIONS] activate|deactivate cardname
.P
capiinit [OPTIONS] activate|deactivate driver [cardname]
.SH DESCRIPTION
.B capiinit
is called with one of the following actions:
.TP
\fBstart\fR
Load all modules and initialize all cards (loading the firmware), which are
configured in \fI/etc/isdn/capi.conf\fR.
.TP
\fBstop\fR
Reset all cards and unload modules.
.TP
\fBshow\fR
Show the current configuration.
.TP
\fBstatus\fR
Show the current status.
.TP
\fBprepare\fR
Load all modules.
.TP
\fBactivate\fR
Initialize all cards.
.TP
\fBactivate\fR \fIcardname\fR
Initialize one card (i.e.: c4-ec00).
.TP
\fBactivate\fR \fIdriver\fR [\fIcardnumber\fR]
Initialize one card.
.TP
\fBdeactivate\fR
Reset all cards.
.TP
\fBdeactivate\fR \fIcardname\fR
Reset one card (i.e.: c4-ec00).
.TP
\fBdeactivate\fR \fIdriver\fR [\fIcardnumber\fR]
Reset one card.
.TP
\fBreload\fR
Reset all cards and initialize them again.
.PP
Firmware files are searched in this order in the following directories:
\fI/usr/share/isdn/`uname\ -r`\fR,
\fI/usr/share/isdn\fR,
\fI/usr/lib/isdn\fR,
\fI/lib/isdn\fR.
.PP
There is a sample config in /etc/isdn/capi.conf.
.SH OPTIONS
.PP
.TP
\fB-c\fR \fIfilename\fR, \fB--config\fR \fIfilename\fR
Use \fIfilename\fP as config file (default is /etc/isdn/capi.conf).
.TP
\fB-d\fR, \fB--debug\fR
Save patch values for debugging purposes.
.TP
\fB-s\fR, \fB--silent\fR
Don't show status information.
.SH AUTHOR
Manpage written from C source by Paul Slootman <paul@debian.org>, updated
by Matthias Klose <m@klose.in-berlin.de>.

654
isdn-manpages.patch Normal file
View File

@ -0,0 +1,654 @@
--- isdn4k-utils/ipppd/ipppd.man.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppd/ipppd.man.in 2013-11-23 13:31:33.804345614 +0100
@@ -133,7 +133,7 @@
.TP
.B callback \fI<string>
Request the peer to call back at the location given in
-<string>. Ususally this is a phone number, but it may be interpreted
+<string>. Usually this is a phone number, but it may be interpreted
differently (or ignored) depending on the \fBcallback-type\fR option.
If <string> is the empty string, \fIipppd\fR automatically tries to
negotiate a callback type that does not need a location to be specified.
@@ -332,7 +332,7 @@
.TP
.B ipx-routing \fI<n>
Set the routing protocol to be received by this option. Use a
-comma-serperated list if you want to specify more than one
+comma-separated list if you want to specify more than one
protocol.
The '\fInone\fR'
option (0) may be specified as the only instance of ipx-routing. The
@@ -367,7 +367,7 @@
send before it rejects the options. The default value is 3.
.TP
.B ipxcp-max-terminate \fI<n>
-Set the maximum nuber of IPXCP terminate request frames before the
+Set the maximum number of IPXCP terminate request frames before the
local system considers that the peer is not listening to them. The
default value is 3.
.TP
@@ -562,7 +562,7 @@
protocols must be loaded or this option will be ignored.
.TP
.B -pred1comp
-Do not accept Predictor-1 comprssion, even if the peer wants to send
+Do not accept Predictor-1 compression, even if the peer wants to send
this type of compression and support has been defined in the kernel.
.TP
.B proxyarp
--- isdn4k-utils/avmb1/avmcapictrl.man.in.manpages 2013-11-23 13:31:33.803345638 +0100
+++ isdn4k-utils/avmb1/avmcapictrl.man.in 2013-11-23 13:33:55.238895248 +0100
@@ -73,7 +73,7 @@
point to point
.br
.I DN1:SPID1 DN2:SPID2
-is for the american protocols 5ESS and NI1.
+is for the North American 5ESS and NI1 protocols.
.LP
.TP 5
.B reset [contrnr]
--- isdn4k-utils/pppdcapiplugin/capiplugin.8.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/pppdcapiplugin/capiplugin.8 2013-11-23 13:36:27.374183518 +0100
@@ -35,12 +35,12 @@
In this case, the party called has to reject the call and call back soon.
When using dial-on-demand it is possible let both parties setup the connection,
that means while the pppd is in dial-on-demand mode not only an outgoing
-paket but also an incoming call can trigger the connection setup. This
+packet but also an incoming call can trigger the connection setup. This
can also combined with callback to assign the cost to one side only (COSO).
.SH PPPD VERSIONS
.LP
-The plugin interface of the pppd is binary incompartible between different
+The plugin interface of the pppd is binary incompatible between different
version of the pppd. So you need a different capiplugin for every version
of the pppd. The different plugins will be in the directory
/usr/lib/ppp/\fI<pppd-version>\fR.
@@ -55,7 +55,7 @@
set up a connection and sets the global variable devnam.
The capiplugin will register a timer function that is
called every second to handle the CAPI messages while pppd is running.
-To notify pppd when CAPI messages arrive, the CAPI file desciptor
+To notify pppd when CAPI messages arrive, the CAPI file descriptor
is added to the list of file descriptors which the pppd monitors for input.
Once the connection is set up the pppd will start PPP negotiation
on device devnam. When the pppd enters the DEAD phase, the connection will
@@ -63,7 +63,7 @@
When operating in dial-on-demand mode with wakeup on incoming calls,
in phase DORMANT the plugin will setup CAPI2.0 to accept incoming calls.
To wakeup pppd when an incoming call arrives, the plugin will generate
-an UDP paket to the discard port (9) of the gateway, so don't filter this paket
+an UDP packet to the discard port (9) of the gateway, so don't filter this packet
or wakeup by incoming a call will not work.
.SH MODES OF OPERATION
@@ -258,7 +258,7 @@
.TP
.B clicb
-The option is retained for compartiblity reasons only.
+The option is retained for compatibility reasons only.
Use option \fIcoso local\fR or \fIcoso remote\fR instead.
.br
Enable callback mode.
@@ -273,7 +273,7 @@
before PPP negotiation starts. Default value is 0 seconds.
This option is useful when connecting with protocol \fImodem\fR.
Some Internet access servers will hang up if they receive data
-immediatly after the connection is established.
+immediately after the connection is established.
.TP
.B controller \fI<controller specification>
@@ -298,7 +298,7 @@
.TP
.B coso remote
The costs are assigned to the remote party.
-On an outcoming call the remote party will reject the call and callback.
+On an outgoing call the remote party will reject the call and callback.
.TP
.B dialmax \fI<times>
@@ -572,10 +572,10 @@
.LP
Do not provide option \fIcli\fR to the capiplugin.
Start a pppd for every b channel.
-Authorization is checked using PAP or CHAP and the ip numbers are assigned
+Authorization is checked using PAP or CHAP and the IP addresses are assigned
according to the /etc/ppp/pap-secrets or /etc/ppp/chap-secrets file.
-Assume that the server has ip number 192.168.0.1, the clients are
-to be assigned the ip numbers starting from 192.168.0.2, and the hostname of the
+Assume that the server has IP address 192.168.0.1, the clients are
+to be assigned IP addresses starting from 192.168.0.2, and the hostname of the
server is "dialinserver".
Add these two lines to the /etc/inittab file:
.IP
@@ -610,8 +610,8 @@
\fIinmsn\fR, \fIcli\fR and \fIprotocol\fI.
.LP
Start a pppd for every client.
-Assume that the server has ip number 192.168.0.1 and the clients are to be
-assigned the ip numbers starting from 192.168.0.2.
+Assume that the server has IP address 192.168.0.1 and the clients are to be
+assigned IP addresses starting from 192.168.0.2.
Add these three lines to the /etc/inittab file:
.IP
p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 192.168.0.1:192.168.0.2
@@ -641,8 +641,8 @@
and call back.
.LP
Start a pppd for every client.
-Assume that the server has ip number 192.168.0.1 and the clients are to be
-assigned the ip numbers starting from 192.168.0.2.
+Assume that the server has IP address 192.168.0.1 and the clients are to be
+assigned IP addresses starting from 192.168.0.2.
Add these three lines to the /etc/inittab file.
.IP
p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 cbnumber 4711 192.168.0.1:192.168.0.2
@@ -666,8 +666,8 @@
.SH EXAMPLE OF A LEASED LINE CONNECTION WITH HDLC
.LP
-Assume that the server has ip number 192.168.0.1 and the peer has
-the ip number 192.168.0.2.
+Assume that the server has IP address 192.168.0.1 and the peer has
+the IP address 192.168.0.2.
Add this line to the /etc/inittab file:
.IP
p0:23:respawn:/usr/sbin/pppd call leased-hdlc controller 1 channels 1 192.168.0.1:192.168.0.2
@@ -699,8 +699,8 @@
.SH EXAMPLE OF A LEASED LINE CONNECTION WITH V42BIS
.LP
-Assume that the server has ip number 192.168.0.1 and the peer has
-the ip number 192.168.0.2.
+Assume that the server has IP address 192.168.0.1 and the peer has
+the IP address 192.168.0.2.
Add this line to the /etc/inittab file for server 1 (192.168.0.1):
.IP
p0:23:respawn:/usr/sbin/pppd call leased-v42bis controller 1 channels 1 192.168.0.1:192.168.0.2
--- isdn4k-utils/isdnctrl/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnctrl/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100
@@ -39,17 +39,13 @@
interface
.IR name " to the kernel. If " name
is omitted, the kernel will use
-.BI eth X,
-where
-.I X
-is an increasing number starting from 0. This is probably not useful with
-.SM ISDN
-so using a name like
+.BI ethX,
+where X is an increasing number starting from 0. This is not ideal so providing a name such as
.B isdn0
(for raw ip interfaces) or
.B ippp0
(for synchronous PPP interfaces)
-is always recommended.
+is strongly recommended.
.TP
.BI delif " name " [force]
Removes the
@@ -66,7 +62,7 @@
.B reset [force]
Removes all
.SM ISDN
-interfaces from the kernel if it is possible. If the optional keyword
+interfaces from the kernel if possible. If the optional keyword
.B force
is appended,
.BR isdnctrl " executes"
@@ -74,9 +70,9 @@
before removing an interface.
.TP
.BI ifdefaults " name "
-resets the interface
+resets interface
.IR name
-to some reasonable defaults.
+to reasonable defaults.
.TP
.BI dialmode " name " [ off | manual | auto ]
Sets the dial mode of the interface to one of:
@@ -85,7 +81,7 @@
.B off
.br
no connection can be made; an existing connection is terminated immediately.
-Incoming connections are also not possible.
+Also, incoming connections are not possible.
.LP
.B manual
.br
@@ -145,7 +141,7 @@
.B isdnctrl addphone
repeatedly. If more than one number is set, these will be tried
one after another (the last added number is tried first, etc.).
-When using a german SPV-type connection,
+When using a German SPV-type connection,
the number has to be prefixed by a capital S.
.TP
.BI addphone " name " in " num"
@@ -357,7 +353,7 @@
.I encapsulation
is omitted, the current setting is printed.
.TP
-.BI l2_prot " name " [ protocol ]
+.BI l2_prot " name " [protocol]
Set the layer-2 protocol for interface
.IR name .
Possible values for
@@ -368,7 +364,7 @@
.I protocol
is omitted the current setting is printed.
.TP
-.B l3_prot " name " [ protocol ]
+.B l3_prot " name " [protocol]
Set the layer-3 protocol for interface
.IR name .
At the moment only
@@ -385,7 +381,7 @@
.I name
is
.BR all ,
-then all interfaces are listed.
+all interfaces are listed.
.TP
.BI status " name"
Show the connection status for interface
--- isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in 2013-11-23 13:31:43.582106889 +0100
@@ -81,14 +81,14 @@
CBDELAY = 5
.TP 5
.BI "DIALMAX = " num
-Set the number of dial atempts to
+Set the number of dial attempts to
.IR num .
.B Example:
DIALMAX = 1
.TP 5
.BI "HUPTIMEOUT = " seconds
-Set the hanguptime to
+Set the hangup time to
.IR seconds .
.B Example:
@@ -168,7 +168,7 @@
.BI "PPPBIND = " num
Binds the current interface to the ippp device
.BI /dev/ippp X .
-This works only for syncronous ppp.
+This works only for synchronous PPP.
The value must be a number.
.B Example:
--- isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in 2013-11-23 13:31:43.582106889 +0100
@@ -25,10 +25,10 @@
You can use this program to build your own phonebook. These files are
used by many of the other ISDN utilities that use phone numbers, to
-display a number symbolicly instead of as a plain number.
+display a number symbolically instead of as a plain number.
.SH OPTIONS
-Note: usage of the options -A and -D is dangerous! The
+Note: use of the options -A and -D is dangerous! The
complete structure of the file may be changed, and all comments are
removed! Make backups of your data files before trying these.
@@ -37,7 +37,7 @@
.TP 4
.B \-A
Add a new entry, which is read from standard input. The following
-values are asked for (here with examples):
+values are asked for (shown here with examples):
.RS
.nf
@@ -54,7 +54,7 @@
Time: 8-20
Flags: (control-D here indicates end of flags)
-Alias: (control-D here indicated end of entries)
+Alias: (control-D here indicates end of entries)
.fi
If you want another [Flags] entry, simply enter the data for another
@@ -64,7 +64,7 @@
If you want to add another number, simply enter the data for the next
number at the Alias prompt.
-You can also pipe the data into this program; the input data then must
+You can also pipe the data into the program; the input data must
correspond to the prompts that the program gives! Note that you can
only add one number at a time then (there's no way of telling
.I isdnconf
@@ -93,7 +93,7 @@
will display entries which match the data given.
.B DATA OPTIONS:
-(none applicable for -A)
+(not applicable for -A)
.TP 4
.B \-n 'number'
number: match the given number. It can contain wildcards.
--- isdn4k-utils/isdnlog/tools/isdnrate.man.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/isdnrate.man 2013-11-23 13:31:43.583106864 +0100
@@ -1,7 +1,7 @@
.\" CHECKIN $Date: 2004/07/13 21:44:20 $
.TH ISDNRATE 1 "@MANDATE@" -lt-
.SH NAME
-isdnrate \- Print telefon rates and various info from rate\-files(5).
+isdnrate \- Print telephone rates and various info from rate\-files(5).
.SH SYNOPSIS
.BI "isdnrate \-b" best " \-d" day " \-f" from " \-h" hour " \-l" len
.B \-o
@@ -18,14 +18,14 @@
.SH DESCRIPTION
The
.B isdnrate
-program prints various information from rate\-files(5). It's main purpose
-is the calculation of telefon rates from your location to an arbitrary
+program prints various information from rate\-files(5). Its main purpose
+is the calculation of telephone rates from your location to an arbitrary
destination at a certain time and of a certain length for all the providers in a rate\-file.
.P
.SS
.B NUMBER
.P
-A telefon number may be
+A telephone number may be
.IP
.B 1234
a local area number
@@ -51,7 +51,7 @@
.B -s
is also given).
.P
-Note that currently only city names in AT, DE, NL are supported plus some international capitals.
+Note that currently only city names in AT, DE and NL are supported plus some international capitals.
.br
Note also, spaces in country- or service names may be given as underscores.
.SS
@@ -88,7 +88,7 @@
Default is now.
.P
.BI \-f from
-Callers location. Default ist from
+Callers location. Default is from
.IR isdn.conf .
.P
.BI \-h hour
@@ -102,7 +102,7 @@
.IR isdn.conf .
.P
.BI \-l len
-Length of call in second. Default value is 153 secs.
+Length of call in seconds. Default is 153 seconds.
.P
.B \-o
Show only booked providers. These are providers, which are listed in
@@ -118,8 +118,8 @@
for business providers.
.P
\fB\-r\fPv\fINN\fP
-Show only providers whose vbn begins with \fINN\fP.
-The vbn is also known as provider prefix consisting of VBN and provider number.
+Show only providers whose VBN begins with \fINN\fP.
+The VBN is also known as provider prefix consisting of VBN and provider number.
.P
.B \-s
Consider
@@ -141,7 +141,7 @@
.B DISPLAY AND RUN OPTIONS
.P
.B \-C
-Connect to a running isdnrate daemon. This avoids long startup times.
+Connect to a running isdnrate daemon. This avoids long start-up times.
.P
.B \-D
Start as a daemon, waiting for connections from a client. The socket
@@ -231,8 +231,8 @@
.br
shows the rate for provider 1 and the cheapest rate to this service.
.P
-Note: Various output options may not be used together. If you gave conflicting
-options you'll see a warning.
+Note: Various output options may not be used together. Conflicting
+options will produce a warning.
.br
Note also: Sort by name or providernumber and
.BI -b best
@@ -242,7 +242,7 @@
.br
And finally: Some options like
.IR \-X50 ", " \-X51 ", " \-X52 ", " \-D ", " \-V
-don't require a telefon
+don't require a telephone
.IR NUMBER .
.SH FILES
.IR rate-CC.dat ,
@@ -280,7 +280,9 @@
.I isdnrate -CX -p1_2,24 +1
.br
Show rates and zones for destination USA for providers
-.IR "1_2 " and " 24" .
+.IR "1, 2"
+and
+.IR "24" .
.P
.I isdnrate -C -l60 -rv010 HAM
.br
@@ -302,7 +304,7 @@
.br
Show rates and numbers for service
.I Internet
-for a 1 minutes call.
+for a 1 minute call.
.P
.I isdnrate -CZ 19430
.br
--- isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in 2013-11-23 13:31:43.582106889 +0100
@@ -124,7 +124,7 @@
.TP
.B REBOOTCMD
-Isdnlog can use this command to reboot linux (when all else fails).
+Isdnlog can use this command to reboot Linux (when all else fails).
Default value is "@REBOOTCMD@". Optional.
.TP
--- isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in 2013-11-23 13:31:43.583106864 +0100
@@ -107,7 +107,7 @@
.TP
.B \-i\fIx\fB internS0="value"
-Telefon number shorter then
+Telephone numbers shorter then
.I value
are considered to be internal numbers on your PABX.
@@ -425,7 +425,7 @@
This needs a kernel patch to work. If the kernel patch is not found
a simulation is done.
.br
-Note: depending on your telefon provider local area calls may or may not
+Note: depending on your telephone provider local area calls may or may not
be routed to alternate providers.
For changing the ISP a script is called. s. next option 'providerchange'
--- isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in 2013-11-23 13:31:43.583106864 +0100
@@ -4,7 +4,7 @@
.PD 0
.SH NAME
-isdnrep \- report isdn activity
+isdnrep \- report ISDN activity
.SH DESCRIPTION
Isdnrep reads the isdnlog log files, generates reports, does statistics,
@@ -95,12 +95,12 @@
.TP
.B \-v verbose
-Display warnings on startup.
+Display warnings on start-up.
.TP
.B \-c ignore default options
Do not append the "REPOPTIONS" setting from @I4LCONFDIR@/@CONFFILE@
-to the commandline.
+to the command line.
.TP
.B \-p [n][m]'number'[,[m]'number'...] phonenumber
@@ -171,13 +171,13 @@
.RE
.sp
This will display all calls on Tuesdays, Wednesdays, or Thursdays
-that are no holidays with a start time between 09:00 and 12:00 or
+that are not holidays with a start time between 09:00 and 12:00 or
15:00 and 17:00.
.TP
.B \-u unknown caller
At the end of the report, all numbers not aliased in callerid.conf or
-~/.isdn are displayed. This option is not available when HTML output
+~/.isdn are displayed. This option is unavailable when HTML output
is requested.
.TP
@@ -389,7 +389,7 @@
and can be used with
.B -Fshort.
-Without showing the transfered bytes, this string also fits into 80 chars:
+Without showing the transferred bytes, this string also fits into 80 chars:
.sp
.RS
" %X %D %16.16H %T %-25.25F %U"
@@ -509,18 +509,18 @@
.RE
.fi
-The package NAS (Network Audio System) may be needed.
+The NAS (Network Audio System) package may be needed.
Now, when the browser is started, it will recognize WAV files and start
-the corresponding program to handle these. The WAV format has been chosen
-as this can also be played from a Windows pc.
+the corresponding program to handle them. The WAV format has been chosen
+as it can also be played from a Windows PC.
.cu
faxes received by mgetty
When %G is used in the isdnrep output format, any faxes received by mgetty
-will be accessible via a HTML link, in the same manner as the ansering
+will be accessible via a HTML link, in the same manner as the answering
machine messages.
For the faxes the following entry in the [ISDNLOG] section in isdn.conf
@@ -594,7 +594,7 @@
already installed if you want to use this feature :-)
The advantage of the JPEG format is that it can also be displayed by
-a browser running on a Windows pc.
+a browser running on a Windows PC.
.cu
summary
@@ -674,7 +674,7 @@
there was no connection, as the called party didn't pick up the phone
.TP
(5)
-"the number you have dialled is not connected. Hang up and dial again. ..."
+"the number you have dialed is not connected. Hang up and dial again. ..."
.TP
(6)
total time for incoming calls
--- isdn4k-utils/doc/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/doc/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100
@@ -48,10 +48,10 @@
Create a slave interface.
.RS
Creates a slave interface for RAW-device channel-bundling.
-These devices behave like network-interfaces, execpt they
+These devices behave like network-interfaces, except they
are invisible to user. Only
.SM ISDN
-parameters can be controlled, but no IP-parameters. IP-parameters
+parameters can be controlled, not IP-parameters. IP-parameters
are inherited from the corresponding master-device.
.TP
Argument:
@@ -81,7 +81,7 @@
.I arg
should point to a zero terminated string of max. 10 characters
naming an existing interface which will be deleted. If the interface
-is a master interface, all it's slave-interfaces will be deleted also.
+is a master interface, all its slave-interfaces will be deleted also.
.TP
Return:
On success, the call returns 0. On failure, an error code is returned.
@@ -98,7 +98,7 @@
.TP
Argument:
.I arg
-shoud point to a
+should point to a
.I struct isdn_net_ioctl_cfg
(defined in linux/isdn.h)
.TP
@@ -117,7 +117,7 @@
.TP
Argument:
.I arg
-shoud point to a
+should point to a
.I struct isdn_net_ioctl_cfg
(defined in linux/isdn.h) which will be filled by the current setup.
.TP
@@ -135,7 +135,7 @@
.TP
Argument:
.I arg
-shoud point to a
+should point to a
.I struct isdn_net_ioctl_phone
which contains necessary information.
.TP
@@ -153,7 +153,7 @@
.TP
Argument:
.I arg
-shoud point to a
+should point to a
.I struct isdn_net_ioctl_phone
which contains necessary information.
.TP
@@ -172,7 +172,7 @@
.TP
Argument:
.I arg
-shoud point to a a union of
+should point to a union of
.I struct isdn_net_ioctl_phone
and a buffer, large enough to hold a concatenated list of
strings containing the phone numbers.
@@ -457,7 +457,7 @@
filled correctly. The arg component inside isdn_ioctl_struct is
handed down to the driver's ioctl function. Its meaning is not
defined here and depends on the lowlevel driver. See documentation
-for the various lewlevel drivers for information about driver-
+for the various lowlevel drivers for information about driver-
specific ioctl.
.TP
Return:

23
isdn-nofirmware.patch Normal file
View File

@ -0,0 +1,23 @@
--- isdn4k-utils/icn/Makefile.in.nofw 2013-11-23 18:55:13.780774825 +0100
+++ isdn4k-utils/icn/Makefile.in 2013-11-23 18:55:13.800774324 +0100
@@ -49,9 +49,6 @@
install-data:
mkdir -p $(DESTDIR)$(DATADIR)
- $(INSTALL_DATA) firmware/loadpg.bin $(DESTDIR)$(DATADIR)/loadpg.bin
- $(INSTALL_DATA) firmware/pc_eu_ca.bin $(DESTDIR)$(DATADIR)/pc_eu_ca.bin
- $(INSTALL_DATA) firmware/pc_1t_ca.bin $(DESTDIR)$(DATADIR)/pc_1t_ca.bin
install-man: $(PROGRAM).man
mkdir -p $(DESTDIR)$(MAN8DIR)
--- isdn4k-utils/hisax/Makefile.in.nofw 2013-11-23 18:58:57.654318661 +0100
+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 18:59:17.007847228 +0100
@@ -44,8 +44,6 @@
install: $(PROGRAMS) $(MANPAGES)
mkdir -p $(DESTDIR)$(SBINDIR)
$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(SBINDIR)
- mkdir -p $(DESTDIR)$(DATADIR)
- $(INSTALL_DATA) ISAR.BIN $(DESTDIR)$(DATADIR)/ISAR.BIN
mkdir -p $(DESTDIR)$(MAN8DIR)
$(INSTALL_MAN) $(MANPAGES) $(DESTDIR)$(MAN8DIR)

283
isdn.init Executable file
View File

@ -0,0 +1,283 @@
#! /bin/bash
#
# chkconfig: 2345 9 91
# description: start and stop ISDN services
#
PATH=/bin:/sbin:/usr/bin:/usr/sbin
# Check that we're a privileged user
[ `id -u` = 0 ] || exit 4
[ -x /sbin/isdnctrl ] || exit 5
# source function library
. /etc/init.d/functions
test -f /etc/sysconfig/isdncard || exit 6
. /etc/sysconfig/isdncard
if [ -z "$MODULE" -o -z "$RESOURCES" ]; then
exit 6
fi
# disable debug as default
IBOD=no
RETVAL=0
sync_devices=0
raw_devices=0
PCMCIA=no
COMPRESSION=7
# check PCMCIA
if [ "$RESOURCES" = "NONE" ] ; then
PCMCIA=yes
fi
function isapnp()
{
[ -f /proc/isapnp ] || return
[ -f /proc/bus/isapnp/devices ] || return
found=0
eval $RESOURCES >/dev/null 2>&1
if [ -z "$VENDOR_ID" -o -z "$DEVICE_ID" ] ; then
case "$type" in
12) VENDOR_ID="ASU1690" # ASUS COM ISDNLink ISA PnP
DEVICE_ID="ASU1690"
;;
14) VENDOR_ID="TAG2610" # Teles 16.3c PnP
DEVICE_ID="TAG2610"
;;
7) VENDOR_ID="ELS0133" # Elsa Quickstep 1000 PnP
DEVICE_ID="ELS0133"
;;
*) return
;;
esac
fi
# get isapnp infos
id_list="$(cat /proc/bus/isapnp/devices 2>/dev/null | while read dummy id dummy ; do echo $id ; done)"
for i in $id_list ; do
_vendor_id="$(echo $i | cut -b1-7)"
_device_id="$(echo $i | cut -b8-)"
if [ "$VENDOR_ID" = "$_vendor_id" -a "$DEVICE_ID" = "$_device_id" ] ; then
found=1
break
fi
done
[ "$found" = "1" ] || return
card="card 0 $VENDOR_ID"
dev="dev 0 $DEVICE_ID"
[ -n "$io" ] && port0="port 0 $io"
[ -n "$io1" ] && port1="port 1 $io1"
[ -n "$io2" ] && port2="port 2 $io2"
[ -n "$irq" ] && irq="irq 0 $irq"
[ -n "$mem" ] && memory="memory 0 $mem"
case "$1" in
activate) activate_isapnp ;;
deactivate) deactivate_isapnp ;;
*) return
esac
}
function activate_isapnp()
{
[ ! -f /var/lock/subsys/isapnp_isdn ] || return
str=''
for i in "$card" "$dev" "$port0" "$port1" "$port2" "$memory" "$irq" ; do
[ -n "$i" ] || continue
str="$str$i\n"
done
[ -n "$str" ] || return
echo -e "${str}activate" >/proc/isapnp
touch /var/lock/subsys/isapnp_isdn
}
function deactivate_isapnp()
{
echo -e "$card\n$dev\ndeactivate" >/proc/isapnp
rm -f /var/lock/subsys/isapnp_isdn
}
function load_modules()
{
isdn_path="/lib/modules/$(uname -r)/kernel/drivers/isdn"
if [ -f $isdn_path/isdn_lzscomp.o -o -f $isdn_path/isdn_lzscomp.ko ] ; then
modprobe isdn_lzscomp comp=$COMPRESSION debug=0 > /dev/null 2>&1
fi
[ "$PCMCIA" = "no" ] || return
modprobe $MODULE $RESOURCES > /dev/null 2>&1
isdnctrl list all >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
action $"Loading ISDN modules" /bin/true
touch /var/lock/subsys/isdn
else
action $"Loading ISDN modules" /bin/false
modprobe -r $MODULE > /dev/null 2>&1
fi
}
function remove_modules()
{
modprobe -r isdn_lzscomp >/dev/null 2>&1
# Unload hisax modules
[ "$PCMCIA" = "no" ] || return
if lsmod | grep "^$MODULE" >/dev/null 2>&1 ; then
action $"Unloading ISDN modules" modprobe -r $MODULE
rm -f /var/lock/subsys/isdn
fi
}
function load_firmware()
{
# loading firmware
if [ -n "$FIRMWARE" ] ; then
$FIRMWARE >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
action $"Loading Firmware" /bin/true
else
action $"Loading Firmware" /bin/false
fi
fi
}
function start_isdnlog()
{
# don't start isdnlog, if the ISDN card requires the firmware
[ -z "$FIRMWARE" ] || return
prog="isdnlog"
if [ "$MODULE" = "hisax" ] ; then
driverid="HiSax"
elif [ "$MODULE" = "hisax_fcpcipnp" ] ; then
driverid="fcpcipnp0"
else
return
fi
if ! hisaxctrl $driverid 1 0x3ff >/dev/null 2>&1 ; then
return
fi
if [ -f /etc/isdn/isdnlog.option ] ; then
daemon /sbin/isdnlog /dev/isdnctrl0 -D -f /etc/isdn/isdnlog.option
else
daemon /sbin/isdnlog /dev/isdnctrl0 -x0x3fff -M -w2 -S -D -s -O+/var/log/isdnctrl
fi
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
action $"Starting $prog" /bin/true
touch /var/lock/subsys/isdnlog
else
action $"Starting $prog" /bin/false
fi
}
function stop_isdnlog()
{
prog="isdnlog"
echo -n $"Shutting down $prog"
killproc isdnlog
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/isdnlog
}
function makedev()
{
if [ -x /sbin/MAKEDEV ] ; then
if ! /bin/ls /dev/isdn* /dev/ippp* >/dev/null 2>&1 ; then
/sbin/MAKEDEV isdn ippp capi
fi
fi
}
function start()
{
# workaround for kernel/udev (ISDN part)
makedev
# activate ISA PnP
isapnp activate
# load modules
load_modules
# load firmware and setup isdn device driver
load_firmware
# start isdn logging
start_isdnlog
}
function stop()
{
stop_isdnlog
remove_modules
isapnp deactivate
}
function restart()
{
stop
start
}
function status()
{
ifcfg_prefix="/etc/sysconfig/network-scripts/ifcfg-"
interfaces="$(cat /proc/net/dev 2>/dev/null | egrep "(ippp*|isdn*)" | cut -f1 -d:)"
if [ -z "$interfaces" ]; then
echo $"$0: Link is down"
return
fi
for i in $interfaces ;do
if [ -f $ifcfg_prefix$i ]; then
. $ifcfg_prefix$i
echo $"$NAME is attached to $DEVICE"
fi
done
}
function condrestart()
{
if [ -f /var/lock/subsys/isdn ] ; then
restart
fi
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
condrestart)
condrestart
;;
status)
status
;;
*)
echo $"Usage: $0 {start|stop|restart|status|condrestart}"
RETVAL=3
esac
exit $RETVAL

15
isdn.service Normal file
View File

@ -0,0 +1,15 @@
[Unit]
Description=ISDN Services
Requires=syslog.target network.target
[Service]
Type=oneshot
ExecStart=/usr/libexec/isdn start
ExecStop=/usr/libexec/isdn stop
Environment=BOOTUP=serial
Environment=CONSOLETYPE=serial
StandardError=syslog
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

49
isdn4k-fix-Werror-format-security-ftbfs.patch Normal file
View File

@ -0,0 +1,49 @@
--- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnlog/asn1_address.c 2006-01-15 10:08:55.000000000 -0500
+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnlog/asn1_address.c 2014-01-28 16:59:10.588350961 -0500
@@ -160,7 +160,7 @@
XSEQUENCE_1(ParsePartyNumber, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partyNumber);
XSEQUENCE_OPT_1(ParsePartySubaddress, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partySubaddress);
- str += sprintf(str, partyNumber);
+ str += sprintf(str, "%s", partyNumber);
if (strlen(partySubaddress))
str += sprintf(str, ".%s", partySubaddress);
@@ -191,13 +191,13 @@
switch (publicTypeOfNumber) {
case 0: break; // unknown
- case 1: str += sprintf(str, countryprefix); break;
- case 2: str += sprintf(str, areaprefix); break;
+ case 1: str += sprintf(str, "%s", countryprefix); break;
+ case 2: str += sprintf(str, "%s", areaprefix); break;
case 3: str += sprintf(str, "(network)"); break;
case 4: str += sprintf(str, "(MSN)"); break;
case 6: str += sprintf(str, "(abbrev)"); break;
}
- str += sprintf(str, numberDigits);
+ str += sprintf(str, "%s", numberDigits);
return p - beg;
}
@@ -219,7 +219,7 @@
case 4: str += sprintf(str, "(local)"); break;
case 6: str += sprintf(str, "(abbrev)"); break;
}
- str += sprintf(str, numberDigits);
+ str += sprintf(str, "%s", numberDigits);
return p - beg;
}
--- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnrep/isdnbill.c 2009-10-20 05:07:28.000000000 -0400
+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnrep/isdnbill.c 2014-01-28 17:16:00.533957441 -0500
@@ -271,8 +271,7 @@
memset(s, c, len);
s[len] = 0;
- printf(s);
- printf("\n");
+ printf("%s\n", s);
} /* strich */

14
isdn4k-utils-3.27_20151118-help-text.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c
--- isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me 2018-10-08 10:53:25.317135507 +0200
+++ isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c 2018-10-08 10:54:15.545306401 +0200
@@ -195,8 +195,8 @@ static void usage(void)
fprintf(stderr, "\n");
fprintf(stderr, "Usage: %s OPTION [ OPTION ] [ ... ]\n", vbasename);
fprintf(stderr, "\n");
- fprintf(stderr, "-c, --create Removes a control file (default).\n");
- fprintf(stderr, "-r, --remove Creates a control file.\n");
+ fprintf(stderr, "-c, --create Creates a control file.\n");
+ fprintf(stderr, "-r, --remove Removes a control file (default).\n");
fprintf(stderr, "-n, --answernow Control file \"vboxctrl-answernow\".\n");
fprintf(stderr, "-a, --answerall Control file \"vboxctrl-answerall\".\n");
fprintf(stderr, "-p, --stop Control file \"vboxctrl-stop\".\n");

18
isdn4k-utils-3.27_20151118-perl-wld-modul.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest
--- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than 2017-08-08 11:49:59.607377458 +0200
+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest 2017-08-08 11:52:10.989430703 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/perl -w -I .
# make dest.gdbm
# necessary parts: ../../country-de.dat
diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate
--- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than 2017-08-08 11:52:26.278855030 +0200
+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate 2017-08-08 11:52:38.020412941 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/perl -w- I .
# This version of pp_rate originates from rates4linux:
# $Id: pp_rate,v 1.11 2004/10/23 17:40:21 tobiasb Exp $

BIN
isdn4k-utils-3.27_20151118.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
isdn4k-utils-CVS-2005-03-09-xmon.patch Normal file
View File

@ -0,0 +1,8 @@
--- isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile.tn 2005-11-16 11:43:34.000000000 +0100
+++ isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile 2005-11-16 11:43:47.000000000 +0100
@@ -25,4 +25,4 @@
-e s,\@CONFIG_XMONISDN_DOWNCMD\@,${CONFIG_XMONISDN_DOWNCMD},g \
< $< > $@
-install.all: install install.man install.bitmap
+install.all: install install.man

12
isdn4k-utils-CVS-2009-10-20-lib64.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template
--- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me 2009-10-20 14:08:23.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template 2009-10-20 14:09:17.000000000 +0200
@@ -8,7 +8,7 @@
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
include $(TOPDIR)/Rules.make

12
isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in
--- isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me 2010-09-20 14:55:42.000000000 +0200
+++ isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in 2010-09-20 14:56:22.000000000 +0200
@@ -81,7 +81,7 @@ exec_prefix = @exec_prefix@
mandir = @CONFIG_MANDIR@
bindir = @CONFIG_BINDIR@
sbindir = /usr/sbin
-sysconfdir = /etc/vbox
+sysconfdir = /etc/isdn
LOGFILEDIR = @VBOX_LOGDIR@
PIDFILEDIR = @VBOX_PIDDIR@

13
isdn4k-utils-autoconf-2.6.4-quoting.patch Normal file
View File

@ -0,0 +1,13 @@
--- isdn4k-utils/isdnlog/configure.in.quote 2013-11-23 13:24:33.093608335 +0100
+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 13:24:33.101608142 +0100
@@ -140,8 +140,8 @@
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])

287
isdn4k-utils-autoconf25x.patch Normal file
View File

@ -0,0 +1,287 @@
--- isdn4k-utils/imon/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imon/configure.in 2013-11-23 12:58:32.616668380 +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/isdnctrl/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnctrl/configure.in 2013-11-23 12:58:32.616668380 +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/isdnlog/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/aclocal.m4 2013-11-23 12:58:32.615668404 +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/isdnlog/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 12:58:32.615668404 +0100
@@ -81,45 +81,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.
@@ -132,17 +133,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
@@ -160,7 +161,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)
@@ -169,16 +170,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
@@ -198,28 +199,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/vbox3/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox3/configure.in 2013-11-23 12:58:32.615668404 +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/vbox3/vboxgetty/Makefile.am.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox3/vboxgetty/Makefile.am 2013-11-23 12:58:32.615668404 +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/vbox/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox/aclocal.m4 2013-11-23 12:58:32.615668404 +0100
@@ -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

39
isdn4k-utils-capiinit.patch Normal file
View File

@ -0,0 +1,39 @@
--- isdn4k-utils/capiinit/capiinit.c.capi 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinit/capiinit.c 2013-11-23 13:24:33.099608191 +0100
@@ -1248,6 +1248,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;
@@ -1492,8 +1493,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);
--- isdn4k-utils/capiinit/capi.conf.capi 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinit/capi.conf 2013-11-23 13:24:33.098608215 +0100
@@ -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

20
isdn4k-utils-man.patch Normal file
View File

@ -0,0 +1,20 @@
--- isdn4k-utils/xmonisdn/Makefile.in.man 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/xmonisdn/Makefile.in 2013-11-23 12:57:21.280407677 +0100
@@ -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}'`; \
XUP=`echo ${CONFIG_XMONISDN_UPCMD}|sed 's/&/\\\&/g'`; \
XDOWN=`echo ${CONFIG_XMONISDN_DOWNCMD}|sed 's/&/\\\&/g'`; \
@@ -62,7 +62,7 @@
-e "s,\@CONFIG_XMONISDN_DOWNCMD\@,$${XDOWN},g" \
< $< > $@
-config:
+config: xmonisdn.man
@cp Makefile.in GNUmakefile
@xmkmf

11
isdn4k-utils-mkzonedb.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c
--- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash 2014-07-31 11:31:57.000000000 +0200
+++ isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c 2014-07-31 11:35:12.000000000 +0200
@@ -362,6 +362,7 @@ int main (int argc, char *argv[])
if (verbose)
stdoutisatty = isatty(fileno(stdout));
+ if (!rf || !df) usage(argv);
read_rzfile(rf);
make_table();
write_db(df);

772
isdn4k-utils-redhat.patch Normal file
View File

@ -0,0 +1,772 @@
--- isdn4k-utils/.config.rpm.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/.config.rpm 2013-11-23 12:47:59.064117681 +0100
@@ -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/ipppd/ccp.c.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppd/ccp.c 2013-11-23 12:47:59.064117681 +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/ipppd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppd/Makefile.in 2013-11-23 12:49:30.400890185 +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 -DREQ_SYSOPTIONS=0
+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0
VER = 2.2.0
# it's a hack
--- isdn4k-utils/loop/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/loop/Makefile.in 2013-11-23 12:47:59.063117706 +0100
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/imontty/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imontty/Makefile 2013-11-23 12:47:59.062117731 +0100
@@ -15,14 +15,14 @@
# Manual config standalone
#
CONFIG_SBINDRIR := /sbin
- MAN8DIR := /usr/man/man8
+ MAN8DIR := /usr/share/man/man8
endif
INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
MANPAGE=imontty.8
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
#CCFLAGS=-I$(ISDN_INCLUDE) -g
# nothing to change behind this line
--- isdn4k-utils/iprofd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/iprofd/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/avmb1/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/avmb1/Makefile.in 2013-11-23 12:47:59.061117756 +0100
@@ -5,7 +5,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS)
LDFLAGS = -L../lib @LIBS@
INCLUDES = -I.
PROGRAMS = avmcapictrl
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils/imon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imon/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -7,8 +7,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/act2000/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/act2000/Makefile.in 2013-11-23 12:47:59.061117756 +0100
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = $(RPM_OPT_FLAGS)
+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/isdnctrl/Makefile.in.redhat 2013-11-23 12:47:59.062117731 +0100
+++ isdn4k-utils/isdnctrl/Makefile.in 2013-11-23 12:50:53.592861497 +0100
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/xisdnload/Imakefile.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/xisdnload/Imakefile 2013-11-23 12:47:59.064117681 +0100
@@ -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/icn/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/icn/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/areacode/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/areacode/Makefile.in 2013-11-23 12:47:59.061117756 +0100
@@ -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/rcapid/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/rcapid/Makefile.am 2013-11-23 12:47:59.064117681 +0100
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils/isdnlog/samples/callerid.conf.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/samples/callerid.conf 2013-11-23 12:47:59.063117706 +0100
@@ -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/isdnlog/tools/cdb/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/cdb/Makefile.in 2013-11-23 12:51:38.509766289 +0100
@@ -20,7 +20,7 @@
BINDIR:=$(DESTDIR)@prefix@/bin
INCDIR:=$(DESTDIR)@prefix@/include
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
all: depend $(FILES)
@@ -45,7 +45,7 @@
install-dirs:
install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) $(INCDIR)
-install:
+install: install-dirs
true
# install -m0755 $(BINS) $(BINDIR)
# install -m0644 $(MAN1) $(MAN1DIR)
--- isdn4k-utils/isdnlog/tools/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/Makefile 2013-11-23 12:47:59.065117655 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
#CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
all: rate-at
--- isdn4k-utils/isdnlog/tools/dest/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/dest/Makefile.in 2013-11-23 12:47:59.063117706 +0100
@@ -6,7 +6,7 @@
-include ../../../.config
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
export DBEXT = @DBEXT@
@@ -20,9 +20,9 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
+INSTALL_DATA = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
DATADIR = @datadir@
--- isdn4k-utils/isdnlog/tools/zone/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/zone/Makefile.in 2013-11-23 12:47:59.063117706 +0100
@@ -5,7 +5,7 @@
#
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
CDBEXTRALIBS = @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
#CC = @CC@ -V2.7.2.3
--- isdn4k-utils/isdnlog/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/Makefile.in 2013-11-23 12:47:59.063117706 +0100
@@ -1659,10 +1659,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
@@ -1717,9 +1717,9 @@
SUBDIRS += $(LIBISDNDIR)
endif
-# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
-export CFLAGS = -Wall -pipe
+export CFLAGS = -Wall $(RPM_OPT_FLAGS)
ifndef _CC
export _CC = gcc
endif
--- isdn4k-utils/capiinfo/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinfo/Makefile.am 2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/Makefile 2013-11-23 12:47:59.065117655 +0100
@@ -16,8 +16,8 @@
# Following line is important for lib and isdnlog (sl).
export ROOTDIR=$(shell pwd)
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
do-it-all: subtargets
else
CONFIGURATION = config
@@ -129,14 +129,8 @@
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
#
--- isdn4k-utils/divertctrl/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/divertctrl/Makefile.in 2013-11-23 12:47:59.061117756 +0100
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+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/capifax/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capifax/Makefile.am 2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
stamp-h.in
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils/capiinit/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinit/Makefile.am 2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
stamp-h.in comperr core
INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
LDFLAGS = $(all_libraries)
LDADD =
--- isdn4k-utils/hisax/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -6,7 +6,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -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/doc/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/doc/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -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/eicon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/eicon/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -7,8 +7,8 @@
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -DUNIX -DLINUX
-INCLUDES = -I. -Iinclude
+CFLAGS = -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/eicon
LDFLAGS = -L../lib @LIBS@
PROGRAMS =
PROGRAM = eiconctrl
@@ -23,9 +23,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/vbox/examples/vboxgetty.conf.example.redhat 2013-11-23 12:47:59.064117681 +0100
+++ isdn4k-utils/vbox/examples/vboxgetty.conf.example 2013-11-23 12:53:01.601740005 +0100
@@ -20,12 +20,12 @@
# Settings for port ttyI6
-port /dev/ttyI6
- modeminit ATZ&B512&E000000
- user vboxdaemonuser
- group users
- spooldir /var/spool/vbox/ttyI6
- vboxconfig /home/vboxdaemonuser/.vbox.conf
+#port /dev/ttyI6
+# modeminit ATZ&B512&E000000
+# user vboxdaemonuser
+# group users
+# spooldir /var/spool/vbox/ttyI6
+# vboxconfig /home/vboxdaemonuser/.vbox.conf
# Settings for port ttyI7
--- isdn4k-utils/vbox/examples/vboxd.conf.example.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox/examples/vboxd.conf.example 2013-11-23 12:52:33.205432705 +0100
@@ -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
@@ -15,7 +15,7 @@
# One user in this file can be configured by the `debconf' system, the next one.
# Remove this comment if you don't want any configuration to happen.
-A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming
+# A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming
# A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
A:*:!:!:!:!:!
--- isdn4k-utils/ipppstats/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppstats/Makefile.in 2013-11-23 12:47:59.062117731 +0100
@@ -6,14 +6,14 @@
MANDIR = @CONFIG_MANDIR@
CC = @CC@
INSTALL = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR = $(INSTALL) -m 755 -d
PPPSTATSRCS = ipppstats.c
PPPSTATOBJS = ipppstats.o
-CFLAGS = -fomit-frame-pointer -O2
+CFLAGS = $(RPM_OPT_FLAGS) -I@CONFIG_KERNELDIR@/include
all: ipppstats
--- isdn4k-utils/lib/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/lib/Makefile 2013-11-23 12:47:59.065117655 +0100
@@ -28,7 +28,7 @@
# USER CONFIGURATION AREA
######################################################################
-CFLAGS = -g -Wall -pipe #-O6
+CFLAGS = $(RPM_OPT_FLAGS)
DEFS =
ifndef _CC
export _CC = gcc
--- isdn4k-utils/lib/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/lib/Makefile.in 2013-11-23 12:47:59.063117706 +0100
@@ -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

11
isdn4k-utils-sh-linux.patch Normal file
View File

@ -0,0 +1,11 @@
--- isdn4k-utils/ipppd/main.c.sh-support 2013-11-23 13:19:37.218825637 +0100
+++ isdn4k-utils/ipppd/main.c 2013-11-23 13:21:21.585279930 +0100
@@ -1298,7 +1298,7 @@
case 'r':
f = va_arg(args, char *);
a = va_arg(args, va_list);
-#ifdef __alpha__ /* always do this? */
+#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);

21
isdn4k-utils-statfs.patch Normal file
View File

@ -0,0 +1,21 @@
--- 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)
{

26
isdn4k-utils-strict-aliasing.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than isdn4k-utils-3.27_20151118/ipppd/Makefile.in
--- isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than 2015-11-18 22:33:13.351145388 +0100
+++ isdn4k-utils-3.27_20151118/ipppd/Makefile.in 2015-11-18 22:33:24.649039181 +0100
@@ -73,7 +73,7 @@ endif
DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
COMPILE_FLAGS = @CFLAGS@
-CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0
+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 -fno-strict-aliasing
VER = 2.2.0
# it's a hack
diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than isdn4k-utils-3.27_20151118/rcapid/Makefile.am
--- isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than 2015-11-18 22:34:20.527513865 +0100
+++ isdn4k-utils-3.27_20151118/rcapid/Makefile.am 2015-11-18 22:34:36.784361034 +0100
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = configure aclo
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall $(RPM_OPT_FLAGS)
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -fno-strict-aliasing
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.in.than isdn4k-utils-3.27_20151118/rcapid/Makefile.in
diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in

13
isdn4k-utils-true.patch Normal file
View File

@ -0,0 +1,13 @@
--- isdn4k-utils/imon/imon.c.true 2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imon/imon.c 2013-11-23 13:12:03.435893932 +0100
@@ -73,6 +73,10 @@
#include <linux/isdn.h>
+#ifndef TRUE
+#define TRUE 1
+#endif
+
#define KEY_Q 81
#define KEY_q 113

1042
isdn4k-utils.spec
View File

File diff suppressed because it is too large Load Diff

74
vbox-tcl-8.6.patch Normal file
View File

@ -0,0 +1,74 @@
diff -up isdn4k-utils-3.27_20151118/ipppd/main.c.than isdn4k-utils-3.27_20151118/ipppd/main.c
--- isdn4k-utils-3.27_20151118/ipppd/main.c.than 2015-11-18 21:13:04.575352833 +0100
+++ isdn4k-utils-3.27_20151118/ipppd/main.c 2015-11-18 21:39:36.637385767 +0100
@@ -1297,12 +1297,13 @@ int vfmtmsg(char *buf,int buflen,char *f
break;
case 'r':
f = va_arg(args, char *);
- a = va_arg(args, va_list);
+ va_copy(a, args);
#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
+ va_end(a);
buf += n;
buflen -= n;
continue;
diff -up isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c.than isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c
diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c
--- isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than 2015-11-18 21:10:11.454980332 +0100
+++ isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c 2015-11-18 21:10:53.089588917 +0100
@@ -1134,11 +1134,11 @@ char *prefix2provider_variant(int pref
return s;
}
-inline int getNProvider( void ) {
+extern inline int getNProvider( void ) {
return nProvider;
}
-inline int isProviderBooked( int i) {
+extern inline int isProviderBooked( int i) {
return Provider[i].booked;
}
diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h
diff -up isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c
--- isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than 2015-11-18 21:45:31.798046888 +0100
+++ isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c 2015-11-18 21:45:44.743925189 +0100
@@ -4,6 +4,8 @@
** Copyright 1996-1998 Michael 'Ghandi' Herold <michael@abadonna.mayn.de>
*/
+#define USE_INTERP_ERRORLINE
+
#ifdef HAVE_CONFIG_H
# include "../config.h"
#endif
diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in
--- isdn4k-utils-3.27_20151118/vbox/Makefile.in.than 2015-11-18 21:51:41.090575154 +0100
+++ isdn4k-utils-3.27_20151118/vbox/Makefile.in 2015-11-18 21:52:12.312281654 +0100
@@ -53,7 +53,7 @@ INSTALL_DIRS = @INSTALL@ -d
#----------------------------------------------------------------------------#
CC = @CC@
-VBOX_CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie
+VBOX_CFLAGS = -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie
LDFLAGS = @LDFLAGS@ -pie
#----------------------------------------------------------------------------#
diff -up isdn4k-utils-3.27_20151118/vbox/src/script.c.than isdn4k-utils-3.27_20151118/vbox/src/script.c
--- isdn4k-utils-3.27_20151118/vbox/src/script.c.than 2015-11-18 21:40:49.833697651 +0100
+++ isdn4k-utils-3.27_20151118/vbox/src/script.c 2015-11-18 21:45:17.911177444 +0100
@@ -4,6 +4,9 @@
** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold
*/
+#define USE_INTERP_RESULT
+#define USE_INTERP_ERRORLINE
+
#include "config.h"
#if TIME_WITH_SYS_TIME