[packages/isdn4k-utils] - updated to 3.25, epoch 3 (note: new libcapi20 soname) - updated make,pppdcapiplugin,am,opt patches

qboosh qboosh at pld-linux.org
Sun Jan 27 15:33:27 CET 2013 

commit d143c4fff51f9b77ede840fabba262ea830355e4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 27 15:34:13 2013 +0100

    - updated to 3.25, epoch 3 (note: new libcapi20 soname)
    - updated make,pppdcapiplugin,am,opt patches and .config
    - removed obsolete ppc,isdnlog_dont_touch_etc_services,libdir,libc,gcc,tcl patches
    - added link patch (fix libcapi20 linking)

 isdn4k-utils-am.patch                              |  24 ++--
 isdn4k-utils-gcc.patch                             | 112 -----------------
 isdn4k-utils-isdnlog_dont_touch_etc_services.patch |  16 ---
 isdn4k-utils-libc.patch                            |  21 ----
 isdn4k-utils-libdir.patch                          |  21 ----
 isdn4k-utils-link.patch                            |  11 ++
 isdn4k-utils-make.patch                            | 139 ++++-----------------
 isdn4k-utils-opt.patch                             |  63 +++-------
 isdn4k-utils-ppc.patch                             |  12 --
 isdn4k-utils-pppdcapiplugin.patch                  | 121 ++++++++----------
 isdn4k-utils-tcl.patch                             |  26 ----
 isdn4k-utils.config                                |  17 ++-
 isdn4k-utils.spec                                  | 109 ++++++++--------
 13 files changed, 188 insertions(+), 504 deletions(-)
---
diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index 4175253..f4fe9d0 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -2,33 +2,31 @@ Summary:	Utilities for the kernel ISDN-subsystem
 Summary(pl.UTF-8):	Narzędzia dla podsystemu ISDN jądra
 Summary(pt_BR.UTF-8):	Utilitários para configuração do subsistema ISDN
 Name:		isdn4k-utils
-Version:	040111
-Release:	4
-Epoch:		2
+Version:	3.25
+Release:	1
+Epoch:		3
 License:	GPL v2
 Group:		Applications/Communications
-Source0:	http://rk.pop.e-wro.pl/%{name}-%{version}.tar.gz
-# Source0-md5:	6955ecdcd7df5bc8fa2844fa9c45bbf6
+# git clone git://git.misdn.eu/isdn4k-utils.git
+# git checkout v3.25
+Source0:	%{name}-%{version}.tar.xz
+# Source0-md5:	cb297fd819a146f4c7afc6bc9706ac51
 Source1:	%{name}.config
 Patch0:		%{name}-make.patch
-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
+Patch1:		%{name}-pppdcapiplugin.patch
+Patch2:		%{name}-am.patch
+Patch3:		%{name}-sh.patch
+Patch4:		%{name}-opt.patch
+Patch5:		%{name}-link.patch
 URL:		http://www.isdn4linux.de/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	ncurses-ext-devel
 BuildRequires:	ppp-plugin-devel
 BuildRequires:	rpmbuild(macros) >= 1.145
 BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	tcl-devel >= 8.4
 BuildRequires:	xorg-cf-files >= 1.0.4-2
 BuildRequires:	xorg-lib-libXaw-devel
@@ -36,9 +34,9 @@ BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-lib-libXt-devel >= 1.0.0
 BuildRequires:	xorg-util-imake
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sbindir	/sbin
 %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)
 
@@ -198,20 +196,12 @@ 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
-%endif
 %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
@@ -223,17 +213,14 @@ cd capi20
 %{__autoconf}
 %{__automake}
 cd ..
-for i in capifax capiinfo capiinit rcapid; do
+for i in capifax capiinfo capiinit rcapid vbox; do
 	cd $i
 	%{__aclocal}
 	%{__autoconf}
+	[ "$i" == "rcapid" ] || %{__autoheader}
 	%{__automake}
 	cd ..
 done
-cd vbox
-%{__aclocal}
-%{__autoconf}
-cd ..
 
 cp %{SOURCE1} .config
 %{__make} subconfig \
@@ -252,7 +239,7 @@ cp %{SOURCE1} .config
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},/var/lock/isdn}
+install -d $RPM_BUILD_ROOT{/var/lock/isdn,/sbin}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -265,6 +252,10 @@ 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
+# vbox.txt packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vbox
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/capi/lib_capi_mod_*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -274,16 +265,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%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
+%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 vbox/doc/de/vbox.txt
 %dir %{_sysconfdir}/isdn
 %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
+%dir %{_sysconfdir}/vbox
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vbox/vboxd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vbox/vboxgetty.conf
 %attr(755,root,root) %{_bindir}/autovbox
 %attr(755,root,root) %{_bindir}/rmdtovbox
 %attr(755,root,root) %{_bindir}/isdnbill
@@ -294,29 +286,30 @@ rm -rf $RPM_BUILD_ROOT
 %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) /sbin/actctrl
