[packages/isdn4k-utils] - added am patch (fixes build with automake 1.13) - added libc patch (fixes build with recent glibc)
qboosh
qboosh at pld-linux.org
Sun Jan 27 07:41:29 CET 2013
commit 994c63cc8655759b1c1b39f942f1ce19ed135ff5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 27 07:42:12 2013 +0100
- added am patch (fixes build with automake 1.13)
- added libc patch (fixes build with recent glibc)
- added gcc patch (fixes build with gcc 4.x)
- added tcl patch (fixes tcl 8.5 detection)
- added sh patch (fixes build with non-bash /bin/sh)
- added opt patch (use optflags)
isdn4k-utils-am.patch | 38 +++++++
isdn4k-utils-gcc.patch | 112 +++++++++++++++++++++
isdn4k-utils-libc.patch | 21 ++++
isdn4k-utils-opt.patch | 260 ++++++++++++++++++++++++++++++++++++++++++++++++
isdn4k-utils-sh.patch | 11 ++
isdn4k-utils-tcl.patch | 26 +++++
isdn4k-utils.spec | 240 +++++++++++++++++++++++++++++++++-----------
7 files changed, 648 insertions(+), 60 deletions(-)
---
diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index 0c78280..4175253 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -15,6 +15,12 @@ Patch1: %{name}-ppc.patch
Patch2: %{name}-pppdcapiplugin.patch
Patch3: %{name}-isdnlog_dont_touch_etc_services.patch
Patch4: %{name}-libdir.patch
+Patch5: %{name}-am.patch
+Patch6: %{name}-libc.patch
+Patch7: %{name}-gcc.patch
+Patch8: %{name}-tcl.patch
+Patch9: %{name}-sh.patch
+Patch10: %{name}-opt.patch
URL: http://www.isdn4linux.de/
BuildRequires: autoconf
BuildRequires: automake
@@ -22,12 +28,18 @@ BuildRequires: libtool
BuildRequires: ncurses-ext-devel
BuildRequires: ppp-plugin-devel
BuildRequires: rpmbuild(macros) >= 1.145
-BuildRequires: tcl-devel >= 8.3.4-10
+BuildRequires: sed >= 4.0
+BuildRequires: tcl-devel >= 8.4
+BuildRequires: xorg-cf-files >= 1.0.4-2
+BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXmu-devel
+BuildRequires: xorg-lib-libXpm-devel
+BuildRequires: xorg-lib-libXt-devel >= 1.0.0
+BuildRequires: xorg-util-imake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
-%define xincludedir /usr/X11R6/include/X11
-%define _appdefsdir /usr/X11R6/lib/X11/app-defaults
+%define _appdefsdir /usr/share/X11/app-defaults
%define ppp_ver %(awk -F'"' '/VERSION/ { print $2 }' /usr/include/pppd/patchlevel.h 2>/dev/null || echo ERROR)
%description
@@ -44,6 +56,7 @@ Summary: Utilities for the kernel ISDN-subsystem - frontend for X11
Summary(pl.UTF-8): Narzędzia dla podsystemu ISDN jądra - nakladki dla X11
Group: Applications/Communications
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: xorg-lib-libXt >= 1.0.0
%description x11
Utilities for the kernel ISDN-subsystem and some contributions (X11).
@@ -51,11 +64,13 @@ Utilities for the kernel ISDN-subsystem and some contributions (X11).
%description x11 -l pl.UTF-8
Narzędzia dla podsystemu ISDN jądra, nakładki graficzne (X11).
+# rename to -x11-bitmaps ?
%package devel
Summary: Developement files for isdn4k-tools
Summary(pl.UTF-8): Pliki potrzebne do programowania z użyciem isdn4k-tools
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: xorg-data-bitmaps
%description devel
Developement files for isdn4k-tools.
@@ -63,21 +78,9 @@ Developement files for isdn4k-tools.
%description devel -l pl.UTF-8
Pliki potrzebne do programowania z użyciem isdn4k-tools.
-%package -n ppp-plugin-capi
-Summary: capiplugin for pppd-%{ppp_ver}
-Summary(pl.UTF-8): Wtyczka capi dla pppd w wersji %{ppp_ver}
-Group: Applications/Communications
-%{requires_eq_to ppp ppp-plugin-devel}
-
-%description -n ppp-plugin-capi
-capiplugin for pppd-%{ppp_ver}.
-
-%description -n ppp-plugin-capi -l pl.UTF-8
-Wtyczka capi dla pppd w wersji %{ppp_ver}.
-
%package -n capi
Summary: Program which can initialize CAPI hardware
-Summary(pl.UTF-8): Program, który inicjalizuje sprzęt ISDN zgodny z CAPI
+Summary(pl.UTF-8): Program inicjujący sprzęt ISDN zgodny z CAPI
Group: Applications/Communications
%description -n capi
@@ -158,7 +161,7 @@ CAPI) otwiera nowy wymiar w świecie technologii komunikacyjnych.
Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
Ten pakiet zawiera pliki niezbędne przy tworzeniu programów
-wykorzystujących standard CAPI 2.0
+wykorzystujących standard CAPI 2.0.
%package -n capi-tools
Summary: CAPI 2.0 - useful programs
@@ -171,7 +174,7 @@ opens up a new dimension in communication technologies. It provides a
uniform, independent interface to ISDN hardware components.
This package contains programs which can make use of your CAPI
-compilant ISDN hardware
+compliant ISDN hardware.
%description -n capi-tools -l pl.UTF-8
Standard Common ISDN Application Programming Interface (w skrócie
@@ -181,8 +184,21 @@ Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
Ten pakiet zawiera programy, które potrafią zrobić użytek ze zgodnego
z CAPI sprzętu ISDN.
+%package -n ppp-plugin-capi
+Summary: CAPI plugin for pppd-%{ppp_ver}
+Summary(pl.UTF-8): Wtyczka CAPI dla pppd w wersji %{ppp_ver}
+Group: Applications/Communications
+%{requires_eq_to ppp ppp-plugin-devel}
+
+%description -n ppp-plugin-capi
+CAPI plugin for pppd-%{ppp_ver}.
+
+%description -n ppp-plugin-capi -l pl.UTF-8
+Wtyczka CAPI dla pppd w wersji %{ppp_ver}.
+
%prep
%setup -q -n %{name}
+find . -type d -name CVS | xargs %{__rm} -r
%patch0 -p1
%ifarch ppc
%patch1 -p1
@@ -190,42 +206,65 @@ z CAPI sprzętu ISDN.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+# don't symlink app-defaults dir to /etc/X11
+%{__sed} -i -e 's, at xmkmf,imake -I%{_libdir}/X11/config -DUseInstalled -DUseSeparateConfDir=NO,' xisdnload/Makefile.in
%build
-for i in capi20 capifax capiinfo capiinit rcapid; do
+cd capi20
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ..
+for i in capifax capiinfo capiinit rcapid; do
cd $i
- %{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
cd ..
done
+cd vbox
+%{__aclocal}
+%{__autoconf}
+cd ..
cp %{SOURCE1} .config
%{__make} subconfig \
+ CC="%{__cc}" \
+ CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
+ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
CONFIG_LIBDIR=%{_libdir} \
- OPTIM="%{rpmcflags}"\
- CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+ OPTIM="%{rpmcflags}"
+# explicit CC/CCFLAGS for imontty and few other dirs
%{__make} \
+ CC="%{__cc}" \
+ CCFLAGS="%{rpmcflags}" \
PPPVERSION=%{ppp_ver} \
- CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+ XAPPLOADDIR=%{_appdefsdir}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},/var/lock/isdn,%{_datadir}/doc/%{name}-%{version}/faq}
+install -d $RPM_BUILD_ROOT{%{_sbindir},/var/lock/isdn}
%{__make} install \
- PPPVERSION=%{ppp_ver} \
+ DESTDIR=$RPM_BUILD_ROOT \
CONFIG_LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
+ INCROOT=%{_includedir} \
+ PPPVERSION=%{ppp_ver} \
+ XAPPLOADDIR=%{_appdefsdir}
-mv -f $RPM_BUILD_ROOT%{_datadir}/doc/isdn4linux/faq/*.txt \
- $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/faq
-mv -f $RPM_BUILD_ROOT%{_datadir}/doc/isdn4linux/faq/*.html \
- $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/faq
-mv -f $RPM_BUILD_ROOT%{_datadir}/doc/vbox/*.txt \
- $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+test ! -d isdn-doc || %{__rm} -r isdn-doc
+install -d isdn-doc/faq
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/isdn4linux/faq/*.{txt,html} isdn-doc/faq
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/isdn4linux/faq/*.sgml
%clean
rm -rf $RPM_BUILD_ROOT
@@ -235,19 +274,93 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README FAQ NEWS LEGAL.ipppcomp ipppcomp/README.LZS Mini-FAQ/*.txt
-%doc isdnlog/{tools/dest/README*,isdnrep/CHANGES*}
-%doc FAQ/{_howto,_example}
+%doc README FAQ NEWS LEGAL.ipppcomp ipppcomp/README.LZS Mini-FAQ/isdn-faq.txt isdnlog/{tools/dest/README.*,isdnrep/CHANGES.isdnrep} FAQ/{_howto,_example} isdn-doc/faq
%dir %{_sysconfdir}/isdn
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/*
-%attr(755,root,root) %{_bindir}/[!cx]*
-%attr(755,root,root) %{_sbindir}/[!acr]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/callerid.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/isdn.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/isdnlog.isdnctrl0.options
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/isdnlog.users
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/rate.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/vboxd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/vboxgetty.conf
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isdn/stop
+%attr(755,root,root) %{_bindir}/autovbox
+%attr(755,root,root) %{_bindir}/rmdtovbox
+%attr(755,root,root) %{_bindir}/isdnbill
+%attr(755,root,root) %{_bindir}/isdnconf
+%attr(755,root,root) %{_bindir}/isdnrate
+%attr(755,root,root) %{_bindir}/isdnrep
+%attr(755,root,root) %{_bindir}/vbox
+%attr(755,root,root) %{_bindir}/vboxbeep
+%attr(755,root,root) %{_bindir}/vboxcnvt
+%attr(755,root,root) %{_bindir}/vboxctrl
+%attr(755,root,root) %{_bindir}/vboxmail
+%attr(755,root,root) %{_bindir}/vboxmode
+%attr(755,root,root) %{_bindir}/vboxplay
+%attr(755,root,root) %{_bindir}/vboxtoau
+%attr(755,root,root) %{_sbindir}/hisaxctrl
+%attr(755,root,root) %{_sbindir}/icnctrl
+%attr(755,root,root) %{_sbindir}/imon
+%attr(755,root,root) %{_sbindir}/imontty
+%attr(755,root,root) %{_sbindir}/ipppd
+%attr(755,root,root) %{_sbindir}/ipppstats
+%attr(755,root,root) %{_sbindir}/iprofd
+%attr(755,root,root) %{_sbindir}/isdnctrl
+%attr(755,root,root) %{_sbindir}/isdnlog
+%attr(755,root,root) %{_sbindir}/loopctrl
+%attr(755,root,root) %{_sbindir}/mkzonedb
+%attr(755,root,root) %{_sbindir}/pcbitctl
+%attr(755,root,root) %{_sbindir}/vboxd
+%attr(755,root,root) %{_sbindir}/vboxgetty
+%attr(755,root,root) %{_sbindir}/vboxputty
%{_prefix}/lib/isdn
%dir /var/lock/isdn
-%{_mandir}/man1/[!x]*
-%{_mandir}/man[457]/*
-%{_mandir}/man8/[!ac]*
+%{_mandir}/man1/autovbox.1*
+%{_mandir}/man1/rmdtovbox.1*
+%{_mandir}/man1/isdnconf.1*
+%{_mandir}/man1/isdnrate.1*
+%{_mandir}/man1/isdnrep.1*
+%{_mandir}/man1/vbox.1*
+%{_mandir}/man1/vboxbeep.1*
+%{_mandir}/man1/vboxconvert.1*
+%{_mandir}/man1/vboxctrl.1*
+%{_mandir}/man1/vboxmode.1*
+%{_mandir}/man1/vboxplay.1*
+%{_mandir}/man1/vboxtoau.1*
+%{_mandir}/man4/isdn_audio.4*
+%{_mandir}/man4/isdnctrl.4*
+%{_mandir}/man4/isdninfo.4*
+%{_mandir}/man4/ttyI.4*
+%{_mandir}/man5/callerid.conf.5*
+%{_mandir}/man5/isdn.conf.5*
+%{_mandir}/man5/isdnformat.5*
+%{_mandir}/man5/isdnlog.5*
+%{_mandir}/man5/isdnlog.users.5*
+%{_mandir}/man5/rate-files.5*
+%{_mandir}/man5/vbox.conf.5*
+%{_mandir}/man5/vbox_file.5*
+%{_mandir}/man5/vboxd.conf.5*
+%{_mandir}/man5/vboxgetty.conf.5*
+%{_mandir}/man5/vboxrc.5*
+%{_mandir}/man5/vboxtcl.5*
+%{_mandir}/man7/isdn_cause.7*
%{_mandir}/man8/.isdnctrl_conf.8*
+%{_mandir}/man8/hisaxctrl.8*
+%{_mandir}/man8/icnctrl.8*
+%{_mandir}/man8/imon.8*
+%{_mandir}/man8/imontty.8*
+%{_mandir}/man8/ipppd.8*
+%{_mandir}/man8/ipppstats.8*
+%{_mandir}/man8/iprofd.8*
+%{_mandir}/man8/isdnctrl.8*
+%{_mandir}/man8/isdnlog.8*
+%{_mandir}/man8/loopctrl.8*
+%{_mandir}/man8/mkzonedb.8*
+%{_mandir}/man8/pcbitctl.8*
+%{_mandir}/man8/vboxd.8*
+%{_mandir}/man8/vboxgetty.8*
+%{_mandir}/man8/vboxmail.8*
+%{_mandir}/man8/vboxputty.8*
%files x11
%defattr(644,root,root,755)
@@ -259,38 +372,45 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%{xincludedir}/bitmaps/*
+%{_includedir}/X11/bitmaps/net*
-%files -n capi-libs-static
+%files -n capi
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%doc capiinit/capi.conf
+%attr(755,root,root) %{_sbindir}/capiinit
-%files -n ppp-plugin-capi
+%files -n capi-libs
%defattr(644,root,root,755)
-%doc pppdcapiplugin/{README,examples/*,peers/*}
-%attr(755,root,root) %{_libdir}/pppd/%{ppp_ver}/*
-%{_mandir}/man8/capiplugin*
+%attr(755,root,root) %{_libdir}/libcapi20.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcapi20.so.2
-%files -n capi-libs
+%files -n capi-libs-static
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
+%{_libdir}/libcapi20.a
+%{_libdir}/libcapi20dyn.a
%files -n capi-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libcapi20.so
+%{_libdir}/libcapi20.la
+%{_includedir}/capi20.h
+%{_includedir}/capicmd.h
+%{_includedir}/capiutils.h
%files -n capi-tools
%defattr(644,root,root,755)
%doc rcapid/README
-%attr(755,root,root) %{_sbindir}/[ar]*
+%attr(755,root,root) %{_sbindir}/avmcapictrl
+%attr(755,root,root) %{_sbindir}/rcapid
%attr(755,root,root) %{_bindir}/capiinfo
-%attr(755,root,root) %{_bindir}/capifax*
-%{_mandir}/man8/avmcapi*
-%{_mandir}/man8/capiinfo*
+%attr(755,root,root) %{_bindir}/capifax
+%attr(755,root,root) %{_bindir}/capifaxrcvd
+%{_mandir}/man8/avmcapictrl.8*
+%{_mandir}/man8/capiinfo.8*
-%files -n capi
+%files -n ppp-plugin-capi
%defattr(644,root,root,755)
-%doc capiinit/capi.conf
-%attr(755,root,root) %{_sbindir}/capiinit
+%doc pppdcapiplugin/{README,examples/*,peers/*}
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_ver}/capiplugin.so
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_ver}/userpass.so
+%{_mandir}/man8/capiplugin.8*
diff --git a/isdn4k-utils-am.patch b/isdn4k-utils-am.patch
new file mode 100644
index 0000000..b256c8a
--- /dev/null
+++ b/isdn4k-utils-am.patch
@@ -0,0 +1,38 @@
+--- isdn4k-utils/capifax/configure.in.orig 2002-07-04 12:25:21.000000000 +0200
++++ isdn4k-utils/capifax/configure.in 2013-01-25 22:11:27.429865260 +0100
+@@ -37,5 +37,5 @@
+ AC_SUBST(INSTALL)
+ AC_SUBST(CONFIG_SBINDIR)
+ AC_SUBST(CONFIG_MANDIR)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(Makefile)
+--- isdn4k-utils/capiinfo/configure.in.orig 2002-07-19 23:23:51.000000000 +0200
++++ isdn4k-utils/capiinfo/configure.in 2013-01-25 22:17:52.826523897 +0100
+@@ -42,5 +42,5 @@
+ AC_SUBST(I4LVERSION)
+ AC_SUBST(CONFIG_SBINDIR)
+ AC_SUBST(CONFIG_MANDIR)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(Makefile)
+--- isdn4k-utils/capiinit/configure.in.orig 2002-07-06 02:11:17.000000000 +0200
++++ isdn4k-utils/capiinit/configure.in 2013-01-25 22:19:13.129855554 +0100
+@@ -20,5 +20,5 @@
+ AC_SUBST(INSTALL)
+ AC_SUBST(CONFIG_SBINDIR)
+ AC_SUBST(CONFIG_MANDIR)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(Makefile)
+--- isdn4k-utils/vbox/configure.in.orig 1998-11-23 10:18:04.000000000 +0100
++++ isdn4k-utils/vbox/configure.in 2013-01-26 18:28:11.065010301 +0100
+@@ -3,7 +3,7 @@
+ dnl to configure the system for the local environment.
+
+ AC_INIT(src/vboxgetty.h)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+
+ dnl #------------------------------------------------------------------------#
+ dnl # Version of the vbox package. Theres no need to change this ;-) #
diff --git a/isdn4k-utils-gcc.patch b/isdn4k-utils-gcc.patch
new file mode 100644
index 0000000..12d782d
--- /dev/null
+++ b/isdn4k-utils-gcc.patch
@@ -0,0 +1,112 @@
+--- isdn4k-utils/lib/libtools.c.orig 1999-11-03 17:13:36.000000000 +0100
++++ isdn4k-utils/lib/libtools.c 2013-01-25 22:33:39.569837494 +0100
+@@ -710,7 +710,7 @@
+ break;
+ case 'r': _mode |= R_OK;
+ break;
+- default :
++ default : ;
+ }
+ }
+
+--- isdn4k-utils/isdnlog/isdnlog/processor.c.orig 2004-01-11 11:15:51.000000000 +0100
++++ isdn4k-utils/isdnlog/isdnlog/processor.c 2013-01-25 22:42:02.836493672 +0100
+@@ -4517,6 +4517,8 @@
+ void procinfo(int channel, CALL * cp, int state) {}
+ #endif
+
++void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */
++
+ static void processctrl(int card, char *s)
+ {
+ register char *ps = s, *p;
+@@ -5564,7 +5566,6 @@
+ tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */
+
+ if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */
+- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */
+ moreinfo();
+ } /* if */
+
+--- isdn4k-utils/isdnlog/tools/rate.c.orig 2004-01-11 11:15:55.000000000 +0100
++++ isdn4k-utils/isdnlog/tools/rate.c 2013-01-26 08:10:13.989116438 +0100
+@@ -1810,7 +1810,7 @@
+ numbers++;
+ number=realloc(number, numbers*sizeof(int));
+ number[numbers-1]=i;
+- skip:
++ skip: ;
+ }
+
+ while (isblank(*s)) s++;
+@@ -2381,7 +2381,7 @@
+ }
+ }
+ return UNKNOWN;
+- done:
++ done: ;
+ }
+ }
+ }
+--- isdn4k-utils/isdnlog/tools/isdnrate.c.orig 2004-01-11 11:15:55.000000000 +0100
++++ isdn4k-utils/isdnlog/tools/isdnrate.c 2013-01-26 09:01:50.325718566 +0100
+@@ -318,7 +318,7 @@
+
+ static void print_header(void);
+
+-static char *myname, *myshortname;
++char *myname, *myshortname;
+ static char options[] = "ab:c:d:f:h:i:l:op:r:st:v::x:CD::G:HLNP:O:S:TUVX::Z";
+ static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n";
+
+@@ -327,7 +327,7 @@
+ static int usestat = 0;
+ static int duration = LCR_DURATION;
+ static time_t start;
+-static int day, month, year, hour, min, sec;
++int day, month, year, hour, min, sec;
+ static char ignore[MAXPROVIDER];
+ static char *fromarea = 0;
+ static char wanted_day;
+--- isdn4k-utils/hisax/hisaxctrl.c.orig 2000-06-29 19:38:26.000000000 +0200
++++ isdn4k-utils/hisax/hisaxctrl.c 2013-01-26 09:46:23.125662858 +0100
+@@ -37,13 +37,13 @@
+ read_firmware(unsigned char *fname)
+ {
+ FILE *infile;
+- int *p, cnt;
++ int cnt;
+
+ if (!(infile = fopen(fname, "rb"))) {
+ fprintf(stderr, "cannot open file %s\n", fname);
+ exit(-1);
+ }
+- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4);
++ buffer = (unsigned char *) malloc(MAX_SIZE+4);
+ if (!buffer) {
+ fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4);
+ exit(-1);
+@@ -54,7 +54,7 @@
+ fprintf(stderr, "wrong filesize\n");
+ exit(-1);
+ }
+- *p = cnt;
++ memcpy(buffer, &cnt, 4);
+ return(buffer);
+ }
+
+--- isdn4k-utils/ipppd/main.c.orig 2004-01-11 11:15:45.000000000 +0100
++++ isdn4k-utils/ipppd/main.c 2013-01-26 10:43:53.802257602 +0100
+@@ -1044,10 +1044,10 @@
+ static char line[256]; /* line to be logged accumulated here */
+ static char *linep;
+
++static void pr_log __P((void *, char *, ...));
++
+ void log_packet(u_char *p,int len,char *prefix,int linkunit)
+ {
+- static void pr_log __P((void *, char *, ...));
+-
+ int i, n;
+ u_short proto;
+ u_char x;
diff --git a/isdn4k-utils-libc.patch b/isdn4k-utils-libc.patch
new file mode 100644
index 0000000..ed65c3c
--- /dev/null
+++ b/isdn4k-utils-libc.patch
@@ -0,0 +1,21 @@
+--- isdn4k-utils/isdnlog/tools/cdb/cdbmake.c.orig 2002-01-31 20:59:44.000000000 +0100
++++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2013-01-25 22:27:23.709845326 +0100
+@@ -3,8 +3,6 @@
+ #include "freecdbmake.h"
+ #include <unistd.h>
+
+-extern char *malloc();
+-
+ void diesys(why) char *why; { perror(why); exit(111); }
+
+ void writeerror() { diesys("cdbmake: fatal: unable to write"); }
+--- isdn4k-utils/capi20/capi20.h.orig 2000-04-03 16:27:15.000000000 +0200
++++ isdn4k-utils/capi20/capi20.h 2013-01-26 10:34:21.538936192 +0100
+@@ -20,6 +20,7 @@
+ #ifndef __CAPI20_H__
+ #define __CAPI20_H__
+
++#include <stddef.h>
+ #include <sys/time.h>
+
+ #ifdef __cplusplus
diff --git a/isdn4k-utils-opt.patch b/isdn4k-utils-opt.patch
new file mode 100644
index 0000000..9b0b868
--- /dev/null
+++ b/isdn4k-utils-opt.patch
@@ -0,0 +1,260 @@
+--- isdn4k-utils/isdnlog/tools/cdb/Makefile.in.orig 2000-08-15 17:16:23.000000000 +0200
++++ isdn4k-utils/isdnlog/tools/cdb/Makefile.in 2013-01-26 19:47:47.128244088 +0100
+@@ -20,7 +20,9 @@
+ BINDIR:=$(DESTDIR)@prefix@/bin
+ INCDIR:=$(DESTDIR)@prefix@/include
+
+-CFLAGS:=-Wall -O2
++CC=@CC@
++CFLAGS=@CFLAGS@ -Wall
++CPPFLAGS=@CPPFLAGS@ -Wall
+
+ all: depend $(FILES)
+
+--- isdn4k-utils/imon/Makefile.in.orig 2013-01-26 20:03:13.501558111 +0100
++++ isdn4k-utils/imon/Makefile.in 2013-01-26 20:10:12.841549371 +0100
+@@ -7,7 +7,8 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall
++CPPFLAGS = @CPPFLAGS@
+ INCLUDES = -I.
+ LDFLAGS = -L../lib @LIBS@
+ PROGRAM = imon
+@@ -28,7 +29,7 @@
+ .SUFFIXES: .c .o
+
+ %.o: %.c Makefile
+- $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
+
+ all: $(PROGRAM)
+
+--- isdn4k-utils/isdnlog/Makefile.in.orig 2013-01-26 20:03:13.518224778 +0100
++++ isdn4k-utils/isdnlog/Makefile.in 2013-01-26 20:14:31.764877308 +0100
+@@ -1633,12 +1633,8 @@
+
+ # export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+
+-export CFLAGS = -Wall -pipe
+-ifndef _CC
+-export _CC = gcc
+-endif
+-
+-CC = $(_CC)
++export CFLAGS = @CFLAGS@ -Wall -pipe
++CC = @CC@
+
+ INCLUDE = -I./isdnlog -I./connect -I./tools -I$(PREFIXDIR) -I$(LIBISDNDIR)
+
+--- isdn4k-utils/imontty/Makefile.orig 2013-01-26 20:36:48.114849455 +0100
++++ isdn4k-utils/imontty/Makefile 2013-01-26 20:51:40.354830857 +0100
+@@ -32,7 +32,7 @@
+ all: $(PROGS)
+
+ imontty: imontty.c imontty.h
+- cc $(CCFLAGS) -o imontty imontty.c
++ $(CC) $(CCFLAGS) -o imontty imontty.c
+
+ rootperm:
+ @echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
+--- isdn4k-utils/isdnctrl/Makefile.in.orig 2013-01-26 20:54:07.324827793 +0100
++++ isdn4k-utils/isdnctrl/Makefile.in 2013-01-26 21:01:51.744818113 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall -DVERSION=\"@I4LVERSION@\"
+ INCLUDES = -I.
+ LDFLAGS = @LIBS@
+ PROGRAM = isdnctrl
+@@ -17,7 +17,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = $(INSTALL) -m 0750
+ INSTALL_MAN = $(INSTALL) -m 0644
+-CC = @CC@ -DVERSION=\"@I4LVERSION@\"
++CC = @CC@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+
+--- isdn4k-utils/xisdnload/Makefile.in.orig 2013-01-26 21:02:14.011484316 +0100
++++ isdn4k-utils/xisdnload/Makefile.in 2013-01-26 22:12:24.118063231 +0100
+@@ -17,7 +17,7 @@
+ all: xisdnload
+
+ xisdnload:
+- CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(EDEF)"
++ CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(EDEF)" CDEBUGFLAGS="$(CCFLAGS)" CC="$(CC)"
+
+ config:
+ @cp Makefile.in GNUmakefile
+--- isdn4k-utils/xmonisdn/Makefile.in.orig 2002-07-19 23:23:55.000000000 +0200
++++ isdn4k-utils/xmonisdn/Makefile.in 2013-01-26 22:13:13.154728877 +0100
+@@ -48,7 +48,7 @@
+ mkdir -p X11/bitmaps
+ cp netinactive netwaiting netactive \
+ netactiveout netstart netstop X11/bitmaps
+- CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)"
++ CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)" CDEBUGFLAGS="$(CCFLAGS)" CC="$(CC)"
+ rm -rf X11
+
+ xmonisdn.man: xmonisdn.man.in Makefile
+--- isdn4k-utils/isdnlog/Makefile.in.orig 2013-01-26 21:02:14.008150983 +0100
++++ isdn4k-utils/isdnlog/Makefile.in 2013-01-26 22:13:57.434727954 +0100
+@@ -1714,8 +1714,7 @@
+ PCFLAGS = mode=oracle ireclen=160 lines=yes
+
+ %.o: %.c
+- @echo Compiling $<
+- @$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -c -o $@ $<
++ $(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -c -o $@ $<
+
+ %.1: %.man
+ MANDATE=`grep CHECKIN $< | $(AWK) '{print $$4}'`; \
+--- isdn4k-utils/iprofd/Makefile.in.orig 2013-01-26 22:14:19.808060821 +0100
++++ isdn4k-utils/iprofd/Makefile.in 2013-01-26 22:32:02.101372014 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall
+ INCLUDES = -I.
+ LDFLAGS = -L../lib @LIBS@
+ PROGRAM = iprofd
+--- isdn4k-utils/icn/Makefile.in.orig 2013-01-26 22:14:19.808060821 +0100
++++ isdn4k-utils/icn/Makefile.in 2013-01-26 22:32:43.214704487 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall
+ INCLUDES = -I.
+ DEFS =
+ LDFLAGS = -L../lib @LIBS@
+--- isdn4k-utils/pcbit/Makefile.in.orig 2013-01-26 22:14:19.811394154 +0100
++++ isdn4k-utils/pcbit/Makefile.in 2013-01-26 22:33:13.934703847 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -Wstrict-prototypes -O2 -g
++CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes
+ INCLUDES = -I. -DDEBUG
+ LDFLAGS = -L../lib @LIBS@
+ PROGRAM = pcbitctl
+--- isdn4k-utils/hisax/Makefile.in.orig 2013-01-26 22:14:19.808060821 +0100
++++ isdn4k-utils/hisax/Makefile.in 2013-01-26 22:33:42.911369911 +0100
+@@ -6,7 +6,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2 -I.
++CFLAGS = @CFLAGS@ -Wall -I.
+ LDFLAGS = -L../lib @LIBS@
+ PROGRAMS =
+ MODULES = hisaxctrl.o
+--- isdn4k-utils/capiinfo/Makefile.am.orig 2000-10-20 19:14:20.000000000 +0200
++++ isdn4k-utils/capiinfo/Makefile.am 2013-01-26 22:34:53.928035099 +0100
+@@ -8,7 +8,7 @@
+ stamp-h.in comperr
+
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
++AM_CFLAGS = -Wall
+ LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+
+--- isdn4k-utils/avmb1/Makefile.in.orig 2013-01-26 22:14:19.804727488 +0100
++++ isdn4k-utils/avmb1/Makefile.in 2013-01-26 22:35:35.098034238 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall
+ LDFLAGS = -L../lib @LIBS@
+ INCLUDES = -I.
+ PROGRAMS = avmcapictrl
+--- isdn4k-utils/capiinit/Makefile.am.orig 2000-03-17 17:19:43.000000000 +0100
++++ isdn4k-utils/capiinit/Makefile.am 2013-01-26 22:36:24.354699878 +0100
+@@ -8,7 +8,7 @@
+ stamp-h.in comperr core
+
+ INCLUDES = $(all_includes)
+-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
++AM_CFLAGS = -Wall -D_GNU_SOURCE
+ LDFLAGS = $(all_libraries)
+ LDADD =
+
+--- isdn4k-utils/loop/Makefile.in.orig 2013-01-26 22:14:19.811394154 +0100
++++ isdn4k-utils/loop/Makefile.in 2013-01-26 22:36:58.991365825 +0100
+@@ -5,7 +5,7 @@
+ #
+ #
+ SHELL = /bin/sh
+-CFLAGS = -Wall -O2
++CFLAGS = @CFLAGS@ -Wall
+ INCLUDES = -I.
+ DEFS =
+ LDFLAGS = -L../lib @LIBS@
+--- isdn4k-utils/ipppstats/Makefile.in.orig 2013-01-26 22:14:19.808060821 +0100
++++ isdn4k-utils/ipppstats/Makefile.in 2013-01-26 22:37:57.108031281 +0100
+@@ -13,7 +13,7 @@
+ PPPSTATSRCS = ipppstats.c
+ PPPSTATOBJS = ipppstats.o
+
+-CFLAGS = -fomit-frame-pointer -O2
++CFLAGS = @CFLAGS@ -fomit-frame-pointer
+
+ all: ipppstats
+
+--- isdn4k-utils/ipppd/Makefile.in.orig 2013-01-26 22:14:19.808060821 +0100
++++ isdn4k-utils/ipppd/Makefile.in 2013-01-26 22:39:06.664696509 +0100
+@@ -70,7 +70,7 @@
+
+ DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
+ COMPILE_FLAGS =
+-CFLAGS = -O2 -fomit-frame-pointer -Wall
++CFLAGS = @CFLAGS@ -fomit-frame-pointer -Wall
+ VER = 2.2.0
+
+ # it's a hack
+--- isdn4k-utils/rcapid/Makefile.am.orig 2002-07-19 23:23:54.000000000 +0200
++++ isdn4k-utils/rcapid/Makefile.am 2013-01-26 22:41:53.248026357 +0100
+@@ -8,7 +8,7 @@
+ stamp-h.in comperr
+
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
++AM_CFLAGS = -Wall
+ LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+
+--- isdn4k-utils/capifax/Makefile.am.orig 2000-03-03 16:54:12.000000000 +0100
++++ isdn4k-utils/capifax/Makefile.am 2013-01-26 22:42:29.944692261 +0100
+@@ -8,7 +8,7 @@
+ stamp-h.in
+
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
++AM_CFLAGS = -Wall
+ LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+
+--- isdn4k-utils/pppdcapiplugin/Rules.make.orig 2013-01-26 22:14:19.818060819 +0100
++++ isdn4k-utils/pppdcapiplugin/Rules.make 2013-01-26 22:44:14.688023411 +0100
+@@ -13,7 +13,8 @@
+ CC = gcc
+ INC = -I$(TOPDIR) -I$(CAPIINC)
+ DEFS = -DPPPVER=$(shell $(TOPDIR)/pversion $(PPPVERSION))
+-CFLAGS = -O2
++CCFLAGS = -O2
++CFLAGS = $(CCFLAGS)
+ LDFLAGS = -shared -L$(CAPILIB)
+
+ ALL = capiplugin.so userpass.so
diff --git a/isdn4k-utils-sh.patch b/isdn4k-utils-sh.patch
new file mode 100644
index 0000000..76ff8e0
--- /dev/null
+++ b/isdn4k-utils-sh.patch
@@ -0,0 +1,11 @@
+--- isdn4k-utils/FAQ/configure.in.orig 2000-04-03 02:45:19.000000000 +0200
++++ isdn4k-utils/FAQ/configure.in 2013-01-26 19:46:00.781579636 +0100
+@@ -3,7 +3,7 @@
+
+ dnl Set default installation directory
+ if test -r ../.config ; then
+- source ../.config
++ . ../.config
+ TARGET_DIR=$CONFIG_FAQDIR
+ else
+ TARGET_DIR=./out
diff --git a/isdn4k-utils-tcl.patch b/isdn4k-utils-tcl.patch
new file mode 100644
index 0000000..39b9440
--- /dev/null
+++ b/isdn4k-utils-tcl.patch
@@ -0,0 +1,26 @@
+--- isdn4k-utils/vbox/acinclude.m4.orig 2002-07-06 02:11:19.000000000 +0200
++++ isdn4k-utils/vbox/acinclude.m4 2013-01-26 18:52:37.758313064 +0100
+@@ -36,18 +36,18 @@
+
+ if (test "${gnd_use_tcl_lib}" = "")
+ then
+- gnd_1st_tcl_lib_test="tcl8.4"
+- gnd_2nd_tcl_lib_test="tcl8.3"
++ gnd_1st_tcl_lib_test="tcl8.5"
++ gnd_2st_tcl_lib_test="tcl8.4"
+ gnd_3rd_tcl_lib_test="tcl8.0"
+ else
+ gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}"
+- gnd_2nd_tcl_lib_test="tcl8.4"
+- gnd_3rd_tcl_lib_test="tcl8.3"
++ gnd_2nd_tcl_lib_test="tcl8.5"
++ gnd_3nd_tcl_lib_test="tcl8.4"
+ fi
+
+ AC_CHECK_LIB(m,
+ cos,
+- AC_CHECK_LIB(dl,
++ [AC_CHECK_LIB(dl,
+ dlerror,
+ [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
+ Tcl_CreateInterp,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/isdn4k-utils.git/commitdiff/994c63cc8655759b1c1b39f942f1ce19ed135ff5
More information about the pld-cvs-commit
mailing list