+%attr(755,root,root) /sbin/hisaxctrl
+%attr(755,root,root) /sbin/icnctrl
+%attr(755,root,root) /sbin/imon
+%attr(755,root,root) /sbin/imontty
+%attr(755,root,root) /sbin/ipppd
+%attr(755,root,root) /sbin/ipppstats
+%attr(755,root,root) /sbin/iprofd
+%attr(755,root,root) /sbin/isdnctrl
+%attr(755,root,root) /sbin/isdnlog
+%attr(755,root,root) /sbin/loopctrl
+%attr(755,root,root) /sbin/mkzonedb
 %attr(755,root,root) %{_sbindir}/vboxd
 %attr(755,root,root) %{_sbindir}/vboxgetty
+%attr(755,root,root) %{_sbindir}/vboxmail
 %attr(755,root,root) %{_sbindir}/vboxputty
 %{_prefix}/lib/isdn
 %dir /var/lock/isdn
 %{_mandir}/man1/autovbox.1*
 %{_mandir}/man1/rmdtovbox.1*
+%{_mandir}/man1/isdnbill.1*
 %{_mandir}/man1/isdnconf.1*
 %{_mandir}/man1/isdnrate.1*
 %{_mandir}/man1/isdnrep.1*
@@ -336,6 +329,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/isdnformat.5*
 %{_mandir}/man5/isdnlog.5*
 %{_mandir}/man5/isdnlog.users.5*
+%{_mandir}/man5/rate.conf.5*
 %{_mandir}/man5/rate-files.5*
 %{_mandir}/man5/vbox.conf.5*
 %{_mandir}/man5/vbox_file.5*
@@ -345,6 +339,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/vboxtcl.5*
 %{_mandir}/man7/isdn_cause.7*
 %{_mandir}/man8/.isdnctrl_conf.8*
+%{_mandir}/man8/actctrl.8*
 %{_mandir}/man8/hisaxctrl.8*
 %{_mandir}/man8/icnctrl.8*
 %{_mandir}/man8/imon.8*
@@ -356,7 +351,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
@@ -377,12 +371,17 @@ rm -rf $RPM_BUILD_ROOT
 %files -n capi
 %defattr(644,root,root,755)
 %doc capiinit/capi.conf
-%attr(755,root,root) %{_sbindir}/capiinit
+%attr(755,root,root) /sbin/capiinit
+%{_mandir}/man8/capiinit.8*
 
 %files -n capi-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcapi20.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcapi20.so.2
+%attr(755,root,root) %ghost %{_libdir}/libcapi20.so.3
+%dir %{_libdir}/capi
+%attr(755,root,root) %{_libdir}/capi/lib_capi_mod_fritzbox.so*
+%attr(755,root,root) %{_libdir}/capi/lib_capi_mod_rcapi.so*
+%attr(755,root,root) %{_libdir}/capi/lib_capi_mod_std.so*
 
 %files -n capi-libs-static
 %defattr(644,root,root,755)
@@ -394,19 +393,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libcapi20.so
 %{_libdir}/libcapi20.la
 %{_includedir}/capi20.h
+%{_includedir}/capi_debug.h
+%{_includedir}/capi_mod.h
 %{_includedir}/capicmd.h
 %{_includedir}/capiutils.h
+%{_pkgconfigdir}/capi20.pc
 
 %files -n capi-tools
 %defattr(644,root,root,755)
 %doc rcapid/README
-%attr(755,root,root) %{_sbindir}/avmcapictrl
-%attr(755,root,root) %{_sbindir}/rcapid
+%attr(755,root,root) /sbin/avmcapictrl
+%attr(755,root,root) /sbin/rcapid
 %attr(755,root,root) %{_bindir}/capiinfo
 %attr(755,root,root) %{_bindir}/capifax
 %attr(755,root,root) %{_bindir}/capifaxrcvd
+%{_mandir}/man1/capifax.1*
 %{_mandir}/man8/avmcapictrl.8*
 %{_mandir}/man8/capiinfo.8*
+%{_mandir}/man8/capifaxrcvd.8*
+%{_mandir}/man8/rcapid.8*
 
 %files -n ppp-plugin-capi
 %defattr(644,root,root,755)
diff --git a/isdn4k-utils-am.patch b/isdn4k-utils-am.patch
index b256c8a..12b3f24 100644
--- a/isdn4k-utils-am.patch
+++ b/isdn4k-utils-am.patch
@@ -16,23 +16,23 @@
 -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)
+--- isdn4k-utils/capiinit/configure.in.orig	2013-01-27 10:27:38.030477094 +0100
++++ isdn4k-utils/capiinit/configure.in	2013-01-27 10:29:47.987141053 +0100
+@@ -24,5 +24,5 @@
  AC_SUBST(CONFIG_SBINDIR)
  AC_SUBST(CONFIG_MANDIR)
+ AC_SUBST(CONFIG_FIRMWAREDIR)
 -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)
+--- isdn4k-utils/vbox/configure.in.orig	2013-01-27 10:27:38.033810427 +0100
++++ isdn4k-utils/vbox/configure.in	2013-01-27 10:30:13.897140511 +0100
+@@ -7,7 +7,7 @@
+ dnl #------------------------------------------------------------------------#
+ AC_INIT(vbox,[2.0.0BETA5])
+ AM_INIT_AUTOMAKE
 -AM_CONFIG_HEADER(src/config.h)
 +AC_CONFIG_HEADERS(src/config.h)
+ AC_CONFIG_SRCDIR(src/vboxgetty.h)
  
- dnl #------------------------------------------------------------------------#
- dnl # Version of the vbox package. Theres no need to change this ;-)         #
+ VERDATE="17-NOV-98"
diff --git a/isdn4k-utils-gcc.patch b/isdn4k-utils-gcc.patch
deleted file mode 100644
index 12d782d..0000000
--- a/isdn4k-utils-gcc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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-isdnlog_dont_touch_etc_services.patch b/isdn4k-utils-isdnlog_dont_touch_etc_services.patch
deleted file mode 100644
index 54035be..0000000
--- a/isdn4k-utils-isdnlog_dont_touch_etc_services.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur isdn4k-utils.orig/isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in
---- isdn4k-utils.orig/isdnlog/Makefile.in	Wed Jun 11 20:52:54 2003
-+++ isdn4k-utils/isdnlog/Makefile.in	Wed Jun 11 20:53:26 2003
-@@ -1872,9 +1872,9 @@
- 		  $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
- 		  echo Installing $(DESTDIR)$(DATADIR)/$$f; \
- 		done
--		@(grep isdnlog $(SERVICEFILE) >/dev/null) || \
--		(echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \
--		echo "isdnlog $(SERV_PORT)/tcp        isdnlog" >> $(SERVICEFILE))
-+#		@(grep isdnlog $(SERVICEFILE) >/dev/null) || \
-+#		(echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \
-+#		echo "isdnlog $(SERV_PORT)/tcp        isdnlog" >> $(SERVICEFILE))
- 
- install-strip:
- 		$(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \
diff --git a/isdn4k-utils-libc.patch b/isdn4k-utils-libc.patch
deleted file mode 100644
index ed65c3c..0000000
--- a/isdn4k-utils-libc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-libdir.patch b/isdn4k-utils-libdir.patch
deleted file mode 100644
index 5082054..0000000
--- a/isdn4k-utils-libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- isdn4k-utils/pppdcapiplugin/Makefile.orig	Fri Apr  2 14:48:38 2004
-+++ isdn4k-utils/pppdcapiplugin/Makefile	Fri Apr  2 15:11:58 2004
-@@ -17,6 +17,6 @@
- MANDIR=/usr/share/man
- 
- #PPPVERSION=$(shell /usr/sbin/pppd --version 2>&1 | sed -e "s/pppd\ version\ //")
--PLUGINDIR=$(DESTDIR)/usr/lib/pppd/$(PPPVERSION)
-+PLUGINDIR=$(DESTDIR)$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
- include $(TOPDIR)/Rules.make
- 
---- isdn4k-utils/Makefile.orig	Fri Apr  2 14:48:38 2004
-+++ isdn4k-utils/Makefile	Fri Apr  2 15:11:32 2004
-@@ -202,7 +202,7 @@
- 	@set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
- 		if [ -x $$i/configure ] ; then \
- 			/bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
--			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
-+			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) --libdir=$(CONFIG_LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
- 		elif [ -f $$i/Makefile.in ] ; then \
- 			/bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
- 			$(MAKE) -C $$i -f Makefile.in config; \
diff --git a/isdn4k-utils-link.patch b/isdn4k-utils-link.patch
new file mode 100644
index 0000000..37f1d61
--- /dev/null
+++ b/isdn4k-utils-link.patch
@@ -0,0 +1,11 @@
+--- isdn4k-utils/capi20/Makefile.am.orig	2013-01-27 08:06:25.000000000 +0100
++++ isdn4k-utils/capi20/Makefile.am	2013-01-27 11:23:08.603741004 +0100
+@@ -10,7 +10,7 @@
+ lib_LIBRARIES   = libcapi20dyn.a
+ 
+ libcapi20_la_SOURCES = capi20.c capifunc.c convert.c capi_defs.h compat/byteswap.h
+-libcapi20_la_LDFLAGS = -version-info ${LIBCAPI_VERSION}:${LIBCAPI_VERSION_RELEASE}:${LIBCAPI_VERSION_AGE} -lc -rdynamic
++libcapi20_la_LDFLAGS = -version-info ${LIBCAPI_VERSION}:${LIBCAPI_VERSION_RELEASE}:${LIBCAPI_VERSION_AGE} -lpthread -rdynamic
+ libcapi20_la_CFLAGS = -fno-strict-aliasing -DLIBDIR=\"$(libdir)/capi\"
+ 
+ modulesdir = $(libdir)/capi
diff --git a/isdn4k-utils-make.patch b/isdn4k-utils-make.patch
index f279d07..d1de5cd 100644
--- a/isdn4k-utils-make.patch
+++ b/isdn4k-utils-make.patch
@@ -132,20 +132,6 @@
  MANPAGE=imontty.8
  
  CCFLAGS=-O2
-@@ -52,10 +52,10 @@
- 	mkdir -p $(DESTDIR)$(MAN8DIR)
- 	$(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
- 
--install: $(PROGS) rootperm install-man
--	install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
-+install: $(PROGS) install-man
-+	install -s $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
- 
--uninstall: rootperm
-+uninstall:
- 	for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
- 
- clean:
 --- ./ipppd/Makefile.in.org	Mon Jul 22 04:00:35 2002
 +++ ./ipppd/Makefile.in	Thu Aug  1 15:02:45 2002
 @@ -11,10 +11,10 @@
@@ -191,17 +177,17 @@
  prefix			= @prefix@
  exec_prefix		= @exec_prefix@
  CC				= @CC@
---- ./isdnctrl/Makefile.in.org	Mon Jul 22 04:00:37 2002
-+++ ./isdnctrl/Makefile.in	Thu Aug  1 15:04:29 2002
+--- isdn4k-utils/isdnctrl/Makefile.in.orig	2013-01-27 08:34:27.770618623 +0100
++++ isdn4k-utils/isdnctrl/Makefile.in	2013-01-27 09:16:32.723899330 +0100
 @@ -15,8 +15,8 @@
  MANDIR			= @CONFIG_MANDIR@
  MAN8DIR			= $(MANDIR)/man8
  INSTALL			= @INSTALL@
--INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
+-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@\"
+ CC			= @CC@ -DVERSION=\"@I4LVERSION@\"
  prefix			= @prefix@
  exec_prefix		= @exec_prefix@
 --- ./isdnlog/tools/dest/Makefile.in.org	Thu Jan 31 21:01:12 2002
@@ -219,19 +205,6 @@
  prefix			= @prefix@
  exec_prefix		= @exec_prefix@
  DATADIR			= @datadir@
---- ./isdnlog/tools/telrate/Makefile.in.org	Fri Dec 24 15:17:08 1999
-+++ ./isdnlog/tools/telrate/Makefile.in	Thu Aug  1 15:22:44 2002
-@@ -8,8 +8,8 @@
- CGIDIR		= @CGIDIR@
- TELDIR		= @TELDIR@
- INSTALL		= @INSTALL@
--INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0755
--INSTALL_FILE	= $(INSTALL) -o 0 -g 0 -m 0644
-+INSTALL_PROGRAM	= $(INSTALL) -m 0755
-+INSTALL_FILE	= $(INSTALL) -m 0644
- 
- FILES = index.html info.html *.jpg *.gif tt.js
- 
 --- ./isdnlog/tools/zone/Makefile.in.org	Tue Jun 12 16:24:17 2001
 +++ ./isdnlog/tools/zone/Makefile.in	Thu Aug  1 13:17:28 2002
 @@ -20,8 +20,8 @@
@@ -269,22 +242,6 @@
  
  LIBISDNDIR		:= @LIBISDNDIR@
  I4LCONFDIR		:= @I4LCONFDIR@
-@@ -1741,10 +1741,11 @@
- endif
- 
- rootperm:
--	@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
--	@if gcc -x c -o G g && rm -f g && ./G ; then \
--		echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
--	fi
-+	echo "No check"
-+#	@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
-+#	@if gcc -x c -o G g && rm -f g && ./G ; then \
-+#		echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
-+#	fi
- 
- uninstall: 
- 		if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
 --- ./lib/Makefile.in.org	Sun Dec 12 18:22:36 1999
 +++ ./lib/Makefile.in	Thu Aug  1 15:06:14 2002
 @@ -11,7 +11,7 @@
@@ -309,75 +266,33 @@
  prefix			= @prefix@
  exec_prefix		= @exec_prefix@
  ifeq (../.config,$(wildcard ../.config))
---- ./pcbit/Makefile.in.org	Mon Jul 22 04:00:40 2002
-+++ ./pcbit/Makefile.in	Thu Aug  1 15:07:46 2002
-@@ -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@
---- ./vbox/Makefile.in.org	Thu Jan 31 21:05:40 2002
-+++ ./vbox/Makefile.in	Thu Aug  1 15:20:52 2002
-@@ -14,33 +14,33 @@
- # [*] Program to install binaries to the sbin directory (eg vboxgetty):      #
- #----------------------------------------------------------------------------#
- 
--INSTALL_SBIN	= @INSTALL@ -m 750 -o root -g root -s
-+INSTALL_SBIN	= @INSTALL@ -m 750 -s
- 
- #----------------------------------------------------------------------------#
- # [*] Program to install binaries to the bin directory (eg vboxconvert):     #
- #----------------------------------------------------------------------------#
- 
--INSTALL_BIN	= @INSTALL@ -m 755 -o root -g root -s
-+INSTALL_BIN	= @INSTALL@ -m 755 -s
- 
- #----------------------------------------------------------------------------#
- # [*] Program to install bash scripts to the bin directory (eg vboxplay):    #
- #----------------------------------------------------------------------------#
- 
--INSTALL_SHBIN	= @INSTALL@ -m 755 -o root -g root
-+INSTALL_SHBIN	= @INSTALL@ -m 755
- 
- #----------------------------------------------------------------------------#
- # [*] Program to install binaries to the bin directory and set the suid bit  #
- #     (eg vboxbeep):                                                         #
- #----------------------------------------------------------------------------#
- 
--INSTALL_UBIN	= @INSTALL@ -m 4755 -o root -g root -s
-+INSTALL_UBIN	= @INSTALL@ -m 4755 -s
- 
- #----------------------------------------------------------------------------#
- # [*] Program to install configurations to sysconf directory                 #
- #     (eg vboxgetty.conf):                                                   #
- #----------------------------------------------------------------------------#
- 
--INSTALL_SYSCONF	= @INSTALL@ -m 640 -o root -g root
-+INSTALL_SYSCONF	= @INSTALL@ -m 640
- 
- #----------------------------------------------------------------------------#
- # [*] Program to create missing directories:                                 #
---- ./Makefile.org	Mon Jul 22 04:00:29 2002
-+++ ./Makefile	Thu Aug  1 16:33:13 2002
-@@ -130,13 +130,13 @@
- 		exit 1; \
- 	fi
- 
--install: rootperm
-+install:
- 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
- 	@if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
+--- isdn4k-utils/Makefile.orig	2013-01-27 08:34:27.780618623 +0100
++++ isdn4k-utils/Makefile	2013-01-27 09:22:21.953892055 +0100
+@@ -133,7 +133,7 @@
  	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) ; \
-+		echo "Not running creating devices"; \
++		echo "Not creating devices" ; \
  	fi
  
  uninstall: rootperm
+--- isdn4k-utils/vbox/configure.in.orig	2013-01-27 11:34:57.610392895 +0100
++++ isdn4k-utils/vbox/configure.in	2013-01-27 12:01:55.373692511 +0100
+@@ -141,6 +141,7 @@
+ )
+ 
+ AC_MSG_RESULT(${VBOX_LCKDIR})
++VBOX_LOCKDIR=$VBOX_LCKDIR
+ 
+ AC_DEFINE_UNQUOTED(LCKFILEDIR, "${VBOX_LCKDIR}", [vbox lock directory])
+ AC_SUBST(VBOX_LCKDIR)
+@@ -198,6 +199,8 @@
+    fi
+ fi
+ 
++VBOX_DOCDIR="`eval echo $VBOX_DOCDIR`"
++
+ dnl #------------------------------------------------------------------------#
+ dnl # Creates output files:                                                  #
+ dnl #------------------------------------------------------------------------#
diff --git a/isdn4k-utils-opt.patch b/isdn4k-utils-opt.patch
index 9b0b868..7e888c1 100644
--- a/isdn4k-utils-opt.patch
+++ b/isdn4k-utils-opt.patch
@@ -49,33 +49,33 @@
  
  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
+--- isdn4k-utils/imontty/Makefile.orig	2013-01-27 10:51:09.940447663 +0100
++++ isdn4k-utils/imontty/Makefile	2013-01-27 11:02:26.557100226 +0100
 @@ -32,7 +32,7 @@
  all: $(PROGS)
  
  imontty: imontty.c imontty.h
--	cc $(CCFLAGS) -o imontty imontty.c
-+	$(CC) $(CCFLAGS) -o imontty imontty.c
+-	cc $(CFLAGS) $(CCFLAGS) -o imontty imontty.c
++	$(CC) $(CFLAGS) $(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
+--- isdn4k-utils/isdnctrl/Makefile.in.orig	2013-01-27 10:51:10.273780990 +0100
++++ isdn4k-utils/isdnctrl/Makefile.in	2013-01-27 11:03:21.640432415 +0100
 @@ -5,7 +5,7 @@
  #
  #
- SHELL			  = /bin/sh
+ SHELL			= /bin/sh
 -CFLAGS			= -Wall -O2
 +CFLAGS			= @CFLAGS@ -Wall -DVERSION=\"@I4LVERSION@\"
  INCLUDES		= -I.
- LDFLAGS			= @LIBS@ 
+ 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@ -DVERSION=\"@I4LVERSION@\"
 +CC			= @CC@
  prefix			= @prefix@
  exec_prefix		= @exec_prefix@
@@ -102,15 +102,15 @@
  	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 @@
+--- isdn4k-utils/isdnlog/Makefile.in.orig	2013-01-27 10:51:10.277114325 +0100
++++ isdn4k-utils/isdnlog/Makefile.in	2013-01-27 11:04:09.040431424 +0100
+@@ -1848,8 +1848,7 @@
  PCFLAGS = mode=oracle ireclen=160 lines=yes
  
  %.o: %.c
 -	@echo Compiling $<
--	@$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -c -o $@ $<
+-	@$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -fno-strict-aliasing -c -o $@ $<
++	$(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -fno-strict-aliasing -c -o $@ $<
  
  %.1: %.man
  	MANDATE=`grep CHECKIN $< | $(AWK) '{print $$4}'`; \
@@ -136,17 +136,6 @@
  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 @@
@@ -213,14 +202,14 @@
  
  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 @@
+--- isdn4k-utils/ipppd/Makefile.in.orig	2013-01-27 10:51:10.400447654 +0100
++++ isdn4k-utils/ipppd/Makefile.in	2013-01-27 11:05:31.063763050 +0100
+@@ -73,7 +73,7 @@
  
  DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
- COMPILE_FLAGS = 
--CFLAGS        = -O2 -fomit-frame-pointer -Wall
-+CFLAGS        = @CFLAGS@ -fomit-frame-pointer -Wall
+ COMPILE_FLAGS = @CFLAGS@
+-CFLAGS        = -O2 -fomit-frame-pointer -Wall -DREQ_SYSOPTIONS=0
++CFLAGS        = -fomit-frame-pointer -Wall -DREQ_SYSOPTIONS=0
  VER           = 2.2.0
  
  # it's a hack
@@ -246,15 +235,3 @@
  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-ppc.patch b/isdn4k-utils-ppc.patch
deleted file mode 100644
index 88f9829..0000000
--- a/isdn4k-utils-ppc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr isdn4k-utils.orig/capi20/capi20.c isdn4k-utils/capi20/capi20.c
---- isdn4k-utils.orig/capi20/capi20.c	Thu Mar  1 15:59:11 2001
-+++ isdn4k-utils/capi20/capi20.c	Sun Aug 25 15:23:15 2002
-@@ -367,7 +367,7 @@
- 	          rcvbuf[0] = 30;
- 	          rcvbuf[1] = 0;
- 	       }
--	       data = (u_int64_t)rcvbuf + CAPIMSG_LEN(rcvbuf);
-+	       data = rcvbuf + CAPIMSG_LEN(rcvbuf);
- 	       rcvbuf[12] = rcvbuf[13] = rcvbuf[14] = rcvbuf[15] = 0;
- 	       rcvbuf[22] = data & 0xff;
- 	       rcvbuf[23] = (data >> 8) & 0xff;
diff --git a/isdn4k-utils-pppdcapiplugin.patch b/isdn4k-utils-pppdcapiplugin.patch
index a3aa0e9..d5b42c8 100644
--- a/isdn4k-utils-pppdcapiplugin.patch
+++ b/isdn4k-utils-pppdcapiplugin.patch
@@ -1,7 +1,6 @@
-diff -Naur isdn4k-utils.orig/pppdcapiplugin/Makefile isdn4k-utils/pppdcapiplugin/Makefile
---- isdn4k-utils.orig/pppdcapiplugin/Makefile	Wed Jun 11 23:06:50 2003
-+++ isdn4k-utils/pppdcapiplugin/Makefile	Wed Jun 11 23:08:26 2003
-@@ -8,86 +8,15 @@
+--- isdn4k-utils/pppdcapiplugin/Makefile.orig	2013-01-27 09:27:33.333885560 +0100
++++ isdn4k-utils/pppdcapiplugin/Makefile	2013-01-27 10:09:25.173833208 +0100
+@@ -8,13 +8,15 @@
  #  as published by the Free Software Foundation; either version
  #  2 of the License, or (at your option) any later version.
  
@@ -9,47 +8,46 @@ diff -Naur isdn4k-utils.orig/pppdcapiplugin/Makefile isdn4k-utils/pppdcapiplugin
 -export CAPIINC=$(TOPDIR)/../capi20
 -export CAPILIB=$(TOPDIR)/../capi20
 -export INSTALL=$(TOPDIR)/install-sh -c
--export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
+-export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
 -export MKDIR=$(TOPDIR)/mkinstalldirs
+-export PPPINC=/usr/include/pppd
 +TOPDIR=$(shell pwd)
 +CAPIINC=$(TOPDIR)/../capi20
 +CAPILIB=$(TOPDIR)/../capi20
 +INSTALL=$(TOPDIR)/install-sh -c
-+INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
++INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
 +MKDIR=$(TOPDIR)/mkinstalldirs
++PPPINC=/usr/include/pppd
 +MANDIR=/usr/share/man
-+
-+#PPPVERSION=$(shell /usr/sbin/pppd --version 2>&1 | sed -e "s/pppd\ version\ //")
-+PLUGINDIR=$(DESTDIR)/usr/lib/pppd/$(PPPVERSION)
-+include $(TOPDIR)/Rules.make
++PLUGINDIR=$(DESTDIR)$(CONFIG_LIBDIR)/pppd/$(PPPVERSION)
  
--PPPSRCDIRS=/src/isdn/pppd
--
--ifeq ($(PPPVERSIONS),)
--PPPVERSIONS = 2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3
--endif
--
--PEERDIR=${DESTDIR}/etc/ppp/peers/isdn
--DRDSLDIR=${DESTDIR}/etc/drdsl
--PEERS= arcor otelo talkline avm avm-ml leased
--DRDSLFILES = adsl.conf
--
--ALL = capiplugin.so userpass.so
--
--all: pversion
--	@for i in $(PPPVERSIONS) ; do \
--	    echo $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	    $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	done
+ ifeq ($(PPPVERSION),)
+ PPPVERSION_XX=$(shell grep VERSION $(PPPINC)/patchlevel.h)
+@@ -28,70 +30,9 @@
+ 
+ ALL = capiplugin.so userpass.so
+ 
+-#all: pversion
+-#	@for i in $(PPPVERSIONS) ; do \
+-#	    echo $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
+-#	    $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
+-#	done
 -
--distclean: clean
+-all: pversion ppp-$(PPPVERSION)
+-	echo $(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION)
+-	$(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION)
 -
+-ppp-$(PPPVERSION):
+-	$(MKDIR) ppp-$(PPPVERSION)
+-	echo created ppp-$(PPPVERSION)
+-	cp Makefile.template ppp-$(PPPVERSION)/Makefile
++include $(TOPDIR)/Rules.make
+ 
+ distclean: clean
+ 
 -clean:
--	@for i in $(PPPVERSIONS) ; do \
--	    echo $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	    $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	done
--	$(RM) comperr pversion
+-	echo $(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION) $@ ;
+-	$(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION) $@ ;
 -
 -install-peers:
 -	$(MKDIR) $(PEERDIR)
@@ -77,11 +75,9 @@ diff -Naur isdn4k-utils.orig/pppdcapiplugin/Makefile isdn4k-utils/pppdcapiplugin
 -		fi ; \
 -	done
 -
--install: pversion
--	@for i in $(PPPVERSIONS) ; do \
--	    echo $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	    $(MAKE) -C ppp-$$i PPPVERSION=$$i $@ ; \
--	done
+-install:
+-	echo $(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION) $@ ;
+-	$(MAKE) -C ppp-$(PPPVERSION) PPPVERSION=$(PPPVERSION) $@ ;
 -	$(MAKE) install-peers
 -	$(MAKE) install-drdsl
 -	$(MAKE) install-man
@@ -97,54 +93,35 @@ diff -Naur isdn4k-utils.orig/pppdcapiplugin/Makefile isdn4k-utils/pppdcapiplugin
 -	    done \
 -	done
 -
--config:
--	@echo nothing to configure
-diff -Naur isdn4k-utils.orig/pppdcapiplugin/Rules.make isdn4k-utils/pppdcapiplugin/Rules.make
---- isdn4k-utils.orig/pppdcapiplugin/Rules.make	Wed Jun 11 23:06:50 2003
-+++ isdn4k-utils/pppdcapiplugin/Rules.make	Wed Jun 11 23:07:21 2003
-@@ -11,20 +11,37 @@
- vpath %.c $(TOPDIR)
- 
+ config:
+ 	@echo nothing to configure
+--- isdn4k-utils/pppdcapiplugin/Rules.make.orig	2013-01-27 08:06:26.000000000 +0100
++++ isdn4k-utils/pppdcapiplugin/Rules.make	2013-01-27 10:06:32.657170129 +0100
+@@ -13,12 +13,21 @@
  CC	= gcc
--INC     = -I$(TOPDIR) -I$(CAPIINC) -Ipppd
-+INC     = -I$(TOPDIR) -I$(CAPIINC) 
+ INC     = -I$(TOPDIR) -I$(CAPIINC) -I$(PPPINC)
  DEFS    = -DPPPVER=$(shell $(TOPDIR)/pversion $(PPPVERSION))
--CFLAGS	= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
-+CFLAGS	= -O2 
+-MYCFLAGS= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
++CCFLAGS = -O2
++CFLAGS  = $(CCFLAGS)
++MYCFLAGS= -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
  LDFLAGS	= -shared -L$(CAPILIB)
  
  ALL = capiplugin.so userpass.so
  
 -all:	$(ALL)
-+all: def $(ALL)
- 
++all:	def $(ALL)
++
 +pversion: pversion.c
 +	$(CC) $(CFLAGS) pversion.c -o pversion
 +
 +def: pversion
 +	echo \#define PPPVER $(shell $(TOPDIR)/pversion $(PPPVERSION)) >> p.h
 +	echo \#endif >> p.h
-+	
-+
-+capiplugin.o: capiplugin.c
-+	$(CC) $(CFLAGS) -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB) -o capiplugin.o -c capiplugin.c
-+
-+capiconn.o: capiconn.c
-+	$(CC) $(CFLAGS) -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB) -o capiconn.o -c capiconn.c
-+       
+ 
  capiplugin.so: capiplugin.o capiconn.o
  	$(CC) -o $@ $(LDFLAGS) capiplugin.o capiconn.o -lcapi20dyn
- 
-+userpass.o: userpass.c
-+	$(CC) $(CFLAGS) -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB) -o userpass.o -c userpass.c
-+
- userpass.so: userpass.o
--	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) -nostdlib userpass.o
-+	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB) -nostdlib userpass.o
- 
- distclean: clean
- 
-@@ -33,10 +50,12 @@
+@@ -36,10 +45,12 @@
  
  install: $(ALL)
  	$(MKDIR) $(PLUGINDIR)
diff --git a/isdn4k-utils-tcl.patch b/isdn4k-utils-tcl.patch
deleted file mode 100644
index 39b9440..0000000
--- a/isdn4k-utils-tcl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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,
diff --git a/isdn4k-utils.config b/isdn4k-utils.config
index 7626a99..6268ebd 100644
--- a/isdn4k-utils.config
+++ b/isdn4k-utils.config
@@ -14,7 +14,10 @@ CONFIG_BUILDX11=y
 CONFIG_KERNELDIR='/usr/src/linux'
 CONFIG_BINDIR='/usr/bin'
 CONFIG_SBINDIR='/sbin'
+CONFIG_CARD_SBINDIR='/sbin'
+CONFIG_LIBDIR='/usr/lib'
 CONFIG_MANDIR='/usr/share/man'
+CONFIG_FIRMWAREDIR='/usr/lib/isdn'
 CONFIG_RUNDIR='/var/run'
 CONFIG_LOCKDIR='/var/lock'
 CONFIG_LOCKFILE='LCK..'
@@ -22,17 +25,18 @@ CONFIG_I4LCONFDIR='/etc/isdn'
 CONFIG_CONFFILE='isdn.conf'
 CONFIG_CALLERIDFILE='callerid.conf'
 CONFIG_USERCONFFILE='~/.isdn'
-CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
 CONFIG_COUNTRY_PREFIX='+'
 CONFIG_AREA_PREFIX='0'
+CONFIG_COUNTRYCODE='49'
 CONFIG_DATADIR='/usr/lib/isdn'
+CONFIG_AREACODE=''
 CONFIG_LIB_AREACODE=y
 
 #
 # Runtime configuration tools
 #
 CONFIG_ISDNCTRL=y
+# CONFIG_ISDNCTRL_DEBUG is not set
 CONFIG_ISDNCTRL_CONF=y
 CONFIG_ISDNCTRL_TIMRU=y
 CONFIG_IPROFD=y
@@ -40,12 +44,11 @@ CONFIG_IPROFD=y
 #
 # Card configuration tools
 #
-# CONFIG_TELESCTRL is not set
 CONFIG_HISAXCTRL=y
 CONFIG_ICNCTRL=y
 # CONFIG_ICNCTRL_DEBUG is not set
-CONFIG_PCBITCTL=y
 CONFIG_AVMCAPICTRL=y
+CONFIG_ACTCTRL=y
 CONFIG_LOOPCTRL=y
 CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
 # CONFIG_LOOPCTRL_DEBUG is not set
@@ -67,10 +70,13 @@ CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
 CONFIG_ISDNLOG_RELOADCMD='reload'
 CONFIG_ISDNLOG_STOPCMD='stop'
 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_DOCDIR='/usr/doc/packages/i4l/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 # CONFIG_ISDNLOG_POSTGRES is not set
+CONFIG_ISDNLOG_POSTGRESDIR='/usr/local/postgres95'
 # CONFIG_ISDNLOG_MYSQLDB is not set
+CONFIG_ISDNLOG_MYSQLDIR='/usr/local/mysql'
 CONFIG_ISDN_LOG_DE=y
 CONFIG_IPPPSTATS=y
 CONFIG_XISDNLOAD=y
@@ -105,8 +111,10 @@ CONFIG_IPPPD_MSCHAP=y
 # CONFIG_IPPPD_RADIUS is not set
 # CONFIG_RADIUS_WTMP_LOGGING is not set
 RADIUS_CLIENT_CONFIG_FILE=''
+
 CONFIG_CAPIFAX=y
 CONFIG_RCAPID=y
+# CONFIG_C20LIBDIR='/usr/src/capi-adk/c20lib'
 
 #
 # Documentation
@@ -119,4 +127,3 @@ CONFIG_FAQDIR='/usr/share/doc/isdn4linux/faq'
 # pppdcupiplugin
 #
 CONFIG_PPPDCAPIPLUGIN=y
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/isdn4k-utils.git/commitdiff/d143c4fff51f9b77ede840fabba262ea830355e4

More information about the pld-cvs-commit mailing list